Remove old versions; revision bump to fix a mistake in the init script.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 20 insertions, 291 deletions

diff --git a/net-proxy/ufdbguard/ChangeLog b/net-proxy/ufdbguard/ChangeLog
index ac70d5774a2e..1d292cd3ffbd 100644
--- a/net-proxy/ufdbguard/ChangeLog
+++ b/net-proxy/ufdbguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/ufdbguard
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.23 2011/11/04 03:41:55 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.24 2012/01/12 13:22:22 flameeyes Exp $
+
+*ufdbguard-1.27-r1 (12 Jan 2012)
+
+  12 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +ufdbguard-1.27-r1.ebuild, -ufdbguard-1.26-r1.ebuild, -ufdbguard-1.26.ebuild,
+  -ufdbguard-1.27.ebuild, files/ufdb.initd.2:
+  Remove old versions; revision bump to fix a mistake in the init script.
 
 *ufdbguard-1.27 (04 Nov 2011)
 
diff --git a/net-proxy/ufdbguard/Manifest b/net-proxy/ufdbguard/Manifest
index 52e3c79f5d5f..0a0812e65f37 100644
--- a/net-proxy/ufdbguard/Manifest
+++ b/net-proxy/ufdbguard/Manifest
@@ -3,26 +3,22 @@ Hash: SHA1
 
 AUX ufdb.confd 672 RMD160 42308498bf95a6b4e104c9718789b4dc169030be SHA1 21f8c458d4ffa080e6adef6b75e51e08e76ac178 SHA256 dd12bbbb1c4babb44af9ebdf8e233b09405d820f816c17495e34ddd283e01b6b
 AUX ufdb.initd 1905 RMD160 9d8c121184b17d3ad34faf3fefc9af783f6ab82c SHA1 fceb9cbf14e7b365dc1ad593730fbf6d1f8bba08 SHA256 b6c092282cc16681c7936b0a115d7f040d66e570425d53116700f311e1ab0ebe
-AUX ufdb.initd.2 1612 RMD160 f4b4766dbf0170309b9bcb0ba97ab8c84c24112f SHA1 130aa81b82033393116c124a4e20a1b5a73cf730 SHA256 425f77def535e3587de5f2d2cbaf65abc7a0b59df9ee0002eef48b1fcf13b40c
+AUX ufdb.initd.2 1618 RMD160 f20c125ce30895aa61271b9e4eaa804a750eac58 SHA1 4edb24d70c2cddaffce96455a8712a9921915261 SHA256 886af50f1ca6e9a9c4c061fa062e998273ebff3d39b32d3d859bc1d8263d4ed3
 AUX ufdbUpdate.cron 464 RMD160 f2d45ee168d6b7e241ca6ee87687325174472132 SHA1 c11eff202a88f26255f18c15a75a31db5ccedf53 SHA256 31695bab91bfe4584df988399c344f8d7bba2c3bf9680492b9edf27807afee99
 AUX ufdbguard-1.23-parallel-make.patch 3910 RMD160 5086735f2500899c28185a2887a44d9fdd585a39 SHA1 6861a77315776627d728ccfe893641999b9cc6f6 SHA256 6a855ed8b9232c3c663ec6fc890b19eb828d675f4cb6a0f9829702ed709cceb7
 AUX ufdbguard-1.24-gentoo.patch 536 RMD160 702db979db7ee3d1a1617f9b9ee697b2dffc7b74 SHA1 e2e5dcfc9093a8ec5f4811c4eb6e52844c1665b3 SHA256 3e22a42b73c6aa6ff6737455b19d202d661990c9931ffa3785b6aaa78af73d90
 DIST ufdbGuard-1.24.tar.gz 747635 RMD160 48209be420bf9593a46a89be92be4a19ddfd0841 SHA1 30e3fdf7a3c04415f743cf32a4bde18b60b966f9 SHA256 6e5df4ef7f5d13d1ad2a0902449c9909cc013242f3783925800df5011bd3446c
-DIST ufdbGuard-1.26.tar.gz 766725 RMD160 10f881cf40a5294ee074b913042e273ce6674149 SHA1 cbb035e03e943749bd5f3a35ec49f6dc1dbef706 SHA256 f4d72cc4ea1e2983207d2509d3408b04041bcfc48a790338c5a8b5e6662c8eac
 DIST ufdbGuard-1.27.tar.gz 780380 RMD160 a624c7843343d151674db0d64730bb12707d82a1 SHA1 d0de38f0f5ea2f69e3b3a24eefe8cb02e77671d3 SHA256 b70c531e670d1ee817048ee1c25ab5ad844b39b54013eb262a61d1473a41353c
 DIST ufdbguard-1.24-manual.pdf 491034 RMD160 f0eb280602c5bbc191431457bc49714ed1260a44 SHA1 eeb415fe32d84d27bda4250bb2b67196d7fe93d0 SHA256 7185161d912202510ec1767fc0239f48c2a98f948afb3a207ea55c341e03e459
