Index: head/net/libpcap/Makefile =================================================================== --- head/net/libpcap/Makefile (revision 560523) +++ head/net/libpcap/Makefile (revision 560524) @@ -1,32 +1,31 @@ # Created by: Bruce M Simpson # $FreeBSD$ PORTNAME= libpcap -PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTVERSION= 1.10.0 CATEGORIES= net MASTER_SITES= http://www.tcpdump.org/release/ MAINTAINER= garga@FreeBSD.org COMMENT= Ubiquitous network traffic capture library LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex USES= bison gmake GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-dbus=no \ --with-pcap=bpf CONFIGURE_ENV+= LEX=${LOCALBASE}/bin/flex CFLAGS_amd64= -fPIC CFLAGS_sparc64= -fPIC PLIST_SUB+= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= IPV6 IPV6_CONFIGURE_ENABLE= ipv6 .include Index: head/net/libpcap/distinfo =================================================================== --- head/net/libpcap/distinfo (revision 560523) +++ head/net/libpcap/distinfo (revision 560524) @@ -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 Index: head/net/libpcap/files/patch-gencode.c =================================================================== --- head/net/libpcap/files/patch-gencode.c (revision 560523) +++ head/net/libpcap/files/patch-gencode.c (nonexistent) @@ -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) { - Property changes on: head/net/libpcap/files/patch-gencode.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/libpcap/files/patch-nametoaddr.c =================================================================== --- head/net/libpcap/files/patch-nametoaddr.c (revision 560523) +++ head/net/libpcap/files/patch-nametoaddr.c (nonexistent) @@ -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; Property changes on: head/net/libpcap/files/patch-nametoaddr.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/libpcap/pkg-plist =================================================================== --- head/net/libpcap/pkg-plist (revision 560523) +++ head/net/libpcap/pkg-plist (revision 560524) @@ -1,86 +1,87 @@ bin/pcap-config include/pcap-bpf.h include/pcap-namedb.h include/pcap.h include/pcap/bluetooth.h include/pcap/bpf.h include/pcap/can_socketcan.h include/pcap/compiler-tests.h include/pcap/dlt.h include/pcap/funcattrs.h include/pcap/ipnet.h include/pcap/namedb.h include/pcap/nflog.h include/pcap/pcap-inttypes.h include/pcap/pcap.h include/pcap/sll.h include/pcap/socket.h include/pcap/usb.h include/pcap/vlan.h lib/libpcap.a lib/libpcap.so lib/libpcap.so.1 lib/libpcap.so.%%PORTVERSION%% libdata/pkgconfig/libpcap.pc man/man1/pcap-config.1.gz man/man3/pcap.3.gz man/man3/pcap_activate.3.gz man/man3/pcap_breakloop.3.gz man/man3/pcap_can_set_rfmon.3.gz man/man3/pcap_close.3.gz man/man3/pcap_compile.3.gz man/man3/pcap_create.3.gz man/man3/pcap_datalink.3.gz man/man3/pcap_datalink_name_to_val.3.gz man/man3/pcap_datalink_val_to_name.3.gz man/man3/pcap_dump.3.gz man/man3/pcap_dump_close.3.gz man/man3/pcap_dump_file.3.gz man/man3/pcap_dump_flush.3.gz man/man3/pcap_dump_ftell.3.gz man/man3/pcap_dump_open.3.gz man/man3/pcap_file.3.gz man/man3/pcap_fileno.3.gz man/man3/pcap_findalldevs.3.gz man/man3/pcap_freecode.3.gz 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 man/man3/pcap_list_datalinks.3.gz man/man3/pcap_list_tstamp_types.3.gz man/man3/pcap_lookupdev.3.gz man/man3/pcap_lookupnet.3.gz man/man3/pcap_loop.3.gz man/man3/pcap_major_version.3.gz man/man3/pcap_next_ex.3.gz man/man3/pcap_offline_filter.3.gz man/man3/pcap_open_dead.3.gz man/man3/pcap_open_live.3.gz man/man3/pcap_open_offline.3.gz man/man3/pcap_set_buffer_size.3.gz man/man3/pcap_set_datalink.3.gz man/man3/pcap_set_immediate_mode.3.gz man/man3/pcap_set_promisc.3.gz man/man3/pcap_set_protocol_linux.3.gz man/man3/pcap_set_rfmon.3.gz man/man3/pcap_set_snaplen.3.gz man/man3/pcap_set_timeout.3.gz man/man3/pcap_set_tstamp_precision.3.gz man/man3/pcap_set_tstamp_type.3.gz man/man3/pcap_setdirection.3.gz man/man3/pcap_setfilter.3.gz man/man3/pcap_setnonblock.3.gz man/man3/pcap_snapshot.3.gz man/man3/pcap_stats.3.gz man/man3/pcap_statustostr.3.gz man/man3/pcap_strerror.3.gz man/man3/pcap_tstamp_type_name_to_val.3.gz man/man3/pcap_tstamp_type_val_to_name.3.gz man/man5/pcap-savefile.5.gz man/man7/pcap-filter.7.gz man/man7/pcap-linktype.7.gz man/man7/pcap-tstamp.7.gz