Remove obsolete test version. Version bump.

(Portage version: 2.0.54)

9 files changed, 37 insertions, 103 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 58fc6b0028d4..0440fdb9566a 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.17 2006/03/23 06:02:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.18 2006/04/14 08:40:32 mrness Exp $
+
+*dansguardian-2.9.6.2_alpha (14 Apr 2006)
+
+  14 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  -files/dansguardian-2.9.3.1_alpha-gentoo.patch,
+  -files/dansguardian-2.9.3.2_alpha-gentoo.patch,
+  -files/dansguardian-2.9.3.2_alpha-kaspersky-response.patch,
+  +files/dansguardian-2.9.6.2_alpha-gentoo.patch,
+  -dansguardian-2.9.3.2_alpha.ebuild, +dansguardian-2.9.6.2_alpha.ebuild:
+  Remove obsolete test version. Version bump.
 
   23 Mar 2006; Alin Nastac <mrness@gentoo.org>
   dansguardian-2.9.6.1_alpha.ebuild:
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index 29f18eaf2d7b..3a1772a21060 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -1,26 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c98c2e6602af3bcc45c2a31b910bb87e ChangeLog 7016
 MD5 731f8b248c22fd1b51895c8ee7b94d4c dansguardian-2.8.0.6-r1.ebuild 1239
-MD5 cc1855282d075dc27803a24c89946d65 dansguardian-2.9.3.2_alpha.ebuild 2920
 MD5 73c1ed5f4db751c31657845affbe84c9 dansguardian-2.9.6.1_alpha.ebuild 2892
+MD5 73c1ed5f4db751c31657845affbe84c9 dansguardian-2.9.6.2_alpha.ebuild 2892
 MD5 0cf459b33bd205ff0e5d270cf1db72e0 files/dansguardian-2.8.0.6-gentoo.patch 886
-MD5 f249b7117148a18fcf2c596cedaa40c0 files/dansguardian-2.9.3.1_alpha-gentoo.patch 471
-MD5 db7897c4f2af3a8223f92a17b1841216 files/dansguardian-2.9.3.2_alpha-gentoo.patch 471
-MD5 85ee439015fd590f6410ea615e8acbf0 files/dansguardian-2.9.3.2_alpha-kaspersky-response.patch 1602
 MD5 62aa94fc0e7270987eefc01771d04c73 files/dansguardian-2.9.6.1_alpha-gentoo.patch 471
+MD5 93283d75c26fd46c00412d8c67f6f56d files/dansguardian-2.9.6.2_alpha-gentoo.patch 471
 MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
 MD5 89d1e03feed0f074cadb635f786c3f32 files/dansguardian.init 826
 MD5 046d9ee8033553a881d5ee0586bf2a3d files/dansguardian.logrotate 188
 MD5 421e49847907b8c4d53ccc01d17656e6 files/digest-dansguardian-2.8.0.6-r1 79
-MD5 7531d831b9a98706611b0f1515888991 files/digest-dansguardian-2.9.3.2_alpha 72
 MD5 6d1078f2be73e19af687b0976d117bc1 files/digest-dansguardian-2.9.6.1_alpha 72
+MD5 eb34ef587ab663199d838cbdd79bc61f files/digest-dansguardian-2.9.6.2_alpha 72
 MD5 30b14eaf02c479d70f60157c1a29a294 metadata.xml 568
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEIjoTjG8pv1lIUX4RAhDGAJ9T31yW3gDT/C4YOy+lx5zto0Bm8gCgpxwC
-6JJx3ycLaHAMYotsSdwlapo=
-=J6oB
------END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian/dansguardian-2.9.3.2_alpha.ebuild b/net-proxy/dansguardian/dansguardian-2.9.6.2_alpha.ebuild
index 6f7d9a8ef152..2c0844daea24 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.3.2_alpha.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.9.6.2_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.3.2_alpha.ebuild,v 1.1 2006/01/08 13:27:09 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.6.2_alpha.ebuild,v 1.1 2006/04/14 08:40:32 mrness Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav kaspersky debug ntlm pcre"
 
 DEPEND="!net-proxy/dansguardian-dgav
-	pcre? ( dev-libs/libpcre )
+	pcre? ( >=dev-libs/libpcre-6.0 )
 	clamav? ( app-antivirus/clamav )"
 
 S=${WORKDIR}/${MY_P}
