Hi, ok to update net/iperf? (maintainer timeout)
bluhm Index: net/iperf/Makefile =================================================================== RCS file: /data/mirror/openbsd/cvs/ports/net/iperf/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- net/iperf/Makefile 26 Jul 2017 22:45:27 -0000 1.27 +++ net/iperf/Makefile 28 Aug 2018 21:14:54 -0000 @@ -2,8 +2,7 @@ COMMENT= tool for measuring maximum TCP and UDP bandwidth -DISTNAME= iperf-2.0.5 -REVISION= 5 +DISTNAME= iperf-2.0.12 CATEGORIES= net HOMEPAGE= http://sourceforge.net/projects/iperf/ @@ -15,10 +14,10 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB= c m pthread ${COMPILER_LIBCXX} -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=iperf/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=iperf2/} CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.65 +AUTOCONF_VERSION= 2.69 # Separate build breaks configure test for IPv6 support SEPARATE_BUILD= No Index: net/iperf/distinfo =================================================================== RCS file: /data/mirror/openbsd/cvs/ports/net/iperf/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- net/iperf/distinfo 25 Sep 2012 20:54:39 -0000 1.8 +++ net/iperf/distinfo 28 Aug 2018 21:12:51 -0000 @@ -1,2 +1,2 @@ -SHA256 (iperf-2.0.5.tar.gz) = Y2tO/wQxzqgGZ+qFpnzkxoaYdgqYN+Hp0TCW0gNiJls= -SIZE (iperf-2.0.5.tar.gz) = 248583 +SHA256 (iperf-2.0.12.tar.gz) = Nn9lH7EmSxP2UY5BuKfgjOPkGyocgOmf8DR1Ye7TJkY= +SIZE (iperf-2.0.12.tar.gz) = 324528 Index: net/iperf/patches/patch-configure_ac =================================================================== RCS file: /data/mirror/openbsd/cvs/ports/net/iperf/patches/patch-configure_ac,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure_ac --- net/iperf/patches/patch-configure_ac 13 May 2017 07:45:07 -0000 1.2 +++ net/iperf/patches/patch-configure_ac 28 Aug 2018 21:34:39 -0000 @@ -1,10 +1,9 @@ $OpenBSD: patch-configure_ac,v 1.2 2017/05/13 07:45:07 espie Exp $ -Right, redefining bool in C++ is going to work wonders. Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -39,9 +39,7 @@ dnl Checks for programs +@@ -73,9 +73,7 @@ dnl Checks for programs dnl =================================================================== AC_PROG_CXX @@ -14,12 +13,3 @@ Index: configure.ac AC_ISC_POSIX AC_PROG_INSTALL AC_PROG_MAKE_SET -@@ -166,8 +164,6 @@ fi - - dnl =================================================================== - dnl Check for compiler characteristics -- --DAST_CHECK_BOOL - - AC_C_BIGENDIAN - Index: net/iperf/patches/patch-src_PerfSocket_cpp =================================================================== RCS file: /data/mirror/openbsd/cvs/ports/net/iperf/patches/patch-src_PerfSocket_cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_PerfSocket_cpp --- net/iperf/patches/patch-src_PerfSocket_cpp 16 May 2009 21:48:20 -0000 1.2 +++ net/iperf/patches/patch-src_PerfSocket_cpp 28 Aug 2018 21:44:29 -0000 @@ -1,12 +1,22 @@ $OpenBSD: patch-src_PerfSocket_cpp,v 1.2 2009/05/16 21:48:20 rui Exp $ ---- src/PerfSocket.cpp.orig Tue Apr 8 03:37:54 2008 -+++ src/PerfSocket.cpp Sat May 16 12:29:06 2009 -@@ -107,7 +107,7 @@ void SetSocketOptions( thread_Settings *inSettings ) { +Index: src/PerfSocket.cpp +--- src/PerfSocket.cpp.orig ++++ src/PerfSocket.cpp +@@ -118,8 +118,8 @@ void SetSocketOptions( thread_Settings *inSettings ) { + } + if (inSettings->mTTL > 0) { + // set TTL +- int val = inSettings->mTTL; + if ( !isIPV6(inSettings) ) { ++ u_int8_t val = inSettings->mTTL; + int rc = setsockopt( inSettings->mSock, IPPROTO_IP, IP_MULTICAST_TTL, + (char*) &val, (Socklen_t) sizeof(val)); - // check if we're sending multicast, and set TTL - if ( isMulticast( inSettings ) && ( inSettings->mTTL > 0 ) ) { -- int val = inSettings->mTTL; -+ u_int8_t val = inSettings->mTTL; - #ifdef HAVE_MULTICAST - if ( !SockAddr_isIPv6( &inSettings->local ) ) { - int rc = setsockopt( inSettings->mSock, IPPROTO_IP, IP_MULTICAST_TTL, +@@ -127,6 +127,7 @@ void SetSocketOptions( thread_Settings *inSettings ) { + } else + # ifdef HAVE_IPV6_MULTICAST + { ++ int val = inSettings->mTTL; + int rc = setsockopt( inSettings->mSock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + (char*) &val, (Socklen_t) sizeof(val)); + WARN_errno( rc == SOCKET_ERROR, "multicast v6 ttl" ); Index: net/iperf/patches/patch-src_Reporter_c =================================================================== RCS file: net/iperf/patches/patch-src_Reporter_c diff -N net/iperf/patches/patch-src_Reporter_c --- net/iperf/patches/patch-src_Reporter_c 3 Mar 2013 12:29:44 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_Reporter_c,v 1.3 2013/03/03 12:29:44 sthen Exp $ ---- src/Reporter.c.orig Wed Mar 31 00:08:24 2010 -+++ src/Reporter.c Sat Mar 2 01:58:00 2013 -@@ -308,6 +308,9 @@ ReportHeader* InitReport( thread_Settings *agent ) { - #else - // set start time - gettimeofday( &(reporthdr->report.startTime), NULL ); -+ reporthdr->report.nextTime = reporthdr->report.startTime; -+ TimeAdd(reporthdr->report.nextTime, reporthdr->report.intervalTime); -+ - /* - * Process the report in this thread - */ Index: net/iperf/patches/patch-src_stdio_c =================================================================== RCS file: net/iperf/patches/patch-src_stdio_c diff -N net/iperf/patches/patch-src_stdio_c --- net/iperf/patches/patch-src_stdio_c 3 Mar 2013 12:29:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_stdio_c,v 1.1 2013/03/03 12:29:44 sthen Exp $ - -don't run past the end of kLabel_bit[] / kLabel_Byte[] for (stupidly) -high bandwidths. - ---- src/stdio.c.orig Sat Mar 2 02:07:53 2013 -+++ src/stdio.c Sat Mar 2 02:07:36 2013 -@@ -210,12 +210,12 @@ void byte_snprintf( char* outString, int inLen, - conv = kConv_Unit; - - if ( isupper((int)inFormat) ) { -- while ( tmpNum >= 1024.0 && conv <= kConv_Giga ) { -+ while ( tmpNum >= 1024.0 && conv < kConv_Giga ) { - tmpNum /= 1024.0; - conv++; - } - } else { -- while ( tmpNum >= 1000.0 && conv <= kConv_Giga ) { -+ while ( tmpNum >= 1000.0 && conv < kConv_Giga ) { - tmpNum /= 1000.0; - conv++; - }
