Re: [maintainer update] net/tcpreplay 4.0.5 -> 4.2.6

2017-09-24 Thread Stuart Henderson 
On 2017/09/24 22:31, Nigel Taylor wrote:
> On 09/24/17 13:02, Stuart Henderson wrote:
> > On 2017/09/23 23:21, Nigel Taylor wrote:
> >> Has been moved to github.
> >>
> >> builds on amd64.
> >>
> >> Ok?
> > 
> > GH_* is for autogenerated tarballs, this is a normal uploaded release,
> > if you are setting MASTER_SITES manually anyway then GH_* is just extra
> > complexity and not useful.
> > 
> > The autogen build dep has gone away. Replacement makefile diff below
> > with those changes, maybe consider EXTRACT_SUFX=.tar.xz as well? (700K
> > vs 2.8MB).
> > 
> > Various security related fixes, not part of big dependency chains,
> > so I generally think this should go in.
> > 
> Bit of a messy one, sure versions were only available from github,
> now 4.2.5/4.2.6 are available from sourceforge, so reverted everything
> back from github.
> 
> Home page still says 4.2.5, and links points to github, but old releases
> link is to sourceforge, and includes 4.2.6 and 4.2.5.
> 
> Can see a tar.xz on sourceforge but it's hidden, and home page only
> lists tar.gz downloads.
> 

It's right on the first page of https://github.com/appneta/tcpreplay/releases,
the ones with a "box" icon and proper filenames are uploaded files (which in
their case are the ones that have already run autogen), the ones that say
"Source code (tar.gz)" are the usual github autogenerated ones.

Since upstream's links point people at github, that's clearly their preferred
source, so that's probably better for the port than sourceforge..

Re: [maintainer update] net/tcpreplay 4.0.5 -> 4.2.6

2017-09-24 Thread Nigel Taylor 
On 09/24/17 13:02, Stuart Henderson wrote:
> On 2017/09/23 23:21, Nigel Taylor wrote:
>> Has been moved to github.
>>
>> builds on amd64.
>>
>> Ok?
> 
> GH_* is for autogenerated tarballs, this is a normal uploaded release,
> if you are setting MASTER_SITES manually anyway then GH_* is just extra
> complexity and not useful.
> 
> The autogen build dep has gone away. Replacement makefile diff below
> with those changes, maybe consider EXTRACT_SUFX=.tar.xz as well? (700K
> vs 2.8MB).
> 
> Various security related fixes, not part of big dependency chains,
> so I generally think this should go in.
> 
Bit of a messy one, sure versions were only available from github,
now 4.2.5/4.2.6 are available from sourceforge, so reverted everything
back from github.

Home page still says 4.2.5, and links points to github, but old releases
link is to sourceforge, and includes 4.2.6 and 4.2.5.

Can see a tar.xz on sourceforge but it's hidden, and home page only
lists tar.gz downloads.

Index: Makefile
===
RCS file: /home/cvs/ports/net/tcpreplay/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile	8 May 2017 18:10:25 -	1.38
+++ Makefile	24 Sep 2017 19:09:01 -
@@ -2,11 +2,10 @@
 
 COMMENT=	resend network traffic saved by tcpdump
 
-DISTNAME=	tcpreplay-4.0.5
+DISTNAME=	tcpreplay-4.2.6
 CATEGORIES=	net
-REVISION=	2
 
-HOMEPAGE=	http://tcpreplay.appneta.com/	
+HOMEPAGE=	http://tcpreplay.appneta.com/
 
 MAINTAINER=	Nigel Taylor 
 
@@ -20,6 +19,5 @@ WANTLIB=	c dnet>=1
 CONFIGURE_STYLE= gnu
 
 LIB_DEPENDS=	net/libdnet
-BUILD_DEPENDS=	devel/autogen
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/net/tcpreplay/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	16 Oct 2014 13:00:56 -	1.9
+++ distinfo	29 Aug 2017 21:05:44 -
@@ -1,2 +1,2 @@
-SHA256 (tcpreplay-4.0.5.tar.gz) = Y3mMityeW+eUZ+I1k4OM4OYXslk4z84xFv7aJjA0TYA=
-SIZE (tcpreplay-4.0.5.tar.gz) = 2059744
+SHA256 (tcpreplay-4.2.6.tar.gz) = BDdWxTLauT4r4zpRfvRrE0H3I5J4oQRa5nAEHdikUx0=
+SIZE (tcpreplay-4.2.6.tar.gz) = 3494827
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure	16 Oct 2014 13:43:48 -	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2014/10/16 13:43:48 nigel Exp $
 configure.orig	Fri Sep  5 17:16:38 2014
