somlo pushed to iperf (f22). "update to v2.0.8"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 10 18:21:22 UTC 2015
>From fe5e133d3b0794f8760b8264f2d4fa2c8364fea6 Mon Sep 17 00:00:00 2001
From: "Gabriel L. Somlo" <somlo at cmu.edu>
Date: Fri, 10 Apr 2015 14:20:59 -0400
Subject: update to v2.0.8
diff --git a/.gitignore b/.gitignore
index 76f62d7..5710842 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
iperf-2.0.4.tar.gz
iperf-2.0.5.tar.gz
+/iperf-2.0.8.tar.gz
diff --git a/iperf-2.0.5-bind_fail.patch b/iperf-2.0.5-bind_fail.patch
deleted file mode 100644
index 843fdaf..0000000
--- a/iperf-2.0.5-bind_fail.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -NarU5 a/src/Client.cpp b/src/Client.cpp
---- a/src/Client.cpp 2010-04-01 16:23:17.000000000 -0400
-+++ b/src/Client.cpp 2014-01-03 13:40:53.367873006 -0500
-@@ -395,21 +395,21 @@
- AF_INET
- #endif
- : AF_INET);
-
- mSettings->mSock = socket( domain, type, 0 );
-- WARN_errno( mSettings->mSock == INVALID_SOCKET, "socket" );
-+ FAIL_errno( mSettings->mSock == INVALID_SOCKET, "socket", mSettings );
-
- SetSocketOptions( mSettings );
-
-
- SockAddr_localAddr( mSettings );
- if ( mSettings->mLocalhost != NULL ) {
- // bind socket to local address
- rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local,
- SockAddr_get_sizeof_sockaddr( &mSettings->local ) );
-- WARN_errno( rc == SOCKET_ERROR, "bind" );
-+ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
- }
-
- // connect socket
- rc = connect( mSettings->mSock, (sockaddr*) &mSettings->peer,
- SockAddr_get_sizeof_sockaddr( &mSettings->peer ));
-diff -NarU5 a/src/Listener.cpp b/src/Listener.cpp
---- a/src/Listener.cpp 2007-08-29 17:57:27.000000000 -0400
-+++ b/src/Listener.cpp 2014-01-03 13:40:07.161876165 -0500
-@@ -331,11 +331,11 @@
- WARN_errno( rc == SOCKET_ERROR, "WSAJoinLeaf (aka bind)" );
- } else
- #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
- if ( !isUDP( mSettings ) ) {
- rc = listen( mSettings->mSock, 5 );
diff --git a/iperf-2.0.5-debuginfo.patch b/iperf-2.0.5-debuginfo.patch
deleted file mode 100644
index 01de201..0000000
--- a/iperf-2.0.5-debuginfo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -NarU5 a/configure.ac b/configure.ac
---- a/configure.ac 2010-04-10 15:23:05.000000000 -0400
-+++ b/configure.ac 2013-08-06 19:14:46.593162631 -0400
-@@ -37,13 +37,13 @@
- dnl ===================================================================
- dnl Checks for programs
- dnl ===================================================================
-
- AC_PROG_CXX
--CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
-+#CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
- AC_PROG_CC
--CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
-+#CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
- AC_ISC_POSIX
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
- AC_LANG(C)
diff --git a/iperf-2.0.5-format_security.patch b/iperf-2.0.5-format_security.patch
deleted file mode 100644
index 86c3641..0000000
--- a/iperf-2.0.5-format_security.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -NarU5 A/compat/Thread.c B/compat/Thread.c
---- A/compat/Thread.c 2010-03-30 19:08:24.000000000 -0400
-+++ B/compat/Thread.c 2013-12-22 12:23:11.623088163 -0500
-@@ -379,11 +379,11 @@
- * ------------------------------------------------------------------- */
- int thread_release_nonterm( int interrupt ) {
- 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 );
- Condition_Unlock( thread_sNum_cond );
- return thread_sNum;
-diff -NarU5 A/src/ReportDefault.c B/src/ReportDefault.c
---- A/src/ReportDefault.c 2010-03-30 18:57:17.000000000 -0400
-+++ B/src/ReportDefault.c 2013-12-22 12:44:12.968001912 -0500
-@@ -76,20 +76,20 @@
- stats->mFormat);
-
- 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,
- stats->startTime, stats->endTime,
- buffer, &buffer[sizeof(buffer)/2] );
- } 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,
- stats->startTime, stats->endTime,
- buffer, &buffer[sizeof(buffer)/2],
-@@ -157,11 +157,11 @@
-
- win = getsock_tcp_windowsize( data->info.transferID,
- (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"),
- data->mPort );
- } else {
-@@ -196,11 +196,11 @@
- byte_snprintf( buffer, sizeof(buffer), win_requested,
- toupper( data->info.mFormat));
- printf( warn_window_requested, buffer );
- }
- printf( "\n" );
-- printf( separator_line );
-+ printf( "%s", separator_line );
- }
-
- /*
- * Report a socket's peer IP address in default style
- */
-@@ -284,11 +284,11 @@
- net = "HIPPI";
- mtu = 65280;
- } 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";
- }
-
-diff -NarU5 A/src/Reporter.c B/src/Reporter.c
---- A/src/Reporter.c 2010-03-30 19:08:24.000000000 -0400
-+++ B/src/Reporter.c 2013-12-22 13:49:36.285733636 -0500
-@@ -894,11 +894,11 @@
- net = "HIPPI";
- mtu = 65280;
- } 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";
- }
-
-diff -NarU5 A/src/Settings.cpp B/src/Settings.cpp
---- A/src/Settings.cpp 2010-07-08 21:05:46.000000000 -0400
-+++ B/src/Settings.cpp 2013-12-22 14:01:09.958686202 -0500
-@@ -373,12 +373,12 @@
- case 'f': // format to print in
- mExtSettings->mFormat = (*optarg);
- 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;
-
- case 'i': // specify interval between periodic bw reports
- mExtSettings->mInterval = atof( optarg );
-@@ -480,11 +480,11 @@
- fprintf( stderr, warn_implied_compatibility, option );
- }
- break;
-
- case 'v': // print version and exit
-- fprintf( stderr, version );
-+ fprintf( stderr, "%s", version );
- exit(1);
- break;
-
- case 'w': // TCP window size (socket buffer size)
- Settings_GetUpperCaseArg(optarg,outarg);
diff --git a/iperf-2.0.5-tcpdual.patch b/iperf-2.0.5-tcpdual.patch
deleted file mode 100644
index 5eebad4..0000000
--- a/iperf-2.0.5-tcpdual.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -NarU5 iperf-2.0.5.orig/src/Client.cpp iperf-2.0.5/src/Client.cpp
---- iperf-2.0.5.orig/src/Client.cpp 2010-08-22 09:25:13.000289100 -0400
-+++ iperf-2.0.5/src/Client.cpp 2010-04-01 16:23:17.000000000 -0400
-@@ -210,14 +210,14 @@
- int adjust = 0;
-
- char* readAt = mBuf;
-
- #if HAVE_THREAD
-- if ( !isUDP( mSettings ) ) {
-- RunTCP();
-- return;
-- }
-+// if ( !isUDP( mSettings ) ) {
-+// RunTCP();
-+// return;
-+// }
- #endif
-
- // Indicates if the stream is readable
- bool canRead = true, mMode_Time = isModeTime( mSettings );
-
diff --git a/iperf-2.0.8-bindfail.patch b/iperf-2.0.8-bindfail.patch
new file mode 100644
index 0000000..b18b2cf
--- /dev/null
+++ b/iperf-2.0.8-bindfail.patch
@@ -0,0 +1,42 @@
+diff -NarpU5 iperf-2.0.8/src/Client.cpp iperf-2.0.8.bindfail/src/Client.cpp
+--- iperf-2.0.8/src/Client.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Client.cpp 2015-04-10 10:05:38.279936555 -0400
+@@ -701,20 +701,20 @@ void Client::Connect( ) {
+ AF_INET
+ #endif
+ : AF_INET);
+
+ mSettings->mSock = socket( domain, type, 0 );
+- WARN_errno( mSettings->mSock == INVALID_SOCKET, "socket" );
++ FAIL_errno( mSettings->mSock == INVALID_SOCKET, "socket", mSettings );
+
+ SetSocketOptions( mSettings );
+
+ SockAddr_localAddr( mSettings );
+ if ( mSettings->mLocalhost != NULL ) {
+ // bind socket to local address
+ rc = bind( mSettings->mSock, (sockaddr*) &mSettings->local,
+ SockAddr_get_sizeof_sockaddr( &mSettings->local ) );
+- WARN_errno( rc == SOCKET_ERROR, "bind" );
++ FAIL_errno( rc == SOCKET_ERROR, "bind", mSettings );
+ }
+ // connect socket
+ rc = connect( mSettings->mSock, (sockaddr*) &mSettings->peer,
+ SockAddr_get_sizeof_sockaddr( &mSettings->peer ));
+ FAIL_errno( rc == SOCKET_ERROR, "connect", mSettings );
+diff -NarpU5 iperf-2.0.8/src/Listener.cpp iperf-2.0.8.bindfail/src/Listener.cpp
+--- iperf-2.0.8/src/Listener.cpp 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.bindfail/src/Listener.cpp 2015-04-10 10:06:23.279699885 -0400
+@@ -342,11 +342,11 @@ void Listener::Listen( ) {
+ WARN_errno( rc == SOCKET_ERROR, "WSAJoinLeaf (aka bind)" );
+ } else
+ #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
+ if ( !isUDP( mSettings ) ) {
+ rc = listen( mSettings->mSock, 5 );
diff --git a/iperf-2.0.8-debuginfo.patch b/iperf-2.0.8-debuginfo.patch
new file mode 100644
index 0000000..2a3ad24
--- /dev/null
+++ b/iperf-2.0.8-debuginfo.patch
@@ -0,0 +1,17 @@
+diff -NarpU5 iperf-2.0.8/configure.ac iperf-2.0.8.debuginfo/configure.ac
+--- iperf-2.0.8/configure.ac 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.debuginfo/configure.ac 2015-04-10 10:11:33.287445003 -0400
+@@ -42,13 +42,11 @@ AC_ARG_ENABLE(kalman, AC_HELP_STRING([--
+ dnl ===================================================================
+ dnl Checks for programs
+ dnl ===================================================================
+
+ AC_PROG_CXX
+-CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_PROG_CC
+-CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AC_LANG(C)
diff --git a/iperf-2.0.8-maninstall.patch b/iperf-2.0.8-maninstall.patch
new file mode 100644
index 0000000..7f2280c
--- /dev/null
+++ b/iperf-2.0.8-maninstall.patch
@@ -0,0 +1,16 @@
+diff -NarpU5 iperf-2.0.8/man/Makefile.in iperf-2.0.8.maninstall/man/Makefile.in
+--- iperf-2.0.8/man/Makefile.in 2015-04-02 16:51:48.000000000 -0400
++++ iperf-2.0.8.maninstall/man/Makefile.in 2015-04-10 10:56:22.284937446 -0400
+@@ -289,11 +289,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
+ install-man1: $(dist_man_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ @list1=''; \
+- list2='$(dist_man_MANS) $(man_MANS)'; \
++ list2='$(dist_man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
diff --git a/iperf.spec b/iperf.spec
index 7221879..7766f49 100644
--- a/iperf.spec
+++ b/iperf.spec
@@ -1,15 +1,14 @@
Name: iperf
-Version: 2.0.5
-Release: 13%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
Summary: Measurement tool for TCP/UDP bandwidth performance
License: BSD
Group: Applications/Internet
-URL: http://sourceforge.net/projects/iperf
-Source: http://sourceforge.net/projects/iperf/files/%{name}-%{version}.tar.gz
-Patch0: iperf-2.0.5-debuginfo.patch
-Patch1: iperf-2.0.5-tcpdual.patch
-Patch2: iperf-2.0.5-format_security.patch
-Patch3: iperf-2.0.5-bind_fail.patch
+URL: http://sourceforge.net/projects/iperf2
+Source: http://sourceforge.net/projects/iperf2/files/%{name}-%{version}.tar.gz
+Patch0: iperf-2.0.8-debuginfo.patch
+Patch1: iperf-2.0.8-bindfail.patch
+Patch2: iperf-2.0.8-maninstall.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
@@ -23,7 +22,6 @@ jitter, datagram loss.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
%{__autoconf}
@@ -44,6 +42,12 @@ jitter, datagram loss.
%{_mandir}/man*/*
%changelog
+* Fri Apr 10 2015 Gabriel Somlo <somlo at cmu.edu> 2.0.8-1
+- update to 2.0.8
+- update source URL in spec file
+- rebase debuginfo and bindfail fixup patches
+- added patch to prevent error on installing manpage
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index d4bb8b2..2d1baf4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44b5536b67719f4250faed632a3cd016 iperf-2.0.5.tar.gz
+186a4c6e7615f47f74823a8fe099cdbe iperf-2.0.8.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/iperf.git/commit/?h=f22&id=fe5e133d3b0794f8760b8264f2d4fa2c8364fea6
More information about the scm-commits
mailing list