* [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/, net-misc/iperf/files/
@ 2016-02-16 16:38 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2016-02-16 16:38 UTC (permalink / raw
To: gentoo-commits
commit: e156086d1cc28d0f73b872ad12fe4e1239811e94
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 16:38:19 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 16:38:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e156086d
net-misc/iperf: Version bump.
Add init.d/conf.d scripts for iamben
Package-Manager: portage-2.2.27
net-misc/iperf/Manifest | 2 +-
net-misc/iperf/files/iperf3.initd | 11 +++++++++++
net-misc/iperf/{iperf-3.1_beta3.ebuild => iperf-3.1.2.ebuild} | 7 ++++++-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index fd65456..573134b 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,3 +1,3 @@
DIST iperf-2.0.5.tar.gz 248583 SHA256 636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b SHA512 da9a0c01dea2a9dd33aa130b11d938d5f44dd6c3ab27526b0a43df5bf2550fede04238a00b7d54037426afe90ac6d8c4f4ae6861aa170ca7835b6664c9d6537f WHIRLPOOL d66b007fad372516c7f7377872b69ea450fa9ff6d1492f2a224a73f2fb3f7616bd2d57a34a815d4d95683d81fd02d76472d4727323e920410034ba725f6476ce
DIST iperf-3.0.11.tar.gz 426434 SHA256 c774b807ea4db20e07558c47951df186b6fb1dd0cdef4282c078853ad87cc712 SHA512 292b826099a1fc813f2fbe4506f8bd8b3b2e4dde04e33a097cce966d7502b3c521a29b9ba74e55fe38406fdb85090695f59febbf4ca31bb1ffc801b3b7615d19 WHIRLPOOL e16799997d7e3c0abe2e2a93bd559a69c0d3c96aab954cd9fb4be93cc8ce4f38c7a2ced034b1b03b2dc257bd5c82d202b4da528ee11f86ed99890fb02cad4b04
-DIST iperf-3.1_beta3.tar.gz 542912 SHA256 ed96fd8dcc7150f3bb93536e3f1858121210e7f90cd637d76400e26cb1426679 SHA512 eab26b54a14e86fbe1503979b5924abdb3438710c7baf782fef97e7170f4d81eb9946b000fadd89d123daecb03b6a09fc429615c076fb0a444d30929983e3be8 WHIRLPOOL a627a88fe7c863af354a7e00bfe066bd06daee7e1fc72de385d4294b7304bd7ce1af7c35a0bf257305b5851db8a1b376d58f39e2053c8aa801b7a16bae0c9531
+DIST iperf-3.1.2.tar.gz 545107 SHA256 48b5c783bb4a9c44f2bdcfe52c5d45b77ab1e1c82de3d0131f692457950811f9 SHA512 f0503e8dc77c575fe85f0800da9242da73c7d1ffce3aae0971f8fe7c5c3e74901ebdc3956bfe0bb58a5ffe4f6ccbe5a6d5402f188b0ceb1a02c410f5589a568d WHIRLPOOL 1537ba5a9e300b2b67ff42ba78fe97c09f99891feff6e2b66ec460dd1c12e29acdfee1e17b3af2d5a74aac17bd4bb635b0a268646b1117d5147dd8790ad77af9
diff --git a/net-misc/iperf/files/iperf3.initd b/net-misc/iperf/files/iperf3.initd
new file mode 100644
index 0000000..d02f560
--- /dev/null
+++ b/net-misc/iperf/files/iperf3.initd
@@ -0,0 +1,11 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="IP bandwidth measurement server"
+command="/usr/bin/iperf3"
+
+command_background="yes"
+pidfile="/run/${SVCNAME}.pid"
+command_args="-s ${IPERF_OPTS}"
diff --git a/net-misc/iperf/iperf-3.1_beta3.ebuild b/net-misc/iperf/iperf-3.1.2.ebuild
similarity index 88%
rename from net-misc/iperf/iperf-3.1_beta3.ebuild
rename to net-misc/iperf/iperf-3.1.2.ebuild
index 6e0d184..985ad2a 100644
--- a/net-misc/iperf/iperf-3.1_beta3.ebuild
+++ b/net-misc/iperf/iperf-3.1.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit autotools eutils
DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
@@ -20,6 +20,9 @@ S=${WORKDIR}/${P/_beta/b}
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0.5-flags.patch
+
+ eapply_user
+
eautoreconf
}
@@ -29,5 +32,7 @@ src_configure() {
src_install() {
default
+ newconfd "${FILESDIR}"/iperf.confd iperf3
+ newinitd "${FILESDIR}"/iperf3.initd iperf3
prune_libtool_files
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/, net-misc/iperf/files/
@ 2017-02-07 15:52 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2017-02-07 15:52 UTC (permalink / raw
To: gentoo-commits
commit: 5f05166700675083fedae19c63a6110fce7d47cd
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 15:46:30 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 15:46:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f051667
net-misc/iperf: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-misc/iperf/Manifest | 3 -
.../files/iperf-bidirectional-tcp-server.patch | 23 ------
.../iperf-cast-to-max_size_t-instead-of-int.patch | 20 -----
net-misc/iperf/files/iperf-die-on-bind-fail.patch | 19 -----
.../iperf/files/iperf-fix-bandwidth-limit.patch | 21 -----
.../files/iperf-fix-format-security-ftbfs.patch | 96 ----------------------
net-misc/iperf/files/iperf-ipv6_mcast_check.patch | 22 -----
net-misc/iperf/iperf-2.0.5-r2.ebuild | 38 ---------
net-misc/iperf/iperf-3.0.12.ebuild | 28 -------
net-misc/iperf/iperf-3.1.4.ebuild | 40 ---------
10 files changed, 310 deletions(-)
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 23d525e..2566a4f 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,7 +1,4 @@
-DIST iperf-2.0.5.tar.gz 248583 SHA256 636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b SHA512 da9a0c01dea2a9dd33aa130b11d938d5f44dd6c3ab27526b0a43df5bf2550fede04238a00b7d54037426afe90ac6d8c4f4ae6861aa170ca7835b6664c9d6537f WHIRLPOOL d66b007fad372516c7f7377872b69ea450fa9ff6d1492f2a224a73f2fb3f7616bd2d57a34a815d4d95683d81fd02d76472d4727323e920410034ba725f6476ce
DIST iperf-2.0.9.tar.gz 277702 SHA256 a5350777b191e910334d3a107b5e5219b72ffa393da4186da1e0a4552aeeded6 SHA512 ff75e51af9d368eedb1e1dc4621f7575219525f0e438f1c8fa896aa7e990a6812a9a351db9004952057d81127f52b67350820e85c9ae1d8db2e6a60c1f2534d2 WHIRLPOOL 044a189931459dca8fc35d94d5d0518533a104cf3981d33f0ab768a98ed5bec971799468146d5d980b614341afcff81d939a35e6ba9bd4c221311520d8fa1c19
-DIST iperf-3.0.12.tar.gz 432822 SHA256 280ecdb1b29b8c2dcb502f91be1575ac9e86cc3be198b3a009d8561f5b1bec89 SHA512 7b013e890b27482959a0e60e211ec53f717b895600047f553b34394d36276ba4bf8bcb2344b0c0f9d63ac57d84c597ff6ef316246d5e19fed1cac50f75c7118f WHIRLPOOL 0765e3b2f37cfb9c8124b81dec7157ac6f457cd43511be4c391defc1142e62d5f4a17a9b048dfdb1aca71f3f1bb8db77d7193ab88a4808039c64c0424524d4f7
DIST iperf-3.1.3.tar.gz 549466 SHA256 e34cf60cffc80aa1322d2c3a9b81e662c2576d2b03e53ddf1079615634e6f553 SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9 WHIRLPOOL 0082f5156df751cbed49e86f794a48ff05857cd7cd4ee3bdb57f4df763a323d84f47d9e0b01e0b5932ae1e065bcf8ac706e6b96b6ac5ecee2daad6615ca4f38d
-DIST iperf-3.1.4.tar.gz 550496 SHA256 8d88aa8d1e197084a84994cc1caf2c3eff69e60ce4badc0addeb35d02ec57109 SHA512 00d9018d93fbe4fa3b8c7dc06e2eb55463f52f7d25d0b1573cf685a526b2d7ea3298d4fb304962718724a96aecd1733e2c5d6b957822b200cb8a76bb39c2ff17 WHIRLPOOL 5326334ed004529b25f8a7462d7672eedceefc22dad445728771a843e7289eeaca61e30d95ad3d9251e994b3327ed7923e8d83937a7af3d823e4dc9056299314
DIST iperf-3.1.5.tar.gz 553119 SHA256 e1ba284bc23269f17b850d9f3ed5258719d1a62e35ec7cfc9d943bca11cb6563 SHA512 12880834bb2070abcc88d03341acc795da25047b36b5815a8aabd1eff77122dcbead7549f1ebdfeb072cf6d605771eb708f1af7e776f87ea3b0ef94ac64d939d WHIRLPOOL 8c2d6c5a54e7a716f20052954555fe6579348a3ea12988db715c654c9639dcb5c7c31e394cb4da9b535200c45f9460c61faf14dc9ecfa4c65a14253a37b31200
DIST iperf-3.1.6.tar.gz 553240 SHA256 18326abe2cc4adafceb40ddbd0243a18624facbfbabdc83b4281893032f05073 SHA512 9dbfa3782d9ccbdf2beebac0248fcdaf80bb50c55ab95dad89cf972cbe5bd405b2a11d37c45a20956316edb789a7c4bf3ead4fd8592b1857a23a92807954fba3 WHIRLPOOL 2cb3da3a973c0d69e15dfae08cefb6a3c912cce6378635dfe80ab40c12c5242a494625c242d818d4702e9ab31708813e06946570921c6d6460ab8e3163eb4438
diff --git a/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch b/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
deleted file mode 100644
index 98206ae..00000000
--- a/net-misc/iperf/files/iperf-bidirectional-tcp-server.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix bidirectional TCP server exiting after the test
- iperf bidirectional test using parameter -r or -d doesn't work as
- expected, the server exits after the test, but it should continue listening
- for new connections.
-Author: Roberto Lumbreras <rover@debian.org>
-Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=449796
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=1983829&group_id=128336&atid=711371
-
---- a/src/Client.cpp
-+++ b/src/Client.cpp
-@@ -212,10 +212,12 @@ void Client::Run( void ) {
- char* readAt = mBuf;
-
- #if HAVE_THREAD
-+ /*
- if ( !isUDP( mSettings ) ) {
- RunTCP();
- return;
- }
-+ */
- #endif
-
- // Indicates if the stream is readable
diff --git a/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch b/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
deleted file mode 100644
index 34d37ee..00000000
--- a/net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: iperf does not handle right large time values
- Reported by Eugene Butan <eugene@mikrotik.com>
- When I invoke 'iperf' with '-t 100000000' argument from an ordinary shell
- prompt it immediately exits displaying incorrect bandwidth. If I supply
- smaller time value, iperf works as expected.
-Author: Roberto Lumbreras <rover@debian.org>
-Bug-Debian: http://bugs.debian.org/346099
-Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=3140391&group_id=128336&atid=711371
-
---- a/src/Settings.cpp
-+++ b/src/Settings.cpp
-@@ -458,7 +458,7 @@
- case 't': // seconds to write for
- // time mode (instead of amount mode)
- setModeTime( mExtSettings );
-- mExtSettings->mAmount = (int) (atof( optarg ) * 100.0);
-+ mExtSettings->mAmount = (max_size_t) (atof( optarg ) * 100.0);
- break;
-
- case 'u': // UDP instead of TCP
diff --git a/net-misc/iperf/files/iperf-die-on-bind-fail.patch b/net-misc/iperf/files/iperf-die-on-bind-fail.patch
deleted file mode 100644
index 1f54cf5..00000000
--- a/net-misc/iperf/files/iperf-die-on-bind-fail.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: iperf die on bind fail
- When iperf encounters a fatal error when binding to a port, such as
- the port being already in use or lacking permission, it fails to give
- fatal error, but instead pretends to continue to listen on the port.
-Author: Deny IP Any Any <denyipanyany@gmail.com>
-Bug-Debian: http://bugs.debian.org/517239
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3140400&group_id=128336&atid=711371
-
---- a/src/Listener.cpp
-+++ b/src/Listener.cpp
-@@ -333,7 +333,7 @@
- #endif
- {
- rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local, mSettings->size_local );
-- WARN_errno( rc == SOCKET_ERROR, "bind" );
-+ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
- }
- // listen for connections (TCP only).
- // default backlog traditionally 5
diff --git a/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch b/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
deleted file mode 100644
index eb9df8c..00000000
--- a/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-2011-10-14 Israel G. Lugo <israel.lugo@lugosys.com>
-
-* Fix delay_loop() for delays of 1s and greater. Was causing breakage when a
-low bandwidth limit was specified.
-
-
---- a/compat/delay.cpp
-+++ b/compat/delay.cpp
-@@ -63,8 +63,9 @@ void delay_loop(unsigned long usec)
- {
- struct timespec requested, remaining;
-
-- requested.tv_sec = 0;
-- requested.tv_nsec = usec * 1000L;
-+ /* convert to seconds; nanosleep requires 0 <= tv_nsec <= 999999999 */
-+ requested.tv_sec = usec / 1000000UL;
-+ requested.tv_nsec = (usec % 1000000UL) * 1000UL;
-
- while (nanosleep(&requested, &remaining) == -1)
- if (errno == EINTR)
diff --git a/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch b/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
deleted file mode 100644
index 2f5b032..00000000
--- a/net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Description: iperf format string FTBFS with -Werror=format-security
- Reported by Didier Raboud <odyx@debian.org>
-Author: Simon Paillard <spaillard@debian.org>
-Bug-Debian: http://bugs.debian.org/643408
-
---- a/compat/Thread.c
-+++ b/compat/Thread.c
-@@ -381,7 +381,7 @@
- Condition_Lock( thread_sNum_cond );
- thread_sNum -= nonterminating_num;
- if ( thread_sNum > 1 && nonterminating_num > 0 && interrupt != 0 ) {
-- fprintf( stderr, wait_server_threads );
-+ fprintf( stderr, "%s", wait_server_threads );
- }
- nonterminating_num = 0;
- Condition_Signal( &thread_sNum_cond );
---- a/src/ReportDefault.c
-+++ b/src/ReportDefault.c
-@@ -78,7 +78,7 @@
- if ( stats->mUDP != (char)kMode_Server ) {
- // TCP Reporting
- if( !header_printed ) {
-- printf( report_bw_header);
-+ printf( "%s", report_bw_header);
- header_printed = 1;
- }
- printf( report_bw_format, stats->transferID,
-@@ -87,7 +87,7 @@
- } else {
- // UDP Reporting
- if( !header_printed ) {
-- printf( report_bw_jitter_loss_header);
-+ printf( "%s", report_bw_jitter_loss_header);
- header_printed = 1;
- }
- printf( report_bw_jitter_loss_format, stats->transferID,
-@@ -159,7 +159,7 @@
- (data->mThreadMode == kMode_Listener ? 0 : 1) );
- win_requested = data->mTCPWin;
-
-- printf( separator_line );
-+ printf( "%s", separator_line );
- if ( data->mThreadMode == kMode_Listener ) {
- printf( server_port,
- (isUDP( data ) ? "UDP" : "TCP"),
-@@ -198,7 +198,7 @@
- printf( warn_window_requested, buffer );
- }
- printf( "\n" );
-- printf( separator_line );
-+ printf( "%s", separator_line );
- }
-
- /*
-@@ -286,7 +286,7 @@
- } else if ( checkMSS_MTU( inMSS, 576 ) ) {
- net = "minimum";
- mtu = 576;
-- printf( warn_no_pathmtu );
-+ printf( "%s", warn_no_pathmtu );
- } else {
- mtu = inMSS + 40;
- net = "unknown interface";
---- a/src/Reporter.c
-+++ b/src/Reporter.c
-@@ -896,7 +896,7 @@
- } else if ( checkMSS_MTU( inMSS, 576 ) ) {
- net = "minimum";
- mtu = 576;
-- printf( warn_no_pathmtu );
-+ printf( "%s", warn_no_pathmtu );
- } else {
- mtu = inMSS + 40;
- net = "unknown interface";
---- a/src/Settings.cpp
-+++ b/src/Settings.cpp
-@@ -375,8 +375,8 @@
- break;
-
- case 'h': // print help and exit
-- fprintf(stderr, usage_long1);
-- fprintf(stderr, usage_long2);
-+ fprintf(stderr, "%s", usage_long1);
-+ fprintf(stderr, "%s", usage_long2);
- exit(1);
- break;
-
-@@ -482,7 +482,7 @@
- break;
-
- case 'v': // print version and exit
-- fprintf( stderr, version );
-+ fprintf( stderr, "%s", version );
- exit(1);
- break;
-
diff --git a/net-misc/iperf/files/iperf-ipv6_mcast_check.patch b/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
deleted file mode 100644
index bef0525..00000000
--- a/net-misc/iperf/files/iperf-ipv6_mcast_check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix improper check for IPv6 family when sending multicast
- This patch fixes the proper behavior of -T (hop-limit setting) when
- sending IPv6 multicast packets. Due to this bug, it was always fixed to 1.
- .
- SetSocketOptions() is called before socket connection, thus sa_family is
- still set to 0. This is causing the if-branch in the multicast check
- to always assume a non-IPv6 socket.
- Checking the remote-peer family works reliably, instead.
-Author: Luca Bruno <lucab@debian.org>
-Last-Update: 2012-05-24
-
---- a/src/PerfSocket.cpp
-+++ b/src/PerfSocket.cpp
-@@ -109,7 +109,7 @@ void SetSocketOptions( thread_Settings *
- if ( isMulticast( inSettings ) && ( inSettings->mTTL > 0 ) ) {
- int val = inSettings->mTTL;
- #ifdef HAVE_MULTICAST
-- if ( !SockAddr_isIPv6( &inSettings->local ) ) {
-+ if ( !SockAddr_isIPv6( &inSettings->peer ) ) {
- int rc = setsockopt( inSettings->mSock, IPPROTO_IP, IP_MULTICAST_TTL,
- (const void*) &val, (Socklen_t) sizeof(val));
-
diff --git a/net-misc/iperf/iperf-2.0.5-r2.ebuild b/net-misc/iperf/iperf-2.0.5-r2.ebuild
deleted file mode 100644
index 376576b..00000000
--- a/net-misc/iperf/iperf-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="http://iperf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="2"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="ipv6 threads debug"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-fix-bandwidth-limit.patch
- "${FILESDIR}"/${PN}-cast-to-max_size_t-instead-of-int.patch
- "${FILESDIR}"/${PN}-die-on-bind-fail.patch
- "${FILESDIR}"/${PN}-bidirectional-tcp-server.patch
- "${FILESDIR}"/${PN}-fix-format-security-ftbfs.patch
- "${FILESDIR}"/${PN}-ipv6_mcast_check.patch
- )
-DOCS="INSTALL README"
-
-src_configure() {
- econf \
- $(use_enable ipv6) \
- $(use_enable threads) \
- $(use_enable debug debuginfo)
-}
-
-src_install() {
- default
- dohtml doc/*
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-misc/iperf/iperf-3.0.12.ebuild b/net-misc/iperf/iperf-3.0.12.ebuild
deleted file mode 100644
index 1be1772..00000000
--- a/net-misc/iperf/iperf-3.0.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-LICENSE="BSD"
-SLOT="3"
-HOMEPAGE="https://github.com/esnet/iperf/"
-SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV} -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="static-libs"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.0.5-flags.patch
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/net-misc/iperf/iperf-3.1.4.ebuild b/net-misc/iperf/iperf-3.1.4.ebuild
deleted file mode 100644
index 0da709a..00000000
--- a/net-misc/iperf/iperf-3.1.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf/"
-SRC_URI="https://codeload.github.com/esnet/${PN}/tar.gz/${PV/_beta/b} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="sctp static-libs"
-
-DEPEND="sctp? ( net-misc/lksctp-tools )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_beta/b}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-flags.patch )
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- newconfd "${FILESDIR}"/iperf.confd iperf3
- newinitd "${FILESDIR}"/iperf3.initd iperf3
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/, net-misc/iperf/files/
@ 2021-07-02 5:05 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-07-02 5:05 UTC (permalink / raw
To: gentoo-commits
commit: ed20b87b4ea1e936a8bf71fa296839f9bcee339a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 2 04:23:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 2 04:23:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed20b87b
net-misc/iperf: don't force -g
This doesn't fundamentally change the binutils issue but that's
beyond the scope of iperf.
Closes: https://bugs.gentoo.org/788973
Signed-off-by: Sam James <sam <AT> gentoo.org>
...perf-3.10.1-drop-forced-debugging-symbols.patch | 148 +++++++++++++++++++++
net-misc/iperf/iperf-3.10.1.ebuild | 4 +
2 files changed, 152 insertions(+)
diff --git a/net-misc/iperf/files/iperf-3.10.1-drop-forced-debugging-symbols.patch b/net-misc/iperf/files/iperf-3.10.1-drop-forced-debugging-symbols.patch
new file mode 100644
index 00000000000..5ea56957548
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.10.1-drop-forced-debugging-symbols.patch
@@ -0,0 +1,148 @@
+https://bugs.gentoo.org/788973
+
+From 456e9460f9320123c5449fd2314bc1b2a001547a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Jul 2021 05:21:46 +0100
+Subject: [PATCH] Drop forced -g
+
+---
+ examples/Makefile.am | 4 ----
+ examples/Makefile.in | 4 ----
+ src/Makefile.am | 11 ++---------
+ src/Makefile.in | 11 ++---------
+ 4 files changed, 4 insertions(+), 26 deletions(-)
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 829f242..aad0ae2 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -3,11 +3,7 @@ noinst_PROGRAMS = mic mis # Build, but don't install
+ AM_CPPFLAGS = -I$(top_srcdir)/src
+
+ mic_SOURCES = mic.c
+-mic_CFLAGS = -g
+ mic_LDADD = ../src/libiperf.la
+-mic_LDFLAGS = -g
+
+ mis_SOURCES = mis.c
+-mis_CFLAGS = -g
+ mis_LDADD = ../src/libiperf.la
+-mis_LDFLAGS = -g
+diff --git a/examples/Makefile.in b/examples/Makefile.in
+index d74c3c8..089b45d 100644
+--- a/examples/Makefile.in
++++ b/examples/Makefile.in
+@@ -304,13 +304,9 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CPPFLAGS = -I$(top_srcdir)/src
+ mic_SOURCES = mic.c
+-mic_CFLAGS = -g
+ mic_LDADD = ../src/libiperf.la
+-mic_LDFLAGS = -g
+ mis_SOURCES = mis.c
+-mis_CFLAGS = -g
+ mis_LDADD = ../src/libiperf.la
+-mis_LDFLAGS = -g
+ all: all-am
+
+ .SUFFIXES:
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 11d3e17..190ff26 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -47,9 +47,7 @@ libiperf_la_SOURCES = \
+
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES = main.c
+-iperf3_CFLAGS = -g
+ iperf3_LDADD = libiperf.la
+-iperf3_LDFLAGS = -g
+
+ if ENABLE_PROFILING
+ # If the iperf-profiled-binary is enabled
+@@ -58,34 +56,29 @@ if ENABLE_PROFILING
+ iperf3_profile_SOURCES = main.c \
+ $(libiperf_la_SOURCES)
+
+-iperf3_profile_CFLAGS = -pg -g
++iperf3_profile_CFLAGS = -pg
+ iperf3_profile_LDADD = libiperf.la
+-iperf3_profile_LDFLAGS = -pg -g
++iperf3_profile_LDFLAGS = -pg
+ endif
+
+ # Specify the sources and various flags for the test cases
+ t_timer_SOURCES = t_timer.c
+-t_timer_CFLAGS = -g
+ t_timer_LDFLAGS =
+ t_timer_LDADD = libiperf.la
+
+ t_units_SOURCES = t_units.c
+-t_units_CFLAGS = -g
+ t_units_LDFLAGS =
+ t_units_LDADD = libiperf.la
+
+ t_uuid_SOURCES = t_uuid.c
+-t_uuid_CFLAGS = -g
+ t_uuid_LDFLAGS =
+ t_uuid_LDADD = libiperf.la
+
+ t_api_SOURCES = t_api.c
+-t_api_CFLAGS = -g
+ t_api_LDFLAGS =
+ t_api_LDADD = libiperf.la
+
+ t_auth_SOURCES = t_auth.c
+-t_auth_CFLAGS = -g
+ t_auth_LDFLAGS =
+ t_auth_LDADD = libiperf.la
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 34d92fa..2144ff7 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -671,9 +671,7 @@ libiperf_la_SOURCES = \
+
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES = main.c
+-iperf3_CFLAGS = -g
+ iperf3_LDADD = libiperf.la
+-iperf3_LDFLAGS = -g
+
+ # If the iperf-profiled-binary is enabled
+ # Specify the sources and various flags for the profiled iperf binary. This
+@@ -681,29 +679,24 @@ iperf3_LDFLAGS = -g
+ @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 = -pg
+ @ENABLE_PROFILING_TRUE@iperf3_profile_LDADD = libiperf.la
+-@ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -pg -g
++@ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -pg
+
+ # Specify the sources and various flags for the test cases
+ t_timer_SOURCES = t_timer.c
+-t_timer_CFLAGS = -g
+ t_timer_LDFLAGS =
+ t_timer_LDADD = libiperf.la
+ t_units_SOURCES = t_units.c
+-t_units_CFLAGS = -g
+ t_units_LDFLAGS =
+ t_units_LDADD = libiperf.la
+ t_uuid_SOURCES = t_uuid.c
+-t_uuid_CFLAGS = -g
+ t_uuid_LDFLAGS =
+ t_uuid_LDADD = libiperf.la
+ t_api_SOURCES = t_api.c
+-t_api_CFLAGS = -g
+ t_api_LDFLAGS =
+ t_api_LDADD = libiperf.la
+ t_auth_SOURCES = t_auth.c
+-t_auth_CFLAGS = -g
+ t_auth_LDFLAGS =
+ t_auth_LDADD = libiperf.la
+ dist_man_MANS = iperf3.1 libiperf.3
+--
+2.32.0
+
diff --git a/net-misc/iperf/iperf-3.10.1.ebuild b/net-misc/iperf/iperf-3.10.1.ebuild
index 9e9f34b2843..0b042e73082 100644
--- a/net-misc/iperf/iperf-3.10.1.ebuild
+++ b/net-misc/iperf/iperf-3.10.1.ebuild
@@ -23,6 +23,10 @@ RDEPEND="${DEPEND}"
DOCS=( README.md RELNOTES.md )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
+)
+
src_configure() {
econf \
--disable-static \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/, net-misc/iperf/files/
@ 2024-07-30 18:33 Arthur Zamarin
0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2024-07-30 18:33 UTC (permalink / raw
To: gentoo-commits
commit: 4aa5fca038dbd7eb7f5773387ea0ac8357e9a7c3
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 18:22:41 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 18:33:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa5fca0
net-misc/iperf: add 3.17.1
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-misc/iperf/Manifest | 1 +
.../iperf/files/iperf-3.17.1-Unbundle-cJSON.patch | 110 +++++++++++++++++++++
net-misc/iperf/iperf-3.17.1.ebuild | 53 ++++++++++
3 files changed, 164 insertions(+)
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 6bfe5652d14d..528fe7e69b30 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,3 +1,4 @@
DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
DIST iperf-3.15.tar.gz 649330 BLAKE2B f086d506d1de8e8b333a7ad46a94279aa5b42800ded7cc6724c3400e479a6523b336c74b5956d07117a178b5f89934553535824a05daafcdb2eb8d31754680e1 SHA512 988bc558f40a16c3d94df3956705712829c1c529efd577db16213783846c84bc3edbad19a4d7890b7aba08fbc4e1c6807105df29931e9b45981066b609d87aa2
DIST iperf-3.16.tar.gz 664751 BLAKE2B 4ca930b58c54d5ae5b0c8b14aca2556224ff2c7b943d32e65486dc2a7e1abd2d26b229e9f759358c326be8754e88a203e11a3ab0f029daa982375a880c3f1cbd SHA512 9ba97e03f17f3b939343b07ed3d508fbf57489e2b984b77a3dc3ada535f981350e56495154bdd108a83b3c507ccbed599b2b7b25de0d1778912d2c01b4ad4e7c
+DIST iperf-3.17.1.tar.gz 670547 BLAKE2B 90afa47ba2de2f789b118ea42d7eabe3a7ec202116d51915b05350932231788a95ae142bdf2cff041f5504e67ae5ac1da2c66f408bc302c4e230ef4b7e496e15 SHA512 99c731e2e060d2b241d3137742bf92a975f2b7a94c6c723c9c1625f69c294fd7fe15b7dbf085a6120038fc1dd7628c83d2c7d16b059849fdbecbc88e48fb0974
diff --git a/net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch b/net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch
new file mode 100644
index 000000000000..856403ca6b65
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.17.1-Unbundle-cJSON.patch
@@ -0,0 +1,110 @@
+Date: Tue, 30 Jul 2024 21:11:48 +0300
+Subject: [PATCH] Unbundle cJSON
+
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,6 +61,8 @@ AC_ARG_ENABLE([profiling],
+ AS_HELP_STRING([--enable-profiling], [Enable iperf3 profiling binary]))
+ AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes])
+
++PKG_CHECK_MODULES([libcjson], [libcjson >= 1.7.15])
++
+ # Check for the math library (needed by cjson on some platforms)
+ AC_SEARCH_LIBS(floor, [m], [], [
+ echo "floor()"
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,8 +10,6 @@ include_HEADERS = iperf_api.h # Define
+
+ # Specify the source files and flags for the iperf library
+ libiperf_la_SOURCES = \
+- cjson.c \
+- cjson.h \
+ flowlabel.h \
+ iperf.h \
+ iperf_api.c \
+@@ -46,10 +44,13 @@ libiperf_la_SOURCES = \
+ units.c \
+ units.h \
+ version.h
++libiperf_la_CPPFLAGS = $(CPPFLAGS) @libcjson_CFLAGS@
++libiperf_la_LIBADD = @libcjson_LIBS@
+
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES = main.c
+-iperf3_LDADD = libiperf.la
++iperf3_CPPFLAGS = $(CPPFLAGS) @libcjson_CFLAGS@
++iperf3_LDADD = libiperf.la @libcjson_LIBS@
+
+ if ENABLE_PROFILING
+ # If the iperf-profiled-binary is enabled
+--- a/src/iperf.h
++++ b/src/iperf.h
+@@ -52,7 +52,7 @@
+
+ #include "timer.h"
+ #include "queue.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf_time.h"
+ #include "portable_endian.h"
+
+--- a/src/iperf_api.c
++++ b/src/iperf_api.c
+@@ -79,7 +79,7 @@
+ #endif /* HAVE_SCTP_H */
+ #include "timer.h"
+
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "units.h"
+ #include "iperf_util.h"
+ #include "iperf_locale.h"
+--- a/src/iperf_tcp.c
++++ b/src/iperf_tcp.c
+@@ -42,7 +42,7 @@
+ #include "iperf_api.h"
+ #include "iperf_tcp.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+
+ #if defined(HAVE_FLOWLABEL)
+ #include "flowlabel.h"
+--- a/src/iperf_udp.c
++++ b/src/iperf_udp.c
+@@ -45,7 +45,7 @@
+ #include "iperf_udp.h"
+ #include "timer.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+
+ /* iperf_udp_recv
+ *
+--- a/src/iperf_util.c
++++ b/src/iperf_util.c
+@@ -46,7 +46,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf.h"
+ #include "iperf_api.h"
+
+--- a/src/iperf_util.h
++++ b/src/iperf_util.h
+@@ -28,7 +28,7 @@
+ #define __IPERF_UTIL_H
+
+ #include "iperf_config.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include <sys/select.h>
+ #include <stddef.h>
+
+--
+2.45.2
+
diff --git a/net-misc/iperf/iperf-3.17.1.ebuild b/net-misc/iperf/iperf-3.17.1.ebuild
new file mode 100644
index 000000000000..999cff75ed27
--- /dev/null
+++ b/net-misc/iperf/iperf-3.17.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf"
+SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="sctp"
+
+DEPEND="
+ >=dev-libs/cJSON-1.7.15
+ dev-libs/openssl:=
+ sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md RELNOTES.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
+ "${FILESDIR}"/${PN}-3.17.1-Unbundle-cJSON.patch
+)
+
+src_prepare() {
+ default
+
+ # Drop bundled cjson
+ rm src/cjson.{c,h} || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with sctp)
+}
+
+src_install() {
+ default
+
+ newconfd "${FILESDIR}"/iperf.confd iperf3
+ newinitd "${FILESDIR}"/iperf3.initd iperf3
+ systemd_dounit contrib/iperf3.service
+
+ find "${ED}" -name '*.la' -type f -delete || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-30 18:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-07 15:52 [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/, net-misc/iperf/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2024-07-30 18:33 Arthur Zamarin
2021-07-02 5:05 Sam James
2016-02-16 16:38 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox