summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2017-02-07 16:46:30 +0100
committerJeroen Roovers <jer@gentoo.org>2017-02-07 16:46:30 +0100
commit5f05166700675083fedae19c63a6110fce7d47cd (patch)
tree1c1505f2df5d4e1869f255f9652420fd669cddda /net-misc/iperf/files
parentnet-misc/iperf: Version bump. (diff)
downloadgentoo-5f05166700675083fedae19c63a6110fce7d47cd.tar.gz
gentoo-5f05166700675083fedae19c63a6110fce7d47cd.tar.bz2
gentoo-5f05166700675083fedae19c63a6110fce7d47cd.zip
net-misc/iperf: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-misc/iperf/files')
-rw-r--r--net-misc/iperf/files/iperf-bidirectional-tcp-server.patch23
-rw-r--r--net-misc/iperf/files/iperf-cast-to-max_size_t-instead-of-int.patch20
-rw-r--r--net-misc/iperf/files/iperf-die-on-bind-fail.patch19
-rw-r--r--net-misc/iperf/files/iperf-fix-bandwidth-limit.patch21
-rw-r--r--net-misc/iperf/files/iperf-fix-format-security-ftbfs.patch96
-rw-r--r--net-misc/iperf/files/iperf-ipv6_mcast_check.patch22
6 files changed, 0 insertions, 201 deletions
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 <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 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 <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 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 <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 eb9df8cd31b3..000000000000
--- 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 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 <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 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 <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));
-