Version bump. Remove dansguardian-dgav block atom from DEPENDs.

(Portage version: 2.1.2.11)

8 files changed, 244 insertions, 8 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 260f61b5ceac..01d2014bc302 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,16 @@
 # 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.29 2007/06/17 06:01:15 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.30 2007/08/18 14:34:42 mrness Exp $
+
+*dansguardian-2.9.9.0_beta (18 Aug 2007)
+
+  18 Aug 2007; Alin Năstac <mrness@gentoo.org>
+  +files/dansguardian-2.9.9.0-gentoo.patch,
+  +files/dansguardian-2.9.9.0-no-default-lists.patch,
+  +files/dansguardian-2.9.9.0-uclibc++.patch,
+  dansguardian-2.8.0.6-r1.ebuild, dansguardian-2.9.8.5_beta.ebuild,
+  +dansguardian-2.9.9.0_beta.ebuild:
+  Version bump. Remove dansguardian-dgav block atom from DEPENDs.
 
   17 Jun 2007; Alin Năstac <mrness@gentoo.org>
   -files/dansguardian-2.9.8.2-gentoo.patch,
diff --git a/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild b/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild
index 8f9c77b39754..9ae2ed05b2fc 100644
--- a/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.7 2006/05/31 21:18:35 mrness Exp $
+# $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
 
@@ -12,7 +12,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
-DEPEND="!net-proxy/dansguardian-dgav"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild
index 6195c5d8265f..05d9a92bdb03 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2007/06/17 06:01:15 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild,v 1.4 2007/08/18 14:34:42 mrness Exp $
 
 inherit eutils autotools
 
@@ -15,11 +15,11 @@ 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 )
+DEPEND="pcre? ( >=dev-libs/libpcre-6.0 )
 	clamav? ( app-antivirus/clamav )"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if has_version "<${CATEGORY}/${PN}-2.9" ; then
