From: Solene Rapenne <solene@perso.pw>
Subject: update net/iperf
To: ports@openbsd.org, Lawrence Teo <lteo@openbsd.org>
Date: Mon, 29 Apr 2024 14:07:31 +0200

update to latest version of iperf 2
tested with public servers as a client, worked fine

the cpp file patch is not required anymore, upstream
seems to have imported it


diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 8d753deda55..9cf1ddabe1a 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,8 +1,7 @@
 COMMENT=	tool for measuring maximum TCP and UDP bandwidth
 
-DISTNAME=	iperf-2.0.12
+DISTNAME=	iperf-2.2.0
 CATEGORIES=	net
-REVISION=	1
 
 HOMEPAGE=	https://sourceforge.net/projects/iperf/
 
@@ -18,7 +17,7 @@ COMPILER =	base-clang ports-gcc base-gcc
 SITES=		${SITE_SOURCEFORGE:=iperf2/}
 
 CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.69
+AUTOCONF_VERSION= 2.71
 
 # Separate build breaks configure test for IPv6 support
 SEPARATE_BUILD=	No
diff --git a/net/iperf/distinfo b/net/iperf/distinfo
index 5c8314df734..01baf17c549 100644
--- a/net/iperf/distinfo
+++ b/net/iperf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (iperf-2.0.12.tar.gz) = Nn9lH7EmSxP2UY5BuKfgjOPkGyocgOmf8DR1Ye7TJkY=
-SIZE (iperf-2.0.12.tar.gz) = 324528
+SHA256 (iperf-2.2.0.tar.gz) = FoEKlXXkxt1l5KGKtd882sZzCzyDLPCAqJkPEy9oNko=
+SIZE (iperf-2.2.0.tar.gz) = 477261
diff --git a/net/iperf/patches/patch-configure_ac b/net/iperf/patches/patch-configure_ac
index 9b364fcfc93..9ed269c2b63 100644
--- a/net/iperf/patches/patch-configure_ac
+++ b/net/iperf/patches/patch-configure_ac
@@ -1,13 +1,13 @@
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -73,9 +73,7 @@ dnl Checks for programs
+@@ -127,9 +127,7 @@ dnl Checks for programs
  dnl ===================================================================
  
  AC_PROG_CXX
 -CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
  AC_PROG_CC
 -CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
- AC_ISC_POSIX
+ AC_SEARCH_LIBS([strerror],[cposix])
  AC_PROG_INSTALL
  AC_PROG_MAKE_SET
diff --git a/net/iperf/patches/patch-src_PerfSocket_cpp b/net/iperf/patches/patch-src_PerfSocket_cpp
deleted file mode 100644
index c2c898e7921..00000000000
--- a/net/iperf/patches/patch-src_PerfSocket_cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-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));
- 
-@@ -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" );