* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. de8810fbaa42aebf2f2a9949482fca57778db92b
@ 2019-07-17 11:16 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2019-07-17 11:16 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 9747 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via de8810fbaa42aebf2f2a9949482fca57778db92b (commit)
via e4e1b8718e75e72e192e748fb11643ba198d3c08 (commit)
via fd7c2f3a9ea343a1e123694025f166b960857921 (commit)
from 3ec3329dffe9e045c37b1b3d048947bb59cd6fa6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit de8810fbaa42aebf2f2a9949482fca57778db92b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jul 17 13:15:33 2019 +0200
iperf3: update to 3.7
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e4e1b8718e75e72e192e748fb11643ba198d3c08
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jul 17 13:15:01 2019 +0200
iperf: update to 2.0.13
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fd7c2f3a9ea343a1e123694025f166b960857921
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jul 17 13:12:46 2019 +0200
initskripts: fix i586 rootfile
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/i586/initscripts | 4 +-
lfs/iperf | 8 ++--
lfs/iperf3 | 10 ++---
src/patches/iperf3/0001-remove-pg-flag.patch | 46 -----------------------
src/patches/iperf3/iperf-3.7-remove-pg-flag.patch | 30 +++++++++++++++
5 files changed, 41 insertions(+), 57 deletions(-)
delete mode 100644 src/patches/iperf3/0001-remove-pg-flag.patch
create mode 100644 src/patches/iperf3/iperf-3.7-remove-pg-flag.patch
Difference in files:
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 88ec789bc..d74fb743b 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -41,7 +41,7 @@ etc/rc.d/init.d/networking/green
etc/rc.d/init.d/networking/orange
etc/rc.d/init.d/networking/red
#etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
+etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders
etc/rc.d/init.d/networking/red.down/10-ipsec
etc/rc.d/init.d/networking/red.down/10-miniupnpd
etc/rc.d/init.d/networking/red.down/10-ovpn
@@ -49,7 +49,7 @@ etc/rc.d/init.d/networking/red.down/10-static-routes
etc/rc.d/init.d/networking/red.down/20-firewall
#etc/rc.d/init.d/networking/red.up
etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
-etc/rc.d/init.d/networking/red.up/05-remove-dns-forwarders
+etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
etc/rc.d/init.d/networking/red.up/10-miniupnpd
etc/rc.d/init.d/networking/red.up/10-multicast
etc/rc.d/init.d/networking/red.up/10-static-routes
diff --git a/lfs/iperf b/lfs/iperf
index 23a8b7abe..aaace823f 100644
--- a/lfs/iperf
+++ b/lfs/iperf
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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 #
@@ -24,7 +24,7 @@
include Config
-VER = 2.0.9
+VER = 2.0.13
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 = iperf
-PAK_VER = 3
+PAK_VER = 4
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 351b018b71176b8cb25f20eef6a9e37c
+$(DL_FILE)_MD5 = 31ea1c6d5cbf80b16ff3abe4288dad5e
install : $(TARGET)
diff --git a/lfs/iperf3 b/lfs/iperf3
index fc84f6468..842d48cec 100644
--- a/lfs/iperf3
+++ b/lfs/iperf3
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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 #
@@ -24,7 +24,7 @@
include Config
-VER = 3.1.2
+VER = 3.7
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
-PAK_VER = 1
+PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f48a1b45c68647a9d8a8491af44470d6
+$(DL_FILE)_MD5 = 9534aae7430791b46d8cb8fc44afb6f8
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)
- 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
diff --git a/src/patches/iperf3/0001-remove-pg-flag.patch b/src/patches/iperf3/0001-remove-pg-flag.patch
deleted file mode 100644
index 601712d88..000000000
--- 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(a)ipfire.org>
-Date: Thu, 31 Mar 2016 19:33:17 +0200
-Subject: [PATCH] remove -pg flag
-
-Signed-off-by: Jonatan Schlag <jonatan.schlag(a)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
index 000000000..1dae2c211
--- /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(a)iperf3_profile_SOURCES = main.c \
+ @ENABLE_PROFILING_TRUE@ $(libiperf_la_SOURCES)
+
+-(a)ENABLE_PROFILING_TRUE@iperf3_profile_CFLAGS = -pg -g
++(a)ENABLE_PROFILING_TRUE@iperf3_profile_CFLAGS = -g
+ @ENABLE_PROFILING_TRUE(a)iperf3_profile_LDADD = libiperf.la
+-(a)ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -pg -g
++(a)ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -g
+
+ # Specify the sources and various flags for the test cases
+ t_timer_SOURCES = t_timer.c
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-07-17 11:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-17 11:16 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. de8810fbaa42aebf2f2a9949482fca57778db92b Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox