diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-08 19:07:49 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-08 19:07:49 +0100 |
commit | 95e942704e668277ba8f57022a06d385e0516896 (patch) | |
tree | be38db50df08772362d9a85f25eb077ec3d11924 /package | |
parent | 6f2c1e1ed1d9ac59e8dda23d151d0085888498e8 (diff) | |
parent | 6f99f8e50e9a99e151c9aa75ce016648126deea8 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r-- | package/dansguardian/Makefile | 11 | ||||
-rw-r--r-- | package/dansguardian/patches/patch-src_ConnectionHandler_cpp | 10 | ||||
-rw-r--r-- | package/dansguardian/patches/patch-src_ImageContainer_cpp | 10 | ||||
-rw-r--r-- | package/dansguardian/patches/patch-src_SocketArray_cpp | 10 | ||||
-rw-r--r-- | package/dansguardian/patches/patch-src_UDSocket_cpp | 10 | ||||
-rw-r--r-- | package/dansguardian/patches/patch-src_downloadmanagers_fancy_cpp | 10 | ||||
-rw-r--r-- | package/dialog/Makefile | 4 | ||||
-rw-r--r-- | package/dialog/patches/patch-configure | 10 | ||||
-rw-r--r-- | package/dnsmasq/Makefile | 6 | ||||
-rw-r--r-- | package/dropbear/Makefile | 6 | ||||
-rw-r--r-- | package/iproute2/Makefile | 6 | ||||
-rw-r--r-- | package/iproute2/patches/patch-Makefile | 11 | ||||
-rw-r--r-- | package/iptables/Makefile | 6 | ||||
-rw-r--r-- | package/libpcap/Makefile | 9 | ||||
-rw-r--r-- | package/openvpn/files/openvpn.conffiles | 1 | ||||
-rw-r--r-- | package/samba/Makefile | 4 | ||||
-rw-r--r-- | package/squid/Makefile | 4 | ||||
-rw-r--r-- | package/tcpdump/Makefile | 4 |
18 files changed, 63 insertions, 69 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> diff --git a/package/dialog/Makefile b/package/dialog/Makefile index 91e27fe65..87765c242 100644 --- a/package/dialog/Makefile +++ b/package/dialog/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dialog -PKG_VERSION:= 1.1-20080819 +PKG_VERSION:= 1.2-20130928 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3caebd641a9f337b980becb4444336c5 +PKG_MD5SUM:= 2cf55cd9d4603ffdb4b24cd6843d740c PKG_DESCR:= A text gui interface PKG_SECTION:= misc PKG_DEPENDS:= libncurses diff --git a/package/dialog/patches/patch-configure b/package/dialog/patches/patch-configure deleted file mode 100644 index 4013b3f57..000000000 --- a/package/dialog/patches/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- dialog-1.1-20080819.orig/configure 2008-03-16 19:54:16.000000000 +0100 -+++ dialog-1.1-20080819/configure 2011-05-15 20:15:38.756610583 +0200 -@@ -9024,7 +9024,6 @@ fi - - ;; - linux*) # Suse Linux does not follow /usr/lib convention -- LIBS="$LIBS -L/lib" - ;; - sunos3*|sunos4*) - test -d /usr/5lib && \ diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 4cce72c8e..3e4e23e3c 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,14 +4,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.63 +PKG_VERSION:= 2.67 PKG_RELEASE:= 1 -PKG_MD5SUM:= 43e771997615ebcd8f6c6ffa60c3e40b +PKG_MD5SUM:= 3560068c6cc644a01924fa089a70bb9c PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= dns PKG_URL:= http://thekelleys.org.uk/dnsmasq/ PKG_SITES:= http://thekelleys.org.uk/dnsmasq/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DNSMASQ,dnsmasq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 530e455fe..5a07ea5c5 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dropbear -PKG_VERSION:= 2013.58 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 8d3579bbbfcea48404a3219643076450 +PKG_VERSION:= 2013.62 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ca2c7932a1399cf361f795aaa3843998 PKG_DESCR:= SSH 2 server/client designed for embedded systems PKG_SECTION:= net/security PKG_URL:= http://matt.ucc.asn.au/dropbear/ diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 40522c030..4a894389f 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iproute2 -PKG_VERSION:= 3.10.0 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 45fb5427fc723a0001c72b92c931ba02 +PKG_VERSION:= 3.12.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f87386aaaecafab95607fd10e8152c68 PKG_DESCR:= iproute2 routing control utility PKG_SECTION:= route PKG_BUILDDEP:= iptables libnl linux-atm diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile deleted file mode 100644 index 44cda46e9..000000000 --- a/package/iproute2/patches/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/Makefile 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/Makefile 2013-10-10 15:30:09.000000000 +0200 -@@ -30,7 +30,7 @@ CC = gcc - HOSTCC = gcc - DEFINES += -D_GNU_SOURCE - CCOPTS = -O2 --WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes -+WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes - WFLAGS += -Wmissing-declarations -Wold-style-definition - - CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) diff --git a/package/iptables/Makefile b/package/iptables/Makefile index a76a77cd7..89c9994c9 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables -PKG_VERSION:= 1.4.20 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 387b92d3efcf4f07fe31c3bf0f1d18f5 +PKG_VERSION:= 1.4.21 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 536d048c8e8eeebcd9757d0863ebb0c0 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 7a7507a06..44d6126ef 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libpcap -PKG_VERSION:= 1.3.0 -PKG_RELEASE:= 2 -PKG_MD5SUM:= f78455a92622b7a3c05c58b6ad1cec7e +PKG_VERSION:= 1.5.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 33ba2f10f3a402cb5d34f5e2a904794a PKG_DESCR:= a low-level packet capture library PKG_SECTION:= libs -PKG_BUILDDEP:= flex-host bison-host +PKG_BUILDDEP:= flex-host bison-host libnl PKG_URL:= http://www.tcpdump.org/ PKG_SITES:= http://www.tcpdump.org/release/ PKG_OPTS:= dev @@ -24,6 +24,7 @@ $(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D CONFIGURE_ENV+= ac_cv_linux_vers=26 CONFIGURE_ARGS+= --disable-yydebug \ --with-build-cc=$(CC_FOR_BUILD) \ + --without-libnl \ --with-pcap=linux TARGET_CFLAGS+= ${TARGET_CPPFLAGS} INSTALL_TARGET= install install-shared diff --git a/package/openvpn/files/openvpn.conffiles b/package/openvpn/files/openvpn.conffiles deleted file mode 100644 index e8f42b815..000000000 --- a/package/openvpn/files/openvpn.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/openvpn/client.conf diff --git a/package/samba/Makefile b/package/samba/Makefile index 98a10bb77..7d04d4ee2 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= samba -PKG_VERSION:= 3.6.19 +PKG_VERSION:= 3.6.21 PKG_RELEASE:= 1 -PKG_MD5SUM:= afe9c7c590f3093555cd6e870d2532e1 +PKG_MD5SUM:= faa67c625508dc495c082357913ccea6 PKG_DESCR:= NetBIOS/SMB file and print server PKG_SECTION:= net/fs PKG_BUILDDEP:= gettext-tiny util-linux popt diff --git a/package/squid/Makefile b/package/squid/Makefile index 74c7d2257..205bd49da 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 3.3.9 +PKG_VERSION:= 3.3.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1c550c02a041f77ed6ac96568ca36f26 +PKG_MD5SUM:= 1db9aa98a70e501ae8280bc5cfa33140 PKG_DESCR:= squid web and cache proxy PKG_SECTION:= proxy PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index e4eead006..5e9f67f09 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcpdump -PKG_VERSION:= 4.3.0 +PKG_VERSION:= 4.5.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= a3fe4d30ac85ff5467c889ff46b7e1e8 +PKG_MD5SUM:= 973a2513d0076e34aa9da7e15ed98e1b PKG_DESCR:= A tool for network monitoring and data acquisition PKG_SECTION:= net PKG_DEPENDS:= libpcap |