Version bump (#258524). Remove obsolete versions.

(Portage version: 2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64)

7 files changed, 26 insertions, 232 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index e24fe9af75a7..fbf3dfab90a9 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-proxy/dansguardian
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.42 2008/12/01 21:08:01 mrness Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.43 2009/02/17 23:04:05 mrness Exp $
+
+*dansguardian-2.10.0.3 (17 Feb 2009)
+
+  17 Feb 2009; Alin Năstac <mrness@gentoo.org>
+  -files/dansguardian-xnaughty-2.7.6-1.diff,
+  -files/dansguardian-2.8.0.6-ctime.patch,
+  -files/dansguardian-2.8.0.6-gentoo.patch,
+  -files/dansguardian-2.9.9.5-gentoo.patch, -dansguardian-2.8.0.6-r1.ebuild,
+  -dansguardian-2.9.9.5_beta.ebuild, +dansguardian-2.10.0.3.ebuild:
+  Version bump (#258524). Remove obsolete versions.
 
 *dansguardian-2.10-r2 (01 Dec 2008)
 
diff --git a/net-proxy/dansguardian/dansguardian-2.9.9.5_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
index 9bb2ee3988db..34f8ec6ed04b 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.9.5_beta.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild
@@ -1,25 +1,21 @@
-# Copyright 1999-2008 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/dansguardian/dansguardian-2.9.9.5_beta.ebuild,v 1.1 2008/07/13 14:10:08 mrness Exp $
-
-inherit eutils
-
-MY_P=${P/_beta/}
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.10.0.3.ebuild,v 1.1 2009/02/17 23:04:05 mrness Exp $
 
 DESCRIPTION="Web content filtering via proxy"
 HOMEPAGE="http://dansguardian.org"
-SRC_URI="http://dansguardian.org/downloads/2/Beta/${MY_P}.tar.gz"
+SRC_URI="http://dansguardian.org/downloads/2/Stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav kaspersky debug ntlm pcre"
 
-DEPEND="pcre? ( dev-libs/libpcre )
+RDEPEND="sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
 	clamav? ( >=app-antivirus/clamav-0.93 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	if has_version "<${CATEGORY}/${PN}-2.9" ; then
@@ -40,15 +36,11 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P%_beta}-gentoo.patch"
-}
-
 src_compile() {
 	local myconf="--with-logdir=/var/log/dansguardian
 		--with-piddir=/var/run
+		--docdir=/usr/share/doc/${PF}
+		--htmldir=/usr/share/doc/${PF}/html
 		$(use_enable pcre)
 		$(use_enable ntlm)
 		--enable-fancydm
@@ -73,6 +65,11 @@ src_compile() {
 src_install() {
 	make "DESTDIR=${D}" install || die "make install failed"
 
+	# Move html documents to html dir
+	mkdir "${D}"/usr/share/doc/${PF}/html \
+		&& mv "${D}"/usr/share/doc/${PF}/*.html "${D}"/usr/share/doc/${PF}/html \
+		|| die "no html docs found in docdir"
+
 	# Copying init script
 	newinitd "${FILESDIR}/dansguardian.init" dansguardian
 
@@ -90,18 +87,6 @@ src_install() {
 
 	keepdir /var/log/dansguardian
 	fperms o-rwx /var/log/dansguardian
-
-	# TODO : see if no-default-lists.patch and these linea are still needed in next version
-	local f
-	touch "${T}"/emptyfile
-	insinto /etc/dansguardian/lists
-	for f in exceptionfileurllist bannedregexpheaderlist logsitelist logurllist headerregexplist logregexpurllist; do
-		if [ -f "${f}" ] ; then
-			einfo "${f} already exists"
-		else
-			newins "${T}"/emptyfile ${f}
-		fi
-	done
 }
 
 pkg_postinst() {
diff --git a/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild b/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild
deleted file mode 100644
index 9ae2ed05b2fc..000000000000
--- a/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild
+++ /dev/null
@@ -1,49 +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/dansguardian/dansguardian-2.8.0.6-r1.ebuild,v 1.8 2007/08/18 14:34:42 mrness Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Web content filtering via proxy"
-HOMEPAGE="http://dansguardian.org"
-SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${P}.source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/dansguardian-xnaughty-2.7.6-1.diff"
-	epatch "${FILESDIR}/${P}-ctime.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	./configure \
-		--prefix= \
-		--installprefix="${D}" \
-		--mandir=/usr/share/man/ \
-		--cgidir=/var/www/localhost/cgi-bin/ \
-		--logrotatedir="${D}/etc/logrotate.d" || die "./configure failed"
-	emake CPP=$(tc-getCXX) OPTIMISE="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	make install || die "make install failed"
-
-	newinitd "${FILESDIR}/dansguardian.init" dansguardian
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/dansguardian.logrotate" dansguardian
-
-	doman dansguardian.8
-	dodoc README
-
-	#Create log directory
-	diropts -m0700
-	keepdir /var/log/dansguardian
-}
diff --git a/net-proxy/dansguardian/files/dansguardian-2.8.0.6-ctime.patch b/net-proxy/dansguardian/files/dansguardian-2.8.0.6-ctime.patch
deleted file mode 100644
index a142d971ca79..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.8.0.6-ctime.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru dansguardian-2.8.0.6.orig/ConnectionHandler.cpp dansguardian-2.8.0.6/ConnectionHandler.cpp
---- dansguardian-2.8.0.6.orig/ConnectionHandler.cpp	2006-05-24 11:06:32 +0000
-+++ dansguardian-2.8.0.6/ConnectionHandler.cpp	2006-05-24 11:08:53 +0000
-@@ -36,6 +36,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <cstdio>
-+#include <ctime>
- #include <algorithm>
- #include <iostream>
- #include <netdb.h>
-diff -ru dansguardian-2.8.0.6.orig/DynamicURLList.cpp dansguardian-2.8.0.6/DynamicURLList.cpp
---- dansguardian-2.8.0.6.orig/DynamicURLList.cpp	2006-05-24 11:06:32 +0000
-+++ dansguardian-2.8.0.6/DynamicURLList.cpp	2006-05-24 11:09:06 +0000
-@@ -19,6 +19,7 @@
- 
- #include <syslog.h>
- #include <algorithm>
-+#include <ctime>
- #include "DynamicURLList.hpp"
- #include "OptionContainer.hpp"
- #include <sys/stat.h>
-diff -ru dansguardian-2.8.0.6.orig/FatController.cpp dansguardian-2.8.0.6/FatController.cpp
---- dansguardian-2.8.0.6.orig/FatController.cpp	2006-05-24 11:06:32 +0000
-+++ dansguardian-2.8.0.6/FatController.cpp	2006-05-24 11:09:47 +0000
-@@ -21,6 +21,7 @@
- #include <syslog.h>
- #include "FatController.hpp"
- #include <csignal>
-+#include <ctime>
- #ifdef __BSD
- 	#include <sys/wait.h>
- #else
-diff -ru dansguardian-2.8.0.6.orig/ListContainer.cpp dansguardian-2.8.0.6/ListContainer.cpp
---- dansguardian-2.8.0.6.orig/ListContainer.cpp	2006-05-24 11:06:32 +0000
-+++ dansguardian-2.8.0.6/ListContainer.cpp	2006-05-24 11:10:13 +0000
-@@ -24,6 +24,7 @@
- #include "RegExp.hpp"
- #include <cstdlib>
- #include <cstdio>
-+#include <ctime>
- #include <unistd.h>
- #include "String.hpp"
- #include <iostream>
-diff -ru dansguardian-2.8.0.6.orig/ListManager.cpp dansguardian-2.8.0.6/ListManager.cpp
---- dansguardian-2.8.0.6.orig/ListManager.cpp	2006-05-24 11:06:32 +0000
-+++ dansguardian-2.8.0.6/ListManager.cpp	2006-05-24 11:10:27 +0000
-@@ -22,6 +22,7 @@
- #include "ListManager.hpp"
- #include "RegExp.hpp"
- #include <sys/stat.h>
-+#include <ctime>
- 
- extern bool isDaemonised;
- 
-diff -ru dansguardian-2.8.0.6.orig/dansguardian.cpp dansguardian-2.8.0.6/dansguardian.cpp
---- dansguardian-2.8.0.6.orig/dansguardian.cpp	2006-05-24 11:06:32 +0000
-+++ dansguardian-2.8.0.6/dansguardian.cpp	2006-05-24 11:10:50 +0000
-@@ -24,6 +24,7 @@
- #include <iostream>
- #include <arpa/inet.h>
- #include <cstdio>
-+#include <ctime>
- #include <string>
- #include <unistd.h>
- #include <cerrno>
diff --git a/net-proxy/dansguardian/files/dansguardian-2.8.0.6-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.8.0.6-gentoo.patch
deleted file mode 100644
index 0728137fd58f..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.8.0.6-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru dansguardian-2.8.0.6.orig/configure dansguardian-2.8.0.6/configure
---- dansguardian-2.8.0.6.orig/configure	2005-08-14 02:47:57.000000000 +0300
-+++ dansguardian-2.8.0.6/configure	2005-12-08 23:52:35.449154000 +0200
-@@ -37,7 +37,7 @@
- prefixdir=''
- installprefixdir=''
- sysconfdir='/etc/dansguardian/'
--sysvdir='/etc/rc.d/init.d/'
-+sysvdir='/etc/init.d/'
- cgidir='/var/www/cgi-bin/'
- runas_usr='nobody'
- runas_grp='nobody'
-diff -Nru dansguardian-2.8.0.6.orig/dansguardian.8 dansguardian-2.8.0.6/dansguardian.8
---- dansguardian-2.8.0.6.orig/dansguardian.8	2005-08-14 02:47:57.000000000 +0300
-+++ dansguardian-2.8.0.6/dansguardian.8	2005-12-08 23:52:57.106507500 +0200
-@@ -3,7 +3,7 @@
- .SH NAME
- DansGuardian 2
- .SH SYNOPSIS
--/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
-+/etc/init.d/dansguardian [stop|start|status|restart|reload]
- .SH DESCRIPTION
- A Introduction
- 
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.9.5-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.5-gentoo.patch
deleted file mode 100644
index 78e2caa6b60d..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.9.5-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur dansguardian-2.9.9.5.orig/doc/dansguardian.8 dansguardian-2.9.9.5/doc/dansguardian.8
---- dansguardian-2.9.9.5.orig/doc/dansguardian.8	2006-10-30 11:58:08.000000000 +0000
-+++ dansguardian-2.9.9.5/doc/dansguardian.8	2008-07-13 14:02:22.000000000 +0000
-@@ -3,7 +3,7 @@
- .SH NAME
- DansGuardian 2
- .SH SYNOPSIS
--/etc/rc.d/init.d/dansguardian [stop|start|status|restart]
-+/etc/init.d/dansguardian [stop|start|status|restart|reload]
- .SH DESCRIPTION
- An Introduction
- 
diff --git a/net-proxy/dansguardian/files/dansguardian-xnaughty-2.7.6-1.diff b/net-proxy/dansguardian/files/dansguardian-xnaughty-2.7.6-1.diff
deleted file mode 100644
index d1e097ce0b08..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-xnaughty-2.7.6-1.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur DansGuardian-2.7.6-1/ConnectionHandler.cpp DansGuardian-2.7.6-1-new/ConnectionHandler.cpp
---- DansGuardian-2.7.6-1/ConnectionHandler.cpp	2003-12-03 16:04:18.000000000 -0600
-+++ DansGuardian-2.7.6-1-new/ConnectionHandler.cpp	2003-12-03 17:43:36.000000000 -0600
-@@ -990,6 +990,11 @@
-         else if (o.reporting_level == -1) {  // stealth
-             (*checkme).isItNaughty = false;  // dont block
-         }
-+	else if (o.reporting_level == -2) { // just add a header
-+		(*docheader).addXNaughty("true", (*checkme).whatIsNaughty.c_str(), (*url).toCharArray());
-+		(*checkme).isItNaughty = false;  // dont block
-+	}
-+                       
-     } catch (exception& e) {}
-     if ((*checkme).isItNaughty) { // not stealth mode then
-         try {
-Only in DansGuardian-2.7.6-1-new/: ConnectionHandler.cpp.orig
-diff -ur DansGuardian-2.7.6-1/HTTPHeader.cpp DansGuardian-2.7.6-1-new/HTTPHeader.cpp
---- DansGuardian-2.7.6-1/HTTPHeader.cpp	2003-12-03 16:04:18.000000000 -0600
-+++ DansGuardian-2.7.6-1-new/HTTPHeader.cpp	2003-12-03 17:38:09.000000000 -0600
-@@ -456,6 +456,17 @@
-     header.push_back(String(line.c_str()));
- }
- 
-+void HTTPHeader::addXNaughty(std::string naughty, std::string whatIsNaughty, std::string whereIsNaughty) {
-+    std::string line;
-+
-+    line = "X-Naughty: " + naughty + "\r";
-+    header.push_back(String(line.c_str()));
-+    line = "X-Naughty-Why: " + whatIsNaughty + "\r";
-+    header.push_back(String(line.c_str()));
-+    line = "X-Naughty-Where: " + whereIsNaughty + "\r";
-+    header.push_back(String(line.c_str()));
-+}
-+
- void HTTPHeader::setTimeout(int t) {
-     timeout = t;
- }
-Only in DansGuardian-2.7.6-1-new/: HTTPHeader.cpp.orig
-diff -ur DansGuardian-2.7.6-1/HTTPHeader.hpp DansGuardian-2.7.6-1-new/HTTPHeader.hpp
---- DansGuardian-2.7.6-1/HTTPHeader.hpp	2003-12-03 16:04:18.000000000 -0600
-+++ DansGuardian-2.7.6-1-new/HTTPHeader.hpp	2003-12-03 17:38:09.000000000 -0600
-@@ -43,6 +43,7 @@
-         std::string getXForwardedForIP();
-         void setTimeout(int t);
-         void addXForwardedFor(std::string clientip);
-+        void addXNaughty(std::string naughty, std::string whatIsNaughty, std::string whereIsNaughty);
-         bool isCompressed();
-         String contentEncoding();
-         void removeEncoding(int newlen);
-Only in DansGuardian-2.7.6-1-new/: HTTPHeader.hpp.orig