Version bump.

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

3 files changed, 143 insertions, 5 deletions

diff --git a/net-proxy/ufdbguard/ChangeLog b/net-proxy/ufdbguard/ChangeLog
index b0bc7e92bbb3..782a21c587cb 100644
--- a/net-proxy/ufdbguard/ChangeLog
+++ b/net-proxy/ufdbguard/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2011/05/01 16:05:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.15 2011/06/10 15:20:05 flameeyes Exp $
+
+*ufdbguard-1.25 (10 Jun 2011)
+
+  10 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> +ufdbguard-1.25.ebuild:
+  Version bump.
 
 *ufdbguard-1.24-r1 (01 May 2011)
 
diff --git a/net-proxy/ufdbguard/Manifest b/net-proxy/ufdbguard/Manifest
index fe2e4ee94895..57869a4d5864 100644
--- a/net-proxy/ufdbguard/Manifest
+++ b/net-proxy/ufdbguard/Manifest
@@ -13,16 +13,19 @@ AUX ufdbguard.initd 1021 RMD160 7d4c5e63dcce32db5e4db24bdb35c8aa71611ac7 SHA1 d7
 DIST ufdbGuard-1.11.tar.gz 586455 RMD160 bf5386f65283a41de2263566b812f0f20c22a9fe SHA1 675c0c18b8b37570fd5e163f5e475f2c370dcfa4 SHA256 5ce227a5cc23c2f6b6f5ccac3e59711386feaa751ff56a922890e4cb240528f3
 DIST ufdbGuard-1.20.tar.gz 681981 RMD160 b789de2d27c4e1834bdd1b7a1625f22210446889 SHA1 d16b3849d3ec05d1b0db73f2261ae111792f4203 SHA256 ef9ce77f7614cb1004fcbe4bf6bf8f54f44a2a7cedab0fdab61e6d2a580949da
 DIST ufdbGuard-1.24.tar.gz 747635 RMD160 48209be420bf9593a46a89be92be4a19ddfd0841 SHA1 30e3fdf7a3c04415f743cf32a4bde18b60b966f9 SHA256 6e5df4ef7f5d13d1ad2a0902449c9909cc013242f3783925800df5011bd3446c
+DIST ufdbGuard-1.25.tar.gz 765898 RMD160 33c5fd15b03f58ac6cacac6dc8bd58505145d8c2 SHA1 102c8e3efa554d68fc050c2f5a67a66dd85355c7 SHA256 fe281469061ff03f885382448fa538c8214b969e921bb7857821cbe501c3f436
 DIST ufdbguard-1.24-manual.pdf 491034 RMD160 f0eb280602c5bbc191431457bc49714ed1260a44 SHA1 eeb415fe32d84d27bda4250bb2b67196d7fe93d0 SHA256 7185161d912202510ec1767fc0239f48c2a98f948afb3a207ea55c341e03e459
+DIST ufdbguard-1.25-manual.pdf 524717 RMD160 b79e1bd98dc397fee9dbd378b1cd36038d5627f4 SHA1 92727623a348201f418b57d2e85d37337c548740 SHA256 267931122be216774332cf237320fbba57cd45e23cacc01afbefcd2973066ddc
 EBUILD ufdbguard-1.11.ebuild 1449 RMD160 ab72eddf685fe820661107c123ce02855cd31132 SHA1 b8c060fa78bc04e45a578b7bd83934c799e0fd65 SHA256 95fb89dcc517861b01f7a3af5da8593f96acfac5756d2ada0f18761a77532f86
 EBUILD ufdbguard-1.20.ebuild 1742 RMD160 7a7babe1db357f89530e1b9d0f05a16c59c38cee SHA1 99eef95b0fbc1aa41f9663fb22068d3a1aee0a18 SHA256 c4e0d89f8174604b2774e341159c7845cc2bdebc241622c7b5fa1f67db224f0c
 EBUILD ufdbguard-1.24-r1.ebuild 3833 RMD160 72407a6526f4bcdffe7e75a4a602be9e7119df82 SHA1 cea66e743db90bb49c0d28a85e8430076b8a1ee7 SHA256 11db64c50749b7ce71dd24d5c092f4a30cee00c8ce08ed21214a7e672d056180
-MISC ChangeLog 3487 RMD160 15cc653fcbe550753a400a983542289b2f874d97 SHA1 c0d003483264f9368e12f5134c1f473c2843907d SHA256 5a153ae2ec368d988405d50d3607bcf7be22993cc4da8fb87941eaa8bae4eeeb
+EBUILD ufdbguard-1.25.ebuild 3752 RMD160 49c61a583762964622276030b8511efe4e4bad54 SHA1 803eb18ea4a6398d53d107d9a05870e77c560212 SHA256 ffdfd6661e3a692d3351d1d237dce816c63cd7d24e39e9f97b7a37ecb0867587
+MISC ChangeLog 3615 RMD160 d6d55d3e5ee026540474f2f5cb9309da6dfcfc87 SHA1 cefc3c73a6358d9998bf54f40393623c5d082397 SHA256 203f771a06ea95be3a8c013a719cfe1cf9060a5e71fcfc6174e3f4630e87ffd9
 MISC metadata.xml 953 RMD160 e5c3a65fdc0074587bdb6d0cd3dca4610c54faa7 SHA1 eed3aec0f91aadf91c767a8915d0bf53dbf91675 SHA256 9d7949c88251c6e36f5302c2695481d848f237451b77c70849351c6bdf9b2e2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk29hNcACgkQAiZjviIA2XigYgCfRZz+Aptpv90qEfuyZSoVmZeG
-bfkAoNjV5dIl4p3x23NtqpLvmEIif7ra
-=0bW9
+iEYEARECAAYFAk3yNiYACgkQAiZjviIA2XhhFwCfcUXXk0e1RR6Nms1oEy2m/lym
+dFAAniFW4lfwzOwVdIp+27UCkP3TMzKz
+=1d2A
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/ufdbguard/ufdbguard-1.25.ebuild b/net-proxy/ufdbguard/ufdbguard-1.25.ebuild
new file mode 100644
index 000000000000..11d2f0cb1f8c
--- /dev/null
+++ b/net-proxy/ufdbguard/ufdbguard-1.25.ebuild
@@ -0,0 +1,130 @@
+# 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.25.ebuild,v 1.1 2011/06/10 15:20:05 flameeyes Exp $
+
+EAPI="4"
+
+inherit eutils
+
+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"
+
+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() {
+	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
+}