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 -0000 1.38 +++ Makefile 24 Sep 2017 19:09:01 -0000 @@ -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 <ni...@openbsd.org> @@ -20,6 +19,5 @@ WANTLIB= c dnet>=1 CONFIGURE_STYLE= gnu LIB_DEPENDS= net/libdnet -BUILD_DEPENDS= devel/autogen .include <bsd.port.mk> 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 -0000 1.9 +++ distinfo 29 Aug 2017 21:05:44 -0000 @@ -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 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 <stdio.h> - #include <stdlib.h> - #include <sys/types.h> -@@ -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 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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
