Reviewed-by: Peter Müller peter.mueller@ipfire.org
- Update from version 3.10.1 to 3.12
- Update of rootfile not required
- patch to remove pg flag no longer needed. Source code no longer has pg flag set in CFLAGS
- Changelog iperf-3.12 2022-09-30 * Notable user-visible changes * cJSON has been updated to version 1.7.15 (#1383). * The --bind <host>%<dev> option syntax now works properly (#1360 / #1371). * A server-side file descriptor leak with the --logfile option has been fixed (#1369 / #1360 / #1369 / #1389 / #1393). * A bug that caused some large values from TCP_INFO to be misprinted as negative numbers has been fixed (#1372). * Using the -k or -n flags with --reverse no longer leak into future tests (#1363 / #1364). * There are now various debug level options available with the --debug option. These can be used to adjust the amount of debugging output (#1327). * A new --snd-timeout option has been added to set a termination timeout for idle TCP connections (#1215 / #1282). * iperf3 is slightly more robust to out-of-order packets during UDP connection setup in --reverse mode (#914 / #1123 / #1182 / #1212 / #1260). * iperf3 will now use different ports for each direction when the --cport and --bdir options are set (#1249 / #1259). * The iperf3 server will now exit if it can't open its log file (#1225 / #1251). * Various help message and output fixes have been made (#1299 / #1330 / #1345 / #1350). * Various compiler warnings have been fixed (#1211 / #1316). * Developer-visible changes * Operation of bootstrap.sh has been fixed and simplified (#1335 / #1325). * Flow label support / compatibility under Linux has been improved (#1310). * Various minor memory leaks have been fixed (#1332 / #1333). * A getter/setter has been added for the bind_port parameter (--cport option). (#1303, #1305) * Various internal documentation improvements (#1265 / #1285 / #1304). iperf-3.11 2022-01-31 * Notable user-visible changes * Update links to Discussions in documentation * Fix DSCP so that TOS = DSCP * 4 (#1162) * Fix --bind-dev for TCP streams (#1153) * Fix interface specification so doesn't overlap with IPv6 link-local addresses for -c and -B (#1157, #1180) * Add get/set test_unit_format function declaration to iperf_api.h * Auto adjustment of test-end condition for file transfers (-F), if no end condition is set, it will automatically adjust it to file size in bytes * Exit if idle time expires waiting for a connection in one-off mode (#1187, #1197) * Support zerocopy by reverse mode (#1204) * Update help and manpage text for #1157, support bind device * Consistently print target_bandwidth in JSON start section (#1177) * Test bitrate added to JSON output (#1168) * Remove fsync call after every write to receiving --file (#1176, #1159) * Update documentation for -w (#1175) * Fix for #952, different JSON object names for bidir reverse channel
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
lfs/iperf3 | 9 +++--- .../iperf3/iperf-3.9-remove-pg-flag.patch | 30 ------------------- 2 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 src/patches/iperf3/iperf-3.9-remove-pg-flag.patch
diff --git a/lfs/iperf3 b/lfs/iperf3 index d5422d502..434764b66 100644 --- a/lfs/iperf3 +++ b/lfs/iperf3 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ include Config
SUMMARY = A tool to measure network performance
-VER = 3.10.1 +VER = 3.12
THISAPP = iperf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iperf3 -PAK_VER = 4 +PAK_VER = 5
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8390b4fb0d4c6590bf73e46d55fbe100f1c9832b4e7baba23b4bec2808b42582bf76cc4250c529a1eb4a58c7214120f0e3a393a7c2602b838b22d97eb53842b3 +$(DL_FILE)_BLAKE2 = 95753e4fd2b7ca640b17501f6b21b0e63ea0a3df2ba920c672ffcccd991502cacf4bf3641be1ffbbb993c86e6915ceada5745cffe1796bb86b6a6a1dff8811ae
install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -80,7 +80,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iperf3/iperf-3.9-remove-pg-flag.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
diff --git a/src/patches/iperf3/iperf-3.9-remove-pg-flag.patch b/src/patches/iperf3/iperf-3.9-remove-pg-flag.patch deleted file mode 100644 index e5fafe4af..000000000 --- a/src/patches/iperf3/iperf-3.9-remove-pg-flag.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur iperf-3.9.org/src/Makefile.am iperf-3.9/src/Makefile.am ---- iperf-3.9.org/src/Makefile.am 2020-08-15 00:08:27.000000000 +0200 -+++ iperf-3.9/src/Makefile.am 2020-12-22 22:16:14.488228000 +0100 -@@ -58,9 +58,9 @@
- iperf3_profile_SOURCES = main.c \
$(libiperf_la_SOURCES)--iperf3_profile_CFLAGS = -pg -g -+iperf3_profile_CFLAGS = -g
- iperf3_profile_LDADD = libiperf.la
--iperf3_profile_LDFLAGS = -pg -g -+iperf3_profile_LDFLAGS = -g
- endif
- # Specify the sources and various flags for the test cases
-diff -Naur iperf-3.9.org/src/Makefile.in iperf-3.9/src/Makefile.in ---- iperf-3.9.org/src/Makefile.in 2020-08-15 00:08:27.000000000 +0200 -+++ iperf-3.9/src/Makefile.in 2020-12-22 22:16:41.934746000 +0100 -@@ -680,9 +680,9 @@
- @ENABLE_PROFILING_TRUE@iperf3_profile_SOURCES = main.c \
- @ENABLE_PROFILING_TRUE@ $(libiperf_la_SOURCES)
--@ENABLE_PROFILING_TRUE@iperf3_profile_CFLAGS = -pg -g -+@ENABLE_PROFILING_TRUE@iperf3_profile_CFLAGS = -g
- @ENABLE_PROFILING_TRUE@iperf3_profile_LDADD = libiperf.la
--@ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -pg -g -+@ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -g
- # Specify the sources and various flags for the test cases
- t_timer_SOURCES = t_timer.c