update pcre, add dansguardian (lightly tested)

11 files changed, 124 insertions, 4 deletions

diff --git a/mk/package.mk b/mk/package.mk
index 3f0cc4a7d..8d4575425 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -44,7 +44,9 @@ CONFIGURE_ENV+=		CONFIG_SHELL='$(strip ${SHELL})' \
 			CFLAGS='$(strip ${TCFLAGS})' \
 			CXXFLAGS='$(strip ${TCXXFLAGS})' \
 			CPPFLAGS='$(strip ${TCPPFLAGS})' \
-			LDFLAGS='$(strip ${TLDFLAGS})'
+			LDFLAGS='$(strip ${TLDFLAGS})' \
+			PKG_CONFIG_PATH='${STAGING_DIR}/usr/lib/pkgconfig' \
+			PKG_CONFIG_LIBDIR=/dev/null
 else
 CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} \
 			${HOST_CONFIGURE_OPTS} \
diff --git a/package/Config.in b/package/Config.in
index b5523f8bc..088580f1c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -311,8 +311,9 @@ source "package/raddump/Config.in"
 endmenu
 
 menu "Proxy"
-source "package/igmpproxy/Config.in"
+source "package/dansguardian/Config.in"
 source "package/frickin/Config.in"
+source "package/igmpproxy/Config.in"
 source "package/parprouted/Config.in"
 source "package/privoxy/Config.in"
 source "package/siproxd/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index c5ae83d4d..ee9f74030 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -30,6 +30,7 @@ ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
 cxxtools-compile: uclibc++-compile
 endif
 cyrus-sasl-compile: openssl-compile
+dansguardian-compile: pcre-compile
 ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
 davfs2-compile: fuse-compile
 endif
diff --git a/package/Makefile b/package/Makefile
index 60fc52a25..c381befe2 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -66,6 +66,7 @@ package-$(ADK_PACKAGE_CRYPTSETUP) += cryptsetup
 package-$(ADK_COMPILE_CYRUS_SASL) += cyrus-sasl
 package-$(ADK_PACKAGE_CXXTOOLS) += cxxtools
 package-$(ADK_PACKAGE_DAMAGEPROTO) += damageproto
+package-$(ADK_PACKAGE_DANSGUARDIAN) += dansguardian
 package-$(ADK_PACKAGE_DAVFS2) += davfs2
 package-$(ADK_PACKAGE_DBUS) += dbus
 package-$(ADK_PACKAGE_DECO) += deco
