summaryrefslogtreecommitdiff
path: root/extra/iperf
diff options
context:
space:
mode:
Diffstat (limited to 'extra/iperf')
-rw-r--r--extra/iperf/PKGBUILD26
-rw-r--r--extra/iperf/client.cpp.patch17
2 files changed, 35 insertions, 8 deletions
diff --git a/extra/iperf/PKGBUILD b/extra/iperf/PKGBUILD
index d37cd1c6c..e07fa4562 100644
--- a/extra/iperf/PKGBUILD
+++ b/extra/iperf/PKGBUILD
@@ -1,25 +1,35 @@
-# $Id: PKGBUILD 86402 2010-08-01 10:53:45Z giovanni $
+# $Id: PKGBUILD 132026 2011-07-19 09:15:09Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Dale Blount <dale@archlinux.org>
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"
}
diff --git a/extra/iperf/client.cpp.patch b/extra/iperf/client.cpp.patch
new file mode 100644
index 000000000..85f89e765
--- /dev/null
+++ b/extra/iperf/client.cpp.patch
@@ -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