diff options
| -rw-r--r-- | package/libpcap/Makefile | 4 | ||||
| -rw-r--r-- | package/libpcap/patches/patch-Makefile_in | 14 | ||||
| -rw-r--r-- | package/libpcap/patches/patch-gencode_c | 40 | ||||
| -rw-r--r-- | package/libpcap/patches/patch-pcap-config_in | 27 | ||||
| -rw-r--r-- | package/tcpdump/Makefile | 4 |
5 files changed, 4 insertions, 85 deletions
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index c5b023df1..6cac920ee 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpcap -PKG_VERSION:= 1.8.1 +PKG_VERSION:= 1.9.1 PKG_RELEASE:= 1 -PKG_HASH:= 673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e +PKG_HASH:= 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094 PKG_DESCR:= low-level packet capture library PKG_SECTION:= libs/net PKG_URL:= http://www.tcpdump.org/ diff --git a/package/libpcap/patches/patch-Makefile_in b/package/libpcap/patches/patch-Makefile_in deleted file mode 100644 index 203dd3c6e..000000000 --- a/package/libpcap/patches/patch-Makefile_in +++ /dev/null @@ -1,14 +0,0 @@ - Use $(sort) here, which implicitly removes duplicates. - Otherwise our CFLAGS are passed in via CCOPT and CFLAGS leading - to duplicate -fhonour-copts passing. ---- libpcap-1.8.0.orig/Makefile.in 2016-07-30 15:42:44.000000000 +0200 -+++ libpcap-1.8.0/Makefile.in 2016-08-05 02:22:41.124794216 +0200 -@@ -62,7 +62,7 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ - PROG=libpcap - - # Standard CFLAGS --FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) -+FULL_CFLAGS = $(sort $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)) - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/package/libpcap/patches/patch-gencode_c b/package/libpcap/patches/patch-gencode_c deleted file mode 100644 index 63378e414..000000000 --- a/package/libpcap/patches/patch-gencode_c +++ /dev/null @@ -1,40 +0,0 @@ ---- libpcap-1.8.0.orig/gencode.c 2016-07-30 15:42:44.000000000 +0200 -+++ libpcap-1.8.0/gencode.c 2016-08-05 02:35:50.655555060 +0200 -@@ -523,7 +523,7 @@ static struct block *gen_host6(compiler_ - struct in6_addr *, int, int, int); - #endif - #ifndef INET6 --static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int); -+static struct block *gen_gateway(compiler_state_t *, const u_char *, bpf_u_int32 **, int, int); - #endif - static struct block *gen_ipfrag(compiler_state_t *); - static struct block *gen_portatom(compiler_state_t *, int, bpf_int32); -@@ -690,7 +690,9 @@ pcap_compile(pcap_t *p, struct bpf_progr - } - initchunks(&cstate); - cstate.no_optimize = 0; -+#ifdef INET6 - cstate.ai = NULL; -+#endif - cstate.ic.root = NULL; - cstate.ic.cur_mark = 0; - cstate.bpf_pcap = p; -@@ -4846,7 +4848,8 @@ gen_host6(compiler_state_t *cstate, stru - - #ifndef INET6 - static struct block * --gen_gateway(eaddr, alist, proto, dir) -+gen_gateway(cstate, eaddr, alist, proto, dir) -+ compiler_state_t *cstate; - const u_char *eaddr; - bpf_u_int32 **alist; - int proto; -@@ -6414,7 +6417,7 @@ gen_scode(compiler_state_t *cstate, cons - alist = pcap_nametoaddr(name); - if (alist == NULL || *alist == NULL) - bpf_error(cstate, "unknown host '%s'", name); -- b = gen_gateway(eaddr, alist, proto, dir); -+ b = gen_gateway(cstate, eaddr, alist, proto, dir); - free(eaddr); - return b; - #else diff --git a/package/libpcap/patches/patch-pcap-config_in b/package/libpcap/patches/patch-pcap-config_in deleted file mode 100644 index 2a73106a4..000000000 --- a/package/libpcap/patches/patch-pcap-config_in +++ /dev/null @@ -1,27 +0,0 @@ ---- libpcap-1.2.1.orig/pcap-config.in 2011-03-28 22:37:56.000000000 +0200 -+++ libpcap-1.2.1/pcap-config.in 2012-03-24 11:15:47.343023269 +0100 -@@ -36,16 +36,6 @@ do - esac - shift - done --if [ "$V_RPATH_OPT" != "" ] --then -- # -- # If libdir isn't /usr/lib, add it to the run-time linker path. -- # -- if [ "$libdir" != "/usr/lib" ] -- then -- RPATH=$V_RPATH_OPT$libdir -- fi --fi - if [ "$static" = 1 ] - then - # -@@ -84,6 +74,6 @@ else - echo "-I$includedir" - elif [ "$show_libs" = 1 ] - then -- echo "-L$libdir $RPATH -lpcap" -+ echo "-L$libdir -lpcap" - fi - fi diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 2d320f480..47cc97584 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tcpdump -PKG_VERSION:= 4.9.0 +PKG_VERSION:= 4.9.3 PKG_RELEASE:= 1 -PKG_HASH:= eae98121cbb1c9adbedd9a777bf2eae9fa1c1c676424a54740311c8abcee5a5e +PKG_HASH:= 2cd47cb3d460b6ff75f4a9940f594317ad456cfbf2bd2c8e5151e16559db6410 PKG_DESCR:= tool for network monitoring and data acquisition PKG_SECTION:= net/debug PKG_DEPENDS:= libpcap |