CVS commit: pkgsrc/net/tcpreplay

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Dec  4 09:32:01 UTC 2017

Modified Files:
        pkgsrc/net/tcpreplay: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/tcpreplay/patches: patch-libopts_makeshell.c
            patch-src_common_get.c patch-src_common_mac.c
Removed Files:
        pkgsrc/net/tcpreplay/patches: patch-aa patch-ab patch-lib_Makefile.in
            patch-src_common_Makefile.in patch-src_common_cidr.c
            patch-src_common_tcpdump.c patch-src_defines.h.in
            patch-src_tcpprep.c

Log Message:
Update tcpreplay to version 4.2.6.
This catches up with the project which has apparently moved
to github.com.  With it comes fixes for two known CVEs (CVE-2016-6160,
CVE-2017-6429).  There is otherwise a large set of changes,
see the release history on github for the details.
The license changed to gnu-gpl-v3, LICENSE setting added.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/tcpreplay/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/tcpreplay/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/tcpreplay/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/net/tcpreplay/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/net/tcpreplay/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/net/tcpreplay/patches/patch-lib_Makefile.in \
    pkgsrc/net/tcpreplay/patches/patch-src_common_Makefile.in \
    pkgsrc/net/tcpreplay/patches/patch-src_common_cidr.c \
    pkgsrc/net/tcpreplay/patches/patch-src_common_tcpdump.c \
    pkgsrc/net/tcpreplay/patches/patch-src_defines.h.in \
    pkgsrc/net/tcpreplay/patches/patch-src_tcpprep.c
cvs rdiff -u -r0 -r1.1 pkgsrc/net/tcpreplay/patches/patch-libopts_makeshell.c \
    pkgsrc/net/tcpreplay/patches/patch-src_common_get.c \
    pkgsrc/net/tcpreplay/patches/patch-src_common_mac.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/tcpreplay/Makefile
diff -u pkgsrc/net/tcpreplay/Makefile:1.22 pkgsrc/net/tcpreplay/Makefile:1.23
--- pkgsrc/net/tcpreplay/Makefile:1.22  Thu Oct 31 02:25:16 2013
+++ pkgsrc/net/tcpreplay/Makefile       Mon Dec  4 09:32:01 2017
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.22 2013/10/31 02:25:16 minskim Exp $
+# $NetBSD: Makefile,v 1.23 2017/12/04 09:32:01 he Exp $
 
-DISTNAME=      tcpreplay-3.4.4
+VERSION=       4.2.6
+DISTNAME=      tcpreplay-${VERSION}
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tcpreplay/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=appneta/tcpreplay/releases/download/v${VERSION}/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://tcpreplay.synfin.net/
+HOMEPAGE=      http://tcpreplay.appneta.com/wiki/installation.html
 COMMENT=       Replay saved tcpdump or snoop files
+LICENSE=       gnu-gpl-v3
 
 BUILDLINK_API_DEPENDS.libpcap+=        libpcap>=0.8.0
 

Index: pkgsrc/net/tcpreplay/PLIST
diff -u pkgsrc/net/tcpreplay/PLIST:1.5 pkgsrc/net/tcpreplay/PLIST:1.6
--- pkgsrc/net/tcpreplay/PLIST:1.5      Sat May  2 17:35:43 2009
+++ pkgsrc/net/tcpreplay/PLIST  Mon Dec  4 09:32:01 2017
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2009/05/02 17:35:43 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/12/04 09:32:01 he Exp $
+bin/tcpcapinfo
 bin/tcpbridge
 bin/tcpprep
 bin/tcpreplay
 bin/tcpreplay-edit
 bin/tcprewrite
+man/man1/tcpcapinfo.1
 man/man1/tcpbridge.1
 man/man1/tcpprep.1
 man/man1/tcpreplay.1

Index: pkgsrc/net/tcpreplay/distinfo
diff -u pkgsrc/net/tcpreplay/distinfo:1.12 pkgsrc/net/tcpreplay/distinfo:1.13
--- pkgsrc/net/tcpreplay/distinfo:1.12  Wed Nov  4 00:35:40 2015
+++ pkgsrc/net/tcpreplay/distinfo       Mon Dec  4 09:32:01 2017
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 00:35:40 agc Exp $
+$NetBSD: distinfo,v 1.13 2017/12/04 09:32:01 he Exp $
 
-SHA1 (tcpreplay-3.4.4.tar.gz) = 9e4cca81cfbfb919f8759e1a27ce1b3b963ff3b8
-RMD160 (tcpreplay-3.4.4.tar.gz) = 672812755ff39b284044b08cba32c574ab2b7e70
-SHA512 (tcpreplay-3.4.4.tar.gz) = b129f14689d73905fa3238090de397bf845d6764e73411738a82bdf39c3d4605ad9a64e55dfca88035716704015a1cfc8b4fe097e019e30f84379f4126700cc8
-Size (tcpreplay-3.4.4.tar.gz) = 947179 bytes
-SHA1 (patch-aa) = 377cd7e829b00df9aff0aeed4c4136317602334a
-SHA1 (patch-ab) = 54bd9c0a3e07eef3a3e4cfccc87c8351090301c1
-SHA1 (patch-lib_Makefile.in) = 9a59f2652c08efb87944e132998a3c0778a5b5a7
-SHA1 (patch-src_common_Makefile.in) = 7cd6878eecd94d735e314768a0302298ac415ffc
-SHA1 (patch-src_common_cidr.c) = 77694f71876916e9e77a0257ce91bf7bb2f140a2
-SHA1 (patch-src_common_tcpdump.c) = f46d713dc57db02845173dc92c4f2ec94c158298
-SHA1 (patch-src_defines.h.in) = 58fa82a29f997662d5e793461f4d3cfccd593eb0
-SHA1 (patch-src_tcpprep.c) = 2c5ce09986c4e215230472791a99c4c183223c85
+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

Added files:

Index: pkgsrc/net/tcpreplay/patches/patch-libopts_makeshell.c
diff -u /dev/null pkgsrc/net/tcpreplay/patches/patch-libopts_makeshell.c:1.1
--- /dev/null   Mon Dec  4 09:32:01 2017
+++ pkgsrc/net/tcpreplay/patches/patch-libopts_makeshell.c      Mon Dec  4 09:32:01 2017
@@ -0,0 +1,44 @@
+$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++;
+         }
+     }
Index: pkgsrc/net/tcpreplay/patches/patch-src_common_get.c
diff -u /dev/null pkgsrc/net/tcpreplay/patches/patch-src_common_get.c:1.1
--- /dev/null   Mon Dec  4 09:32:01 2017
+++ pkgsrc/net/tcpreplay/patches/patch-src_common_get.c Mon Dec  4 09:32:01 2017
@@ -0,0 +1,15 @@
+$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 */
Index: pkgsrc/net/tcpreplay/patches/patch-src_common_mac.c
diff -u /dev/null pkgsrc/net/tcpreplay/patches/patch-src_common_mac.c:1.1
--- /dev/null   Mon Dec  4 09:32:01 2017
+++ pkgsrc/net/tcpreplay/patches/patch-src_common_mac.c Mon Dec  4 09:32:01 2017
@@ -0,0 +1,24 @@
+$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;