Remove obsolete alpha version. Version bump (#143448).

(Portage version: 2.1-r2)

8 files changed, 219 insertions, 1 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 1ebeb3504409..4a92f36ac5ba 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-proxy/dansguardian
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.20 2006/05/31 21:18:35 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.21 2006/08/19 06:52:51 mrness Exp $
+
+*dansguardian-2.9.7.5_alpha (19 Aug 2006)
+
+  19 Aug 2006; Alin Nastac <mrness@gentoo.org>
+  -files/dansguardian-2.9.6.2_alpha-gentoo.patch,
+  +files/dansguardian-2.9.7.5-ctime.patch,
+  +files/dansguardian-2.9.7.5-lm.patch,
+  +files/dansguardian-2.9.7.5_alpha-gentoo.patch,
+  -dansguardian-2.9.6.2_alpha.ebuild, +dansguardian-2.9.7.5_alpha.ebuild:
+  Remove obsolete alpha version. Version bump (#143448).
 
   31 May 2006; Alin Nastac <mrness@gentoo.org>
   +files/dansguardian-2.8.0.6-ctime.patch,
diff --git a/net-proxy/dansguardian/dansguardian-2.9.7.5_alpha.ebuild b/net-proxy/dansguardian/dansguardian-2.9.7.5_alpha.ebuild
new file mode 100644
index 000000000000..37377d97deb8
--- /dev/null
+++ b/net-proxy/dansguardian/dansguardian-2.9.7.5_alpha.ebuild
@@ -0,0 +1,112 @@
+# 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.7.5_alpha.ebuild,v 1.1 2006/08/19 06:52:51 mrness Exp $
+
+inherit eutils autotools
+
+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="~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%_alpha}-ctime.patch"
+	epatch "${FILESDIR}/${P%_alpha}-lm.patch"
+	epatch "${FILESDIR}/${P}-gentoo.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=yes
+			--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
+	ewarn "The dansguardian daemon will run by default as user & group ${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.7.5-ctime.patch b/net-proxy/dansguardian/files/dansguardian-2.9.7.5-ctime.patch
new file mode 100644
index 000000000000..914696444de0
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.7.5-ctime.patch
@@ -0,0 +1,66 @@
+diff -ru dansguardian-2.9.7.5.orig/src/ConnectionHandler.cpp dansguardian-2.9.7.5/src/ConnectionHandler.cpp
+--- dansguardian-2.9.7.5.orig/src/ConnectionHandler.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.5/src/ConnectionHandler.cpp	2006-05-30 21:38:25 +0000
+@@ -32,6 +32,7 @@
+ #include <syslog.h>
+ #include <cerrno>
+ #include <cstdio>
++#include <ctime>
+ #include <algorithm>
+ #include <netdb.h>
+ #include <cstdlib>
+diff -ru dansguardian-2.9.7.5.orig/src/DynamicURLList.cpp dansguardian-2.9.7.5/src/DynamicURLList.cpp
+--- dansguardian-2.9.7.5.orig/src/DynamicURLList.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.5/src/DynamicURLList.cpp	2006-05-30 21:38:52 +0000
+@@ -25,6 +25,7 @@
+ 
+ #include <syslog.h>
+ #include <algorithm>
++#include <ctime>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ 
+diff -ru dansguardian-2.9.7.5.orig/src/FatController.cpp dansguardian-2.9.7.5/src/FatController.cpp
+--- dansguardian-2.9.7.5.orig/src/FatController.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.5/src/FatController.cpp	2006-05-30 21:39:28 +0000
+@@ -33,6 +33,7 @@
+ 
+ #include <syslog.h>
+ #include <csignal>
++#include <ctime>
+ #include <sys/stat.h>
+ #include <pwd.h>
+ #include <cerrno>
+diff -ru dansguardian-2.9.7.5.orig/src/ListContainer.cpp dansguardian-2.9.7.5/src/ListContainer.cpp
+--- dansguardian-2.9.7.5.orig/src/ListContainer.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.5/src/ListContainer.cpp	2006-05-30 21:39:57 +0000
+@@ -29,6 +29,7 @@
+ #include "RegExp.hpp"
+ #include <cstdlib>
+ #include <cstdio>
++#include <ctime>
+ #include <unistd.h>
+ #include "String.hpp"
+ #include <iostream>
+diff -ru dansguardian-2.9.7.5.orig/src/ListManager.cpp dansguardian-2.9.7.5/src/ListManager.cpp
+--- dansguardian-2.9.7.5.orig/src/ListManager.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.5/src/ListManager.cpp	2006-05-30 21:40:25 +0000
+@@ -25,6 +25,7 @@
+ 
+ #include <syslog.h>
+ #include <sys/stat.h>
++#include <ctime>
+ 
+ 
+ // GLOBALS
+diff -ru dansguardian-2.9.7.5.orig/src/dansguardian.cpp dansguardian-2.9.7.5/src/dansguardian.cpp
+--- dansguardian-2.9.7.5.orig/src/dansguardian.cpp	2006-05-30 21:36:58 +0000
++++ dansguardian-2.9.7.5/src/dansguardian.cpp	2006-05-30 21:41:24 +0000
+@@ -27,6 +27,7 @@
+ 
+ #include <iostream>
+ #include <cstdio>
++#include <ctime>
+ #include <unistd.h>
+ #include <cerrno>
+ #include <syslog.h>
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.7.5-lm.patch b/net-proxy/dansguardian/files/dansguardian-2.9.7.5-lm.patch
new file mode 100644
index 000000000000..b523a577c9cb
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.7.5-lm.patch
@@ -0,0 +1,11 @@
+diff -Nru dansguardian-2.9.7.5.orig/configure.ac dansguardian-2.9.7.5/configure.ac
+--- dansguardian-2.9.7.5.orig/configure.ac	2006-05-08 14:57:53.000000000 +0300
++++ dansguardian-2.9.7.5/configure.ac	2006-06-01 00:08:39.953911500 +0300
+@@ -135,6 +135,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 --git a/net-proxy/dansguardian/files/dansguardian-2.9.7.5_alpha-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.7.5_alpha-gentoo.patch
new file mode 100644
index 000000000000..4200839641b3
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.7.5_alpha-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Nur dansguardian-2.9.7.5.orig/doc/dansguardian.8 dansguardian-2.9.7.5/doc/dansguardian.8
+--- dansguardian-2.9.7.5.orig/doc/dansguardian.8	2005-02-24 12:30:16.000000000 +0200
++++ dansguardian-2.9.7.5/doc/dansguardian.8	2006-05-30 21:09:00.494363000 +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/files/digest-dansguardian-2.8.0.6-r1 b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.6-r1
index 5acffb70cbf4..04cffbfb0a3c 100644
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.6-r1
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.8.0.6-r1
@@ -1 +1,3 @@
 MD5 aa619607198f37a528dbb65e4a503beb dansguardian-2.8.0.6.source.tar.gz 212737
+RMD160 cf3493b26b4fcd5b366a6fe472e3c6c9e3cfe6d3 dansguardian-2.8.0.6.source.tar.gz 212737
+SHA256 f4d51b805e979369896906b49a388bf102f56cf0755acc9cb1ec2e4176aac34b dansguardian-2.8.0.6.source.tar.gz 212737
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.7.0_alpha b/net-proxy/dansguardian/files/digest-dansguardian-2.9.7.0_alpha
index ea3de298caee..8db8a665bdf3 100644
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.9.7.0_alpha
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.7.0_alpha
@@ -1 +1,3 @@
 MD5 ab487a567065fa3f58981b31e2faa7a8 dansguardian-2.9.7.0.tar.gz 431030
+RMD160 7315a9ea366a18172d406a69cbbeb39aafa8cbc0 dansguardian-2.9.7.0.tar.gz 431030
+SHA256 fb11b1827632f973a591362e6323ed52866e2a97a6681f4d3317106ead0f79a6 dansguardian-2.9.7.0.tar.gz 431030
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.7.5_alpha b/net-proxy/dansguardian/files/digest-dansguardian-2.9.7.5_alpha
new file mode 100644
index 000000000000..10356b0aa048
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.7.5_alpha
@@ -0,0 +1,3 @@
+MD5 f30e0ef7eb34190c038f9abbef2eba5d dansguardian-2.9.7.5.tar.gz 437282
+RMD160 9e05a15136a79316c59c957ef8395db426685aa1 dansguardian-2.9.7.5.tar.gz 437282
+SHA256 9ac89b4fd8e303607c3403bd31a39748a713715d15b569eab5ec702933d5da43 dansguardian-2.9.7.5.tar.gz 437282