From 96c156abcb5b0eada6091975b04e15c87237a6e6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 7 Dec 2013 10:09:08 +0100 Subject: update dansguardian to latest upstream, fix musl build --- package/dansguardian/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'package/dansguardian/Makefile') 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 -- cgit v1.2.3