tcpdump: updated to 4.99.1

Summary for 4.99.1 tcpdump release:
  Source code:
    Squelch some compiler warnings
    ICMP: Update the snapend for some nested IP packets.
    MACsec: Update the snapend thus the ICV field is not payload
      for the caller.
    EIGRP: Fix packet header fields
    SMB: Disable printer by default in CMake builds
    OLSR: Print the protocol name even if the packet is invalid
    MSDP: Print ": " before the protocol name
    ESP: Remove padding, padding length and next header from the buffer
    DHCPv6: Update the snapend for nested DHCPv6 packets
    OpenFlow 1.0: Get snapend right for nested frames.
    TCP: Update the snapend before decoding a MPTCP option
    Ethernet, IEEE 802.15.4, IP, L2TP, TCP, ZEP: Add bounds checks
    ForCES: Refine SPARSEDATA-TLV length check.
    ASCII/hex: Use nd_trunc_longjmp() in truncation cases
    GeoNet: Add a ND_TCHECK_LEN() call
    Replace ND_TCHECK_/memcpy() pairs with GET_CPY_BYTES().
    BGP: Fix overwrites of global 'astostr' temporary buffer
    ARP: fix overwrites of static buffer in q922_string().
    Frame Relay: have q922_string() handle errors better.
  Building and testing:
    Rebuild configure script when building release
    Fix "make clean" for out-of-tree autotools builds
    CMake: add stuff from CMAKE_PREFIX_PATH to PKG_CONFIG_PATH.
  Documentation:
    man: Update a reference as www.cifs.org is gone. [skip ci]
    man: Update DNS sections
  Solaris:
    Fix a compile error with Sun C

Summary for 4.99.0 tcpdump release
  Improve the contents, wording and formatting of the man page.
  Print unsupported link-layer protocol packets in hex.
  Add support for new network protocols and DLTs: Arista, Autosar SOME/IP,
    Broadcom LI and Ethernet switches tag, IEEE 802.15.9, IP-over-InfiniBand
    (IPoIB), Linux SLL2, Linux vsockmon, MACsec, Marvell Distributed Switch
    Architecture, OpenFlow 1.3, Precision Time Protocol (PTP), SSH, WHOIS,
    ZigBee Encapsulation Protocol (ZEP).
  Make protocol-specific updates for: AH, DHCP, DNS, ESP, FRF.16, HNCP,
    ICMP6, IEEE 802.15.4, IPv6, IS-IS, Linux SLL, LLDP, LSP ping, MPTCP, NFS,
    NSH, NTP, OSPF, OSPF6, PGM, PIM, PPTP, RADIUS, RSVP, Rx, SMB, UDLD,
    VXLAN-GPE.
  User interface:
    Make SLL2 the default for Linux "any" pseudo-device.
    Add --micro and --nano shorthands.
    Add --count to print a counter only instead of decoding.
    Add --print, to cause packet printing even with -w.
    Add support for remote capture if libpcap supports it.
    Display the "wireless" flag and connection status.
    Flush the output packet buffer on a SIGUSR2.
    Add the snapshot length to the "reading from file ..." message.
    Fix local time printing (DST offset in timestamps).
    Allow -C arguments > 2^31-1 GB if they can fit into a long.
    Handle very large -f files by rejecting them.
    Report periodic stats only when safe to do so.
    Print the number of packets captured only as often as necessary.
    With no -s, or with -s 0, don't specify the snapshot length with newer
      versions of libpcap.
    Improve version and usage message printing.
  Building and testing:
    Install into bindir, not sbindir.
    autoconf: replace --with-system-libpcap with --disable-local-libpcap.
    Require the compiler to support C99.
    Better detect and use various C compilers and their features.
    Add CMake as the second build system.
    Make out-of-tree builds more reliable.
    Use pkg-config to detect libpcap if available.
    Improve Windows support.
    Add more tests and improve the scripts that run them.
    Test both with "normal" and "x87" floating-point.
    Eliminate dependency on libdnet.
  FreeBSD:
    Print a proper error message about monitor mode VAP.
    Use libcasper if available.
    Fix failure to capture on RDMA device.
    Include the correct capsicum header.
  Source code:
    Start the transition to longjmp() for packet truncation handling.
    Introduce new helper functions, including GET_*(), nd_print_protocol(),
      nd_print_invalid(), nd_print_trunc(), nd_trunc_longjmp() and others.
    Put integer signedness right in many cases.
    Introduce nd_uint*, nd_mac_addr, nd_ipv4 and nd_ipv6 types to fix
      alignment issues, especially on SPARC.
    Fix many C compiler, Coverity, UBSan and cppcheck warnings.
    Fix issues detected with AddressSanitizer.
    Remove many workarounds for older compilers and OSes.
    Add a sanity check on packet header length.
    Add and remove plenty of bounds checks.
    Clean up pcap_findalldevs() call to find the first interface.
    Use a short timeout, rather than immediate mode, for text output.
    Handle DLT_ENC files *not* written on the same OS and byte-order host.
    Add, and use, macros to do locale-independent case mapping.
    Use a table instead of getprotobynumber().
    Get rid of ND_UNALIGNED and ND_TCHECK().
    Make roundup2() generally available.
    Resync SMI list against Wireshark.
    Fix many typos.