diff --git a/package/dansguardian/Config.in b/package/dansguardian/Config.in
new file mode 100644
index 000000000..2a12515ee
--- /dev/null
+++ b/package/dansguardian/Config.in
@@ -0,0 +1,27 @@
+config ADK_PACKAGE_DANSGUARDIAN
+	prompt "dansguardian......................... web content filter proxy"
+	tristate
+	depends on ADK_CXX
+	select ADK_PACKAGE_LIBPCRE
+	default n
+	help
+		http://dansguardian.org
+
+choice
+prompt "C++ library to use"
+depends on ADK_PACKAGE_DANSGUARDIAN
+default ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX
+        bool "Standard C++ library"
+        select ADK_PACKAGE_LIBSTDCXX
+        help
+
+config ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX
+        bool "Embedded uClibc++ library"
+        select ADK_PACKAGE_UCLIBCXX
+        help
+
+endchoice
+
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
new file mode 100644
index 000000000..4e1ef09e6
--- /dev/null
+++ b/package/dansguardian/Makefile
@@ -0,0 +1,44 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		dansguardian
+PKG_VERSION:=		2.10.1.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0987a1c9bfbdf398118386f10279611a
+PKG_DESCR:=		web content filter proxy
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpcre
+PKG_URL:=		http://dansguardian.org
+PKG_SITES:=		http://dansguardian.org/downloads/2/Stable/
+
+ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
+PKG_DEPENDS+=		uclibc++
+else
+PKG_DEPENDS+=		libstdcxx
+endif
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_STYLE:=	gnu
+CONFIGURE_ARGS+=	--enable-orig-ip \
+			--with-proxyuser=proxy \
+			--with-proxygroup=proxy
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
+
+post-install:
+	${INSTALL_DIR} ${IDIR_DANSGUARDIAN}/usr/sbin ${IDIR_DANSGUARDIAN}/etc/dansguardian \
+		${IDIR_DANSGUARDIAN}/usr/share/dansguardian/languages/ukenglish
+	${CP} ${WRKINST}/usr/share/dansguardian/languages/ukenglish/* \
+		${IDIR_DANSGUARDIAN}/usr/share/dansguardian/languages/ukenglish
+	${CP} ${WRKINST}/usr/share/dansguardian/transparent1x1.gif \
+		${IDIR_DANSGUARDIAN}/usr/share/dansguardian
+	${CP} ${WRKINST}/etc/dansguardian/* \
+		${IDIR_DANSGUARDIAN}/etc/dansguardian
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dansguardian ${IDIR_DANSGUARDIAN}/usr/sbin/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dansguardian/files/dansguardian.init b/package/dansguardian/files/dansguardian.init
new file mode 100644
index 000000000..8c883d4bf
--- /dev/null
+++ b/package/dansguardian/files/dansguardian.init
@@ -0,0 +1,28 @@
+#!/bin/sh
+#PKG dansguardian
+#INIT 80
+
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${dansguardian:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	dansguardian
+	;;
+stop)
+	killall dansguardian
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+
+*)
+	echo "usage: $0 {start | stop | restart}"
+	exit 1
+esac
+exit $?
diff --git a/package/dansguardian/files/dansguardian.postinst b/package/dansguardian/files/dansguardian.postinst
new file mode 100644
index 000000000..80272f705
--- /dev/null
+++ b/package/dansguardian/files/dansguardian.postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+gid=$(get_next_gid)
+add_user proxy $(get_next_uid) $gid /etc/dansguardian
+add_group proxy $gid
+add_rcconf dansguardian dansguardian NO
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index a2324d4f6..22d510c6a 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		pcre
-PKG_VERSION:=		7.9
+PKG_VERSION:=		8.00
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		2256d0a1d0a358265165ca70e7cfc47a
+PKG_MD5SUM:=		c95500eeda12c8c7edc6b0926d60952c
 PKG_DESCR:=		a Perl Compatible Regular Expression library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.pcre.org
diff --git a/package/squid/Makefile b/package/squid/Makefile
index f4119aaf1..cb7a51494 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -13,6 +13,12 @@ PKG_DEPENDS:=		libopenssl libpthread
 PKG_URL:=		http://www.squid-cache.org
 PKG_SITES:=		http://www.squid-cache.org/Versions/v3/3.0/
 
+ifeq ($(ADK_COMPILE_SQUID_WITH_UCLIBCXX),y)
+PKG_DEPENDS+=		uclibc++
+else
+PKG_DEPENDS+=		libstdcxx
+endif
+
 AUTH_MODULES:=		basic digest ntlm
 ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},)
 BASIC_AUTH_HELPERS+=	getpwnam
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index c1343ec29..88fb7cbbc 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -55,6 +55,10 @@ if [[ -n $ADK_PACKAGE_SQUID ]]; then
 	NEED_SSLDEV="$NEED_SSLDEV squid"
 fi
 
+if [[ -n $ADK_PACKAGE_DANSGUARDIAN ]]; then
+	NEED_PKGCONFIG="$NEED_PKGCONFIG dansguardian"
+fi
+
 if [[ -n $ADK_PACKAGE_GLIB ]]; then
 	NEED_GLIBZWO="$NEED_GLIBZWO glib"
 	NEED_GETTEXT="$NEED_GETTEXT glib"