diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-07 10:09:08 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-07 10:09:08 +0100 |
| commit | 96c156abcb5b0eada6091975b04e15c87237a6e6 (patch) | |
| tree | de91ffe5ca7d9cde22a08ecf72f9e5703401a9ec /package | |
| parent | 18d3d19d929699d3f27c414090e86ed16669dc07 (diff) | |
update dansguardian to latest upstream, fix musl build
Diffstat (limited to 'package')
6 files changed, 37 insertions, 24 deletions
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 968b1114a..ab62c232f 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -4,27 +4,31 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dansguardian -PKG_VERSION:= 2.10.1.1 +PKG_VERSION:= 2.12.0.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0987a1c9bfbdf398118386f10279611a +PKG_MD5SUM:= 2a88d0392cd28eaec02b7ee727b2e253 PKG_DESCR:= web content filter proxy PKG_SECTION:= proxy PKG_DEPENDS:= libpcre zlib PKG_BUILDDEP:= pcre zlib PKG_URL:= http://dansguardian.org/ -PKG_SITES:= http://dansguardian.org/downloads/2/Stable/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dansguardian/} PKG_NEED_CXX:= 1 PKG_CXX:= DANSGUARDIAN +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y) ifeq ($(ADK_LINUX_AVR32),y) LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc else LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s endif +endif ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) LIBRARIES+=-lssp @@ -36,7 +40,6 @@ CONFIGURE_ENV+= CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \ LIBS="$(LIBRARIES)" endif - CONFIGURE_ARGS+= --enable-orig-ip \ --with-proxyuser=proxy \ --with-proxygroup=proxy diff --git a/package/dansguardian/patches/patch-src_ConnectionHandler_cpp b/package/dansguardian/patches/patch-src_ConnectionHandler_cpp deleted file mode 100644 index 16daddd94..000000000 --- a/package/dansguardian/patches/patch-src_ConnectionHandler_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- dansguardian-2.10.1.1.orig/src/ConnectionHandler.cpp 2009-02-25 12:36:22.000000000 +0100 -+++ dansguardian-2.10.1.1/src/ConnectionHandler.cpp 2009-12-30 13:19:14.000000000 +0100 -@@ -42,6 +42,7 @@ - #include <fcntl.h> - #include <sys/stat.h> - #include <istream> -+#include <limits.h> - - #ifdef ENABLE_ORIG_IP - #include <linux/types.h> diff --git a/package/dansguardian/patches/patch-src_ImageContainer_cpp b/package/dansguardian/patches/patch-src_ImageContainer_cpp new file mode 100644 index 000000000..27ccecafc --- /dev/null +++ b/package/dansguardian/patches/patch-src_ImageContainer_cpp @@ -0,0 +1,10 @@ +--- dansguardian-2.12.0.3.orig/src/ImageContainer.cpp 2012-09-29 22:06:45.000000000 +0200 ++++ dansguardian-2.12.0.3/src/ImageContainer.cpp 2013-12-07 10:07:04.000000000 +0100 +@@ -16,6 +16,7 @@ + #include <stdexcept> + #include <cerrno> + #include <limits.h> ++#include <string.h> + + + // GLOBALS diff --git a/package/dansguardian/patches/patch-src_SocketArray_cpp b/package/dansguardian/patches/patch-src_SocketArray_cpp new file mode 100644 index 000000000..c08c483eb --- /dev/null +++ b/package/dansguardian/patches/patch-src_SocketArray_cpp @@ -0,0 +1,10 @@ +--- dansguardian-2.12.0.3.orig/src/SocketArray.cpp 2011-08-02 15:31:45.000000000 +0200 ++++ dansguardian-2.12.0.3/src/SocketArray.cpp 2013-12-07 10:07:51.000000000 +0100 +@@ -14,6 +14,7 @@ + + #include <syslog.h> + #include <cerrno> ++#include <string.h> + + + // GLOBALS diff --git a/package/dansguardian/patches/patch-src_UDSocket_cpp b/package/dansguardian/patches/patch-src_UDSocket_cpp new file mode 100644 index 000000000..3922e98f1 --- /dev/null +++ b/package/dansguardian/patches/patch-src_UDSocket_cpp @@ -0,0 +1,10 @@ +--- dansguardian-2.12.0.3.orig/src/UDSocket.cpp 2012-09-29 22:06:45.000000000 +0200 ++++ dansguardian-2.12.0.3/src/UDSocket.cpp 2013-12-07 10:05:50.000000000 +0100 +@@ -21,6 +21,7 @@ + #include <unistd.h> + #include <stdexcept> + #include <stddef.h> ++#include <string.h> + + #ifdef DGDEBUG + #include <iostream> diff --git a/package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp b/package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp deleted file mode 100644 index 6afb0e2a5..000000000 --- a/package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- dansguardian-2.10.1.1.orig/src/downloadmanagers/fancy.cpp 2008-11-18 12:27:04.000000000 +0100 -+++ dansguardian-2.10.1.1/src/downloadmanagers/fancy.cpp 2009-11-19 22:17:54.000000000 +0100 -@@ -26,6 +26,7 @@ - #include "../HTMLTemplate.hpp" - #include "../ConnectionHandler.hpp" - -+#include <stdio.h> - #include <syslog.h> - #include <sys/time.h> - #include <sys/types.h> |