diff options
Diffstat (limited to 'package/libpcap/patches')
| -rw-r--r-- | package/libpcap/patches/patch-Makefile_in | 14 | ||||
| -rw-r--r-- | package/libpcap/patches/patch-gencode_c | 40 |
2 files changed, 54 insertions, 0 deletions
diff --git a/package/libpcap/patches/patch-Makefile_in b/package/libpcap/patches/patch-Makefile_in new file mode 100644 index 000000000..203dd3c6e --- /dev/null +++ b/package/libpcap/patches/patch-Makefile_in @@ -0,0 +1,14 @@ + 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 new file mode 100644 index 000000000..63378e414 --- /dev/null +++ b/package/libpcap/patches/patch-gencode_c @@ -0,0 +1,40 @@ +--- 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 |