6 files changed, 132 insertions, 15 deletions
diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index f93a163092c6..ccb69e52f9d9 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,14 @@
 # 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.9 2005/12/08 22:15:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.10 2005/12/13 21:54:55 mrness Exp $
+
+*dansguardian-2.9.3.0_alpha (13 Dec 2005)
+
+  13 Dec 2005; Alin Nastac <mrness@gentoo.org>
+  +files/dansguardian-2.9.3.0_alpha-gentoo.patch,
+  dansguardian-2.8.0.6-r1.ebuild, +dansguardian-2.9.3.0_alpha.ebuild:
+  Mark stable on x86. Bump to the latest alpha version, which now supports
+  ClamAV and Perl compatible regular expressions (#114250).
 
 *dansguardian-2.8.0.6-r1 (08 Dec 2005)
 
diff --git a/net-proxy/dansguardian/Manifest b/net-proxy/dansguardian/Manifest
index 7d6870918f29..23289e2f6dcf 100644
--- a/net-proxy/dansguardian/Manifest
+++ b/net-proxy/dansguardian/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b7155754bb72a87e11aa74ab97678d8e dansguardian-2.8.0.6-r1.ebuild 1244
+MD5 8fd7a223a566bd67962bfd6fe668a21c dansguardian-2.8.0.6-r1.ebuild 1243
+MD5 5933a0871410d0092e684b0c28456ec9 dansguardian-2.9.3.0_alpha.ebuild 2600
 MD5 66b41ef646913a4fe63153d4e76c4193 dansguardian-2.8.0.4.ebuild 1176
 MD5 887c6bdeabb27180c88519f1403b877b dansguardian-2.8.0.6.ebuild 1179
-MD5 67348e217c074d5b4ebd97030c44dd11 ChangeLog 5200
+MD5 0fff309fc44a094336eae81de256f6c9 ChangeLog 5546
 MD5 30b14eaf02c479d70f60157c1a29a294 metadata.xml 568
 MD5 579f2cac2dbebe18ff6900fd3aa87f66 files/digest-dansguardian-2.8.0.4 79
 MD5 421e49847907b8c4d53ccc01d17656e6 files/digest-dansguardian-2.8.0.6 79
 MD5 89d1e03feed0f074cadb635f786c3f32 files/dansguardian.init 826
 MD5 046d9ee8033553a881d5ee0586bf2a3d files/dansguardian.logrotate 188
+MD5 4f460e57b16de6c5371d16d6c1fd4a62 files/dansguardian-2.9.3.0_alpha-gentoo.patch 471
 MD5 6313b934a33da7e4308812e834494074 files/dansguardian-xnaughty-2.7.6-1.diff 2325
 MD5 0cf459b33bd205ff0e5d270cf1db72e0 files/dansguardian-2.8.0.6-gentoo.patch 886
+MD5 26bc6614a469ec90890a688d79a63a8c files/digest-dansguardian-2.9.3.0_alpha 72
 MD5 421e49847907b8c4d53ccc01d17656e6 files/digest-dansguardian-2.8.0.6-r1 79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDmLc7NSP4Vda7IdsRAqgIAJ991HyIxgkQoAMAq7oCFClJspx37QCeKbgd
-zaRo/5eXEFBshUnWtHtUB9U=
-=byuJ
------END PGP SIGNATURE-----
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 c30de74c109f..0ed4fffa7d6a 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-2005 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.2 2005/12/08 22:44:00 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.8.0.6-r1.ebuild,v 1.3 2005/12/13 21:54:55 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://mirror.dansguardian.org/downloads/2/Stable/${P}.source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 DEPEND="!net-proxy/dansguardian-dgav
 	virtual/libc"
diff --git a/net-proxy/dansguardian/dansguardian-2.9.3.0_alpha.ebuild b/net-proxy/dansguardian/dansguardian-2.9.3.0_alpha.ebuild
new file mode 100644
index 000000000000..0857c14e4d80
--- /dev/null
+++ b/net-proxy/dansguardian/dansguardian-2.9.3.0_alpha.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2005 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.1 2005/12/13 21:54:55 mrness Exp $
+
+inherit eutils
+
+MY_P=${P/_alpha/}
+
+DESCRIPTION="Web content filtering via proxy"
+HOMEPAGE="http://dansguardian.org"
+SRC_URI="http://dansguardian.org/downloads/2/Alpha/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64 ~x86"
+IUSE="clamav debug ntlm pcre"
+
+DEPEND="virtual/libc
+	!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"
+		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}-gentoo.patch
+}
+
+src_compile() {
+	local myconf="--with-logdir=/var/log/dansguardian
+		--with-piddir=/var/run
+		$(use_enable pcre)
+		$(use_enable ntlm)"
+	if use clamav; then
+		myconf="${myconf} --enable-clamd=yes
+			--with-proxyuser=clamav
+			--with-proxygroup=clamav"
+	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
+	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
+	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
+		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
new file mode 100644
index 000000000000..85b7861e77af
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.3.0_alpha-gentoo.patch
@@ -0,0 +1,12 @@
+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/digest-dansguardian-2.9.3.0_alpha b/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.0_alpha
new file mode 100644
index 000000000000..9e73372c8b2e
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.3.0_alpha
@@ -0,0 +1 @@
+MD5 1c52cbb1c099bae3f40c9615cfadf53e dansguardian-2.9.3.0.tar.gz 389420