packages: iperf/iperf.spec, iperf/iperf-2.0.5-tcpdual.patch (NEW) - rel 2; ...

[arekm]

Author: arekm                        Date: Wed Mar 16 10:25:15 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; don't end server in tcp bidirect mode

---- Files affected:
packages/iperf:
   iperf.spec (1.14 -> 1.15) , iperf-2.0.5-tcpdual.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/iperf/iperf.spec
diff -u packages/iperf/iperf.spec:1.14 packages/iperf/iperf.spec:1.15
--- packages/iperf/iperf.spec:1.14	Wed Mar 16 11:11:06 2011
+++ packages/iperf/iperf.spec	Wed Mar 16 11:25:09 2011
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	Narzędzie do szacowania wydajności sieci
 Name:		iperf
 Version:	2.0.5
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		Networking/Utilities
-Source0:	http://dl.sourceforge.net/iperf/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
 # Source0-md5:	44b5536b67719f4250faed632a3cd016
+Patch0:		%{name}-2.0.5-tcpdual.patch
 URL:		http://iperf.sourceforge.net/
 BuildRequires:	libstdc++-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -61,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/03/16 10:25:09  arekm
+- rel 2; don't end server in tcp bidirect mode
+
 Revision 1.14  2011/03/16 10:11:06  arekm
 - up to 2.0.5
 

================================================================
Index: packages/iperf/iperf-2.0.5-tcpdual.patch
diff -u /dev/null packages/iperf/iperf-2.0.5-tcpdual.patch:1.1
--- /dev/null	Wed Mar 16 11:25:15 2011
+++ packages/iperf/iperf-2.0.5-tcpdual.patch	Wed Mar 16 11:25:09 2011
@@ -0,0 +1,22 @@
+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 ); 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iperf/iperf.spec?r1=1.14&r2=1.15&f=u