Version bump.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

3 files changed, 276 insertions, 1 deletions

diff --git a/net-proxy/ufdbguard/ChangeLog b/net-proxy/ufdbguard/ChangeLog
index 883282b30ccb..c856dc8f5a82 100644
--- a/net-proxy/ufdbguard/ChangeLog
+++ b/net-proxy/ufdbguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/ufdbguard
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.26 2012/03/18 19:25:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.27 2012/08/29 22:30:16 flameeyes Exp $
+
+*ufdbguard-1.29 (29 Aug 2012)
+
+  29 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/ufdbguard-1.29-parallel-make.patch, +ufdbguard-1.29.ebuild:
+  Version bump.
 
   18 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #391429.
diff --git a/net-proxy/ufdbguard/files/ufdbguard-1.29-parallel-make.patch b/net-proxy/ufdbguard/files/ufdbguard-1.29-parallel-make.patch
new file mode 100644
index 000000000000..61ef58030dab
--- /dev/null
+++ b/net-proxy/ufdbguard/files/ufdbguard-1.29-parallel-make.patch
@@ -0,0 +1,132 @@
+--- a/src/Makefile.in	2010-04-12 04:39:43.000000000 +0200
+--- b/src/Makefile.in	2010-05-07 05:26:03.000000000 +0200
+@@ -135,8 +135,8 @@
+ # Dependencies for installing
+ #
+ 
+-daemon:
+-	cd mtserver; make
++daemon: $(UFDBOBJS)
++	cd mtserver; $(MAKE)
+ 
+ ufdbhttpd: ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o
+ 	$(LINK) ufdbhttpd.o httpserver.o ufdbbase.o ufdblib.o sgLog.o crypt.o $(LIBS)
+@@ -235,6 +235,6 @@
+ 	$(RM) $(bindir)/ufdbhttpd
+ 
+ install.mt::
+-	cd mtserver ; make
++	cd mtserver ; $(MAKE)
+ 	$(INSTALL_PROGRAM) mtserver/ufdbguardd  $(bindir)/ufdbguardd
+ 	$(INSTALL_PROGRAM) mtserver/ufdbgclient $(bindir)/ufdbgclient
+@@ -272,8 +272,8 @@
+ 	$(RM) *~ *.bak core core.* *.log *.log.[0-9] *.error
+ 	$(RM) *.o y.tab.c y.tab.h ufdbGuard ufdbGenTable ufdbAnalyse ufdbPrintTable ufdbhttpd 
+ 	$(RM) ipv6 iptst rwtest lex.yy.c
+-	-@cd mtserver && make clean
+-	-@cd api 2>/dev/null && make clean
++	-@cd mtserver && $(MAKE) clean
++	-@cd api 2>/dev/null && $(MAKE) clean
+ 
+ realclean:: clean
+ 	@echo making $@ in `basename \`pwd\``
+@@ -286,11 +286,11 @@
+ distclean:: realclean
+ 	@echo making $@ in `basename \`pwd\``
+ 	$(RM) Makefile sg.h config.h ufdbUpdate ufdbConvertDB ufdbGuard.conf
+-	-cd mtserver ; make distclean
++	-cd mtserver ; $(MAKE) distclean
+ 
+ apidistclean: distclean
+ 	@echo making $@ in `basename \`pwd\``
+-	-cd api ; make distclean
++	-cd api ; $(MAKE) distclean
+ 
+ grab: ufdbGrab
+ 	./ufdbGrab $(cfgdir) $(logdir)
+@@ -532,25 +532,25 @@
+ 	$(CC) --version
+ 
+ g2953:
+-	make clean 
+-	CC=/usr/local/gcc/2.95.3/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
++	$(MAKE) clean 
++	CC=/usr/local/gcc/2.95.3/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
+ 
+ g344:
+-	make clean 
+-	CC=/usr/local/gcc/3.4.4/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
++	$(MAKE) clean 
++	CC=/usr/local/gcc/3.4.4/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
+ 
+ g401:
+-	make clean 
+-	CC=/usr/local/gcc/4.0.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
++	$(MAKE) clean 
++	CC=/usr/local/gcc/4.0.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
+ 
+ g411:
+-	make clean 
+-	CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) ccversion all ufdbPrintTable
++	$(MAKE) clean 
++	CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) ccversion all ufdbPrintTable
+ 
+ qinst:
+ 	/etc/init.d/squid stop
+ 	/etc/init.d/ufdb stop
+-	make install
++	$(MAKE) install
+ 	/etc/init.d/ufdb start
+ 	/etc/init.d/squid start
+ 
+--- a/src/mtserver/Makefile.in	2010-04-12 02:56:20.000000000 +0200
+--- b/src/mtserver/Makefile.in	2010-05-07 05:26:03.000000000 +0200
+@@ -48,10 +48,10 @@
+ 	$(LINK) ufdbgclient.o -L. -lufdbd    $(SOLARIS_LIBS)
+ 
+ ../lex.yy.o:
+-	cd .. ; make lex.yy.o
++	cd .. ; $(MAKE) lex.yy.o
+ 
+ ../y.tab.o:
+-	cd .. ; make y.tab.o
++	cd .. ; $(MAKE) y.tab.o
+ 
+ $(MYLIB): ../crypt.o ../lex.yy.o ../sgDiv.o ../sgLog.o ../ufdbLookup.o \
+           ../ufdblib.o ../y.tab.o ../ufdbbase.o 
+@@ -60,7 +60,7 @@
+ 	               ../ufdblib.o ../y.tab.o ../ufdbbase.o 
+ 
+ ptmalloc3/libptmalloc3.a:
+-	cd ptmalloc3 ; make linux-pthread
++	cd ptmalloc3 ; $(MAKE) linux-pthread
+ 
+ $(MYLIBSSL): ../ufdbchkport.o ../httpsQueue.o ../ufdbHashtable.o
+ 	-@rm -f $(MYLIBSSL)
+@@ -102,7 +102,7 @@
+ 	./ufdbgclient -p $(PORT) -l . -d "www.sex.com" 10.1.1.1 kees
+ 
+ ../../test/blacklist/domains.ufdb: ../../test/blacklist/domains
+-	cd ../../test ; make blacklist/domains.ufdb
++	cd ../../test ; $(MAKE) blacklist/domains.ufdb
+ 
+ LEAKOPTS= --leak-check=full --show-reachable=yes
+ LEAKOPTS=
+@@ -382,7 +382,7 @@
+ 	time ./ufdbgclient -p $(PORT) -l . < ../100000 > /dev/null 2>&1
+ 
+ tt:
+-	make tp3
++	$(MAKE) tp3
+ 	sleep 3
+ 	kill -HUP `ps -ef | grep ufdbguardd | grep -v grep | head -1 | awk '{ print $$2 }'`
+ 
+@@ -455,6 +455,6 @@
+ 
+ 
+ g411:	
+-	make clean
+-	CC=/usr/local/gcc/4.1.1/bin/gcc make -e $(MAKEFLAGS) all
++	$(MAKE) clean
++	CC=/usr/local/gcc/4.1.1/bin/gcc $(MAKE) -e $(MAKEFLAGS) all
+ 
diff --git a/net-proxy/ufdbguard/ufdbguard-1.29.ebuild b/net-proxy/ufdbguard/ufdbguard-1.29.ebuild
new file mode 100644
index 000000000000..29ab1382dff0
--- /dev/null
+++ b/net-proxy/ufdbguard/ufdbguard-1.29.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.29.ebuild,v 1.1 2012/08/29 22:30:16 flameeyes Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic
+
+MY_P="ufdbGuard-${PV}"
+
+DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy."
+HOMEPAGE="http://www.urlfilterdb.com/en/products/ufdbguard.html"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	doc? ( mirror://sourceforge/${PN}/ReferenceManual_v${PV/\./_}.pdf -> ${P}-manual.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+httpd doc"
+
+RDEPEND="dev-libs/openssl
+	app-arch/bzip2
+	net-misc/wget"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+RDEPEND="${RDEPEND}
+	sys-apps/openrc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# create the squid user exactly as done by net-proxy/squid-3.1.9
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.29-parallel-make.patch
+	epatch "${FILESDIR}"/${PN}-1.24-gentoo.patch
+
+	egrep -r -e '/var/tmp/ufdb(guard|http)d.pid' "${S}" -lZ | xargs -0 \
+		sed -i -e 's:/var/tmp/ufdb\(guard\|http\)d.pid:/var/run/ufdbguard/ufdb\1d.pid:' \
+		|| die
+
+	# directory where ufdbhttpd is to be found
+	sed -i -e 's:DEFAULT_BINDIR.*:DEFAULT_BINDIR "/usr/libexec/ufdbguard":' \
+		src/ufdb.h.in || die
+}
+
+src_configure() {
+	# better safe than sorry, the code has a number of possible
+	# breakage, and at least one certain breakage.
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--with-ufdb-user=squid \
+		--with-ufdb-config=/etc \
+		--with-ufdb-logdir=/var/log/ufdbguard \
+		--with-ufdb-dbhome=/usr/share/ufdbguard/blacklists \
+		--with-ufdb-images_dir=/usr/share/ufdbguard/images
+}
+
+src_install() {
+	dodoc CHANGELOG INSTALL README src/sampleufdbGuard.conf
+	doman doc/*.1
+
+	dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab \
+		src/ufdbConvertDB
+	dosbin src/ufdbUpdate
+
+	exeinto /usr/libexec/ufdbguard
+	doexe src/mtserver/ufdbguardd src/mtserver/ufdbgclient
+
+	if use httpd; then
+		exeinto /usr/libexec/ufdbguard
+		doexe src/ufdbhttpd
+	fi
+
+	keepdir /usr/share/ufdbguard/blacklists
+
+	insinto /etc
+	doins src/ufdbGuard.conf
+
+	insinto /usr/share/ufdbguard/images
+	doins src/images/*
+
+	newconfd "${FILESDIR}"/ufdb.confd ufdb
+	newinitd "${FILESDIR}"/ufdb.initd.2 ufdb
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/ufdbUpdate.cron ufdbUpdate
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		newins "${DISTDIR}"/${P}-manual.pdf ReferenceManual.pdf
+	fi
+}
+
+pkg_postinst() {
+	elog "The default location for the blacklist database has been"
+	elog "moved to /usr/share/ufdbguard/blacklists."
+	elog ""
+	elog "The configuration file is no longer configurable in the"
+	elog "service file, and now resides at /etc/ufdbGuard.conf ."
+	elog ""
+	elog "The service script has been renamed from ufdbguad to simply"
+	elog "/etc/init.d/ufdb, to follow the official documentation, and"
+	elog "it gained a reload option with a reconfig alias."
+	elog ""
+	elog "You can configure the username and password parameters for"
+	elog "ufdbUpdate, to fetch the blacklist database provided by"
+	elog "URLfilterDB, directly in /etc/conf.d/ufdb without touching"
+	elog "the script itself."
+	elog ""
+	elog "To enable ufdbguard in squid, you should add this to your"
+	elog "squid.conf:"
+	elog ""
+	elog "    url_rewrite_program /usr/libexec/ufdbguard/ufdbgclient -l /var/log/ufdbguard"
+	elog "    url_rewrite_children 64"
+	elog ""
+	if ! use httpd; then
+		elog "You chose to not install the lightweight http daemon that"
+		elog "comes with ufdbguard."
+	else
+		elog "The ufdb service will start both the ufdbguardd daemon and"
+		elog "the ufdbhttpd http daemon to provide a local redirect CGI."
+		elog "If you don't want this to happen, disable the httpd USE flag."
+	fi
+	if use doc; then
+		elog ""
+		elog "The reference manual has been installed as"
+		elog "    /usr/share/doc/${PF}/ReferenceManual.pdf"
+	fi
+}