[arch-commits] Commit in iperf/trunk (PKGBUILD client.cpp.patch)

[Giovanni Scafora]

    Date: Tuesday, July 19, 2011 @ 05:15:09
  Author: giovanni
Revision: 132026

upgpkg: iperf 2.0.5-2
Fixed FS25159

Added:
  iperf/trunk/client.cpp.patch
Modified:
  iperf/trunk/PKGBUILD

------------------+
 PKGBUILD         |   24 +++++++++++++++++-------
 client.cpp.patch |   17 +++++++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-19 08:44:58 UTC (rev 132025)
+++ PKGBUILD	2011-07-19 09:15:09 UTC (rev 132026)
@@ -4,22 +4,32 @@
 
 pkgname=iperf
 pkgver=2.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to measure maximum TCP bandwidth"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://iperf.sourceforge.net"
-depends=(gcc-libs)
+depends=('gcc-libs')
 source=(http://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz
-	license)
+	license
+        client.cpp.patch)
 md5sums=('44b5536b67719f4250faed632a3cd016'
-         'a2879f900b76668b28a1cc922909db18')
+         'a2879f900b76668b28a1cc922909db18'
+         '82ce63c87cc8bb2f0f94069857ac14a9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # FS#25159
+  patch -Np1 -i ${srcdir}/client.cpp.patch
+
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -Dm644 ${srcdir}/license "${pkgdir}/usr/share/licenses/iperf/LICENSE" || return 1
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 ${srcdir}/license "${pkgdir}/usr/share/licenses/iperf/LICENSE"
+}

Added: client.cpp.patch
===================================================================
--- client.cpp.patch	                        (rev 0)
+++ client.cpp.patch	2011-07-19 09:15:09 UTC (rev 132026)
@@ -0,0 +1,17 @@
+--- a/src/Client.cpp	2010-04-01 22:23:17.000000000 +0200
++++ b/src/Client.cpp	2011-07-19 11:03:42.000000000 +0200
+@@ -212,10 +212,10 @@
+     char* readAt = mBuf;
+ 
+ #if HAVE_THREAD
+-    if ( !isUDP( mSettings ) ) {
+-	RunTCP();
+-	return;
+-    }
++//    if ( !isUDP( mSettings ) ) {
++//	RunTCP();
++//	return;
++//    }
+ #endif
+     
+     // Indicates if the stream is readable