From: Markus Pargmann <mpa@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Markus Pargmann <mpa@pengutronix.de>
Subject: [ptxdist] [PATCH 6/8] iperf: version bump 2.0.4 -> 2.0.5
Date: Wed, 30 Apr 2014 11:59:14 +0200 [thread overview]
Message-ID: <1398851956-18885-7-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1398851956-18885-1-git-send-email-mpa@pengutronix.de>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
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 <w.sang@pengutronix.de>
-
----
- 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 <w.sang@pengutronix.de>
+
+---
+ 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
ptxdist@pengutronix.de
next prev parent reply other threads:[~2014-04-30 9:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-30 9:59 [ptxdist] [PATCH 0/8] network packages updates Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 1/8] iproute2: version bump 3.9.0 -> 3.14.0 Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 2/8] iw: version bump 3.3 -> 3.14 Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 3/8] network: Add batctl Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 4/8] crda: version bump 1.1.3 -> 3.13 Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 5/8] dnsmasq: version bump 2.47 -> 2.69 Markus Pargmann
2014-04-30 9:59 ` Markus Pargmann [this message]
2014-04-30 9:59 ` [ptxdist] [PATCH 7/8] wireshark: version bump 1.10.5 -> 1.10.6 Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 8/8] libjpeg: version bump 8a -> 9a, add binaries Markus Pargmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398851956-18885-7-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox