From: Sander Date: Mon, 13 Jan 2025 12:13:42 +0000 (+0000) Subject: iperf: package update to v3.18 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3921a981df1772d6d1db199256bf565537053f9a;p=feed%2Fpackages.git iperf: package update to v3.18 Signed-off-by: Sander --- diff --git a/net/iperf3/Makefile b/net/iperf3/Makefile index 45d4721bf2..a5fe604506 100644 --- a/net/iperf3/Makefile +++ b/net/iperf3/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf -PKG_VERSION:=3.17.1 -PKG_RELEASE:=4 +PKG_VERSION:=3.18 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.es.net/pub/iperf -PKG_HASH:=84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa +PKG_HASH:=c0618175514331e766522500e20c94bfb293b4424eb27d7207fb427b88d20bab PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-3-Clause diff --git a/net/iperf3/patches/010-big-endian.patch b/net/iperf3/patches/010-big-endian.patch new file mode 100644 index 0000000000..f57ef51a4a --- /dev/null +++ b/net/iperf3/patches/010-big-endian.patch @@ -0,0 +1,21 @@ +From fe09305eb6f907e4eb637b8edd0c8a986187d1dd Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Sat, 8 Jun 2024 15:23:51 -0700 +Subject: [PATCH] fix crash under big endian musl + +iperf_printf is using an int format here but an int64_t variable. The format only needs the first 3 digits. Cast to int to fix it. +--- + src/iperf_api.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/iperf_api.c ++++ b/src/iperf_api.c +@@ -4137,7 +4137,7 @@ iperf_print_results(struct iperf_test *t + iperf_printf(test, report_sender_not_available_summary_format, "SUM"); + } + else { +- iperf_printf(test, report_sum_bw_retrans_format, mbuf, start_time, sender_time, ubuf, nbuf, total_retransmits, report_sender); ++ iperf_printf(test, report_sum_bw_retrans_format, mbuf, start_time, sender_time, ubuf, nbuf, (int)total_retransmits, report_sender); + } + } else { + /* Summary sum, TCP without retransmits. */ diff --git a/net/iperf3/patches/010-y2k.patch b/net/iperf3/patches/010-y2k.patch deleted file mode 100644 index 86350d1ad8..0000000000 --- a/net/iperf3/patches/010-y2k.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 4c7629f590bb18855e478a826833adb05d2a128b Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Sat, 8 Jun 2024 15:35:47 -0700 -Subject: [PATCH] fix -Wformat-y2k error - -%c potentially prints a 2 digit year. Just use a normal format. ---- - src/iperf_error.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/iperf_error.c -+++ b/src/iperf_error.c -@@ -99,7 +99,7 @@ iperf_errexit(struct iperf_test *test, c - if (test != NULL && test->timestamps) { - time(&now); - ltm = localtime(&now); -- strftime(iperf_timestrerr, sizeof(iperf_timestrerr), "%c ", ltm); -+ strftime(iperf_timestrerr, sizeof(iperf_timestrerr), "%Y-%m-%d %H:%M:%S", ltm); - ct = iperf_timestrerr; - } - diff --git a/net/iperf3/patches/020-big-endian.patch b/net/iperf3/patches/020-big-endian.patch deleted file mode 100644 index 35490c9dec..0000000000 --- a/net/iperf3/patches/020-big-endian.patch +++ /dev/null @@ -1,21 +0,0 @@ -From fe09305eb6f907e4eb637b8edd0c8a986187d1dd Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Sat, 8 Jun 2024 15:23:51 -0700 -Subject: [PATCH] fix crash under big endian musl - -iperf_printf is using an int format here but an int64_t variable. The format only needs the first 3 digits. Cast to int to fix it. ---- - src/iperf_api.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/iperf_api.c -+++ b/src/iperf_api.c -@@ -4056,7 +4056,7 @@ iperf_print_results(struct iperf_test *t - iperf_printf(test, report_sender_not_available_summary_format, "SUM"); - } - else { -- iperf_printf(test, report_sum_bw_retrans_format, mbuf, start_time, sender_time, ubuf, nbuf, total_retransmits, report_sender); -+ iperf_printf(test, report_sum_bw_retrans_format, mbuf, start_time, sender_time, ubuf, nbuf, (int)total_retransmits, report_sender); - } - } else { - /* Summary sum, TCP without retransmits. */ diff --git a/net/iperf3/patches/030-musl-crash.patch b/net/iperf3/patches/030-musl-crash.patch deleted file mode 100644 index bc1df68c8e..0000000000 --- a/net/iperf3/patches/030-musl-crash.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 3da07ae96f5b40f76b75e1ccd4b20267f6a5988e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= -Date: Wed, 28 Aug 2024 09:43:04 +0200 -Subject: [PATCH] remove incorrect freeaddrinfo call - ---- - src/net.c | 1 - - 1 file changed, 1 deletion(-) - ---- a/src/net.c -+++ b/src/net.c -@@ -145,7 +145,6 @@ create_socket(int domain, int proto, con - if ((gerror = getaddrinfo(server, portstr, &hints, &server_res)) != 0) { - if (local) - freeaddrinfo(local_res); -- freeaddrinfo(server_res); - return -1; - } -