version bump

Package-Manager: portage-2.1.6.7/cvs/Linux i686

7 files changed, 129 insertions, 24 deletions

diff --git a/net-proxy/ufdbguard/ChangeLog b/net-proxy/ufdbguard/ChangeLog
index 4b1906b80a8a..b81b2c71c2e4 100644
--- a/net-proxy/ufdbguard/ChangeLog
+++ b/net-proxy/ufdbguard/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/ufdbguard
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.4 2008/10/12 08:03:18 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.5 2009/03/18 17:08:49 bass Exp $
+
+*ufdbguard-1.16 (18 Mar 2009)
+
+  18 Mar 2009; J. Alberto Suárez López <bass@gentoo.org>
+  files/ufdbguard.confd, files/ufdbguard.initd, +files/ufdbhttpd.confd,
+  +files/ufdbhttpd.initd, +ufdbguard-1.16.ebuild:
+  Version Bump
 
   12 Oct 2008; Alin Năstac <mrness@gentoo.org> ufdbguard-1.13.ebuild:
   Remove squid run-time dependency (#241212).
diff --git a/net-proxy/ufdbguard/Manifest b/net-proxy/ufdbguard/Manifest
index 8efa764493c4..540afc2e730e 100644
--- a/net-proxy/ufdbguard/Manifest
+++ b/net-proxy/ufdbguard/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX ufdbguard.confd 319 RMD160 2c2e2741e515a2b83ccdfebe1c909f858e576573 SHA1 ddd9702c2b598dfaf5ca6b04cd8499ea90ed0113 SHA256 9497d63271a9c5dda6ff19e2cf2a845e194594ef3d60b62c6ac9a5fa24ab1925
-AUX ufdbguard.initd 1034 RMD160 5ebfaa72f99389d910b5c0d751fa559166e994ee SHA1 ea1771f74c7b37e8d1897e9170873729aed07156 SHA256 af07d98a12db157f77928e86f52bb24a17795d1bbc833bf177a4c3182a3e8008
+AUX ufdbguard.confd 402 RMD160 2cd60b4733d49f77884dcf5f6b424698b6676277 SHA1 09c56de3e2112fce23fc71418303e3e74f7f978f SHA256 f39e7a716c65043e78cfb1e928a656115a9a3e545d8f36a05eabba499f5316a1
+AUX ufdbguard.initd 1021 RMD160 7d4c5e63dcce32db5e4db24bdb35c8aa71611ac7 SHA1 d785bfe9b72b647e36998e39bc7a2ba9fbc6c929 SHA256 129db96a03b132eee27cb65c90e5fea36481d3230309e9d19c126a0c060b4618
+AUX ufdbhttpd.confd 292 RMD160 37e1b7ba717652918856dd1af399613485a067d1 SHA1 47265a838193178641183ecdccdbdfd68238b904 SHA256 2ef748832a479ba7e7610745a19773fc18fb7f278687d98532612e524d140d6e
+AUX ufdbhttpd.initd 683 RMD160 162b1947d8deb82cf1a06b2cf797f676bb43f035 SHA1 f481aebdb7d31c102e9da6daf1b13f1999c668bc SHA256 a3b101c854a9694d38dac967a9436e3d40d1b9a9703a708723baf255bfecc7af
 DIST ufdbGuard-1.11.tar.gz 586455 RMD160 bf5386f65283a41de2263566b812f0f20c22a9fe SHA1 675c0c18b8b37570fd5e163f5e475f2c370dcfa4 SHA256 5ce227a5cc23c2f6b6f5ccac3e59711386feaa751ff56a922890e4cb240528f3
 DIST ufdbGuard-1.13.tar.gz 670476 RMD160 c8c70a918cdf7be6d349b5a701b8baabb76b130b SHA1 51a5bc0f461c02e7219781eb73a587ea81b3c60f SHA256 8ddbef562cf741aee6d8574fbab30de067187f992975a2d58f75cf9a39fad875
+DIST ufdbGuard-1.16.tar.gz 765012 RMD160 7f66e249c778eefb09edd0894c02ee7962891eb4 SHA1 6f14a5d6f77336bab851887b47f2c24025ed4cc7 SHA256 510ea3f61caeb2e2e9a6d108da0755f41b0a44098ad8661133230b672c779ece
 EBUILD ufdbguard-1.11.ebuild 1449 RMD160 ab72eddf685fe820661107c123ce02855cd31132 SHA1 b8c060fa78bc04e45a578b7bd83934c799e0fd65 SHA256 95fb89dcc517861b01f7a3af5da8593f96acfac5756d2ada0f18761a77532f86
 EBUILD ufdbguard-1.13.ebuild 1636 RMD160 9863d276f6e927f20aef8931bb3ae13694141ee8 SHA1 ea26cd15b8bb3dcc31d0d6a208aa01d9074570b7 SHA256 5ff1572a0d0706b135564843a2c0a75205624cee3884e90e716b7302c88d5e28
-MISC ChangeLog 622 RMD160 af7e022492bc7efebae3152a1c68d5ee5a1a7881 SHA1 f04493361522ba1d7935a56888e376ddcdc3ae17 SHA256 2504c8de8eb63a7f03f589affd25b93d28cafbdcbaaff94e5376adb77d563aa2
+EBUILD ufdbguard-1.16.ebuild 1782 RMD160 5e60986c433acc543d0a50ee52581518dbf88a05 SHA1 18701e974259e41a201691c5d766e693dfd46a36 SHA256 e6d6c40d9c019e849ea056ec79a21bfff24185cd00feaa8791ea89a93a948c9a
+MISC ChangeLog 848 RMD160 6e04dcd8ece7df086ef1ba5fed9a62bc5ebc40c5 SHA1 36db0d9dc04e8223b7c5dd286af1f7d8e1e3ab1c SHA256 fd00192ee6539d94e04018a0c030e5768dcf8b6d756c83f526d725d8f9f36195
 MISC metadata.xml 480 RMD160 0fdde361e5387cfb2309ac143af25bafa90c85a7 SHA1 3cf13af5230506504ace227a6bcffad632ec213c SHA256 578bc2eca5799022f63aa1adf4d4f67b73e53d8c3b4e9ee9393d8484c82eb500
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjxr04ACgkQPrHvTlXvhts1igCeNJdkQAcTjYSsQipdpw+subXY
-xGQAnA5YwA+5YhaOQbA82I5pnDm3HK3i
-=AHjX
------END PGP SIGNATURE-----
diff --git a/net-proxy/ufdbguard/files/ufdbguard.confd b/net-proxy/ufdbguard/files/ufdbguard.confd
index c80752dc0349..f16d56c55ff1 100644
--- a/net-proxy/ufdbguard/files/ufdbguard.confd
+++ b/net-proxy/ufdbguard/files/ufdbguard.confd
@@ -1,9 +1,15 @@
-UFDB_OPTS=""
+# Generate Tables (lists)  when init #
 UFDB_GT="alwaysallow alwaysdeny"
 
+UFDB_USER="squid"
+
+# option : ufdbguardd --help #
+# -T : test mode
+UFDB_OPTS="-S"
+
+# Better not change that #
 UFDB_CONFDIR="/etc/ufdbguard"
 UFDB_CONF="${UFDB_CONFDIR}/ufdbGuard.conf"
 UFDB_PIDFILE="/var/run/ufdbguardd.pid"
 UFDB_BINARY="/usr/bin/ufdbguardd"
-
-UFDB_LOGDIR=$( grep logdir ${UFDB_CONF} 2>/dev/null | awk '{print $2}' )                                   UFDB_USER="squid"
+UFDB_LOGDIR=$( grep logdir ${UFDB_CONF} 2>/dev/null | awk '{print $2}' )
diff --git a/net-proxy/ufdbguard/files/ufdbguard.initd b/net-proxy/ufdbguard/files/ufdbguard.initd
index f704dbd5309a..e754346d23a3 100644
--- a/net-proxy/ufdbguard/files/ufdbguard.initd
+++ b/net-proxy/ufdbguard/files/ufdbguard.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdbguard.initd,v 1.3 2007/04/24 13:49:40 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdbguard.initd,v 1.4 2009/03/18 17:08:50 bass Exp $
 
 depend() {
 	need net
@@ -26,18 +26,18 @@ start() {
 
 	if [ ! -d "${UFDB_LOGDIR}" ] ; then
 		mkdir -p ${UFDB_LOGDIR}
-		chown -R ${UFDB_USER} ${UFDB_LOGDIR}
+		chown -R ${UFDB_LOGDIR}
 	fi
 
 	ebegin "Starting ufdbGuard"
 	start-stop-daemon --start --chuid ${UFDB_USER} \
 		--exec ${UFDB_BINARY} --pidfile ${UFDB_PIDFILE} -- -c ${UFDB_CONF} \
 		${UFDB_OPTS}
-	eend $? "Failed to start ufdbguard"
+	eend $? "Failed to start ufdbGuard"
 }
 
 stop() {
-	ebegin "Stopping ufdbguard"
+	ebegin "Stopping ufdbGuard"
 	start-stop-daemon --stop --exec ${UFDB_BINARY} --pidfile ${UFDB_PIDFILE}
-	eend $? "Failed to stop ufdbguard"
+	eend $? "Failed to stop ufdbGuard"
 }
diff --git a/net-proxy/ufdbguard/files/ufdbhttpd.confd b/net-proxy/ufdbguard/files/ufdbhttpd.confd
new file mode 100644
index 000000000000..fad3f01cbed8
--- /dev/null
+++ b/net-proxy/ufdbguard/files/ufdbhttpd.confd
@@ -0,0 +1,11 @@
+UFDB_HUSER="squid"
+UFDB_HPORT="80"
+
+# option : ufdbhttpd --help #
+UFDB_HOPTS=""
+
+# Better not change that #
+UFDB_HIMG="/usr/share/ufdbguard/images"
+UFDB_HBIN="/usr/bin/ufdbhttpd"
+UFDB_HPIDFILE="/var/run/ufdbhttpd.pid"
+UFDB_HLOGDIR=$( grep logdir ${UFDB_CONF} 2>/dev/null | awk '{print $2}' )
diff --git a/net-proxy/ufdbguard/files/ufdbhttpd.initd b/net-proxy/ufdbguard/files/ufdbhttpd.initd
new file mode 100644
index 000000000000..3f7dbcb28a98
--- /dev/null
+++ b/net-proxy/ufdbguard/files/ufdbhttpd.initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdbhttpd.initd,v 1.1 2009/03/18 17:08:50 bass Exp $
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	ebegin "Starting ufdbHttpd"
+	start-stop-daemon --start --chuid ${UFDB_HUSER} \
+		--exec ${UFDB_HBINARY} --pidfile ${UFDB_HPIDFILE} -- -p ${UFDB_HPORT} \
+		-I ${UFDB_HIMG} -l ${UFDB_HLOGDIR} ${UFDB_HOPTS}
+	eend $? "Failed to start ufdbHttpd"
+}
+
+stop() {
+	ebegin "Stopping ufdbHttpd"
+	start-stop-daemon --stop --exec ${UFDB_HBINARY} --pidfile ${UFDB_HPIDFILE}
+	eend $? "Failed to stop ufdbHttpd"
+}
diff --git a/net-proxy/ufdbguard/ufdbguard-1.16.ebuild b/net-proxy/ufdbguard/ufdbguard-1.16.ebuild
new file mode 100644
index 000000000000..f6f31703f832
--- /dev/null
+++ b/net-proxy/ufdbguard/ufdbguard-1.16.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.16.ebuild,v 1.1 2009/03/18 17:08:49 bass Exp $
+
+inherit eutils
+DESCRIPTION="ufdbGuard is a redirector for the Squid internet proxy."
+HOMEPAGE="http://ufdbguard.sf.net"
+SRC_URI="mirror://sourceforge/ufdbguard/ufdbGuard-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="dev-libs/openssl
+		app-arch/bzip2
+		dev-util/yacc
+		sys-devel/flex"
+RDEPEND="${DEPEND}
+		net-misc/wget"
+
+S="${WORKDIR}/ufdbGuard-${PV}"
+
+src_compile() {
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--with-ufdb-config=/etc/ufdbguard \
+		--with-ufdb-logdir=/var/log/ufdbguard \
+		--with-ufdb-dbhome=/etc/ufdbguard/blacklists \
+		--infodir=/usr/share/info \
+		--with-ufdb-images_dir=/usr/share/ufdbguard/images \
+		--mandir=/usr/share/man || die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodoc CHANGELOG INSTALL README
+	dodoc src/UFDB src/sampleufdbGuard.conf
+
+	dobin src/ufdbAnalyse src/ufdbGenTable src/ufdbGrab src/ufdbhttpd src/mtserver/ufdbgclient src/mtserver/ufdbguardd
+
+	dodir /etc/ufdbguard/blacklists
+	insinto /etc/ufdbguard
+	doins src/ufdbGuard.conf
+
+	dodir /usr/share/ufdbguard/images
+	insinto /usr/share/ufdbguard/images
+	doins src/images/*
+
+	newconfd ${FILESDIR}/ufdbguard.confd ufdbguard
+	#newconfd ${FILESDIR}/ufdbhttpd.confd ufdbhttpd
+	newinitd ${FILESDIR}/ufdbguard.initd ufdbguard
+	#newinitd ${FILESDIR}/ufdbhttpd.initd ufdbhttpd
+
+}
+
+pkg_postinst() {
+	einfo "You can configure deamons options in:"
+	einfo " /etc/conf.d/ufdbguard"
+#     einfo " /etc/conf.d/ufdbhttpd"
+	einfo "Add ufdbguard port to services:"
+	einfo ' echo "ufdbguardd      3977/tcp" >> /etc/services '
+}