libpcap: update to 1.9.1

pkgsrc changes:
---------------
* add patch to disable bpf_aux_data on NetBSD (defined in
  /usr/include/net/bpf.h).

upstream changes:
-----------------
Summary for 1.9.1 libpcap release
    Mention pcap_get_required_select_timeout() in the main pcap man page
    Fix pcap-usb-linux.c build on systems with musl
    Fix assorted man page and other documentation issues
    Plug assorted memory leaks
    Documentation changes to use https:
    Changes to how time stamp calculations are done
    Lots of tweaks to make newer compilers happier and warning-free and
        to fix instances of C undefined behavior
    Warn if AC_PROG_CC_C99 can't enable C99 support
    Rename pcap_set_protocol() to  pcap_set_protocol_linux().
    Align pcap_t private data on an 8-byte boundary.
    Fix various error messages
    Use 64-bit clean API in dag_findalldevs()
    Fix cleaning up after some errors
    Work around some ethtool ioctl bugs in newer Linux kernels (GitHub
        issue #689)
    Add backwards compatibility sections to some man pages (GitHub issue
        #745)
    Fix autotool configuration on AIX and macOS
    Don't export bpf_filter_with_aux_data() or struct bpf_aux_data;
        they're internal-only and subject to change
    Fix pcapng block size checking
    On macOS, don't build rpcapd or test programs any fatter than they
        need to be
    Fix reading of capture statistics for Linux USB
    Fix packet size values for Linux USB packets (GitHub issue #808)
    Check only VID in VLAN test in filterss (GitHub issue #461)
    Fix pcap_list_datalinks on 802.11 devices on macOS
    Fix overflows with very large snapshot length in pcap file
    Improve parsing of rpcapd configuration file (GitHub issue #767)
    Handle systems without strlcpy() or strlcat() better
    Fix crashes and other errors with invalid filter expressions
    Fix use of uninitialized file descriptor in remote capture
    Fix some CMake issues
    Fix some divide-by-zero issues with the filter compiler
    Work around a GNU libc bug in pcap_nametonetaddr()
    Add support for DLT_LINUX_SLL2
    Fix handling of the packet-count argument for Myricom SNF devices
    Fix --disable-rdma in configure script (GitHub issue #782)
    Fix compilation of TurboCap support (GitHub issue #764)
    Constify first argument to pcap_findalldevs_ex()
    Fix a number of issues when running rpcapd as an inetd-style daemon
    Fix CMake issues with D-Bus libraries
    In rpcapd, clean up termination of a capture session
    Redo remote capture protocol negotiation
    In rpcapd, report the same error for "invalid user name" and
        "invalid password", to make brute-forcing harder
    For remote captures, add an error code for "the server requires TLS"
    Fix pcap_dump_fopen() on Windows to avoid clashes between
        {Win,N}Pcap and application C runtimes
    Fix exporting of functions from Windows DLLs (GitHub issue #810)
    Fix building as part of Npcap
    Allow rpcapd to rebind more rapidly
    Fix building shared libpcap library on midipix (midipix.org)
    Fix hack to detect UTF-16LE adapter names on Windows not to go past
        the end of the string
    Fix handling of "wireless WAN" (mobile phone network modems) on
        Windows with WinPcap/Npcap (GitHub issue #824)
    Have pcap_dump_open_append() create the dump file if it doesn't
        exists (GitHub issue #247)
    Fix the maxmum snapshot length for DLT_USBPCAP
    Use -fPIC when building for 64-bit SPARC on Linux (GitHub issue #837)
    Fix CMake 64-bit library installation directory on some Linux
        distributions
    Boost the TPACKET_V3 timeout to the maximum if a timeout of 0 was
        specified
    Five CVE-2019-15161, CVE-2019-15162, CVE-2019-15163, CVE-2019-15164, CVE-2019-15165
    Fixes for CVE-2018-16301, errors in pcapng reading.
    PCAPNG reader applies some sanity checks before doing malloc().

6 files changed, 67 insertions, 27 deletions

diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 7cedba6f176..721752e68f1 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2019/07/04 07:17:24 adam Exp $
+# $NetBSD: Makefile,v 1.65 2019/10/14 20:10:19 triaxx Exp $
 
-DISTNAME=	libpcap-1.9.0
+DISTNAME=	libpcap-1.9.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/release/
 
diff --git a/net/libpcap/PLIST b/net/libpcap/PLIST
index 35fef795fa7..44e5cf204e6 100644
--- a/net/libpcap/PLIST
+++ b/net/libpcap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2019/07/04 07:17:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/10/14 20:10:19 triaxx Exp $
 bin/pcap-config
 include/pcap-bpf.h
 include/pcap-int.h
@@ -16,6 +16,7 @@ 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.la
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 1435037988a..4e6695d3cb2 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.35 2019/07/04 07:17:24 adam Exp $
+$NetBSD: distinfo,v 1.36 2019/10/14 20:10:19 triaxx Exp $
 
-SHA1 (libpcap-1.9.0.tar.gz) = c565f591c9a921fb5938cc16407c321c1ca8b9e8
-RMD160 (libpcap-1.9.0.tar.gz) = 81d3bad9e4caddb955fdb984c7ba404902f74c14
-SHA512 (libpcap-1.9.0.tar.gz) = 0ff25641f1e9d29082766caef45888c19214f770c4f378818caa73fcbc4ae54ad9195549c2499d4879ff46e35741d93b2b02cc5f3d6aa99e85a32194cf10bfe7
-Size (libpcap-1.9.0.tar.gz) = 832079 bytes
-SHA1 (patch-Makefile.in) = d14bd32d23bbbbe69e1fcdc7b8c2cd0ccd9f2808
-SHA1 (patch-configure) = 28d773e2a25fd029291c2b12f5cad141e46d51b7
+SHA1 (libpcap-1.9.1.tar.gz) = 04d6e619defad5bb17af15f6d2304e79b649786c
+RMD160 (libpcap-1.9.1.tar.gz) = 127fab6927919bea9c0ffc0d57efb67e52d07fbe
+SHA512 (libpcap-1.9.1.tar.gz) = ae0d6b0ad8253e7e059336c0f4ed3850d20d7d2f4dc1d942c2951f99a5443a690f0cc42c6f8fdc4a0ccb19e9e985192ba6f399c4bde2c7076e420f547fddfb08
+Size (libpcap-1.9.1.tar.gz) = 861228 bytes
+SHA1 (patch-Makefile.in) = ca43b1c1e75bc9a3af5e1fa2833f99bdb72eef13
+SHA1 (patch-configure) = 51b8a471655e94945f8240285201886b8da324f2
 SHA1 (patch-fad-getad.c) = f7a29d558e1f3c54a143d0977deffb2be3f494ef
+SHA1 (patch-pcap-int.h) = b213697c144dc3ae17cf5dd5d9c38b99c59d81c3
diff --git a/net/libpcap/patches/patch-Makefile.in b/net/libpcap/patches/patch-Makefile.in
index 2bcbdc698be..6899f6d6dc2 100644
--- a/net/libpcap/patches/patch-Makefile.in
+++ b/net/libpcap/patches/patch-Makefile.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile.in,v 1.1 2019/07/04 07:17:25 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2019/10/14 20:10:19 triaxx Exp $
 
 Add libtoolization.
 Fix manpage installation.
 
---- Makefile.in.orig	2018-07-22 17:08:39.000000000 +0000
+--- Makefile.in.orig	2019-09-30 14:39:22.000000000 +0000
 +++ Makefile.in
 @@ -45,7 +45,7 @@ VPATH = @srcdir@
  #
@@ -40,7 +40,7 @@ Fix manpage installation.
  PUBHDR = \
  	pcap.h \
  	pcap-bpf.h \
-@@ -379,12 +380,10 @@ EXTRA_DIST = \
+@@ -385,12 +386,10 @@ EXTRA_DIST = \
  	Win32/Prj/wpcap.vcxproj \
  	Win32/Prj/wpcap.vcxproj.filters
  
@@ -56,7 +56,7 @@ Fix manpage installation.
  
  shared: libpcap.$(DYEXT)
  
-@@ -471,7 +470,7 @@ scanner.h: scanner.c
+@@ -477,7 +476,7 @@ scanner.h: scanner.c
  		$(MAKE) $(MAKEFLAGS) scanner.c; \
  	fi
  
@@ -65,7 +65,7 @@ Fix manpage installation.
  	$(CC) $(FULL_CFLAGS) -c scanner.c
  
  grammar.c: $(srcdir)/grammar.y
-@@ -483,16 +482,16 @@ grammar.h: grammar.c
+@@ -489,25 +488,25 @@ grammar.h: grammar.c
  		$(MAKE) $(MAKEFLAGS) grammar.c; \
  	fi
  
@@ -77,16 +77,28 @@ Fix manpage installation.
 +gencode.lo: $(srcdir)/gencode.c grammar.h scanner.h
  	$(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c
  
+-asprintf.o: $(srcdir)/missing/asprintf.c
++asprintf.lo: $(srcdir)/missing/asprintf.c
+ 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/asprintf.c
+ 
 -snprintf.o: $(srcdir)/missing/snprintf.c
 +snprintf.lo: $(srcdir)/missing/snprintf.c
  	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
  
+-strlcat.o: $(srcdir)/missing/strlcat.c
++strlcat.lo: $(srcdir)/missing/strlcat.c
+ 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcat.c
+ 
+-strlcpy.o: $(srcdir)/missing/strlcpy.c
++strlcpy.lo: $(srcdir)/missing/strlcpy.c
+ 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strlcpy.c
+ 
 -strtok_r.o: $(srcdir)/missing/strtok_r.c
 +strtok_r.lo: $(srcdir)/missing/strtok_r.c
  	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strtok_r.c
  
  #
-@@ -538,7 +537,7 @@ testprogs: FORCE
+@@ -553,7 +552,7 @@ testprogs: FORCE
  
  FORCE:
  
@@ -95,7 +107,7 @@ Fix manpage installation.
  	[ -d $(DESTDIR)$(libdir) ] || \
  	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
  	[ -d $(DESTDIR)$(includedir) ] || \
-@@ -553,59 +552,60 @@ install: install-shared install-archive 
+@@ -568,62 +567,60 @@ install: install-shared install-archive 
  	    (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
  	[ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
  	    (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
@@ -127,6 +139,9 @@ Fix manpage installation.
 -	rm -f pcap_datalink_val_to_description.3pcap && \
 -	$(LN_S) pcap_datalink_val_to_name.3pcap \
 -		 pcap_datalink_val_to_description.3pcap && \
+-	rm -f pcap_datalink_val_to_description_or_dlt.3pcap && \
+-	$(LN_S) pcap_datalink_val_to_name.3pcap \
+-		 pcap_datalink_val_to_description_or_dlt.3pcap && \
 -	rm -f pcap_dump_fopen.3pcap && \
 -	$(LN_S) pcap_dump_open.3pcap pcap_dump_fopen.3pcap && \
 -	rm -f pcap_freealldevs.3pcap && \
@@ -195,7 +210,7 @@ Fix manpage installation.
  	for i in $(MANFILE); do \
  		$(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
  		    $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
-@@ -647,15 +647,15 @@ install-shared-shareda: libpcap.shareda
+@@ -665,15 +662,15 @@ install-shared-shareda: libpcap.shareda
  install-shared-none:
  
  install-archive: install-archive-$(DYEXT)
diff --git a/net/libpcap/patches/patch-configure b/net/libpcap/patches/patch-configure
index 615b95c9022..8825d19cbdc 100644
--- a/net/libpcap/patches/patch-configure
+++ b/net/libpcap/patches/patch-configure
@@ -1,30 +1,31 @@
-$NetBSD: patch-configure,v 1.6 2019/07/04 07:17:25 adam Exp $
+$NetBSD: patch-configure,v 1.7 2019/10/14 20:10:19 triaxx Exp $
 
 Ensure consistent manpage locations.
 Correctly detect Mac OS X Leopard.
 
---- configure.orig	2018-06-24 17:54:20.000000000 +0000
+--- configure.orig	2019-09-30 16:08:23.000000000 +0000
 +++ configure
-@@ -7974,9 +7974,6 @@ fi
- # Individual cases can override this.
+@@ -8178,10 +8178,6 @@ fi
+ # and daemons in section 8).  Individual cases can override this.
  #
  DYEXT="none"
+-MAN_DEVICES=4
 -MAN_FILE_FORMATS=5
 -MAN_MISC_INFO=7
 -MAN_ADMIN_COMMANDS=8
  case "$host_os" in
  
  aix*)
-@@ -8074,7 +8071,7 @@ fi
- 			LDFLAGS="$LDFLAGS -arch ppc -arch ppc64 -arch i386 -arch x86_64"
+@@ -8300,7 +8296,7 @@ fi
+ 			V_PROG_LDFLAGS_FAT="-arch ppc -arch ppc64 -arch i386 -arch x86_64"
  			;;
  
 -		darwin9.*)
 +		darwin9*)
  			#
- 			# Leopard.  Build for 32-bit PowerPC, 64-bit
- 			# PowerPC, x86, and x86-64, with 32-bit PowerPC
-@@ -8271,6 +8268,10 @@ $as_echo "#define HAVE_SOLARIS 1" >>conf
+ 			# Leopard.  Build libraries for 32-bit PowerPC,
+ 			# 64-bit PowerPC, 32-bit x86, and x86-64, with
+@@ -8567,6 +8563,10 @@ $as_echo "#define HAVE_SOLARIS 1" >>conf
  	;;
  esac
  
diff --git a/net/libpcap/patches/patch-pcap-int.h b/net/libpcap/patches/patch-pcap-int.h
new file mode 100644
index 00000000000..45656fc1d35
--- /dev/null
+++ b/net/libpcap/patches/patch-pcap-int.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-pcap-int.h,v 1.1 2019/10/14 20:10:19 triaxx Exp $
+
+NetBSD already defines bpf_aux_data in /usr/include/net/bpf.h.
+
+--- pcap-int.h.orig	2019-09-30 14:39:22.000000000 +0000
++++ pcap-int.h
+@@ -497,6 +497,7 @@ void	sf_cleanup(pcap_t *p);
+  * Linux kernel when the kernel rejects the filter (requiring us to
+  * run it in userland).  It contains VLAN tag information.
+  */
++#ifndef __NetBSD__
+ struct bpf_aux_data {
+ 	u_short vlan_tag_present;
+ 	u_short vlan_tag;
+@@ -508,6 +509,7 @@ struct bpf_aux_data {
+  */
+ u_int	bpf_filter_with_aux_data(const struct bpf_insn *,
+     const u_char *, u_int, u_int, const struct bpf_aux_data *);
++#endif
+ 
+ /*
+  * Internal interfaces for both "pcap_create()" and routines that