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 # +# Copyright (C) 2007-2023 IPFire Team # # # # 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