svn commit: r419703 - in head/net/libpcap: . files
Renato Botelho
garga at FreeBSD.org
Fri Aug 5 18:41:23 UTC 2016
Author: garga
Date: Fri Aug 5 18:41:21 2016
New Revision: 419703
URL: https://svnweb.freebsd.org/changeset/ports/419703
Log:
Fix net/libpcap build without IPV6
Obtained from: https://github.com/DragonFlyBSD/DeltaPorts/pull/602
Sponsored by: Rubicon Communications (Netgate)
Added:
head/net/libpcap/files/patch-gencode.c (contents, props changed)
Modified:
head/net/libpcap/Makefile
Modified: head/net/libpcap/Makefile
==============================================================================
--- head/net/libpcap/Makefile Fri Aug 5 18:35:54 2016 (r419702)
+++ head/net/libpcap/Makefile Fri Aug 5 18:41:21 2016 (r419703)
@@ -3,6 +3,7 @@
PORTNAME= libpcap
PORTVERSION= 1.8.0
+PORTREVISION= 1
CATEGORIES= net ipv6
MASTER_SITES= http://www.tcpdump.org/release/
Added: head/net/libpcap/files/patch-gencode.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/libpcap/files/patch-gencode.c Fri Aug 5 18:41:21 2016 (r419703)
@@ -0,0 +1,45 @@
+--- gencode.c.orig 2016-07-30 13:42:44 UTC
++++ gencode.c
+@@ -523,7 +523,8 @@ 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 +691,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,11 +4849,8 @@ gen_host6(compiler_state_t *cstate, stru
+
+ #ifndef INET6
+ static struct block *
+-gen_gateway(eaddr, alist, proto, dir)
+- const u_char *eaddr;
+- bpf_u_int32 **alist;
+- int proto;
+- int dir;
++gen_gateway(compiler_state_t *cstate, const u_char *eaddr,
++ bpf_u_int32 **alist, int proto, int dir)
+ {
+ struct block *b0, *b1, *tmp;
+
+@@ -6414,7 +6414,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
More information about the svn-ports-all
mailing list