diff --git a/net-proxy/dansguardian/dansguardian-2.9.9.0_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.9.9.0_beta.ebuild
new file mode 100644
index 000000000000..1c315490864b
--- /dev/null
+++ b/net-proxy/dansguardian/dansguardian-2.9.9.0_beta.ebuild
@@ -0,0 +1,119 @@
+# 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.9.0_beta.ebuild,v 1.1 2007/08/18 14:34:42 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="pcre? ( >=dev-libs/libpcre-6.0 )
+	clamav? ( app-antivirus/clamav )"
+RDEPEND="${DEPEND}"
+
+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"
+	epatch "${FILESDIR}/${P%_beta}-no-default-lists.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
+	newinitd "${FILESDIR}/dansguardian.init" dansguardian
+
+	if use clamav; then
+		sed -r -i -e 's/[ \t]+use dns/& 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
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/dansguardian.logrotate" dansguardian
+
+	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
+		newins "${T}"/emptyfile ${f}
+	done
+}
+
+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.9.0-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.0-gentoo.patch
new file mode 100644
index 000000000000..757878683e20
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.9.0-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Nru dansguardian-2.9.9.0.orig/doc/dansguardian.8 dansguardian-2.9.9.0/doc/dansguardian.8
+--- dansguardian-2.9.9.0.orig/doc/dansguardian.8	2006-10-16 19:17:10.000000000 +0300
++++ dansguardian-2.9.9.0/doc/dansguardian.8	2007-08-18 16:33:39.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.9.0-no-default-lists.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.0-no-default-lists.patch
new file mode 100644
index 000000000000..e069ef6bb7b9
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.9.0-no-default-lists.patch
@@ -0,0 +1,16 @@
+diff -Nru dansguardian-2.9.9.0.orig/configs/dansguardianf1.conf.in dansguardian-2.9.9.0/configs/dansguardianf1.conf.in
+--- dansguardian-2.9.9.0.orig/configs/dansguardianf1.conf.in	2007-08-18 17:19:27.000000000 +0300
++++ dansguardian-2.9.9.0/configs/dansguardianf1.conf.in	2007-08-18 17:15:46.000000000 +0300
+@@ -71,9 +71,9 @@
+ # Supply categorised lists here and the category string shall be logged against
+ # matching requests, but matching these lists does not perform any filtering
+ # action.
+-#logsitelist = '@DGCONFDIR@/lists/logsitelist'
+-#logurllist = '@DGCONFDIR@/lists/logurllist'
+-#logregexpurllist = '@DGCONFDIR@/lists/logregexpurllist'
++logsitelist = '@DGCONFDIR@/lists/logsitelist'
++logurllist = '@DGCONFDIR@/lists/logurllist'
++logregexpurllist = '@DGCONFDIR@/lists/logregexpurllist'
+ 
+ # Outgoing HTTP header rules:
+ # Optional lists for blocking based on, and modification of, outgoing HTTP
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.9.0-uclibc++.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.0-uclibc++.patch
new file mode 100644
index 000000000000..fd452885b151
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.9.0-uclibc++.patch
@@ -0,0 +1,77 @@
+diff -Nru dansguardian-2.9.9.0.orig/configure.ac dansguardian-2.9.9.0/configure.ac
+--- dansguardian-2.9.9.0.orig/configure.ac	2007-07-11 11:48:21.000000000 +0300
++++ dansguardian-2.9.9.0/configure.ac	2007-08-18 16:34:30.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.9.0.orig/src/ConnectionHandler.cpp dansguardian-2.9.9.0/src/ConnectionHandler.cpp
+--- dansguardian-2.9.9.0.orig/src/ConnectionHandler.cpp	2007-08-09 12:48:27.000000000 +0300
++++ dansguardian-2.9.9.0/src/ConnectionHandler.cpp	2007-08-18 16:34:30.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.9.0.orig/src/dansguardian.cpp dansguardian-2.9.9.0/src/dansguardian.cpp
+--- dansguardian-2.9.9.0.orig/src/dansguardian.cpp	2007-03-27 14:33:19.000000000 +0300
++++ dansguardian-2.9.9.0/src/dansguardian.cpp	2007-08-18 16:34:30.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.9.0.orig/src/DynamicURLList.cpp dansguardian-2.9.9.0/src/DynamicURLList.cpp
+--- dansguardian-2.9.9.0.orig/src/DynamicURLList.cpp	2006-12-19 12:26:47.000000000 +0200
++++ dansguardian-2.9.9.0/src/DynamicURLList.cpp	2007-08-18 16:34:30.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.9.0.orig/src/FatController.cpp dansguardian-2.9.9.0/src/FatController.cpp
+--- dansguardian-2.9.9.0.orig/src/FatController.cpp	2007-07-12 12:35:02.000000000 +0300
++++ dansguardian-2.9.9.0/src/FatController.cpp	2007-08-18 16:34:30.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.9.0.orig/src/ListContainer.cpp dansguardian-2.9.9.0/src/ListContainer.cpp
+--- dansguardian-2.9.9.0.orig/src/ListContainer.cpp	2007-08-09 12:41:33.000000000 +0300
++++ dansguardian-2.9.9.0/src/ListContainer.cpp	2007-08-18 16:34:30.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.9.0.orig/src/ListManager.cpp dansguardian-2.9.9.0/src/ListManager.cpp
+--- dansguardian-2.9.9.0.orig/src/ListManager.cpp	2007-02-02 12:16:16.000000000 +0200
++++ dansguardian-2.9.9.0/src/ListManager.cpp	2007-08-18 16:34:30.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.9.0_beta b/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.0_beta
new file mode 100644
index 000000000000..ba8d14a43dc8
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.0_beta
@@ -0,0 +1,3 @@
+MD5 cfde623f20809a012ac1f32232a32c9b dansguardian-2.9.9.0.tar.gz 471642
+RMD160 ba440aec5303b3900cd0382a1ac516b6bb5220e7 dansguardian-2.9.9.0.tar.gz 471642
+SHA256 a34d73dfd432af46f1a75ea0cdae495f48d537c3552684e6c5761105b0cdd294 dansguardian-2.9.9.0.tar.gz 471642