remove old test version; version bumped with optional kaspersky support (#117268)

(Portage version: 2.0.53)

8 files changed, 93 insertions, 27 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 5d9b92e2e070..9359b6b23e46 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-proxy/dansguardian
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.13 2005/12/24 15:38:39 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.14 2006/01/08 13:27:09 mrness Exp $
+
+*dansguardian-2.9.3.2_alpha (08 Jan 2006)
+
+  08 Jan 2006; Alin Nastac <mrness@gentoo.org>
+  -files/dansguardian-2.9.3.0_alpha-gentoo.patch,
+  +files/dansguardian-2.9.3.2_alpha-gentoo.patch,
+  +files/dansguardian-2.9.3.2_alpha-kaspersky-response.patch,
+  -dansguardian-2.9.3.0_alpha.ebuild, +dansguardian-2.9.3.2_alpha.ebuild:
+  Remove old test version. Version bump with optional support for Kaspersky
+  antivirus software, selectable through kaspersky useflag (#117268). Thanks
+  goes to Cahya <cahya@mail.com>.
 
   24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org>
   dansguardian-2.8.0.6-r1.ebuild:
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index 1ac719a5f8d6..b3acfc9796b2 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -2,17 +2,18 @@ MD5 dc68a71e2c82d7a310a0d6d99472b22b ChangeLog 5960
 MD5 66b41ef646913a4fe63153d4e76c4193 dansguardian-2.8.0.4.ebuild 1176
 MD5 cf3df64f8b7fc1c8dbbf86407374f680 dansguardian-2.8.0.6-r1.ebuild 1241
 MD5 887c6bdeabb27180c88519f1403b877b dansguardian-2.8.0.6.ebuild 1179
-MD5 fd1a1fc7ddb51bbc51c2748f7da78eb5 dansguardian-2.9.3.0_alpha.ebuild 2734
 MD5 a5991f287357da0f94385aef3f748a2c dansguardian-2.9.3.1_alpha.ebuild 2734
+MD5 a03951e4f9aca83dacce5b5c088c375e dansguardian-2.9.3.2_alpha.ebuild 2960
 MD5 0cf459b33bd205ff0e5d270cf1db72e0 files/dansguardian-2.8.0.6-gentoo.patch 886
-MD5 4f460e57b16de6c5371d16d6c1fd4a62 files/dansguardian-2.9.3.0_alpha-gentoo.patch 471
 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 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
 MD5 89d1e03feed0f074cadb635f786c3f32 files/dansguardian.init 826
 MD5 046d9ee8033553a881d5ee0586bf2a3d files/dansguardian.logrotate 188
 MD5 579f2cac2dbebe18ff6900fd3aa87f66 files/digest-dansguardian-2.8.0.4 79
 MD5 421e49847907b8c4d53ccc01d17656e6 files/digest-dansguardian-2.8.0.6 79
 MD5 421e49847907b8c4d53ccc01d17656e6 files/digest-dansguardian-2.8.0.6-r1 79
-MD5 26bc6614a469ec90890a688d79a63a8c files/digest-dansguardian-2.9.3.0_alpha 72
 MD5 cb02acc628e684209123dcd1252f120d files/digest-dansguardian-2.9.3.1_alpha 72
+MD5 7531d831b9a98706611b0f1515888991 files/digest-dansguardian-2.9.3.2_alpha 72
 MD5 30b14eaf02c479d70f60157c1a29a294 metadata.xml 568
diff --git a/net-proxy/dansguardian/dansguardian-2.9.3.0_alpha.ebuild b/net-proxy/dansguardian/dansguardian-2.9.3.2_alpha.ebuild
index 7c48980062e5..6f7d9a8ef152 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.3.0_alpha.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.9.3.2_alpha.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.0_alpha.ebuild,v 1.2 2005/12/16 06:29:17 mrness Exp $
+# $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 $
 
 inherit eutils
 
@@ -13,21 +13,18 @@ SRC_URI="http://dansguardian.org/downloads/2/Alpha/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav debug ntlm pcre"
+IUSE="clamav kaspersky debug ntlm pcre"
 
-DEPEND="virtual/libc
-	!net-proxy/dansguardian-dgav
+DEPEND="!net-proxy/dansguardian-dgav
 	pcre? ( dev-libs/libpcre )
 	clamav? ( app-antivirus/clamav )"
 
 S=${WORKDIR}/${MY_P}
 
-MY_REFRESH_LOG_OWNER=""
-
 pkg_setup() {
 	if has_version "<${CATEGORY}/${PN}-2.9" ; then
 		ewarn "This version introduces brand new USE flags:"
-		ewarn "   clamav ntlm pcre"
+		ewarn "   clamav kaspersky ntlm pcre"
 		echo
 
 		local f="${ROOT}/etc/dansguardian"
@@ -47,6 +44,7 @@ src_unpack() {
 	unpack ${A}
 
 	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-kaspersky-response.patch
 }
 
 src_compile() {
@@ -59,6 +57,9 @@ src_compile() {
 			--with-proxyuser=clamav
 			--with-proxygroup=clamav"
 	fi
+	if use kaspersky; then
+		myconf="${myconf} --enable-kavd"
+	fi
 	if use debug; then
 		myconf="${myconf} --with-dgdebug=on"
 	fi
@@ -79,6 +80,8 @@ src_install() {
 		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
 	fi
 
 	# Copying logrotation file
@@ -96,7 +99,7 @@ pkg_postinst() {
 	fi
 	ewarn "The dansguardian daemon will run by default as user & group ${runas}"
 
-	if has_version "<${CATEGORY}/${PN}-2.9" && [ -d "${ROOT}/var/log/dansguardian" ] ; then
+	if [ -d "${ROOT}/var/log/dansguardian" ] ; then
 		chown -R ${runas} "${ROOT}/var/log/dansguardian"
 		chmod o-rwx "${ROOT}/var/log/dansguardian"
 	fi
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.3.0_alpha-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.3.0_alpha-gentoo.patch
deleted file mode 100644
index 85b7861e77af..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.3.0_alpha-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru dansguardian-2.9.3.0.orig/doc/dansguardian.8 dansguardian-2.9.3.0/doc/dansguardian.8
---- dansguardian-2.9.3.0.orig/doc/dansguardian.8	2005-02-24 12:30:16.000000000 +0200
-+++ dansguardian-2.9.3.0/doc/dansguardian.8	2005-12-13 21:12:13.615021750 +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
new file mode 100644
index 000000000000..a17733d03ace
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.3.2_alpha-gentoo.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..047edaef2e3a
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.3.2_alpha-kaspersky-response.patch
@@ -0,0 +1,51 @@
+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/digest-dansguardian-2.9.3.0_alpha b/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.0_alpha
deleted file mode 100644
index 9e73372c8b2e..000000000000
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.0_alpha
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c52cbb1c099bae3f40c9615cfadf53e dansguardian-2.9.3.0.tar.gz 389420
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
new file mode 100644
index 000000000000..8d7f66502083
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.2_alpha
@@ -0,0 +1 @@
+MD5 9683eab32ee99f270213c394713de171 dansguardian-2.9.3.2.tar.gz 402793