iperf3: update to 3.7

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/iperf3 b/lfs/iperf3
index fc84f64687e6acefe5cceae67ea1b58bcd2c01de..842d48cecab5e2127a64a1ef83ee9c569e78b7c0 100644 (file)
--- a/lfs/iperf3
+++ b/lfs/iperf3
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
 #                                                                             #
 # 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        #


@@ -24,7 +24,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 3.1.2
+VER        = 3.7

 
 THISAPP    = iperf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = iperf-$(VER)
 DL_FILE    = $(THISAPP).tar.gz


@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iperf3
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iperf3

-PAK_VER    = 1
+PAK_VER    = 2

 
 DEPS       = ""
 
 
 DEPS       = ""
 


@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = f48a1b45c68647a9d8a8491af44470d6
+$(DL_FILE)_MD5 = 9534aae7430791b46d8cb8fc44afb6f8

 
 install : $(TARGET)
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 install : $(TARGET)
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))


@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 $(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/0001-remove-pg-flag.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch

        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install

diff --git a/src/patches/iperf3/0001-remove-pg-flag.patch b/src/patches/iperf3/0001-remove-pg-flag.patch
deleted file mode 100644 (file)
index 601712d..0000000
--- a/src/patches/iperf3/0001-remove-pg-flag.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From be7dafdb802f39c3ad8bcc896216508842c42751 Mon Sep 17 00:00:00 2001
-From: Jonatan Schlag <jonatan.schlag@ipfire.org>
-Date: Thu, 31 Mar 2016 19:33:17 +0200
-Subject: [PATCH] remove -pg flag
-
-Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
----
- src/Makefile.am | 4 ++--
- src/Makefile.in | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 23b0c72..6268145 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -49,9 +49,9 @@ iperf3_LDFLAGS          = -g
- 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
- 
- # Specify the sources and various flags for the test cases
- t_timer_SOURCES         = t_timer.c
-diff --git a/src/Makefile.in b/src/Makefile.in
-index f7c46ad..016a022 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -610,9 +610,9 @@ iperf3_LDFLAGS = -g
- 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
- 
- # Specify the sources and various flags for the test cases
- t_timer_SOURCES = t_timer.c
--- 
-2.1.4
-

diff --git a/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch b/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch
new file mode 100644 (file)
index 0000000..1dae2c2
--- /dev/null
+++ b/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch
@@ -0,0 +1,30 @@
+diff -Naur iperf-3.7.org/src/Makefile.am iperf-3.7/src/Makefile.am
+--- iperf-3.7.org/src/Makefile.am      2019-06-21 03:12:47.000000000 +0200
++++ iperf-3.7/src/Makefile.am  2019-07-17 12:19:38.133540594 +0200
+@@ -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.7.org/src/Makefile.in iperf-3.7/src/Makefile.in
+--- iperf-3.7.org/src/Makefile.in      2019-06-21 03:12:47.000000000 +0200
++++ iperf-3.7/src/Makefile.in  2019-07-17 12:19:53.133496336 +0200
+@@ -670,9 +670,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