Version bump (#173102)

Package-Manager: portage-2.1.2.2

6 files changed, 235 insertions, 8 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 5024dbf98cbc..a03b10a003c4 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.26 2007/03/26 21:51:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.27 2007/04/04 13:01:36 mrness Exp $
+
+*dansguardian-2.9.8.5_beta (04 Apr 2007)
+
+  04 Apr 2007; Alin Năstac <mrness@gentoo.org>
+  +files/dansguardian-2.9.8.5-gentoo.patch,
+  +files/dansguardian-2.9.8.5-uclibc++.patch,
+  +dansguardian-2.9.8.5_beta.ebuild:
+  Version bump (#173102).
 
 *dansguardian-2.9.8.2_beta-r1 (26 Mar 2007)
 
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index e998cdeb3b3c..67c0b05df0f8 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -17,6 +17,14 @@ AUX dansguardian-2.9.8.2-uclibc++.patch 3015 RMD160 c4c5afc84ac169bb37eb12f17187
 MD5 5f279b085dc2e6823189c425392cfd62 files/dansguardian-2.9.8.2-uclibc++.patch 3015
 RMD160 c4c5afc84ac169bb37eb12f171870a4ced5c2a68 files/dansguardian-2.9.8.2-uclibc++.patch 3015
 SHA256 2901b66f09122f9572d58e7bcd4ab1d6e93e5baa01767275bc91fa3d4dc61480 files/dansguardian-2.9.8.2-uclibc++.patch 3015
+AUX dansguardian-2.9.8.5-gentoo.patch 472 RMD160 ad2e598564d2d7e4a08c113077041ef414fb128e SHA1 6b994956f14728509e7a6fd75731370c766c57ac SHA256 bf811c02a06741cdeddcafe75805fb200a55ec91b76c74c8f44294fd67e8da4e
+MD5 8b358ca48aed8b6282ad92fc085d5b6b files/dansguardian-2.9.8.5-gentoo.patch 472
+RMD160 ad2e598564d2d7e4a08c113077041ef414fb128e files/dansguardian-2.9.8.5-gentoo.patch 472
+SHA256 bf811c02a06741cdeddcafe75805fb200a55ec91b76c74c8f44294fd67e8da4e files/dansguardian-2.9.8.5-gentoo.patch 472
+AUX dansguardian-2.9.8.5-uclibc++.patch 3015 RMD160 cfdfdf1141ba24f09c42ec319d60a6763125dce4 SHA1 2f87a2fe0fc9fba109578247817517ae07d6b3d8 SHA256 1312ff97e277d49c4cb7fb967731483ab8ddebf139f00b64e95bc1bfd802c612
+MD5 161972dc92a3cd7687283ada35fac505 files/dansguardian-2.9.8.5-uclibc++.patch 3015
+RMD160 cfdfdf1141ba24f09c42ec319d60a6763125dce4 files/dansguardian-2.9.8.5-uclibc++.patch 3015
+SHA256 1312ff97e277d49c4cb7fb967731483ab8ddebf139f00b64e95bc1bfd802c612 files/dansguardian-2.9.8.5-uclibc++.patch 3015
 AUX dansguardian-xnaughty-2.7.6-1.diff 2325 RMD160 9716fa42f87adb3f27e8009d2ff1da46ebdc8fa9 SHA1 ab7ee4f3c7f3a0865cab6913d4ac3eefa07d1989 SHA256 ae438113e94d2292e85dbf9be702b002e3f1b36b853bb7a7573e11786a1db9a7
 MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
 RMD160 9716fa42f87adb3f27e8009d2ff1da46ebdc8fa9 files/dansguardian-xnaughty-2.7.6-1.diff 2325
@@ -31,6 +39,7 @@ RMD160 c2c433f4209518a83725382f8952141a34d58d25 files/dansguardian.logrotate 188
 SHA256 124775c1a6dd20652e7b7511bb484c654ac63cc0c0a2baf2357d8ce7086867a2 files/dansguardian.logrotate 188
 DIST dansguardian-2.8.0.6.source.tar.gz 212737 RMD160 cf3493b26b4fcd5b366a6fe472e3c6c9e3cfe6d3 SHA1 6d82eed13536a64a2f6711fa221756fa0bfe19f0 SHA256 f4d51b805e979369896906b49a388bf102f56cf0755acc9cb1ec2e4176aac34b
 DIST dansguardian-2.9.8.2.tar.gz 469129 RMD160 7a9cc375a48baaadc064a9de4a5de32499bf6522 SHA1 01cf6a19853b1078aed1713e6fdff18888ba0d01 SHA256 228b5240e34c6a59d1cfdf7cc7ed206c6552bb6d584ba4e9e16478fdbd688c55
+DIST dansguardian-2.9.8.5.tar.gz 469549 RMD160 d63337e728331d658d7a2941549b8132dbbd467e SHA1 69a96319532d3d3afec8cf52bb67b52b78fa65dc SHA256 614a9287b852996bf56aff62e39324e86e091dba388de99bc2b608a626084e62
 EBUILD dansguardian-2.8.0.6-r1.ebuild 1308 RMD160 e39a97785ef12e03be4fbc8d1719d64d8e2ff6c8 SHA1 b7b6f037409917d04c9c6de81e5d938c12c29ef9 SHA256 64416167ee7f7197fbf642c71f023347ad78d219d8b5e90cf1ab4a063508a3d6
 MD5 d6d7a39faf1eacef321056bd39afeb5f dansguardian-2.8.0.6-r1.ebuild 1308
 RMD160 e39a97785ef12e03be4fbc8d1719d64d8e2ff6c8 dansguardian-2.8.0.6-r1.ebuild 1308
@@ -39,10 +48,14 @@ EBUILD dansguardian-2.9.8.2_beta-r1.ebuild 3016 RMD160 98cf271b0e650e395cfc7acfa
 MD5 bf80a5e3a098021444cf211d63e09bd1 dansguardian-2.9.8.2_beta-r1.ebuild 3016
 RMD160 98cf271b0e650e395cfc7acfae10f77f46996be4 dansguardian-2.9.8.2_beta-r1.ebuild 3016
 SHA256 c5081b5994d4b7c5bfd683d4a9662faa84169aa00931dbdb584d1192ab72db59 dansguardian-2.9.8.2_beta-r1.ebuild 3016
-MISC ChangeLog 10052 RMD160 84a8bb4760a5064df2a281f558e52b36798ec3c7 SHA1 a5603049a019bae4fcc0a9a7a849020d91028bc6 SHA256 2c532047f4b2705329cb0a810d9f3f37a2f9736bee6975237a01b0e2a95e7857
-MD5 dbfb73a9aabf5b970ec62d3029de785b ChangeLog 10052
-RMD160 84a8bb4760a5064df2a281f558e52b36798ec3c7 ChangeLog 10052
-SHA256 2c532047f4b2705329cb0a810d9f3f37a2f9736bee6975237a01b0e2a95e7857 ChangeLog 10052
+EBUILD dansguardian-2.9.8.5_beta.ebuild 3013 RMD160 550c63591ac0efbe8c8b7f7e9967be07869a3bd5 SHA1 af696a8cfc98f494d9075c5fcd8171df0dae12af SHA256 b0a1026e0a82eb67a78d8e7debcfb7b071b0d9b08ac85d320f7938425e025a2e
+MD5 fcd61c05c408cecc3cebea44c87be5eb dansguardian-2.9.8.5_beta.ebuild 3013
+RMD160 550c63591ac0efbe8c8b7f7e9967be07869a3bd5 dansguardian-2.9.8.5_beta.ebuild 3013
+SHA256 b0a1026e0a82eb67a78d8e7debcfb7b071b0d9b08ac85d320f7938425e025a2e dansguardian-2.9.8.5_beta.ebuild 3013
+MISC ChangeLog 10296 RMD160 79ed9baf1b154f5f946d27e05ef67be352968bc8 SHA1 90c3579455aa85c51c2badd7a14d36f94019c3e3 SHA256 b2d9144100ef58261cef37bb9192f834e364ce73af86f52ba5060d55e6d8b382
+MD5 df69d97f8fb6d5b6f476704717bf7d8b ChangeLog 10296
+RMD160 79ed9baf1b154f5f946d27e05ef67be352968bc8 ChangeLog 10296
+SHA256 b2d9144100ef58261cef37bb9192f834e364ce73af86f52ba5060d55e6d8b382 ChangeLog 10296
 MISC metadata.xml 568 RMD160 9ccaf23e0461f24434c3d8d2375b64cf195c9f4a SHA1 e600d39cf81dbfe1885a3021da330152e1c533ed SHA256 db37880b6baac7d3294b7f8432f1ca816c85356430700e7078d891d4f100ef76
 MD5 30b14eaf02c479d70f60157c1a29a294 metadata.xml 568
 RMD160 9ccaf23e0461f24434c3d8d2375b64cf195c9f4a metadata.xml 568
@@ -53,10 +66,13 @@ SHA256 d3b7befbd826b0c1ba6acbd61579767cb39cbfbd7597d196998969d499c6dc4b files/di
 MD5 d50482728d46c4d460071f43f91f0fb7 files/digest-dansguardian-2.9.8.2_beta-r1 262
 RMD160 c784eeb166dff8dda9c0fb593d8eb304e4104be9 files/digest-dansguardian-2.9.8.2_beta-r1 262
 SHA256 3f989e0788ed1972637a875dcd29272d51f8c4360bc320fdda9dd9956e7d65a4 files/digest-dansguardian-2.9.8.2_beta-r1 262
+MD5 2bfadc3727f0396294af403607256272 files/digest-dansguardian-2.9.8.5_beta 262
+RMD160 3631a9c54285bfcfc750f341e8fc2b905108c9e0 files/digest-dansguardian-2.9.8.5_beta 262
+SHA256 c68cc8d55d511810fb1d947af97a75ba0a11d90a2a0aa3d1342b3dadb6dc15cf files/digest-dansguardian-2.9.8.5_beta 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGCEB3JnxX6mF440QRAm82AKDNMPB0p7rlzPMgt4AjqRDfWSMYJACeOh6K
-7j9DGtF3wd78IouKFIekzTA=
-=xcZJ
+iD8DBQFGE6G+JnxX6mF440QRAmeBAKD3qBWitJWwWcpwmYuXKgh3AsV12wCfUY1c
+a5G/l8Hu7WzUo9dHxYMhNmI=
+=XBSr
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild
new file mode 100644
index 000000000000..054424ef8349
--- /dev/null
+++ b/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild
@@ -0,0 +1,111 @@
+# 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.9.8.5_beta.ebuild,v 1.1 2007/04/04 13:01:36 mrness Exp $
+
+inherit eutils autotools
+
+MY_P=${P/_beta/}
+
+DESCRIPTION="Web content filtering via proxy"
+HOMEPAGE="http://dansguardian.org"
+SRC_URI="http://dansguardian.org/downloads/2/Beta/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav kaspersky debug ntlm pcre"
+
+DEPEND="!net-proxy/dansguardian-dgav
+	pcre? ( >=dev-libs/libpcre-6.0 )
+	clamav? ( app-antivirus/clamav )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if has_version "<${CATEGORY}/${PN}-2.9" ; then
+		ewarn "This version introduces brand new USE flags:"
+		ewarn "   clamav kaspersky ntlm pcre"
+		echo
+
+		local f="${ROOT}/etc/dansguardian"
+		f=${f//\/\///}
+		if [ -d "${f}" ] ; then
+			eerror "The structure of ${f} has changed in this version!"
+			eerror "For avoiding confusion, you must either move or delete the old ${f},"
+			eerror "then continue with the upgrade:"
+			eerror "   mv '${f}' '${f}.old'"
+			eerror "   emerge --resume"
+			die "Obsolete config files detected"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P%_beta}-gentoo.patch"
+	epatch "${FILESDIR}/${P%_beta}-uclibc++.patch"
+
+	cd "${S}"
+	eautoreconf
+}
+
+src_compile() {
+	local myconf="--with-logdir=/var/log/dansguardian
+		--with-piddir=/var/run
+		$(use_enable pcre)
+		$(use_enable ntlm)
+		--enable-fancydm
+		--enable-email"
+	if use clamav; then
+		myconf="${myconf} --enable-clamd --enable-clamav
+			--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
+
+	econf ${myconf} || die "configure failed"
+
+	emake OPTIMISE="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	make "DESTDIR=${D}" install || die "make install failed"
+
+	# Copying init script
+	exeinto /etc/init.d
+	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"
+	elif use kaspersky; then
+		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
+
+	keepdir /var/log/dansguardian
+	fperms o-rwx /var/log/dansguardian
+}
+
+pkg_postinst() {
+	local runas="nobody:nobody"
+	if use clamav ; then
+		runas="clamav:clamav"
+	fi
+	einfo "The dansguardian daemon will run by default as ${runas}"
+
+	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.8.5-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.8.5-gentoo.patch
new file mode 100644
index 000000000000..2246b7472c74
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.8.5-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Nru dansguardian-2.9.8.5.orig/doc/dansguardian.8 dansguardian-2.9.8.5/doc/dansguardian.8
+--- dansguardian-2.9.8.5.orig/doc/dansguardian.8	2006-10-16 19:17:10.000000000 +0300
++++ dansguardian-2.9.8.5/doc/dansguardian.8	2007-04-04 15:11:02.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
+ An Introduction
+ 
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.8.5-uclibc++.patch b/net-proxy/dansguardian/files/dansguardian-2.9.8.5-uclibc++.patch
new file mode 100644
index 000000000000..de42a98a11c5
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.8.5-uclibc++.patch
@@ -0,0 +1,77 @@
+diff -Nru dansguardian-2.9.8.5.orig/configure.ac dansguardian-2.9.8.5/configure.ac
+--- dansguardian-2.9.8.5.orig/configure.ac	2007-03-19 19:07:55.000000000 +0200
++++ dansguardian-2.9.8.5/configure.ac	2007-04-04 15:11:45.000000000 +0300
+@@ -104,6 +104,7 @@
+ AC_CHECK_FUNCS([dup2 gettimeofday memset select])
+ AC_CHECK_FUNCS([strerror strstr strtol])
+ AC_CHECK_FUNCS([setuid setgid umask seteuid setreuid setlocale strdup])
++AC_SEARCH_LIBS([floor], [m])
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_SEARCH_LIBS([socket], [socket], [], [
+ 	AC_CHECK_LIB(
+diff -Nru dansguardian-2.9.8.5.orig/src/ConnectionHandler.cpp dansguardian-2.9.8.5/src/ConnectionHandler.cpp
+--- dansguardian-2.9.8.5.orig/src/ConnectionHandler.cpp	2007-03-15 17:56:44.000000000 +0200
++++ dansguardian-2.9.8.5/src/ConnectionHandler.cpp	2007-04-04 15:11:45.000000000 +0300
+@@ -32,6 +32,7 @@
+ #include <syslog.h>
+ #include <cerrno>
+ #include <cstdio>
++#include <ctime>
+ #include <algorithm>
+ #include <netdb.h>
+ #include <cstdlib>
+diff -Nru dansguardian-2.9.8.5.orig/src/dansguardian.cpp dansguardian-2.9.8.5/src/dansguardian.cpp
+--- dansguardian-2.9.8.5.orig/src/dansguardian.cpp	2007-02-02 12:16:16.000000000 +0200
++++ dansguardian-2.9.8.5/src/dansguardian.cpp	2007-04-04 15:11:45.000000000 +0300
+@@ -27,6 +27,7 @@
+ 
+ #include <iostream>
+ #include <cstdio>
++#include <ctime>
+ #include <unistd.h>
+ #include <cerrno>
+ #include <syslog.h>
+diff -Nru dansguardian-2.9.8.5.orig/src/DynamicURLList.cpp dansguardian-2.9.8.5/src/DynamicURLList.cpp
+--- dansguardian-2.9.8.5.orig/src/DynamicURLList.cpp	2006-12-19 12:26:47.000000000 +0200
++++ dansguardian-2.9.8.5/src/DynamicURLList.cpp	2007-04-04 15:11:45.000000000 +0300
+@@ -25,6 +25,7 @@
+ 
+ #include <syslog.h>
+ #include <algorithm>
++#include <ctime>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ 
+diff -Nru dansguardian-2.9.8.5.orig/src/FatController.cpp dansguardian-2.9.8.5/src/FatController.cpp
+--- dansguardian-2.9.8.5.orig/src/FatController.cpp	2007-02-02 12:16:16.000000000 +0200
++++ dansguardian-2.9.8.5/src/FatController.cpp	2007-04-04 15:11:45.000000000 +0300
+@@ -33,6 +33,7 @@
+ 
+ #include <syslog.h>
+ #include <csignal>
++#include <ctime>
+ #include <sys/stat.h>
+ #include <pwd.h>
+ #include <cerrno>
+diff -Nru dansguardian-2.9.8.5.orig/src/ListContainer.cpp dansguardian-2.9.8.5/src/ListContainer.cpp
+--- dansguardian-2.9.8.5.orig/src/ListContainer.cpp	2007-02-06 18:16:47.000000000 +0200
++++ dansguardian-2.9.8.5/src/ListContainer.cpp	2007-04-04 15:11:45.000000000 +0300
+@@ -29,6 +29,7 @@
+ #include "RegExp.hpp"
+ #include <cstdlib>
+ #include <cstdio>
++#include <ctime>
+ #include <unistd.h>
+ #include "String.hpp"
+ #include <iostream>
+diff -Nru dansguardian-2.9.8.5.orig/src/ListManager.cpp dansguardian-2.9.8.5/src/ListManager.cpp
+--- dansguardian-2.9.8.5.orig/src/ListManager.cpp	2007-02-02 12:16:16.000000000 +0200
++++ dansguardian-2.9.8.5/src/ListManager.cpp	2007-04-04 15:11:45.000000000 +0300
+@@ -25,6 +25,7 @@
+ 
+ #include <syslog.h>
+ #include <sys/stat.h>
++#include <ctime>
+ 
+ 
+ // GLOBALS
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.5_beta b/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.5_beta
new file mode 100644
index 000000000000..41c2049d0d1a
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.5_beta
@@ -0,0 +1,3 @@
+MD5 35f9c0ee535bd8e93b0d30fe7c60a09e dansguardian-2.9.8.5.tar.gz 469549
+RMD160 d63337e728331d658d7a2941549b8132dbbd467e dansguardian-2.9.8.5.tar.gz 469549
+SHA256 614a9287b852996bf56aff62e39324e86e091dba388de99bc2b608a626084e62 dansguardian-2.9.8.5.tar.gz 469549