5 files changed, 5 insertions, 59 deletions

diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 9d1cbc73e2d8..990f46e0abfa 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libpcap
-PORTVERSION=	1.9.1
-PORTREVISION=	1
+PORTVERSION=	1.10.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/release/
 
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index df163fdf745e..a533ecf4e328 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570016067
-SHA256 (libpcap-1.9.1.tar.gz) = 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094
-SIZE (libpcap-1.9.1.tar.gz) = 861228
+TIMESTAMP = 1609875800
+SHA256 (libpcap-1.10.0.tar.gz) = 8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e
+SIZE (libpcap-1.10.0.tar.gz) = 934559
diff --git a/net/libpcap/files/patch-gencode.c b/net/libpcap/files/patch-gencode.c
deleted file mode 100644
index 8d439e20edb9..000000000000
--- a/net/libpcap/files/patch-gencode.c
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/gencode.c b/gencode.c
-index bdc35e64..040a5531 100644
---- gencode.c
-+++ gencode.c
-@@ -6947,11 +6947,15 @@ gen_mcode(compiler_state_t *cstate, const char *s1, const char *s2,
- 		return (NULL);
- 
- 	nlen = __pcap_atoin(s1, &n);
-+	if (nlen < 0)
-+		bpf_error(cstate, "invalid IPv4 address '%s'", s1);
- 	/* Promote short ipaddr */
- 	n <<= 32 - nlen;
- 
- 	if (s2 != NULL) {
- 		mlen = __pcap_atoin(s2, &m);
-+		if (mlen < 0)
-+			bpf_error(cstate, "invalid IPv4 address '%s'", s2);
- 		/* Promote short ipaddr */
- 		m <<= 32 - mlen;
- 		if ((n & ~m) != 0)
-@@ -7009,8 +7013,11 @@ gen_ncode(compiler_state_t *cstate, const char *s, bpf_u_int32 v, struct qual q)
- 		vlen = __pcap_atodn(s, &v);
- 		if (vlen == 0)
- 			bpf_error(cstate, "malformed decnet address '%s'", s);
--	} else
-+	} else {
- 		vlen = __pcap_atoin(s, &v);
-+		if (vlen < 0)
-+			bpf_error(cstate, "invalid IPv4 address '%s'", s);
-+	}
- 
- 	switch (q.addr) {
- 
diff --git a/net/libpcap/files/patch-nametoaddr.c b/net/libpcap/files/patch-nametoaddr.c
deleted file mode 100644
index a501d89a31d7..000000000000
--- a/net/libpcap/files/patch-nametoaddr.c
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/nametoaddr.c b/nametoaddr.c
-index 53070a28..13bf4c68 100644
---- nametoaddr.c
-+++ nametoaddr.c
-@@ -674,8 +674,15 @@ __pcap_atoin(const char *s, bpf_u_int32 *addr)
- 	len = 0;
- 	for (;;) {
- 		n = 0;
--		while (*s && *s != '.')
-+		while (*s && *s != '.') {
-+			if (n > 25) {
-+				/* The result will be > 255 */
-+				return -1;
-+			}
- 			n = n * 10 + *s++ - '0';
-+		}
-+		if (n > 255)
-+			return -1;
- 		*addr <<= 8;
- 		*addr |= n & 0xff;
- 		len += 8;
diff --git a/net/libpcap/pkg-plist b/net/libpcap/pkg-plist
index e7d5b68d24ff..2d0bcaf73fc8 100644
--- a/net/libpcap/pkg-plist
+++ b/net/libpcap/pkg-plist
@@ -47,6 +47,7 @@ man/man3/pcap_get_required_select_timeout.3.gz
 man/man3/pcap_get_selectable_fd.3.gz
 man/man3/pcap_get_tstamp_precision.3.gz
 man/man3/pcap_geterr.3.gz
+man/man3/pcap_init.3.gz
 man/man3/pcap_inject.3.gz
 man/man3/pcap_is_swapped.3.gz
 man/man3/pcap_lib_version.3.gz