Remove old versions (which included a number of QA issues).

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

7 files changed, 7 insertions, 388 deletions

diff --git a/net-proxy/ufdbguard/ChangeLog b/net-proxy/ufdbguard/ChangeLog
index accd9fb6a4d2..9827bff5a90f 100644
--- a/net-proxy/ufdbguard/ChangeLog
+++ b/net-proxy/ufdbguard/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2011/06/25 07:27:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ChangeLog,v 1.18 2011/07/06 22:49:11 flameeyes Exp $
+
+  06 Jul 2011; Diego E. Pettenò <flameeyes@gentoo.org> -ufdbguard-1.11.ebuild,
+  -ufdbguard-1.20.ebuild, -files/ufdbguard-1.20-parallel-make.patch,
+  -files/ufdbguard-1.23-gentoo.patch, -files/ufdbguard.confd,
+  -files/ufdbguard.initd:
+  Remove old versions (which included a number of QA issues).
 
 *ufdbguard-1.26 (25 Jun 2011)
 
diff --git a/net-proxy/ufdbguard/files/ufdbguard-1.20-parallel-make.patch b/net-proxy/ufdbguard/files/ufdbguard-1.20-parallel-make.patch
deleted file mode 100644
index 71af7fb78415..000000000000
--- a/net-proxy/ufdbguard/files/ufdbguard-1.20-parallel-make.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- 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,7 +235,7 @@
- 	$(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 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 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/files/ufdbguard-1.23-gentoo.patch b/net-proxy/ufdbguard/files/ufdbguard-1.23-gentoo.patch
deleted file mode 100644
index a63a2876975f..000000000000
--- a/net-proxy/ufdbguard/files/ufdbguard-1.23-gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: ufdbGuard-1.23/src/ufdbUpdate.in
-===================================================================
---- ufdbGuard-1.23.orig/src/ufdbUpdate.in
-+++ ufdbGuard-1.23/src/ufdbUpdate.in
-@@ -27,6 +27,8 @@ WGET_COMMAND="@WGET@"
- NOTIFY_UFDBGUARDD="yes"                 # send HUP signal to ufdbguardd
- SYSLOG_FACILITY="local6"                # errors/warnings in system log have this facility name
- 
-+source /etc/conf.d/ufdb
-+
- # end of user settings.
- # DO NOT EDIT ANYTHING BELOW THIS LINE.  ########################################
- 
-@@ -268,45 +270,18 @@ else			# no ufdbguardd processes...
-    then
-       echo "No ufdbguardd processes found.  Starting the daemon..."
-    fi
--   for dir in   /usr/pkg/etc/rc.d  \
--                /usr/local/etc/rc.d  \
--		/etc/rc.d/init.d  \
--		/etc/init.d  \
--		/sbin/init.d  \
--		$BINDIR
--   do
--      if [ -f $dir/ufdb.sh -o -f $dir/ufdb ]
--      then
--	 # The most common reason why ufdbguardd does not start is because 
--	 # the UNIX socket /tmp/ufdbguardd-03977 exists, so remove it!
--	 rm -f /tmp/ufdbguardd-03977
--
--	 if [ -x $dir/ufdb.sh ]
--	 then
--	    $dir/ufdb.sh start
--	 else
--	    $dir/ufdb start
--	 fi
--	 exitcode=$?
--	 if [ $exitcode -ne 0 ]
--	 then
--	    logger -p $SYSLOG_FACILITY.error -t ufdbUpdate \
--		   "The ufdbguardd daemon did not start (exit code is $exitval)."
--	    if [ $verbose = yes ]
--	    then
--	       echo "The ufdbguardd daemon did not start (exit code is $exitval)."
--	    fi
--	 fi
--	 exit 0
--      fi
--   done
--
--   logger -p $SYSLOG_FACILITY.error -t ufdbUpdate \
--	  "The ufdbguardd daemon could not be started (could not find the ufdb[.sh] start script)."
--   if [ $verbose = yes ]
--   then
--      echo "The ufdbguardd daemon could not be started (could not find the ufdb[.sh] start script)."
-+   /etc/init.d/ufdb start
-+   exitcode=$?
-+   if [ $exitcode -ne 0 ]
-+   then
-+       logger -p $SYSLOG_FACILITY.error -t ufdbUpdate \
-+	   "The ufdbguardd daemon did not start (exit code is $exitval)."
-+       if [ $verbose = yes ]
-+       then
-+	   echo "The ufdbguardd daemon did not start (exit code is $exitval)."
-+       fi
-    fi
-+   exit 0
- fi
-  
- # Check the latest version.
diff --git a/net-proxy/ufdbguard/files/ufdbguard.confd b/net-proxy/ufdbguard/files/ufdbguard.confd
deleted file mode 100644
index f16d56c55ff1..000000000000
--- a/net-proxy/ufdbguard/files/ufdbguard.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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}' )
diff --git a/net-proxy/ufdbguard/files/ufdbguard.initd b/net-proxy/ufdbguard/files/ufdbguard.initd
deleted file mode 100644
index e754346d23a3..000000000000
--- a/net-proxy/ufdbguard/files/ufdbguard.initd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/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/ufdbguard.initd,v 1.4 2009/03/18 17:08:50 bass Exp $
-
-depend() {
-	need net
-	before squid
-	use logger
-}
-
-ufgt() {
-	if [ -f "/etc/ufdbguard/blacklists/${1}/domains" ] ; then
-		einfo "Generating domainlist $1"
-		/usr/bin/ufdbGenTable -t ${1} -d ${UFDB_CONFDIR}/blacklists/${1}/domains
-	fi
-}
-
-start() {
-	
-	if [ -n "${UFDB_GT}" ] ; then
-		for gt in ${UFDB_GT} ; do
-			ufgt ${gt}
-		done
-	fi
-
-	if [ ! -d "${UFDB_LOGDIR}" ] ; then
-		mkdir -p ${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"
-}
-
-stop() {
-	ebegin "Stopping ufdbGuard"
-	start-stop-daemon --stop --exec ${UFDB_BINARY} --pidfile ${UFDB_PIDFILE}
-	eend $? "Failed to stop ufdbGuard"
-}
diff --git a/net-proxy/ufdbguard/ufdbguard-1.11.ebuild b/net-proxy/ufdbguard/ufdbguard-1.11.ebuild
deleted file mode 100644
index be67116c9652..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.11.ebuild,v 1.2 2007/05/25 11:28:19 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
-		net-proxy/squid"
-
-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 \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodoc CHANGELOG INSTALL README README.multithreaded TODO
-	dodoc doc/*.txt src/UFDB
-	dohtml doc/*.html
-
-	dobin src/ufdbGenTable src/ufdbGuard src/mtserver/ufdbgclient src/mtserver/ufdbguardd src/ufdbGrab
-
-	dodir /etc/ufdbguard/blacklists
-	insinto /etc/ufdbguard
-	doins src/ufdbGuard.conf
-
-	newconfd ${FILESDIR}/ufdbguard.confd ufdbguard
-	newinitd ${FILESDIR}/ufdbguard.initd ufdbguard
-}
-
-pkg_postinst() {
-	einfo "Add ufdbguard port to services:"
-	einfo 'echo "ufdbguardd      3977/tcp" >> /etc/services '
-}
diff --git a/net-proxy/ufdbguard/ufdbguard-1.20.ebuild b/net-proxy/ufdbguard/ufdbguard-1.20.ebuild
deleted file mode 100644
index 521241e7a1c0..000000000000
--- a/net-proxy/ufdbguard/ufdbguard-1.20.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/ufdbguard-1.20.ebuild,v 1.2 2010/05/07 03:37:35 jer Exp $
-
-EAPI="2"
-
-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"
-IUSE=""
-
-RDEPEND="
-	dev-libs/openssl
-	app-arch/bzip2
-	net-misc/wget
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-}
-
-S="${WORKDIR}/ufdbGuard-${PV}"
-
-src_configure() {
-	econf \
-		--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"
-}
-
-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
-	newinitd "${FILESDIR}"/ufdbguard.initd ufdbguard
-}
-
-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 '
-}