-+++ configure	Fri Oct 10 15:21:36 2014
-@@ -18765,7 +18765,7 @@ else
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--[
-+
- #include 
- #include 
- #include 
-@@ -18793,7 +18793,7 @@ main(int argc, char *argv[]) {
- 
- /* else suck, no good */
- exit(-1);
--}]
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- 
Index: patches/patch-src_defines_h_in
===
RCS file: patches/patch-src_defines_h_in
diff -N patches/patch-src_defines_h_in
--- patches/patch-src_defines_h_in	6 Jul 2016 10:29:51 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_defines_h_in,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
 src/defines.h.in.orig	Fri May  9 19:28:13 2014
-+++ src/defines.h.in	Wed Jul  6 10:54:28 2016
-@@ -145,7 +145,7 @@ typedef struct tcpr_speed_s {
- #define DEFAULT_MTU 1500/* Max Transmission Unit of standard ethernet
-  * don't forget *frames* are MTU + L2 header! */
- 
--#define MAXPACKET 65535 /* was 16436 linux loopback, but maybe something is bigger then
-+#define MAXPACKET 65549 /* was 16436 linux loopback, but maybe something is bigger then
-linux loopback */
- 
- #define MAX_SNAPLEN 65535   /* tell libpcap to capture the entire packet */
Index: patches/patch-src_tcprewrite_c
===
RCS file: patches/patch-src_tcprewrite_c
diff -N patches/patch-src_tcprewrite_c
--- patches/patch-src_tcprewrite_c	6 Jul 2016 10:29:51 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_tcprewrite_c,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
 src/tcprewrite.c.orig	Fri May  9 19:28:13 2014
-+++ src/tcprewrite.c	Wed Jul  6 10:54:06 2016
-@@ -250,6 +250,8 @@ rewrite_packets(tcpedit_t *tcpedit, pcap_t *pin, pcap_
- packetnum++;
- dbgx(2, "packet " COUNTER_SPEC " caplen %d", packetnum, pkthdr.caplen);
- 
-+if (pkthdr.caplen > MAXPACKET)
-+errx(-1, "Frame too big, caplen %d exceeds %d", pkthdr.caplen, MAXPACKET);
- /* 
-  * copy over the packet so we can pad it

Re: [maintainer update] net/tcpreplay 4.0.5 -> 4.2.6

2017-09-24 Thread Stuart Henderson 
On 2017/09/23 23:21, Nigel Taylor wrote:
> Has been moved to github.
> 
> builds on amd64.
> 
> Ok?

GH_* is for autogenerated tarballs, this is a normal uploaded release,
if you are setting MASTER_SITES manually anyway then GH_* is just extra
complexity and not useful.

The autogen build dep has gone away. Replacement makefile diff below
with those changes, maybe consider EXTRACT_SUFX=.tar.xz as well? (700K
vs 2.8MB).

Various security related fixes, not part of big dependency chains,
so I generally think this should go in.

Index: Makefile
===
RCS file: /cvs/ports/net/tcpreplay/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile8 May 2017 18:10:25 -   1.38
+++ Makefile24 Sep 2017 11:59:07 -
@@ -2,24 +2,23 @@
 
 COMMENT=   resend network traffic saved by tcpdump
 
-DISTNAME=  tcpreplay-4.0.5
+V= 4.2.6
+DISTNAME=  tcpreplay-$V
 CATEGORIES=net
-REVISION=  2
 
-HOMEPAGE=  http://tcpreplay.appneta.com/   
+HOMEPAGE=  http://tcpreplay.appneta.com/
 
 MAINTAINER=Nigel Taylor 
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=tcpreplay/}
-
 WANTLIB=   c dnet>=1
 
+MASTER_SITES=   https://github.com/appneta/tcpreplay/releases/download/v$V/
+
 CONFIGURE_STYLE= gnu
 
 LIB_DEPENDS=   net/libdnet
-BUILD_DEPENDS= devel/autogen
 
 .include

[maintainer update] net/tcpreplay 4.0.5 -> 4.2.6

2017-09-23 Thread Nigel Taylor 
Has been moved to github.

builds on amd64.

Ok?
Index: Makefile
===
RCS file: /home/cvs/ports/net/tcpreplay/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile	8 May 2017 18:10:25 -	1.38
+++ Makefile	29 Aug 2017 21:04:34 -
@@ -2,18 +2,20 @@
 
 COMMENT=	resend network traffic saved by tcpdump
 
-DISTNAME=	tcpreplay-4.0.5
 CATEGORIES=	net
-REVISION=	2
 
-HOMEPAGE=	http://tcpreplay.appneta.com/	
+GH_ACCOUNT =	appneta
+GH_PROJECT =	tcpreplay
+GH_TAGNAME =	v4.2.6
+
+HOMEPAGE=	http://tcpreplay.appneta.com/
 
 MAINTAINER=	Nigel Taylor 
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=tcpreplay/}
+MASTER_SITES = https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${GH_TAGNAME}/
 
 WANTLIB=	c dnet>=1
 
Index: distinfo
===
RCS file: /home/cvs/ports/net/tcpreplay/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	16 Oct 2014 13:00:56 -	1.9
+++ distinfo	29 Aug 2017 21:05:44 -
@@ -1,2 +1,2 @@
-SHA256 (tcpreplay-4.0.5.tar.gz) = Y3mMityeW+eUZ+I1k4OM4OYXslk4z84xFv7aJjA0TYA=
-SIZE (tcpreplay-4.0.5.tar.gz) = 2059744
+SHA256 (tcpreplay-4.2.6.tar.gz) = BDdWxTLauT4r4zpRfvRrE0H3I5J4oQRa5nAEHdikUx0=
+SIZE (tcpreplay-4.2.6.tar.gz) = 3494827
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure	16 Oct 2014 13:43:48 -	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2014/10/16 13:43:48 nigel Exp $
 configure.orig	Fri Sep  5 17:16:38 2014
-+++ configure	Fri Oct 10 15:21:36 2014
-@@ -18765,7 +18765,7 @@ else
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--[
-+
- #include 
- #include 
- #include 
-@@ -18793,7 +18793,7 @@ main(int argc, char *argv[]) {
- 
- /* else suck, no good */
- exit(-1);
--}]
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- 
Index: patches/patch-src_defines_h_in
===
RCS file: patches/patch-src_defines_h_in
diff -N patches/patch-src_defines_h_in
--- patches/patch-src_defines_h_in	6 Jul 2016 10:29:51 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_defines_h_in,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
 src/defines.h.in.orig	Fri May  9 19:28:13 2014
