From 58d00bd58465f1d62b2ce1cb4b243bdc48cddaa7 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 2 Dec 2008 15:41:27 +0000
Subject: [PATCH] Update dansguardian to 2.10.0.2 (stable), includes patches
 from #4281

git-svn-id: svn://svn.openwrt.org/openwrt/packages@13471 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/dansguardian/Makefile                      |  6 +++---
 net/dansguardian/patches/001-include_dir.patch | 18 ------------------
 .../patches/002-2.10-uclibc++.patch            | 11 +++++++++++
 3 files changed, 14 insertions(+), 21 deletions(-)
 create mode 100644 net/dansguardian/patches/002-2.10-uclibc++.patch

diff --git a/net/dansguardian/Makefile b/net/dansguardian/Makefile
index c668d7597..9e4ffd767 100644
--- a/net/dansguardian/Makefile
+++ b/net/dansguardian/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dansguardian
-PKG_VERSION:=2.9.9.2
+PKG_VERSION:=2.10.0.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Beta
-PKG_MD5SUM:=7877ee4d34df6ac538e6522755cedaf6
+PKG_SOURCE_URL:=http://dansguardian.org/downloads/2/Stable
+PKG_MD5SUM:=0a6c6d35c9e0c82fbc4a2150e8ffe977
 
 PKG_FIXUP = libtool
 
diff --git a/net/dansguardian/patches/001-include_dir.patch b/net/dansguardian/patches/001-include_dir.patch
index 256b834db..e575feba4 100644
--- a/net/dansguardian/patches/001-include_dir.patch
+++ b/net/dansguardian/patches/001-include_dir.patch
@@ -20,24 +20,6 @@ Index: dansguardian-2.9.9.2/configure
  	if test "x$staticzlib" = "xtrue"; then
  		LIBS="-Bstatic -L${withval} -lz -Bdynamic ${LIBS}"
  	else
-@@ -9637,7 +9637,7 @@
- 	PCRE_PREFIX=`pcre-config --prefix`
- 
- 	LIBS="${PCRE_LIBS} ${LIBS}"
--	CPPFLAGS="${CPPFLAGS} -I${PCRE_PREFIX}/include"
-+	CPPFLAGS="${CPPFLAGS}"
- 
- 	{ echo "$as_me:$LINENO: checking for REG_DOTALL in pcreposix.h" >&5
- echo $ECHO_N "checking for REG_DOTALL in pcreposix.h... $ECHO_C" >&6; }
-@@ -10076,7 +10076,7 @@
- 	CLAMAV_PREFIX=`clamav-config --prefix`
- 
- 	LIBS="${CLAMAV_LIBS} -lclamav ${LIBS}"
--		CPPFLAGS="${CPPFLAGS} -I${CLAMAV_PREFIX}/include"
-+		CPPFLAGS="${CPPFLAGS}"
- 
- 
- cat >>confdefs.h <<\_ACEOF
 @@ -10753,7 +10753,7 @@
  if test "${with_libiconv+set}" = set; then
    withval=$with_libiconv;  # check for header & func (in library) in given prefix
diff --git a/net/dansguardian/patches/002-2.10-uclibc++.patch b/net/dansguardian/patches/002-2.10-uclibc++.patch
new file mode 100644
index 000000000..27b417717
--- /dev/null
+++ b/net/dansguardian/patches/002-2.10-uclibc++.patch
@@ -0,0 +1,11 @@
+--- dansguardian-2.10/src/IPList.cpp.orig	2008-11-19 07:45:54 +0000
++++ dansguardian-2.10/src/IPList.cpp	2008-11-19 07:46:44 +0000
+@@ -81,7 +81,7 @@
+ 			hostnames.reset(new std::deque<String>);
+ 			hostnames->push_back(*host);
+ 		}
+-		for (std::deque<String>::const_iterator i = hostnames->begin(); i != hostnames->end(); ++i) 
++		for (std::deque<String>::iterator i = hostnames->begin(); i != hostnames->end(); ++i) 
+ 		{
+ 			if (std::binary_search(hostlist.begin(), hostlist.end(), *i))
+ 			{