Version bump (#164840).

(Portage version: 2.1.1-r2)

5 files changed, 215 insertions, 2 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index da96b4772f28..9eb3cf237696 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.24 2006/12/19 18:43:05 mrness Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.25 2007/02/01 23:06:00 mrness Exp $
+
+*dansguardian-2.9.8.2_beta (01 Feb 2007)
+
+  01 Feb 2007; Alin Năstac <mrness@gentoo.org>
+  -files/dansguardian-2.9.8.0-gentoo.patch,
+  -files/dansguardian-2.9.8.0-uclibc++.patch,
+  +files/dansguardian-2.9.8.2-gentoo.patch,
+  +files/dansguardian-2.9.8.2-uclibc++.patch,
+  -dansguardian-2.9.8.0_beta.ebuild, +dansguardian-2.9.8.2_beta.ebuild:
+  Version bump (#164840).
 
 *dansguardian-2.9.8.1_beta (19 Dec 2006)
 
diff --git a/net-proxy/dansguardian/dansguardian-2.9.8.2_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.9.8.2_beta.ebuild
new file mode 100644
index 000000000000..a76004d7165d
--- /dev/null
+++ b/net-proxy/dansguardian/dansguardian-2.9.8.2_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.2_beta.ebuild,v 1.1 2007/02/01 23:06:00 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=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
+	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.2-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.8.2-gentoo.patch
new file mode 100644
index 000000000000..568f5ae3c760
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.8.2-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Nru dansguardian-2.9.8.2.orig/doc/dansguardian.8 dansguardian-2.9.8.2/doc/dansguardian.8
+--- dansguardian-2.9.8.2.orig/doc/dansguardian.8	2006-10-16 19:17:10.000000000 +0300
++++ dansguardian-2.9.8.2/doc/dansguardian.8	2007-02-02 00:53:50.000000000 +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
+ An Introduction
+ 
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.8.2-uclibc++.patch b/net-proxy/dansguardian/files/dansguardian-2.9.8.2-uclibc++.patch
new file mode 100644
index 000000000000..9b41ddd510ae
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.8.2-uclibc++.patch
@@ -0,0 +1,77 @@
+diff -Nru dansguardian-2.9.8.2.orig/configure.ac dansguardian-2.9.8.2/configure.ac
+--- dansguardian-2.9.8.2.orig/configure.ac	2006-12-20 11:59:42.000000000 +0200
++++ dansguardian-2.9.8.2/configure.ac	2007-02-02 00:54:36.000000000 +0200
+@@ -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.2.orig/src/ConnectionHandler.cpp dansguardian-2.9.8.2/src/ConnectionHandler.cpp
+--- dansguardian-2.9.8.2.orig/src/ConnectionHandler.cpp	2007-01-19 11:59:04.000000000 +0200
++++ dansguardian-2.9.8.2/src/ConnectionHandler.cpp	2007-02-02 00:54:37.000000000 +0200
+@@ -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.2.orig/src/dansguardian.cpp dansguardian-2.9.8.2/src/dansguardian.cpp
+--- dansguardian-2.9.8.2.orig/src/dansguardian.cpp	2006-12-19 12:47:44.000000000 +0200
++++ dansguardian-2.9.8.2/src/dansguardian.cpp	2007-02-02 00:54:37.000000000 +0200
+@@ -27,6 +27,7 @@
+ 
+ #include <iostream>
+ #include <cstdio>
++#include <ctime>
+ #include <unistd.h>
+ #include <cerrno>
+ #include <syslog.h>
+diff -Nru dansguardian-2.9.8.2.orig/src/DynamicURLList.cpp dansguardian-2.9.8.2/src/DynamicURLList.cpp
+--- dansguardian-2.9.8.2.orig/src/DynamicURLList.cpp	2006-12-19 12:26:47.000000000 +0200
++++ dansguardian-2.9.8.2/src/DynamicURLList.cpp	2007-02-02 00:54:37.000000000 +0200
+@@ -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.2.orig/src/FatController.cpp dansguardian-2.9.8.2/src/FatController.cpp
+--- dansguardian-2.9.8.2.orig/src/FatController.cpp	2007-01-15 16:06:50.000000000 +0200
++++ dansguardian-2.9.8.2/src/FatController.cpp	2007-02-02 00:54:37.000000000 +0200
+@@ -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.2.orig/src/ListContainer.cpp dansguardian-2.9.8.2/src/ListContainer.cpp
+--- dansguardian-2.9.8.2.orig/src/ListContainer.cpp	2007-01-15 13:44:31.000000000 +0200
++++ dansguardian-2.9.8.2/src/ListContainer.cpp	2007-02-02 00:54:37.000000000 +0200
+@@ -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.2.orig/src/ListManager.cpp dansguardian-2.9.8.2/src/ListManager.cpp
+--- dansguardian-2.9.8.2.orig/src/ListManager.cpp	2006-01-04 12:19:59.000000000 +0200
++++ dansguardian-2.9.8.2/src/ListManager.cpp	2007-02-02 00:54:37.000000000 +0200
+@@ -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.2_beta b/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.2_beta
new file mode 100644
index 000000000000..12b0665f8bdf
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.2_beta
@@ -0,0 +1,3 @@
+MD5 6d6e002be64df2ba7a3842e29fb2dd36 dansguardian-2.9.8.2.tar.gz 469129
+RMD160 7a9cc375a48baaadc064a9de4a5de32499bf6522 dansguardian-2.9.8.2.tar.gz 469129
+SHA256 228b5240e34c6a59d1cfdf7cc7ed206c6552bb6d584ba4e9e16478fdbd688c55 dansguardian-2.9.8.2.tar.gz 469129