From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH] New package iperf3 Date: Fri, 01 Apr 2016 21:49:02 +0200 Message-ID: <1459540142-20775-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8980226479012699592==" List-Id: --===============8980226479012699592== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Jonatan Schlag --- config/rootfiles/packages/iperf3 | 9 +++ lfs/iperf3 | 84 ++++++++++++++++++++++++++= ++ make.sh | 1 + src/patches/iperf3/0001-remove-pg-flag.patch | 46 +++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 config/rootfiles/packages/iperf3 create mode 100644 lfs/iperf3 create mode 100644 src/patches/iperf3/0001-remove-pg-flag.patch diff --git a/config/rootfiles/packages/iperf3 b/config/rootfiles/packages/ipe= rf3 new file mode 100644 index 0000000..7057f11 --- /dev/null +++ b/config/rootfiles/packages/iperf3 @@ -0,0 +1,9 @@ +usr/bin/iperf3 +#usr/include/iperf_api.h +#usr/lib/libiperf.a +#usr/lib/libiperf.la +#usr/lib/libiperf.so +usr/lib/libiperf.so.0 +usr/lib/libiperf.so.0.0.0 +#usr/share/man/man1/iperf3.1 +#usr/share/man/man3/libiperf.3 diff --git a/lfs/iperf3 b/lfs/iperf3 new file mode 100644 index 0000000..9eb1e8a --- /dev/null +++ b/lfs/iperf3 @@ -0,0 +1,84 @@ +############################################################################= ### +# = # +# IPFire.org - A linux based firewall = # +# Copyright (C) 2007-2016 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 = # +# the Free Software Foundation, either version 3 of the License, or = # +# (at your option) any later version. = # +# = # +# This program is distributed in the hope that it will be useful, = # +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # +# GNU General Public License for more details. = # +# = # +# You should have received a copy of the GNU General Public License = # +# along with this program. If not, see . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 3.1.2 + +THISAPP =3D iperf-$(VER) +DL_FILE =3D $(THISAPP).tar.gz +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D iperf3 +PAK_VER =3D 1 + +DEPS =3D "" + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D f48a1b45c68647a9d8a8491af44470d6 + +install : $(TARGET) +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist:. + $(PAK) + +############################################################################= ### +# Downloading, checking, md5sum +############################################################################= ### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################= ### +# Installation Details +############################################################################= ### + +$(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) && ./configure --prefix=3D/usr + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index b32dfd2..af70b6e 100755 --- a/make.sh +++ b/make.sh @@ -749,6 +749,7 @@ buildipfire() { ipfiremake gutenprint ipfiremake apcupsd ipfiremake iperf + ipfiremake iperf3 ipfiremake netcat ipfiremake 7zip ipfiremake lynis diff --git a/src/patches/iperf3/0001-remove-pg-flag.patch b/src/patches/iperf= 3/0001-remove-pg-flag.patch new file mode 100644 index 0000000..601712d --- /dev/null +++ b/src/patches/iperf3/0001-remove-pg-flag.patch @@ -0,0 +1,46 @@ +From be7dafdb802f39c3ad8bcc896216508842c42751 Mon Sep 17 00:00:00 2001 +From: Jonatan Schlag +Date: Thu, 31 Mar 2016 19:33:17 +0200 +Subject: [PATCH] remove -pg flag + +Signed-off-by: Jonatan Schlag +--- + 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 =3D -g + iperf3_profile_SOURCES =3D main.c \ + $(libiperf_la_SOURCES) +=20 +-iperf3_profile_CFLAGS =3D -pg -g ++iperf3_profile_CFLAGS =3D -g + iperf3_profile_LDADD =3D libiperf.la +-iperf3_profile_LDFLAGS =3D -pg -g ++iperf3_profile_LDFLAGS =3D -g +=20 + # Specify the sources and various flags for the test cases + t_timer_SOURCES =3D 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 =3D -g + iperf3_profile_SOURCES =3D main.c \ + $(libiperf_la_SOURCES) +=20 +-iperf3_profile_CFLAGS =3D -pg -g ++iperf3_profile_CFLAGS =3D -g + iperf3_profile_LDADD =3D libiperf.la +-iperf3_profile_LDFLAGS =3D -pg -g ++iperf3_profile_LDFLAGS =3D -g +=20 + # Specify the sources and various flags for the test cases + t_timer_SOURCES =3D t_timer.c +--=20 +2.1.4 + --=20 2.1.4 --===============8980226479012699592==--