From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: New package iPerf3 Date: Tue, 29 Mar 2016 14:56:16 +0100 Message-ID: <1459259776.30749.199.camel@ipfire.org> In-Reply-To: <1450877399.7835.0@smtp.1und1.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6303311119065915257==" List-Id: --===============6303311119065915257== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, I would be interested in merging this as more and more people tend to use ipe= rf3 instead of the legacy one. However, the patch has some whitespace issues. Could you resend it like the other ones? Also fix authorship and the other usual things. Regarding the build error: Don't change the release tarball. You can use sed = to remove the "-pg" flag from src/Makefile.am and then run autoreconf -vfi. After that run ./configure ... && make && make install and the issue should be gone. gcc -pg would add some debugging information for gprof which is handy for development but not useful in release builds. Best, -Michael On Wed, 2015-12-23 at 14:29 +0100, Jonatan Schlag wrote: > Hi, > I build iPerf3 for IPFire, (for reasons look here:=C2=A0http://forum.ipfire= .org/vie > wtopic.php?f=3D50&t=3D15498) and was told =C2=A0that i should submit change= s to the > mailing list. >=20 > Here is a patch with all changes: >=20 > Signed-off-by: Jonatan Schlag >=20 > From a403b42f389cd5617937a0df220c67e279236034 Mon Sep 17 00:00:00 2001 > From: jonaschl > Date: Wed, 23 Dec 2015 13:43:20 +0100 > Subject: [PATCH] new package iPerf 3 >=20 > email: jonnyschlag(a)gmail.com > author: jonaschl > --- > =C2=A0config/rootfiles/packages/iperf3 | 10 +++++ > =C2=A0lfs/iperf3 | 84 ++++++++++++++++++++++++++++++++++++++++ > =C2=A0make.sh | 1 + > =C2=A03 files changed, 95 insertions(+) > =C2=A0create mode 100644 config/rootfiles/packages/iperf3 > =C2=A0create mode 100644 lfs/iperf3 >=20 > diff --git a/config/rootfiles/packages/iperf3 > b/config/rootfiles/packages/iperf3 > new file mode 100644 > index 0000000..717cc96 > --- /dev/null > +++ b/config/rootfiles/packages/iperf3 > @@ -0,0 +1,10 @@ > +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..b8e0cd2 > --- /dev/null > +++ b/lfs/iperf3 > @@ -0,0 +1,84 @@ > +##########################################################################= ### > ## > +# # > +# IPFire.org - A linux based firewall # > +# Copyright (C) 2007-2015 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.1 > + > +THISAPP =3D iperf3-$(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 62e3d2a057cca69e88ebfbf35b7483ef > + > +install : $(TARGET) > + > +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) > + > +download :$(patsubst %,$(DIR_DL)/%,$(objects)) > + > +md5 : $(subst %,%_MD5,$(objects)) > + > +dist:=C2=A0 > + @$(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) && ./configure --prefix=3D/usr > + cd $(DIR_APP) && make $(MAKETUNING) > + cd $(DIR_APP) && make install > + @rm -rf $(DIR_APP) > + @$(POSTBUILD) > diff --git a/make.sh b/make.sh > index 39089cd..b184115 100755 > --- a/make.sh > +++ b/make.sh > @@ -740,6 +740,7 @@ buildipfire() { > =C2=A0 =C2=A0ipfiremake gutenprint > =C2=A0 =C2=A0ipfiremake apcupsd > =C2=A0 =C2=A0ipfiremake iperf > + ipfiremake iperf3 > =C2=A0 =C2=A0ipfiremake netcat > =C2=A0 =C2=A0ipfiremake 7zip > =C2=A0 =C2=A0ipfiremake lynis > --=C2=A0 > 2.1.4 >=20 >=20 > I do not know if i do all right, in the moment I am not so familiar with git > and patches. >=20 > In addition I have a question. When I build iPerf 3 I run into a bug (see h= ttp > s://github.com/esnet/iperf/issues/337). I modified the source package and n= ow > iPerf 3 build. There are c flags which are incompatible. What is the better > style to modify the source package and use this source package or to create= a > patch (what I try but I fail) and use the original source package and patch= it > during the build process? The source package what I use in the moment could= be > find here: http://forum.ipfire.org/download/file.php?id=3D1853 >=20 >=20 >=20 > Yours sincerely Jonatan Schlag >=20 >=20 >=20 --===============6303311119065915257== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlcrb21BQUFvSkVJQjU4UDl2a0FrSEFGMFAvai95K1FUaklnanRieExJYkFsSnZWRlMK REs0V1JtRWNRcmlaT0xzNWt6L09GbVRJQmhzckp0a3JtL3FwWjZWVFhzaGV5aUJPUkgwNnBHS2Fo NHdMajRmSApvVElhNi9QUHgrNDJmaWU5a05KSGFyRlVYYkpjWWRHSEJhTXg5OW1ocVdOVkxWYlFY WUJGSFNTN3c4NWJKNDdGCksxTUFEcUdpSDFXRnh1OFBlVnd4UUVUcWhkT3p4UXpwdGxqRHZYd2Fw b3h1SS9RWlRwdzF0b0J5ZWpuRDZyV0YKODhlbHY1S2FVQ3BoUnV3UE03R29COFJ6SlMwaFJxWU1U WFVmYzViVXlmT0M3OTVQdXY3c1V4TkVpVEZ1NHFQMAplVmJnNVNUNTZkdHJZS1U1dE0zM1U4VWRU RnJjcWdhL2E0U2lJbUZ6TUlJMWNNZXB0ZlUwRGgvcWQ5Mk14NnB6CnNrMjRmbmNETlpRY2RlYmZK Vkh3b0htM3BuRmdBQm8yamUvak1QeWYzUmR6eU1UZDQ2TEN0eFQxQmpmVWVXelgKdnV3K1REejZk dDYxZVIvMFVqTUJwa0pDeDFCUVNwY0RCOTUveFA3SGVQVEJhZG1Ba2d1Qk51SnBrWWhIeDlGTAor OWRkdVljSEt2a2tvbDNsYk9RNTAvbldLL1dEaVpJMDZ2N3BSNDIvKzBybHFjbitkVXBPbUlYamxH MXBtTTBHCm5BUVZER3VPVjNsVDlCdEl4Q0l2VlBjUEIrOEQ0MytURkIzYXMxakZzbnBGSStSdVF4 dU9hUWZvTyttYjAzd0sKT0NVMDhFQWtMSVdxWk54MXFuRmlRc2lWRTUrcU1ZVEZPN0pmVHRMZ2Mw Nnlwb2JXelNjY1pCaUZPY0FWaTNWOQpWNitRUzZqZVpKMHVJNlVwdTZ1aAo9UlZsbgotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============6303311119065915257==--