commit 72038add14391660c339a0a8324519a7cbac97f7 Author: Marcin Krol <h...@tld-linux.org> Date: Tue Jun 23 11:16:47 2020 +0200
- moved to iperf2 code, updated to 2.0.13, patch0 needs update? iperf-Werror.patch | 91 ------------------------------------------------------ iperf.spec | 14 ++++----- 2 files changed, 6 insertions(+), 99 deletions(-) --- diff --git a/iperf.spec b/iperf.spec index 1097bd9..90bea77 100644 --- a/iperf.spec +++ b/iperf.spec @@ -1,15 +1,14 @@ Summary: Network performance measurement tool Summary(pl.UTF-8): Narzędzie do szacowania wydajności sieci Name: iperf -Version: 2.0.5 -Release: 2 +Version: 2.0.13 +Release: 1 License: BSD-like Group: Networking/Utilities -Source0: http://downloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz -# Source0-md5: 44b5536b67719f4250faed632a3cd016 +Source0: http://downloads.sourceforge.net/iperf2/%{name}-%{version}.tar.gz +# Source0-md5: 31ea1c6d5cbf80b16ff3abe4288dad5e Patch0: %{name}-2.0.5-tcpdual.patch -Patch1: %{name}-Werror.patch -URL: http://iperf.sourceforge.net/ +URL: http://iperf2.sourceforge.net/ BuildRequires: libstdc++-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -38,8 +37,7 @@ pasmo, opóźnienia i straty datagramów. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +#%patch0 -p1 %build %configure diff --git a/iperf-Werror.patch b/iperf-Werror.patch deleted file mode 100644 index 1de636a..0000000 --- a/iperf-Werror.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- iperf-2.0.5/compat/Thread.c~ 2010-03-31 01:08:24.000000000 +0200 -+++ iperf-2.0.5/compat/Thread.c 2013-02-16 22:46:54.132703340 +0100 -@@ -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 ); ---- iperf-2.0.5/src/ReportDefault.c~ 2010-03-31 00:57:17.000000000 +0200 -+++ iperf-2.0.5/src/ReportDefault.c 2013-02-16 22:48:31.435151772 +0100 -@@ -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"; ---- iperf-2.0.5/src/Reporter.c~ 2010-03-31 01:08:24.000000000 +0200 -+++ iperf-2.0.5/src/Reporter.c 2013-02-16 22:48:59.255861522 +0100 -@@ -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"; ---- iperf-2.0.5/src/Settings.cpp~ 2010-07-09 03:05:46.000000000 +0200 -+++ iperf-2.0.5/src/Settings.cpp 2013-02-16 22:50:12.124383685 +0100 -@@ -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; - ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/iperf.git/commitdiff/72038add14391660c339a0a8324519a7cbac97f7 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit