Version bump (#191870)

(Portage version: 2.1.2.12)

8 files changed, 125 insertions, 85 deletions

diff --git a/net-proxy/dansguardian/ChangeLog b/net-proxy/dansguardian/ChangeLog
index 01d2014bc302..09a823cd34ff 100644
--- a/net-proxy/dansguardian/ChangeLog
+++ b/net-proxy/dansguardian/ChangeLog
@@ -1,6 +1,17 @@
 # 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.30 2007/08/18 14:34:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/ChangeLog,v 1.31 2007/09/09 19:58:59 mrness Exp $
+
+*dansguardian-2.9.9.1_beta (09 Sep 2007)
+
+  09 Sep 2007; Alin Năstac <mrness@gentoo.org>
+  -files/dansguardian-2.9.8.5-gentoo.patch,
+  -files/dansguardian-2.9.8.5-uclibc++.patch,
+  +files/dansguardian-2.9.9.1-gentoo.patch,
+  +files/dansguardian-2.9.9.1-no-default-lists.patch,
+  +files/dansguardian-2.9.9.1-uclibc++.patch,
+  -dansguardian-2.9.8.5_beta.ebuild, +dansguardian-2.9.9.1_beta.ebuild:
+  Version bump (#191870).
 
 *dansguardian-2.9.9.0_beta (18 Aug 2007)
 
diff --git a/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild b/net-proxy/dansguardian/dansguardian-2.9.9.1_beta.ebuild
index 05d9a92bdb03..38933b3b3101 100644
--- a/net-proxy/dansguardian/dansguardian-2.9.8.5_beta.ebuild
+++ b/net-proxy/dansguardian/dansguardian-2.9.9.1_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.4 2007/08/18 14:34:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dansguardian/dansguardian-2.9.9.1_beta.ebuild,v 1.1 2007/09/09 19:58:59 mrness Exp $
 
 inherit eutils autotools
 
@@ -45,6 +45,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P%_beta}-gentoo.patch"
 	epatch "${FILESDIR}/${P%_beta}-uclibc++.patch"
+	epatch "${FILESDIR}/${P%_beta}-no-default-lists.patch"
 
 	cd "${S}"
 	eautoreconf
@@ -94,6 +95,18 @@ src_install() {
 
 	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
+		if [ -f "${f}" ] ; then
+			einfo "${f} already exists"
+		else
+			newins "${T}"/emptyfile ${f}
+		fi
+	done
 }
 
 pkg_postinst() {
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
deleted file mode 100644
index de42a98a11c5..000000000000
--- a/net-proxy/dansguardian/files/dansguardian-2.9.8.5-uclibc++.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-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/dansguardian-2.9.8.5-gentoo.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.1-gentoo.patch
index 2246b7472c74..dad83bc9267a 100644
--- a/net-proxy/dansguardian/files/dansguardian-2.9.8.5-gentoo.patch
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.9.1-gentoo.patch
@@ -1,6 +1,6 @@
-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
+diff -Nru dansguardian-2.9.9.1.orig/doc/dansguardian.8 dansguardian-2.9.9.1/doc/dansguardian.8
+--- dansguardian-2.9.9.1.orig/doc/dansguardian.8	2006-10-16 19:17:10.000000000 +0300
++++ dansguardian-2.9.9.1/doc/dansguardian.8	2007-09-09 22:38:51.000000000 +0300
 @@ -3,7 +3,7 @@
  .SH NAME
  DansGuardian 2
diff --git a/net-proxy/dansguardian/files/dansguardian-2.9.9.1-no-default-lists.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.1-no-default-lists.patch
new file mode 100644
index 000000000000..6d92324d36e1
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.9.1-no-default-lists.patch
@@ -0,0 +1,16 @@
+diff -Nru dansguardian-2.9.9.1.orig/configs/dansguardianf1.conf.in dansguardian-2.9.9.1/configs/dansguardianf1.conf.in
+--- dansguardian-2.9.9.1.orig/configs/dansguardianf1.conf.in	2007-07-11 12:17:59.000000000 +0300
++++ dansguardian-2.9.9.1/configs/dansguardianf1.conf.in	2007-09-09 22:42:20.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.1-uclibc++.patch b/net-proxy/dansguardian/files/dansguardian-2.9.9.1-uclibc++.patch
new file mode 100644
index 000000000000..941dc05ed407
--- /dev/null
+++ b/net-proxy/dansguardian/files/dansguardian-2.9.9.1-uclibc++.patch
@@ -0,0 +1,77 @@
+diff -Nru dansguardian-2.9.9.1.orig/configure.ac dansguardian-2.9.9.1/configure.ac
+--- dansguardian-2.9.9.1.orig/configure.ac	2007-08-16 12:21:51.000000000 +0300
++++ dansguardian-2.9.9.1/configure.ac	2007-09-09 22:40:17.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.1.orig/src/ConnectionHandler.cpp dansguardian-2.9.9.1/src/ConnectionHandler.cpp
+--- dansguardian-2.9.9.1.orig/src/ConnectionHandler.cpp	2007-08-09 12:48:27.000000000 +0300
++++ dansguardian-2.9.9.1/src/ConnectionHandler.cpp	2007-09-09 22:40:17.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.1.orig/src/dansguardian.cpp dansguardian-2.9.9.1/src/dansguardian.cpp
+--- dansguardian-2.9.9.1.orig/src/dansguardian.cpp	2007-03-27 14:33:19.000000000 +0300
++++ dansguardian-2.9.9.1/src/dansguardian.cpp	2007-09-09 22:40:17.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.1.orig/src/DynamicURLList.cpp dansguardian-2.9.9.1/src/DynamicURLList.cpp
+--- dansguardian-2.9.9.1.orig/src/DynamicURLList.cpp	2006-12-19 12:26:47.000000000 +0200
++++ dansguardian-2.9.9.1/src/DynamicURLList.cpp	2007-09-09 22:40:17.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.1.orig/src/FatController.cpp dansguardian-2.9.9.1/src/FatController.cpp
+--- dansguardian-2.9.9.1.orig/src/FatController.cpp	2007-07-12 12:35:02.000000000 +0300
++++ dansguardian-2.9.9.1/src/FatController.cpp	2007-09-09 22:40:17.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.1.orig/src/ListContainer.cpp dansguardian-2.9.9.1/src/ListContainer.cpp
+--- dansguardian-2.9.9.1.orig/src/ListContainer.cpp	2007-08-09 12:41:33.000000000 +0300
++++ dansguardian-2.9.9.1/src/ListContainer.cpp	2007-09-09 22:40:17.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.1.orig/src/ListManager.cpp dansguardian-2.9.9.1/src/ListManager.cpp
+--- dansguardian-2.9.9.1.orig/src/ListManager.cpp	2007-02-02 12:16:16.000000000 +0200
++++ dansguardian-2.9.9.1/src/ListManager.cpp	2007-09-09 22:40:17.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
deleted file mode 100644
index 41c2049d0d1a..000000000000
--- a/net-proxy/dansguardian/files/digest-dansguardian-2.9.8.5_beta
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.1_beta b/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.1_beta
new file mode 100644
index 000000000000..22a09be41607
--- /dev/null
+++ b/net-proxy/dansguardian/files/digest-dansguardian-2.9.9.1_beta
@@ -0,0 +1,3 @@
+MD5 f46b15f4a99c4c8c4e0a33aa0a9e8393 dansguardian-2.9.9.1.tar.gz 476967
+RMD160 afc7f6875629f6dd5f37e962df0bfadfbc92de30 dansguardian-2.9.9.1.tar.gz 476967
+SHA256 3d7b5714830554552c9ffa9768107f7cc5d8da656c65c215551f02d7a0927340 dansguardian-2.9.9.1.tar.gz 476967