From 5f05166700675083fedae19c63a6110fce7d47cd Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 7 Feb 2017 16:46:30 +0100 Subject: 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(-) delete mode 100644 net-misc/iperf/files/iperf-bidirectional-tcp-server.patch delete mode 100644 net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch delete mode 100644 net-misc/iperf/files/iperf-die-on-bind-fail.patch delete mode 100644 net-misc/iperf/files/iperf-fix-bandwidth-limit.patch delete mode 100644 net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch delete mode 100644 net-misc/iperf/files/iperf-ipv6_mcast_check.patch delete mode 100644 net-misc/iperf/iperf-2.0.5-r2.ebuild delete mode 100644 net-misc/iperf/iperf-3.0.12.ebuild delete mode 100644 net-misc/iperf/iperf-3.1.4.ebuild (limited to 'net-misc') diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index 23d525e746a2..2566a4f5ae41 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 98206ae2c31b..000000000000 --- 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 -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 34d37eef671d..000000000000 --- 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 - 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 -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 1f54cf556d29..000000000000 --- 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 -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 eb9df8cd31b3..000000000000 --- a/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch +++ /dev/null @@ -1,21 +0,0 @@ - -2011-10-14 Israel G. Lugo - -* 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 2f5b03277209..000000000000 --- 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 -Author: Simon Paillard -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 bef05259a4d8..000000000000 --- 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 -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 376576bc7cc4..000000000000 --- 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 1be17724370f..000000000000 --- 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 0da709acbb4e..000000000000 --- 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 -} -- cgit v1.2.3-65-gdbad