From fd0d18101df1032bdafb9d0afbcd72459e842b81 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 May 2025 17:26:45 +0200
Subject: [PATCH] iperf3: 3.18 -> 3.19

(cherry picked from commit f0b02bea3d9a340c1df3a7c80ab79b6ab9f23c48)
---
 pkgs/tools/networking/iperf/3.nix | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix
index ba0b473a24cc..a40da0378205 100644
--- a/pkgs/tools/networking/iperf/3.nix
+++ b/pkgs/tools/networking/iperf/3.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iperf";
-  version = "3.18";
+  version = "3.19";
 
   src = fetchurl {
     url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz";
-    hash = "sha256-wGGBdVFDMedmUiUA4gyUv7KTtEJOsn1yB/tCe4jSC6s=";
+    hash = "sha256-BAFh2hVV7HQRqdgRkQSYMO83cX1CmpTubPCEJhjg4pw=";
   };
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lksctp-tools ];
@@ -24,23 +24,13 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  patches =
-    [
-      # Patch to exit with 0 on SIGTERM, i.e. stop service cleanly under
-      # systemd. Will be part of the next release.
-      (fetchpatch {
-        url = "https://github.com/esnet/iperf/commit/4bab9bc39d08069976c519868fefa11c35f6c3f0.patch";
-        name = "exit-with-0-on-sigterm.patch";
-        hash = "sha256-klW5UzPckJuZ/1Lx0hXJkGK+NyaqSn5AndBT4P+uajw=";
-      })
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMusl [
-      (fetchpatch {
-        url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb";
-        name = "remove-pg-flags.patch";
-        sha256 = "0z3zsmf7ln08rg1mmzl8s8jm5gp8x62f5cxiqcmi8dcs2nsxwgbi";
-      })
-    ];
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
+    (fetchpatch {
+      url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb";
+      name = "remove-pg-flags.patch";
+      sha256 = "0z3zsmf7ln08rg1mmzl8s8jm5gp8x62f5cxiqcmi8dcs2nsxwgbi";
+    })
+  ];
 
   postInstall = ''
     ln -s $out/bin/iperf3 $out/bin/iperf