tcpreplay: Update to 4.3.3

05/20/2020 Version 4.3.3
    - Increase cache buffers size to accomodate VLAN edits (#594)
    - Correct L2 header length to correct IP header offset (#583)
    - Fix warnings from gcc version 10 (#580)
    - Heap Buffer Overflow in randomize_iparp (#579)
    - Use after free in get_ipv6_next (#578)
    - Heap Buffer Overflow in git_ipv6_next (#576)
    - Call pcap_freecode() on pcap_compile() (#572)
    - Increase max snaplen to 262144 (#571)
    - Fix divide by zero in fuzzing (#570)
    - Unique IP repeats at very high iteration counts (#566)
    - Fails to compile on FreeBSD amd64 13.0 (#558)
    - Heap Buffer Overflow in do_checksum (#556) (#577)
    - Attempt to correct corrupt pcap files, if possible (#557)
    - Fix GCC v10 warnings (#555)
    - Remove some duplicated SOURCES entries (#551)
    - Expand /dev/bpfX hard limit to fix macOS Mojave (#550)
    - Implement --loopdelay-ms when using --loop=0 (#546)
    - Heap overflow packet2tree and get_l2len (#530)

03/12/2019 Version 4.3.2
    - CVE-2019-8381 memory access in do_checksum() (#538)
    - CVE-2019-8376 NULL pointer dereference get_layer4_v6() (#537)
    - CVE-2019-8377 NULL pointer dereference get_ipv6_l4proto() (#536)
    - Rename Ethereal to Wireshark (#545)

12/27/2018 Version 4.3.1
    - Fix checkspell detected typos (#531)

11/10/2018 Version 4.3.0
    - Fix maxOS TOS checksum failure (#524)
    - TCP sequence edits seeding (#514)
    - Fix issues identifed by Codacy (#493)
    - CVE-2018-18408 use-after-free in post_args (#489)
    - CVE-2018-18407 heap-buffer-overflow csum_replace4 (#488)
    - CVE-2018-17974 heap-buffer-overflow dlt_en10mb_encode (#486)
    - CVE-2018-17580 heap-buffer-overflow fast_edit_packet (#485)
    - CVE-2018-17582 heap-buffer-overflow in get_next_packet (#484)
    - Out-of-tree build (#482)
    - CVE-2018-13112 heap-buffer-overflow in get_l2len (#477 dup #408)
    - Closing stdin on pipe (#479)
    - Second pcap file hangs on multiplier option (#472)
    - Jumbo frame support for fragroute option (#466)
    - TCP sequence edit ACK corruption (#451)
    - TCP sequence number edit initial SYN packet should have zero ACK (#450)
    - Travis CI build fails due to new build images (#432)
    - Upgrade libopts to 5.18.12 to address version build issues (#430)
    - Add ability to change tcp SEQ/ACK numbers (#425)
    - Hang using loop and netmap options (#424)
    - tcpprep -S not working for large cache files (#423)
    - Unable to tcprewrite range of ports with --portmap (#422)
    - --maxsleep broken for values less than 1000 (#421)
    - -T flag breaks traffic replay timing (#419)
    - Respect 2nd packet timing (#418)
    - Avoid non-blocking behaviour when using STDIN (#416)
    - pcap containing >1020 packets produces invalid cache file (#415)
    - manpage typos (#413)
    - Fails to open tap0 on Zephyr (#411)
    - Heap-buffer-overflow in get_l2protocol (#410)
    - Heap-buffer-overflow in packet2tree (#409)
    - Heap-buffer-overflow in get_l2len (#408)
    - Heap-buffer-overflow in flow_decode (#407)
    - Rewrite zero IP total length field to match the actual packet length (#406)
    - Stack-buffer-overflow in tcpcapinfo (#405)
    - tcpprep --include option does not exclude (#404)
    - Negative-size-param memset in dlt_radiotap_get_80211 (#402)
    - tcpeplay --verbose option not working (#398)
    - Fix replay when using --with-testnic (#178)

6 files changed, 26 insertions, 95 deletions

diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index 01ed8c9cf67..a52ae8ff2ae 100644
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2020/01/26 17:31:56 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2020/06/21 15:30:39 nia Exp $
 
-VERSION=	4.2.6
-DISTNAME=	tcpreplay-${VERSION}
+DISTNAME=	tcpreplay-4.3.3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GITHUB:=appneta/tcpreplay/releases/download/v${VERSION}/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=appneta/}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://tcpreplay.appneta.com/
diff --git a/net/tcpreplay/distinfo b/net/tcpreplay/distinfo
index 53bb49e2202..f3e2616d975 100644
--- a/net/tcpreplay/distinfo
+++ b/net/tcpreplay/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.13 2017/12/04 09:32:01 he Exp $
+$NetBSD: distinfo,v 1.14 2020/06/21 15:30:39 nia Exp $
 
-SHA1 (tcpreplay-4.2.6.tar.gz) = 8f7b91534d7936ae534d87689ad371fd4e4bb059
-RMD160 (tcpreplay-4.2.6.tar.gz) = afdbd71573d04afbe7f6594778e9dd1223b64ff0
-SHA512 (tcpreplay-4.2.6.tar.gz) = a46846b29e3cd7fbc635faee9c4be90db0d346c0d0f291ac8e007e1fbf614289094e14480c1c5b40feb5a175d3cbad018e2dd4d1a5762b7d31a4325af6102e7e
-Size (tcpreplay-4.2.6.tar.gz) = 3494827 bytes
-SHA1 (patch-libopts_makeshell.c) = 1da67df9acb4ac7972ed72db5b113bfee054aeae
-SHA1 (patch-src_common_get.c) = 71685be82d53faa5f1e73afcddb540506055e41e
-SHA1 (patch-src_common_mac.c) = e667846485bb1d07065f98cc685a318ee04873ec
+SHA1 (tcpreplay-4.3.3.tar.xz) = 23ffd5e382d55bb0ed27c7becb196c7565fcaf6b
+RMD160 (tcpreplay-4.3.3.tar.xz) = b159ff5fe5d6e4e126932c155bf9680047d19972
+SHA512 (tcpreplay-4.3.3.tar.xz) = 110d7768a176d2126766829466a209cdd983afcf0c988f7e128baa5057b3ac1dc918fcaeb168a2e6654429100a146afcbdafcda8c3d67adf6b17892a48689a02
+Size (tcpreplay-4.3.3.tar.xz) = 748220 bytes
+SHA1 (patch-configure) = acafd832ae7d94520daf9600a18f3419bd440e1e
diff --git a/net/tcpreplay/patches/patch-configure b/net/tcpreplay/patches/patch-configure
new file mode 100644
index 00000000000..d31788d26d0
--- /dev/null
+++ b/net/tcpreplay/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2020/06/21 15:30:39 nia Exp $
+
+Shell portability.
+
+--- configure.orig	2020-06-14 22:29:09.000000000 +0000
++++ configure
+@@ -18537,7 +18537,7 @@ $as_echo_n "checking for autogen version
+             test ${AUTOGEN_MAJOR} -lt 5 ; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-        if test "x$enable_local_libopts" == "xno"; then
++        if test "x$enable_local_libopts" = "xno"; then
+             as_fn_error $? "${AUTOGEN} is too old (${AUTOGEN_VERSION}) for building from source code. Upgrade to 5.18.4 or higher" "$LINENO" 5
+         fi
+         AUTOGEN_VERSION="${AUTOGEN_VERSION} - downlevel"
diff --git a/net/tcpreplay/patches/patch-libopts_makeshell.c b/net/tcpreplay/patches/patch-libopts_makeshell.c
deleted file mode 100644
index c7375318395..00000000000
--- a/net/tcpreplay/patches/patch-libopts_makeshell.c
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-libopts_makeshell.c,v 1.1 2017/12/04 09:32:01 he Exp $
-
-Ensure args to toxxxx() are within allowed value range.
-
---- ./libopts/makeshell.c.orig	2017-04-27 00:56:25.000000000 +0000
-+++ ./libopts/makeshell.c
-@@ -396,7 +396,7 @@ emit_usage(tOptions * opts)
- 
-         /* Copy the program name into the time/name buffer */
-         for (;;) {
--            if ((*pzPN++ = (char)tolower(*pz++)) == NUL)
-+            if ((*pzPN++ = (char)tolower((unsigned char)*pz++)) == NUL)
-                 break;
-         }
- 
-@@ -653,7 +653,7 @@ emit_match_expr(char const * name, tOptD
-              *  They must not be the same.  They cannot be, because it would
-              *  not compile correctly if they were.
-              */
--            while (toupper(od->pz_Name[match_ct]) == toupper(name[match_ct]))
-+            while (toupper((unsigned char)od->pz_Name[match_ct]) == toupper((unsigned char)name[match_ct]))
-                 match_ct++;
- 
-             if (match_ct > min_match_ct)
-@@ -666,8 +666,8 @@ emit_match_expr(char const * name, tOptD
-                 continue;
- 
-             match_ct = 0;
--            while (  toupper(od->pz_DisableName[match_ct])
--                  == toupper(name[match_ct]))
-+            while (  toupper((unsigned char)od->pz_DisableName[match_ct])
-+                  == toupper((unsigned char)name[match_ct]))
-                 match_ct++;
-             if (match_ct > min_match_ct)
-                 min_match_ct = match_ct;
-@@ -905,7 +905,7 @@ genshelloptUsage(tOptions * opts, int ex
-         AGDUPSTR(pz, optionParseShellOptions->pzPROGNAME, "prog name");
-         *pp = pz;
-         while (*pz != NUL) {
--            *pz = (char)tolower(*pz);
-+            *pz = (char)tolower((unsigned char)*pz);
-             pz++;
-         }
-     }
diff --git a/net/tcpreplay/patches/patch-src_common_get.c b/net/tcpreplay/patches/patch-src_common_get.c
deleted file mode 100644
index 4e2432e5ffb..00000000000
--- a/net/tcpreplay/patches/patch-src_common_get.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_common_get.c,v 1.1 2017/12/04 09:32:01 he Exp $
-
-Ensure args to toxxxx() is within allowed range.
-
---- src/common/get.c.orig	2017-05-16 15:10:27.000000000 +0000
-+++ src/common/get.c
-@@ -569,7 +569,7 @@ get_name2addr4(const char *hostname, boo
-      *  We only want dots 'n decimals.
-      */
-     else {
--        if (!isdigit(hostname[0])) {
-+        if (!isdigit((unsigned char)hostname[0])) {
-             warnx("Expected dotted-quad notation (%s) when DNS lookups are disabled", 
-                     hostname);
-             /* XXX - this is actually 255.255.255.255 */
diff --git a/net/tcpreplay/patches/patch-src_common_mac.c b/net/tcpreplay/patches/patch-src_common_mac.c
deleted file mode 100644
index ccb0205dde5..00000000000
--- a/net/tcpreplay/patches/patch-src_common_mac.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_common_mac.c,v 1.1 2017/12/04 09:32:01 he Exp $
-
-Ensure args to toxxxx() are within allowed value range.
-
---- ./src/common/mac.c.orig	2017-05-09 14:17:52.000000000 +0000
-+++ ./src/common/mac.c
-@@ -42,7 +42,7 @@ mac2hex(const char *mac, u_char *dst, in
-     if (len < 6)
-         return;
- 
--    while (isspace(*mac))
-+    while (isspace((unsigned char)*mac))
-         mac++;
- 
-     /* expect 6 hex octets separated by ':' or space/NUL if last octet */
-@@ -50,7 +50,7 @@ mac2hex(const char *mac, u_char *dst, in
-         l = strtol(mac, &pp, 16);
-         if (pp == mac || l > 0xFF || l < 0)
-             return;
--        if (!(*pp == ':' || (i == 5 && (isspace(*pp) || *pp == '\0'))))
-+        if (!(*pp == ':' || (i == 5 && (isspace((unsigned char)*pp) || *pp == '\0'))))
-             return;
-         dst[i] = (u_char) l;
-         mac = pp + 1;