-+++ src/defines.h.in	Wed Jul  6 10:54:28 2016
-@@ -145,7 +145,7 @@ typedef struct tcpr_speed_s {
- #define DEFAULT_MTU 1500/* Max Transmission Unit of standard ethernet
-  * don't forget *frames* are MTU + L2 header! */
- 
--#define MAXPACKET 65535 /* was 16436 linux loopback, but maybe something is bigger then
-+#define MAXPACKET 65549 /* was 16436 linux loopback, but maybe something is bigger then
-linux loopback */
- 
- #define MAX_SNAPLEN 65535   /* tell libpcap to capture the entire packet */
Index: patches/patch-src_tcprewrite_c
===
RCS file: patches/patch-src_tcprewrite_c
diff -N patches/patch-src_tcprewrite_c
--- patches/patch-src_tcprewrite_c	6 Jul 2016 10:29:51 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_tcprewrite_c,v 1.1 2016/07/06 10:29:51 jasper Exp $
-
-CVE-2016-6160
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829350
-
 src/tcprewrite.c.orig	Fri May  9 19:28:13 2014
-+++ src/tcprewrite.c	Wed Jul  6 10:54:06 2016
-@@ -250,6 +250,8 @@ rewrite_packets(tcpedit_t *tcpedit, pcap_t *pin, pcap_
- packetnum++;
- dbgx(2, "packet " COUNTER_SPEC " caplen %d", packetnum, pkthdr.caplen);
- 
-+if (pkthdr.caplen > MAXPACKET)
-+errx(-1, "Frame too big, caplen %d exceeds %d", pkthdr.caplen, MAXPACKET);
- /* 
-  * copy over the packet so we can pad it out if necessary and
-  * because pcap_next() returns a const ptr