[PR PATCH] iperf: update to 2.1.7.

[PR PATCH] iperf: update to 2.1.7.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 665 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages iperf
https://github.com/void-linux/void-packages/pull/36652

iperf: update to 2.1.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

One patch was upstreamed. The other one was reordering includes to avoid redefinition of `struct ethhdr`; it turns out using `-D__UAPI_DEF_ETHHDR=0` has the same effect and it's easier to maintain.

A patch file from https://github.com/void-linux/void-packages/pull/36652.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iperf-36652.patch --]
[-- Type: text/x-diff, Size: 3577 bytes --]

From 33db3fbf63583dd8678d4f061f284173b8bde8cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 12 Apr 2022 00:00:38 -0300
Subject: [PATCH] iperf: update to 2.1.7.

---
 .../iperf/patches/fix-gettcpinfo-musl.patch   | 20 -------------
 .../patches/reorder-includes-for-musl.patch   | 28 -------------------
 srcpkgs/iperf/template                        | 12 ++++++--
 3 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
 delete mode 100644 srcpkgs/iperf/patches/reorder-includes-for-musl.patch

diff --git a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
deleted file mode 100644
index 71d8abf70585..000000000000
--- a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-It seems there was a broken commit meant to fix compilation on win32,
-but this broke compilation on musl.
-
-See:
-
-https://sourceforge.net/p/iperf2/code/ci/c8f861a0a07b0606a581f2658c71959ad9417923/
-
-for the broken commit. The current patch fixes that by completing the
-definition of gettcpinfo() to what it was before the broken commit.
-
---- a/compat/gettcpinfo.c	2021-12-05 17:49:56.000000000 -0300
-+++ b/compat/gettcpinfo.c	2021-12-11 19:29:24.850947483 -0300
-@@ -99,4 +99,7 @@
- };
- #else
- inline void gettcpinfo (int sock, struct ReportStruct *sample) {
-+    sample->tcpstats.rtt = 1;
-+    sample->tcpstats.isValid  = false;
-+};
- #endif
diff --git a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
deleted file mode 100644
index 066620c8666c..000000000000
--- a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Change order of includes to fix compilation with musl libc
-
---- a/include/headers.h	2021-08-16 14:27:51.000000000 -0300
-+++ b/include/headers.h	2021-10-01 23:42:09.471528972 -0300
-@@ -106,11 +106,6 @@
- #include <net/if.h>
- #endif
- 
--#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
--#include <linux/if_tun.h>
--#include <sys/ioctl.h>
--#endif
--
- 
- // AF_PACKET HEADERS
- #if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_AF_PACKET)
-@@ -146,6 +141,11 @@
- #define  IPV6HDRLEN 40
- #endif // HAVE_AF_PACKET
- 
-+#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
-+#include <linux/if_tun.h>
-+#include <sys/ioctl.h>
-+#endif
-+
- #ifdef WIN32
- 
- /* Windows config file */
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index 555b5670914f..7157ebba77cd 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf'
 pkgname=iperf
-version=2.1.6
+version=2.1.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
@@ -9,8 +9,16 @@ short_desc="Perform network throughput tests"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="NCSA"
 homepage="https://iperf.fr/"
+changelog="https://sourceforge.net/p/iperf2/code/ci/master/tree/doc/RELEASE_NOTES?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=4a43e44439b95622aebeee55754a17d1c94076032e90620dfc1ab9908cb9e080
+checksum=1aba2e1d7aa43641ef841951ed88e16cffba898460e0c51e6b2806f3ff20e9d4
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	# do not define struct ethhdr in <linux/if_ether.h> to avoid
+	# redefinition in <netinet/if_ether.h>
+	CFLAGS="-D__UAPI_DEF_ETHHDR=0"
+	CXXFLAGS="-D__UAPI_DEF_ETHHDR=0"
+fi
 
 post_install() {
 	vlicense COPYING LICENSE

Re: [PR PATCH] [Merged]: iperf: update to 2.1.7.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

There's a merged pull request on the void-packages repository

iperf: update to 2.1.7.
https://github.com/void-linux/void-packages/pull/36652

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

One patch was upstreamed. The other one was reordering includes to avoid redefinition of `struct ethhdr`; it turns out using `-D__UAPI_DEF_ETHHDR=0` has the same effect and it's easier to maintain.