@@ -43,8 +43,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-kaspersky-response.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 src_compile() {
@@ -70,23 +69,23 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make "DESTDIR=${D}" install || die "make install failed"
 
 	# Copying init script
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/dansguardian.init dansguardian
+	newexe "${FILESDIR}/dansguardian.init" dansguardian
 
 	if use clamav; then
-		sed -r -i -e 's/[ \t]+need net.*/& clamd/' ${D}/etc/init.d/dansguardian
-		sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' ${D}/etc/dansguardian/dansguardian.conf
-		sed -r -i -e 's/^#( *clamdudsfile *=.*)/\1/' ${D}/etc/dansguardian/contentscanners/clamdscan.conf
+		sed -r -i -e 's/[ \t]+need net.*/& clamd/' "${D}/etc/init.d/dansguardian"
+		sed -r -i -e 's/^#( *contentscanner *=.*clamdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
+		sed -r -i -e 's/^#( *clamdudsfile *=.*)/\1/' "${D}/etc/dansguardian/contentscanners/clamdscan.conf"
 	elif use kaspersky; then
-		sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' ${D}/etc/dansguardian/dansguardian.conf
+		sed -r -i -e 's/^#( *contentscanner *=.*kavdscan[.]conf.*)/\1/' "${D}/etc/dansguardian/dansguardian.conf"
 	fi
 
 	# Copying logrotation file
 	exeinto /etc/logrotate.d
-	newexe ${FILESDIR}/dansguardian.logrotate dansguardian
+	newexe "${FILESDIR}/dansguardian.logrotate" dansguardian
 
 	keepdir /var/log/dansguardian
 	fperms o-rwx /var/log/dansguardian
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.3.1_alpha-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.3.1_alpha-gentoo.patch
deleted file mode 100644
index b5534058613b..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.3.1_alpha-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru dansguardian-2.9.3.1.orig/doc/dansguardian.8 dansguardian-2.9.3.1/doc/dansguardian.8
---- dansguardian-2.9.3.1.orig/doc/dansguardian.8	2005-02-24 12:30:16.000000000 +0200
-+++ dansguardian-2.9.3.1/doc/dansguardian.8	2005-12-20 15:19:13.000000000 +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.3.2_alpha-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.3.2_alpha-gentoo.patch
deleted file mode 100644
index a17733d03ace..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.3.2_alpha-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru dansguardian-2.9.3.2.orig/doc/dansguardian.8 dansguardian-2.9.3.2/doc/dansguardian.8
---- dansguardian-2.9.3.2.orig/doc/dansguardian.8	2006-01-08 14:40:10.000000000 +0200
-+++ dansguardian-2.9.3.2/doc/dansguardian.8	2006-01-08 14:40:19.504239500 +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.3.2_alpha-kaspersky-response.patch b/net-proxy/dansguardian/files/dansguardian-2.9.3.2_alpha-kaspersky-response.patch
deleted file mode 100644
index 047edaef2e3a..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.3.2_alpha-kaspersky-response.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur dansguardian-2.9.3.2/src/contentscanners/kavdscan.cpp dansguardian-2.9.3.2-new/src/contentscanners/kavdscan.cpp
---- dansguardian-2.9.3.2/src/contentscanners/kavdscan.cpp	2005-11-30 16:31:20.000000000 +0100
-+++ dansguardian-2.9.3.2-new/src/contentscanners/kavdscan.cpp	2005-12-31 01:16:01.110347750 +0100
-@@ -153,22 +153,43 @@
- 		return DGCS_SCANERROR;
- 	}
- 	String reply = buff;
--	delete[]buff;
--	reply.removeWhiteSpace();
- #ifdef DGDEBUG
- 	std::cout << "Got from kavdscan:" << reply << std::endl;
- #endif
--	stripedsocks.close();
- 	if (reply[0] == '2') {	// clean
- #ifdef DGDEBUG
- 		std::cerr << "kavdscan - clean" << std::endl;
- #endif
-+		delete[]buff;
-+		stripedsocks.close();
- 		return DGCS_CLEAN;
- 	}
- 	if (reply.startsWith("322")) {	// infected
--		lastvirusname = reply.after(" ").before(" ");
-+		while(reply[0] != '2' && rc != 0) {
-+			reply.removeWhiteSpace();
-+			lastvirusname = lastvirusname + " " + reply.after("322-").before(" ");
-+			try {
-+				rc = stripedsocks.getLine(buff, 4096, o.content_scanner_timeout);
-+			}
-+			catch(exception & e) {
-+				delete[]buff;
-+				stripedsocks.close();
-+				syslog(LOG_ERR, "%s", "Error reading kavdscan socket");
-+				return DGCS_SCANERROR;
-+			}
-+			reply = buff;
-+#ifdef DGDEBUG
-+			std::cout << "Got from kavdscan:" << reply << std::endl;
-+#endif
-+		}
-+		std::cout << "lastvirusname: " << lastvirusname << std::endl;
-+		delete[]buff;
-+		stripedsocks.close();
- 		// format: 322 nastyvirus blah
-+		return DGCS_INFECTED;
- 	}
-+	delete[]buff;
-+	stripedsocks.close();
- 	// must be an error then
- 	lastmessage = reply;
- 	return DGCS_SCANERROR;
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.6.2_alpha-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.6.2_alpha-gentoo.patch
new file mode 100644
index 000000000000..ecbabf5afc02
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.6.2_alpha-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Nru dansguardian-2.9.6.2.orig/doc/dansguardian.8 dansguardian-2.9.6.2/doc/dansguardian.8
+--- dansguardian-2.9.6.2.orig/doc/dansguardian.8	2005-02-24 12:30:16.000000000 +0200
++++ dansguardian-2.9.6.2/doc/dansguardian.8	2006-04-14 10:57:01.000000000 +0300
+@@ -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/digest-dansguardian-2.9.3.2_alpha b/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.2_alpha
deleted file mode 100644
index 8d7f66502083..000000000000
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.2_alpha
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9683eab32ee99f270213c394713de171 dansguardian-2.9.3.2.tar.gz 402793
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.6.2_alpha b/net-proxy/dansguardian/files/digest-dansguardian-2.9.6.2_alpha
new file mode 100644
index 000000000000..c5d1dfa8dcf9
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.6.2_alpha
@@ -0,0 +1 @@
+MD5 68839dc1f6b3a299fad02ac8826f84b9 dansguardian-2.9.6.2.tar.gz 419452