4 files changed, 9 insertions, 33 deletions

diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 071e5d0b396..0ef533d1e97 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2020/06/14 19:35:38 adam Exp $
+# $NetBSD: Makefile,v 1.52 2021/11/16 16:19:40 adam Exp $
 
-DISTNAME=	tcpdump-4.9.3
+DISTNAME=	tcpdump-4.99.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/release/
 
diff --git a/net/tcpdump/PLIST b/net/tcpdump/PLIST
index 0219d1a18c3..f85cbacba6d 100644
--- a/net/tcpdump/PLIST
+++ b/net/tcpdump/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:24 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/11/16 16:19:40 adam Exp $
+bin/tcpdump
 man/man1/tcpdump.1
-sbin/tcpdump
diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo
index f831afcf4cc..9c7dfa4fc07 100644
--- a/net/tcpdump/distinfo
+++ b/net/tcpdump/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/10/26 11:07:00 nia Exp $
+$NetBSD: distinfo,v 1.30 2021/11/16 16:19:40 adam Exp $
 
-BLAKE2s (tcpdump-4.9.3.tar.gz) = 5d0cb60a29738c397d21efbf61c0eebfb3926276591c925c59ca986a224495ec
-SHA512 (tcpdump-4.9.3.tar.gz) = 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
-Size (tcpdump-4.9.3.tar.gz) = 2333119 bytes
-SHA1 (patch-ah) = 75dbc11440b32349014919ac04a628d8d4d8c45c
+BLAKE2s (tcpdump-4.99.1.tar.gz) = 75a52844d112073af03393257ee02cc1678406fda3b26e2a483d72ef8c930ff8
+SHA512 (tcpdump-4.99.1.tar.gz) = 53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7
+Size (tcpdump-4.99.1.tar.gz) = 2014324 bytes
+SHA1 (patch-Makefile.in) = e492eeb10b2a08ae0d0f4a3433e4956bcbba04df
diff --git a/net/tcpdump/patches/patch-ah b/net/tcpdump/patches/patch-ah
deleted file mode 100644
index 78509d4a7b5..00000000000
--- a/net/tcpdump/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2013/06/15 21:02:03 adam Exp $
-
-Fix VERSION dependency, or install will fail on case-insensitive file-system.
-Don't install another copy.
-
---- Makefile.in.orig	2012-06-12 16:56:20.000000000 +0000
-+++ Makefile.in
-@@ -312,7 +312,7 @@ strsep.o: $(srcdir)/missing/strsep.c
- version.o: version.c
- 	$(CC) $(FULL_CFLAGS) -c version.c
- 
--version.c: $(srcdir)/VERSION
-+version.c: VERSION
- 	@rm -f $@
- 	if grep GIT ${srcdir}/VERSION >/dev/null; then \
- 		read ver <${srcdir}/VERSION; \
-@@ -326,7 +326,6 @@ install: all
- 	[ -d $(DESTDIR)$(sbindir) ] || \
- 	    (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
- 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
--	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG).`cat ${srcdir}/VERSION`
- 	[ -d $(DESTDIR)$(mandir)/man1 ] || \
- 	    (mkdir -p $(DESTDIR)$(mandir)/man1; chmod 755 $(DESTDIR)$(mandir)/man1)
- 	$(INSTALL_DATA) $(PROG).1 $(DESTDIR)$(mandir)/man1/$(PROG).1