Signed-off-by: Markus Pargmann <[email protected]>
---
 patches/iperf-2.0.4/fix_early_termination.diff | 47 --------------------------
 patches/iperf-2.0.4/series                     |  1 -
 patches/iperf-2.0.5/fix_early_termination.diff | 47 ++++++++++++++++++++++++++
 patches/iperf-2.0.5/series                     |  1 +
 rules/iperf.make                               |  4 +--
 5 files changed, 50 insertions(+), 50 deletions(-)
 delete mode 100644 patches/iperf-2.0.4/fix_early_termination.diff
 delete mode 100644 patches/iperf-2.0.4/series
 create mode 100644 patches/iperf-2.0.5/fix_early_termination.diff
 create mode 100644 patches/iperf-2.0.5/series

diff --git a/patches/iperf-2.0.4/fix_early_termination.diff 
b/patches/iperf-2.0.4/fix_early_termination.diff
deleted file mode 100644
index f24dec7..0000000
--- a/patches/iperf-2.0.4/fix_early_termination.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-iperf version 2.0.4 running in server mode exits when a client connects
-using the -d (duplex) flag.
-
-To reproduce: On machine foo, run server:
-
-[somlo@foo]$ iperf -s
-
-on machine bar, run client in duplex mode:
-
-[somlo@bar]$ iperf -c foo -d
-
-
-What happens: At the end of the test, the iperf process on machine foo exits.
-
-What *should* happen: At the end of the test, the iperf process on machine
-should keep running, listening for new connections.
-
-===
-
-Patch form L. Gabriel Somlo on the iperf maillist 2009-01-21
-More precisely: 
http://sourceforge.net/tracker/index.php?func=detail&aid=1983829&group_id=128336&atid=711371
-
-Signed-off-by: Wolfram Sang <[email protected]>
-
----
- src/Client.cpp |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: src/Client.cpp
-===================================================================
---- src/Client.cpp.orig
-+++ src/Client.cpp
-@@ -207,10 +207,10 @@ void Client::Run( void ) {
-     char* readAt = mBuf;
- 
- #if HAVE_THREAD
--    if ( !isUDP( mSettings ) ) {
--      RunTCP();
--      return;
--    }
-+//     if ( !isUDP( mSettings ) ) {
-+//    RunTCP();
-+//    return;
-+//     }
- #endif
-     
-     // Indicates if the stream is readable 
diff --git a/patches/iperf-2.0.4/series b/patches/iperf-2.0.4/series
deleted file mode 100644
index c490ac0..0000000
--- a/patches/iperf-2.0.4/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_early_termination.diff -p0
diff --git a/patches/iperf-2.0.5/fix_early_termination.diff 
b/patches/iperf-2.0.5/fix_early_termination.diff
new file mode 100644
index 0000000..f24dec7
--- /dev/null
+++ b/patches/iperf-2.0.5/fix_early_termination.diff
@@ -0,0 +1,47 @@
+iperf version 2.0.4 running in server mode exits when a client connects
+using the -d (duplex) flag.
+
+To reproduce: On machine foo, run server:
+
+[somlo@foo]$ iperf -s
+
+on machine bar, run client in duplex mode:
+
+[somlo@bar]$ iperf -c foo -d
+
+
+What happens: At the end of the test, the iperf process on machine foo exits.
+
+What *should* happen: At the end of the test, the iperf process on machine
+should keep running, listening for new connections.
+
+===
+
+Patch form L. Gabriel Somlo on the iperf maillist 2009-01-21
+More precisely: 
http://sourceforge.net/tracker/index.php?func=detail&aid=1983829&group_id=128336&atid=711371
+
+Signed-off-by: Wolfram Sang <[email protected]>
+
+---
+ src/Client.cpp |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: src/Client.cpp
+===================================================================
+--- src/Client.cpp.orig
++++ src/Client.cpp
+@@ -207,10 +207,10 @@ void Client::Run( void ) {
+     char* readAt = mBuf;
+ 
+ #if HAVE_THREAD
+-    if ( !isUDP( mSettings ) ) {
+-      RunTCP();
+-      return;
+-    }
++//     if ( !isUDP( mSettings ) ) {
++//    RunTCP();
++//    return;
++//     }
+ #endif
+     
+     // Indicates if the stream is readable 
diff --git a/patches/iperf-2.0.5/series b/patches/iperf-2.0.5/series
new file mode 100644
index 0000000..c490ac0
--- /dev/null
+++ b/patches/iperf-2.0.5/series
@@ -0,0 +1 @@
+fix_early_termination.diff -p0
diff --git a/rules/iperf.make b/rules/iperf.make
index c5e08e9..8f73dfc 100644
--- a/rules/iperf.make
+++ b/rules/iperf.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IPERF) += iperf
 #
 # Paths and names
 #
-IPERF_VERSION  := 2.0.4
-IPERF_MD5      := 8c5bc14cc2ea55f18f22afe3c23e3dcb
+IPERF_VERSION  := 2.0.5
+IPERF_MD5      := 44b5536b67719f4250faed632a3cd016
 IPERF          := iperf-$(IPERF_VERSION)
 IPERF_SUFFIX   := tar.gz
 IPERF_URL      := $(call ptx/mirror, SF, iperf/$(IPERF).$(IPERF_SUFFIX))
-- 
1.9.1


-- 
ptxdist mailing list
[email protected]

Reply via email to