Version bump (#128412)

(Portage version: 2.0.54)

8 files changed, 163 insertions, 18 deletions

diff --git a/net-proxy/dansguardian-dgav/ChangeLog b/net-proxy/dansguardian-dgav/ChangeLog
index 3f0a288278cf..518cbfdc101e 100644
--- a/net-proxy/dansguardian-dgav/ChangeLog
+++ b/net-proxy/dansguardian-dgav/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/dansguardian-dgav
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/ChangeLog,v 1.7 2006/03/06 18:16:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/ChangeLog,v 1.8 2006/04/01 20:51:38 mrness Exp $
+
+*dansguardian-dgav-6.4.4 (01 Apr 2006)
+
+  01 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  files/dansguardian-xnaughty-2.7.6-1.diff,
+  +files/dansguardian-dgav-6.4.4-gentoo.patch,
+  +files/dansguardian-dgav-6.4.4-xnaughty.patch, files/dansguardian.init,
+  +dansguardian-dgav-6.4.4.ebuild:
+  Version bump (#128412).
 
   06 Mar 2006; Alin Nastac <mrness@gentoo.org>
   -dansguardian-dgav-6.4.3.ebuild, dansguardian-dgav-6.4.3-r1.ebuild:
diff --git a/net-proxy/dansguardian-dgav/Manifest b/net-proxy/dansguardian-dgav/Manifest
index 39af8c754cc4..da7831fa9766 100644
--- a/net-proxy/dansguardian-dgav/Manifest
+++ b/net-proxy/dansguardian-dgav/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b78f63a7dd0de8053231d8f88b753381 ChangeLog 2081
 MD5 41b1845294f494282a35de2d43a05b8a dansguardian-dgav-6.4.3-r1.ebuild 1624
+MD5 98e34d99bf7150db533b3608228d68e1 dansguardian-dgav-6.4.4.ebuild 1634
 MD5 6328464c9d6747a4f054f17fb2c4844b files/dansguardian-dgav-6.4.3-gentoo.patch 1291
-MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
+MD5 19e38310930369928da2d1bc74554c87 files/dansguardian-dgav-6.4.4-gentoo.patch 1291
+MD5 c5a5dcce78812ee5b042f0e92d500ebf files/dansguardian-dgav-6.4.4-xnaughty.patch 1983
+MD5 b95490f1de290c1ad054f41fa8c60c78 files/dansguardian-xnaughty-2.7.6-1.diff 2153
 MD5 40108287ed99da7e2d4f078e50288100 files/dansguardian.init 837
 MD5 046d9ee8033553a881d5ee0586bf2a3d files/dansguardian.logrotate 188
 MD5 f4b0b1791105f2daa56e911f08238da4 files/digest-dansguardian-dgav-6.4.3-r1 169
+MD5 52a42da7dfaf8df2f002bff2a6ff9bb4 files/digest-dansguardian-dgav-6.4.4 169
 MD5 775fe3a71382d0807bfddb0235f35f30 metadata.xml 233
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEDHx9jG8pv1lIUX4RAvagAJ0fjmS0fKZNKTvX11L5xtV23O4BnACePXg3
-X1FUQu4a3R1UDHMWgRMWlxo=
-=uc8D
------END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.4.ebuild b/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.4.ebuild
new file mode 100644
index 000000000000..3314f7888a98
--- /dev/null
+++ b/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/dansguardian-dgav-6.4.4.ebuild,v 1.1 2006/04/01 20:51:38 mrness Exp $
+
+inherit eutils
+
+DG_PN=${PN/-*/}
+AV_PN=${PN/*-/}
+DG_PV=2.8.0.6
+
+DESCRIPTION="DansGuardian with Anti-Virus plugin"
+HOMEPAGE="http://sourceforge.net/projects/dgav/"
+SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${DG_PN}-${DG_PV}.source.tar.gz
+	mirror://sourceforge/${AV_PN}/${DG_PN}-${DG_PV}-antivirus-${PV}.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="!net-proxy/dansguardian
+	net-libs/libesmtp
+	app-antivirus/clamav"
+
+S="${WORKDIR}/${DG_PN}-${DG_PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}" || die "source dir not found"
+	epatch "../${DG_PN}-${DG_PV}-antivirus-${PV}.patch"
+	epatch "${FILESDIR}/${P}-xnaughty.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" \
+		--with-av-engine=clamdscan,aveserver,trophie,sophie \
+		--runas_usr=clamav --runas_grp=clamav || die "./configure failed"
+	emake 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 -o clamav
+	keepdir /var/log/dansguardian
+}
diff --git a/net-proxy/dansguardian-dgav/files/dansguardian-dgav-6.4.4-gentoo.patch b/net-proxy/dansguardian-dgav/files/dansguardian-dgav-6.4.4-gentoo.patch
new file mode 100644
index 000000000000..a0c01513f3db
--- /dev/null
+++ b/net-proxy/dansguardian-dgav/files/dansguardian-dgav-6.4.4-gentoo.patch
@@ -0,0 +1,33 @@
+diff -Nru dansguardian-2.8.0.6.orig/configure dansguardian-2.8.0.6/configure
+--- dansguardian-2.8.0.6.orig/configure	2006-04-01 22:16:00.000000000 +0300
++++ dansguardian-2.8.0.6/configure	2006-04-01 22:21:34.887006250 +0300
+@@ -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'
+@@ -3517,7 +3517,7 @@
+ echo "# Set the name of a local clamd socket (file)">>dansguardian.conf
+ echo "# or the hostname:port of a remote clamd server">>dansguardian.conf
+ echo "# default: '/tmp/clamd'">>dansguardian.conf
+-echo "clamdsocket = '/tmp/clamd'">>dansguardian.conf
++echo "clamdsocket = '/var/run/clamav/clamd.sock'">>dansguardian.conf
+ echo "" >>dansguardian.conf
+ echo "" >>dansguardian.conf
+ 
+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	2006-04-01 22:21:34.887006250 +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-dgav/files/dansguardian-dgav-6.4.4-xnaughty.patch b/net-proxy/dansguardian-dgav/files/dansguardian-dgav-6.4.4-xnaughty.patch
new file mode 100644
index 000000000000..9ac22f935277
--- /dev/null
+++ b/net-proxy/dansguardian-dgav/files/dansguardian-dgav-6.4.4-xnaughty.patch
@@ -0,0 +1,49 @@
+diff -Nru dansguardian-2.8.0.6.orig/ConnectionHandler.cpp dansguardian-2.8.0.6/ConnectionHandler.cpp
+--- dansguardian-2.8.0.6.orig/ConnectionHandler.cpp	2006-04-01 23:27:00.000000000 +0300
++++ dansguardian-2.8.0.6/ConnectionHandler.cpp	2006-04-01 23:37:11.378162000 +0300
+@@ -1738,6 +1738,11 @@
+       {                         // 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)
+   {
+diff -Nru dansguardian-2.8.0.6.orig/HTTPHeader.cpp dansguardian-2.8.0.6/HTTPHeader.cpp
+--- dansguardian-2.8.0.6.orig/HTTPHeader.cpp	2006-04-01 23:27:00.000000000 +0300
++++ dansguardian-2.8.0.6/HTTPHeader.cpp	2006-04-01 23:33:23.779938000 +0300
+@@ -763,6 +763,19 @@
+ }
+ 
+ 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;
+diff -Nru dansguardian-2.8.0.6.orig/HTTPHeader.hpp dansguardian-2.8.0.6/HTTPHeader.hpp
+--- dansguardian-2.8.0.6.orig/HTTPHeader.hpp	2006-04-01 23:27:00.000000000 +0300
++++ dansguardian-2.8.0.6/HTTPHeader.hpp	2006-04-01 23:34:12.766999500 +0300
+@@ -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);
diff --git a/net-proxy/dansguardian-dgav/files/dansguardian-xnaughty-2.7.6-1.diff b/net-proxy/dansguardian-dgav/files/dansguardian-xnaughty-2.7.6-1.diff
index d1e097ce0b08..5876cca3bf68 100644
--- a/net-proxy/dansguardian-dgav/files/dansguardian-xnaughty-2.7.6-1.diff
+++ b/net-proxy/dansguardian-dgav/files/dansguardian-xnaughty-2.7.6-1.diff
@@ -13,7 +13,6 @@ diff -ur DansGuardian-2.7.6-1/ConnectionHandler.cpp DansGuardian-2.7.6-1-new/Con
      } 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
@@ -35,7 +34,6 @@ diff -ur DansGuardian-2.7.6-1/HTTPHeader.cpp DansGuardian-2.7.6-1-new/HTTPHeader
  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
@@ -47,4 +45,3 @@ diff -ur DansGuardian-2.7.6-1/HTTPHeader.hpp DansGuardian-2.7.6-1-new/HTTPHeader
          bool isCompressed();
          String contentEncoding();
          void removeEncoding(int newlen);
-Only in DansGuardian-2.7.6-1-new/: HTTPHeader.hpp.orig
diff --git a/net-proxy/dansguardian-dgav/files/dansguardian.init b/net-proxy/dansguardian-dgav/files/dansguardian.init
index 991321c3eaf5..5df3696a336a 100644
--- a/net-proxy/dansguardian-dgav/files/dansguardian.init
+++ b/net-proxy/dansguardian-dgav/files/dansguardian.init
@@ -1,13 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian-dgav/files/dansguardian.init,v 1.2 2005/12/08 22:39:09 mrness Exp $
 
 opts="${opts} reload"
 
 depend() {
-	need net clamd
-	use dns \
+	need net
+	use dns clamd \
 		squid apache2 bfilter mman junkbuster oops polipo privoxy tinyproxy wwwoffled
 	#dansguardian could be used in conjuction with any of the above web proxies
 }
diff --git a/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.4 b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.4
new file mode 100644
index 000000000000..b22f9e1fa58e
--- /dev/null
+++ b/net-proxy/dansguardian-dgav/files/digest-dansguardian-dgav-6.4.4
@@ -0,0 +1,2 @@
+MD5 748a92e06d28144b65cd971dc8801917 dansguardian-2.8.0.6-antivirus-6.4.4.patch.gz 169630
+MD5 aa619607198f37a528dbb65e4a503beb dansguardian-2.8.0.6.source.tar.gz 212737