-DIST ufdbguard-1.26-manual.pdf 494360 RMD160 901d3cd4d5da6976c7e27a2db181e8948f50e4ce SHA1 375234c4bfd627bc9db48e7816f757ebde137f58 SHA256 b0ef3e648c0a9336018ddc7180b853ef904c108c7318d8c5ebaba7015fd185a4
 DIST ufdbguard-1.27-manual.pdf 501140 RMD160 f9c8b5186c9c5ef332ff00e01ecde1772cfa689e SHA1 5078c02a1a8e70016e974a81093b8e08581e6b2d SHA256 9d5cba88b4be71528a60daf6576c662dd69b01d344bc9fd721f70db6ad32d288
 EBUILD ufdbguard-1.24-r1.ebuild 3871 RMD160 11e3db1c0edd914b32db6dccf11394fa555df866 SHA1 a344a9488ae4edac3f463794196f54b07cb0121b SHA256 0fbcae29c11e77b26b02b228b15bc8473956450bd2df5f8429f0e3ee6f233ce8
-EBUILD ufdbguard-1.26-r1.ebuild 3954 RMD160 84972310a663786ce3fc1667f2276851c902280d SHA1 60df603f7d299f23fbb3553c2144ba0a4145f0b9 SHA256 0f9bfdc58294dfefa83f300b5254930c6fa26d1badf6985d891d880a9acd849e
-EBUILD ufdbguard-1.26.ebuild 3949 RMD160 e3e7ae5e6780b6ff33c0993461c1433490b00b05 SHA1 eab8edde62eaa26e210b6c5bca2db0567375f3be SHA256 fc0e5d07a2828585f1d241b43d0fbce1ea6c1040c37db39f4ea0d2682e41cc3e
-EBUILD ufdbguard-1.27.ebuild 3951 RMD160 4e7ce71c67233cc8642e81a2a46ac6c1a0a2563f SHA1 e4e128f2d634a39dab5742f445bec55df7e383cd SHA256 6a543e92b88533f39b319ddda8c90b2e2535fd00c45412ad7c32b3fd1a368a94
-MISC ChangeLog 5136 RMD160 3773148b2c5d311047b87c609e389578286f1fa3 SHA1 a6ae6e1cd11b84571385c5fca54e7f62caa3ad2e SHA256 d59715139b5ec02cf514667382d6fc39426fb3be4f136d73b6f5f6156cf807aa
+EBUILD ufdbguard-1.27-r1.ebuild 3954 RMD160 f6e45d5ba1f0e6d671daf914659ea45af82e1123 SHA1 d7577c05535224a11571e3e6e0bb30edb1976b3a SHA256 4b6bea3e2b54f5293700cb06376fa825e65d7b2cde76efc227891b3f69eeeacb
+MISC ChangeLog 5427 RMD160 2d969c9778a0f693945e87fdbaf208131dc70a7a SHA1 55d9d18194a306c7e7fd85f0a1a170b73dbb89d3 SHA256 87d1d39817e827b34027cec9869c5b4b98f1061c625c819262d88e4606119ec7
 MISC metadata.xml 930 RMD160 b18e50b20ed136dcfc4730edc263f0d47d9a6a42 SHA1 6f6f5f48a9980e9ff4b04169ece36bcc901676c4 SHA256 dd9844b6440d0b7267ec9cc14b9809d48072874cf660968ff43d51f4414eeaa0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6zXw8ACgkQAiZjviIA2XhJ7QCg8IXMzaM2wcNZsfMVg8N8ObLh
-FGkAoJ69LVotA0u3r1RFIJJnuf2IRvfG
-=B/LC
+iEYEARECAAYFAk8O3okACgkQAiZjviIA2XjY7ACg2tw2VYlrUza0mT99tcHbO8to
+L+YAnjmQ4VnPodJamY9hhjKIAjRZskPF
+=BpZd
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/ufdbguard/files/ufdb.initd.2 b/net-proxy/ufdbguard/files/ufdb.initd.2
index 75370da7917d..ec7312aedd42 100644
--- a/net-proxy/ufdbguard/files/ufdb.initd.2
+++ b/net-proxy/ufdbguard/files/ufdb.initd.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd.2,v 1.1 2011/10/22 00:15:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd.2,v 1.2 2012/01/12 13:22:22 flameeyes Exp $
 
 # reconfig is what the upstream documentation suggests, so let's
 # provide it for compatibility.
@@ -47,7 +47,7 @@ gentables() {
 start_pre() {
 	gentables
 
-	checkpath -d -m 0755 -o ${UFDB_USER} $(get_config logdir) /var/run/ufdbguardd
+	checkpath -d -m 0755 -o ${UFDB_USER} $(get_config logdir) "$(dirname "${pidfile}")"
 }
 
 reload() {
diff --git a/net-proxy/ufdbguard/ufdbguard-1.26.ebuild b/net-proxy/ufdbguard/ufdbguard-1.26.ebuild
deleted file mode 100644
index e58dff71c0b7..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.26.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.26.ebuild,v 1.2 2011/09/06 10:03:37 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.23-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 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
-}
diff --git a/net-proxy/ufdbguard/ufdbguard-1.26-r1.ebuild b/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild
index 2497f64aa63e..377363fb615c 100644
--- a/net-proxy/ufdbguard/ufdbguard-1.26-r1.ebuild
+++ b/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.26-r1.ebuild,v 1.1 2011/10/22 00:15:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.27-r1.ebuild,v 1.1 2012/01/12 13:22:22 flameeyes Exp $
 
 EAPI="4"
 
diff --git a/net-proxy/ufdbguard/ufdbguard-1.27.ebuild b/net-proxy/ufdbguard/ufdbguard-1.27.ebuild
deleted file mode 100644
index 59b0e787db32..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.27.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.27.ebuild,v 1.1 2011/11/04 03:41:55 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.23-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
-}