[iperf/f13/master] update to 2.0.5

Tue Aug 24 12:40:52 UTC 2010

commit 041e73ec383094a6d5f4d85eff114a7c86f7fdf6
Author: L. Gabriel Somlo <somlo at hedwig.net.cmu.edu>
Date:   Tue Aug 24 08:40:39 2010 -0400

    update to 2.0.5

 .gitignore                                         |    1 +
 iperf-2.0.4-svn20091201.patch                      |  452 --------------------
 ...-debuginfo.patch => iperf-2.0.5-debuginfo.patch |   18 +-
 ....0.4-tcpdual.patch => iperf-2.0.5-tcpdual.patch |    8 +-
 iperf.spec                                         |   17 +-
 sources                                            |    2 +-
 6 files changed, 24 insertions(+), 474 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2c84fdc..76f62d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 iperf-2.0.4.tar.gz
+iperf-2.0.5.tar.gz
diff --git a/iperf-2.0.4-debuginfo.patch b/iperf-2.0.5-debuginfo.patch
similarity index 58%
rename from iperf-2.0.4-debuginfo.patch
rename to iperf-2.0.5-debuginfo.patch
index 45c53cc..507002f 100644
--- a/iperf-2.0.4-debuginfo.patch
+++ b/iperf-2.0.5-debuginfo.patch
@@ -1,7 +1,7 @@
-diff -NarU5 iperf-2.0.4.orig/configure iperf-2.0.4/configure
---- iperf-2.0.4.orig/configure	2008-04-07 22:47:37.000000000 -0400
-+++ iperf-2.0.4/configure	2008-04-09 10:02:34.000000000 -0400
-@@ -3085,11 +3085,11 @@
+diff -NarU5 iperf-2.0.5.orig/configure iperf-2.0.5/configure
+--- iperf-2.0.5.orig/configure	2010-08-22 09:20:34.948403826 -0400
++++ iperf-2.0.5/configure	2010-04-10 15:23:05.000000000 -0400
+@@ -3649,11 +3649,11 @@
    am__fastdepCXX_TRUE='#'
    am__fastdepCXX_FALSE=
  fi
@@ -14,7 +14,7 @@ diff -NarU5 iperf-2.0.4.orig/configure iperf-2.0.4/configure
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
-@@ -3956,11 +3956,11 @@
+@@ -4299,11 +4299,11 @@
    am__fastdepCC_TRUE='#'
    am__fastdepCC_FALSE=
  fi
@@ -23,7 +23,7 @@ diff -NarU5 iperf-2.0.4.orig/configure iperf-2.0.4/configure
 -CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
 +#CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly
  
- 
-         { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
- echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_cposix_strerror+set}" = set; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+ $as_echo_n "checking for library containing strerror... " >&6; }
+ if test "${ac_cv_search_strerror+set}" = set; then :
+   $as_echo_n "(cached) " >&6
diff --git a/iperf-2.0.4-tcpdual.patch b/iperf-2.0.5-tcpdual.patch
similarity index 73%
rename from iperf-2.0.4-tcpdual.patch
rename to iperf-2.0.5-tcpdual.patch
index c66dbff..5eebad4 100644
--- a/iperf-2.0.4-tcpdual.patch
+++ b/iperf-2.0.5-tcpdual.patch
@@ -1,7 +1,7 @@
-diff -NarU5 iperf-2.0.4.orig/src/Client.cpp iperf-2.0.4/src/Client.cpp
---- iperf-2.0.4.orig/src/Client.cpp	2008-04-07 22:37:54.000000000 -0400
-+++ iperf-2.0.4/src/Client.cpp	2009-01-21 14:10:33.000000000 -0500
-@@ -205,14 +205,14 @@
+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;
diff --git a/iperf.spec b/iperf.spec
index d86b761..a8da554 100644
--- a/iperf.spec
+++ b/iperf.spec
@@ -1,14 +1,13 @@
 Name: iperf
-Version: 2.0.4
-Release: 4%{?dist}
+Version: 2.0.5
+Release: 1%{?dist}
 Summary: Measurement tool for TCP/UDP bandwidth performance
 License: BSD
 Group: Applications/Internet
-URL: http://iperf.sourceforge.net
-Source: http://prdownloads.sourceforge.net/iperf/%{name}-%{version}.tar.gz
-Patch0: iperf-2.0.4-debuginfo.patch
-Patch1: iperf-2.0.4-tcpdual.patch
-Patch2: iperf-2.0.4-svn20091201.patch
+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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,7 +19,6 @@ jitter, datagram loss.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure
@@ -39,6 +37,9 @@ jitter, datagram loss.
 %{_bindir}/iperf
 
 %changelog
+* Sat Aug 21 2010 Gabriel Somlo <somlo at cmu.edu> 2.0.5-1
+- update to 2.0.5
+
 * Tue Dec 01 2009 Gabriel Somlo <somlo at cmu.edu> 2.0.4-4
 - patched to current svn trunk to address performance issues (#506884)
 
diff --git a/sources b/sources
index 06d673b..d4bb8b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c5bc14cc2ea55f18f22afe3c23e3dcb  iperf-2.0.4.tar.gz
+44b5536b67719f4250faed632a3cd016  iperf-2.0.5.tar.gz
