version bump

(Portage version: 2.1.6.7/cvs/Linux i686)

6 files changed, 122 insertions, 11 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/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 '
+}