Date: Sunday, October 9, 2016 @ 12:19:10 Author: seblu Revision: 191700
archrelease: copy trunk to community-i686, community-x86_64 Added: iperf/repos/community-i686/PKGBUILD (from rev 191699, iperf/trunk/PKGBUILD) iperf/repos/community-i686/iperf-tcp.service (from rev 191699, iperf/trunk/iperf-tcp.service) iperf/repos/community-i686/iperf-udp.service (from rev 191699, iperf/trunk/iperf-udp.service) iperf/repos/community-i686/iperf.install (from rev 191699, iperf/trunk/iperf.install) iperf/repos/community-x86_64/PKGBUILD (from rev 191699, iperf/trunk/PKGBUILD) iperf/repos/community-x86_64/iperf-tcp.service (from rev 191699, iperf/trunk/iperf-tcp.service) iperf/repos/community-x86_64/iperf-udp.service (from rev 191699, iperf/trunk/iperf-udp.service) iperf/repos/community-x86_64/iperf.install (from rev 191699, iperf/trunk/iperf.install) Deleted: iperf/repos/community-i686/PKGBUILD iperf/repos/community-i686/client.cpp.patch iperf/repos/community-i686/iperf-tcp.service iperf/repos/community-i686/iperf-udp.service iperf/repos/community-i686/iperf.install iperf/repos/community-x86_64/PKGBUILD iperf/repos/community-x86_64/client.cpp.patch iperf/repos/community-x86_64/iperf-tcp.service iperf/repos/community-x86_64/iperf-udp.service iperf/repos/community-x86_64/iperf.install ------------------------------------+ /PKGBUILD | 106 +++++++++++++++++++++++++++++++++++ /iperf-tcp.service | 18 +++++ /iperf-udp.service | 18 +++++ /iperf.install | 22 +++++++ community-i686/PKGBUILD | 45 -------------- community-i686/client.cpp.patch | 17 ----- community-i686/iperf-tcp.service | 9 -- community-i686/iperf-udp.service | 9 -- community-i686/iperf.install | 11 --- community-x86_64/PKGBUILD | 45 -------------- community-x86_64/client.cpp.patch | 17 ----- community-x86_64/iperf-tcp.service | 9 -- community-x86_64/iperf-udp.service | 9 -- community-x86_64/iperf.install | 11 --- 14 files changed, 164 insertions(+), 182 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-10-09 12:18:47 UTC (rev 191699) +++ community-i686/PKGBUILD 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Dale Blount <d...@archlinux.org> - -pkgname=iperf -pkgver=2.0.5 -pkgrel=9 -pkgdesc='A tool to measure maximum TCP bandwidth' -arch=('i686' 'x86_64') -license=('custom') -url='http://iperf.sourceforge.net' -depends=('gcc-libs') -install=iperf.install -source=("http://downloads.sourceforge.net/iperf/iperf-$pkgver.tar.gz" - 'iperf-tcp.service' - 'iperf-udp.service' - 'client.cpp.patch') -md5sums=('44b5536b67719f4250faed632a3cd016' - '1d8660b540aa0db2e627d3d400cb8de4' - 'a27a8d27b1585bc999a04a2f082e2726' - '82ce63c87cc8bb2f0f94069857ac14a9') - -build() { - cd $pkgname-$pkgver - # fix FS#25159 - patch -Np1 -i "$srcdir/client.cpp.patch" - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-multicast \ - --enable-threads - make -} - -package() { - pushd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/iperf/LICENSE" - popd - # systemd - install -Dm644 iperf-tcp.service "$pkgdir/usr/lib/systemd/system/iperf-tcp.service" - install -Dm644 iperf-udp.service "$pkgdir/usr/lib/systemd/system/iperf-udp.service" -} - -# vim:set ts=2 sw=2 et: Copied: iperf/repos/community-i686/PKGBUILD (from rev 191699, iperf/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-10-09 12:19:10 UTC (rev 191700) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Dale Blount <d...@archlinux.org> + +pkgname=iperf +pkgver=2.0.9 +pkgrel=1 +pkgdesc='A tool to measure maximum TCP bandwidth' +arch=('i686' 'x86_64') +license=('custom') +url='https://sourceforge.net/projects/iperf2/' +depends=('gcc-libs') +install=iperf.install +source=("http://downloads.sourceforge.net/iperf2/iperf-$pkgver.tar.gz" + 'iperf-tcp.service' + 'iperf-udp.service') +md5sums=('351b018b71176b8cb25f20eef6a9e37c' + '1d8660b540aa0db2e627d3d400cb8de4' + 'a27a8d27b1585bc999a04a2f082e2726') +prepare() { + cd $pkgname-$pkgver + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + msg2 "Applying patch $filename" + patch -p1 -N -i "$srcdir/$filename" + fi + done + : +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --enable-ipv6 \ + --enable-multicast \ + --enable-threads + make +} + +package() { + pushd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/iperf/LICENSE" + popd + # systemd + install -Dm644 iperf-tcp.service "$pkgdir/usr/lib/systemd/system/iperf-tcp.service" + install -Dm644 iperf-udp.service "$pkgdir/usr/lib/systemd/system/iperf-udp.service" +} + +# vim:set ts=2 sw=2 et: Deleted: community-i686/client.cpp.patch =================================================================== --- community-i686/client.cpp.patch 2016-10-09 12:18:47 UTC (rev 191699) +++ community-i686/client.cpp.patch 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,17 +0,0 @@ ---- 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 Deleted: community-i686/iperf-tcp.service =================================================================== --- community-i686/iperf-tcp.service 2016-10-09 12:18:47 UTC (rev 191699) +++ community-i686/iperf-tcp.service 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,9 +0,0 @@ -[Unit] -Description=Iperf TCP Server -After=network.target - -[Service] -ExecStart=/usr/bin/iperf -s -V - -[Install] -WantedBy=multi-user.target Copied: iperf/repos/community-i686/iperf-tcp.service (from rev 191699, iperf/trunk/iperf-tcp.service) =================================================================== --- community-i686/iperf-tcp.service (rev 0) +++ community-i686/iperf-tcp.service 2016-10-09 12:19:10 UTC (rev 191700) @@ -0,0 +1,9 @@ +[Unit] +Description=Iperf TCP Server +After=network.target + +[Service] +ExecStart=/usr/bin/iperf -s -V + +[Install] +WantedBy=multi-user.target Deleted: community-i686/iperf-udp.service =================================================================== --- community-i686/iperf-udp.service 2016-10-09 12:18:47 UTC (rev 191699) +++ community-i686/iperf-udp.service 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,9 +0,0 @@ -[Unit] -Description=Iperf UDP Server -After=network.target - -[Service] -ExecStart=/usr/bin/iperf -u -s -V - -[Install] -WantedBy=multi-user.target Copied: iperf/repos/community-i686/iperf-udp.service (from rev 191699, iperf/trunk/iperf-udp.service) =================================================================== --- community-i686/iperf-udp.service (rev 0) +++ community-i686/iperf-udp.service 2016-10-09 12:19:10 UTC (rev 191700) @@ -0,0 +1,9 @@ +[Unit] +Description=Iperf UDP Server +After=network.target + +[Service] +ExecStart=/usr/bin/iperf -u -s -V + +[Install] +WantedBy=multi-user.target Deleted: community-i686/iperf.install =================================================================== --- community-i686/iperf.install 2016-10-09 12:18:47 UTC (rev 191699) +++ community-i686/iperf.install 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,11 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 2.0.5-6)" -lt 0 ]; then - cat << EOF -===> iperf.service unit has been moved to iperf-udp.service and iperf-tcp.service. -EOF - fi -} - -# vim:set ts=2 sw=2 ft=sh et: Copied: iperf/repos/community-i686/iperf.install (from rev 191699, iperf/trunk/iperf.install) =================================================================== --- community-i686/iperf.install (rev 0) +++ community-i686/iperf.install 2016-10-09 12:19:10 UTC (rev 191700) @@ -0,0 +1,11 @@ +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 2.0.5-6)" -lt 0 ]; then + cat << EOF +===> iperf.service unit has been moved to iperf-udp.service and iperf-tcp.service. +EOF + fi +} + +# vim:set ts=2 sw=2 ft=sh et: Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-10-09 12:18:47 UTC (rev 191699) +++ community-x86_64/PKGBUILD 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Dale Blount <d...@archlinux.org> - -pkgname=iperf -pkgver=2.0.5 -pkgrel=9 -pkgdesc='A tool to measure maximum TCP bandwidth' -arch=('i686' 'x86_64') -license=('custom') -url='http://iperf.sourceforge.net' -depends=('gcc-libs') -install=iperf.install -source=("http://downloads.sourceforge.net/iperf/iperf-$pkgver.tar.gz" - 'iperf-tcp.service' - 'iperf-udp.service' - 'client.cpp.patch') -md5sums=('44b5536b67719f4250faed632a3cd016' - '1d8660b540aa0db2e627d3d400cb8de4' - 'a27a8d27b1585bc999a04a2f082e2726' - '82ce63c87cc8bb2f0f94069857ac14a9') - -build() { - cd $pkgname-$pkgver - # fix FS#25159 - patch -Np1 -i "$srcdir/client.cpp.patch" - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-multicast \ - --enable-threads - make -} - -package() { - pushd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/iperf/LICENSE" - popd - # systemd - install -Dm644 iperf-tcp.service "$pkgdir/usr/lib/systemd/system/iperf-tcp.service" - install -Dm644 iperf-udp.service "$pkgdir/usr/lib/systemd/system/iperf-udp.service" -} - -# vim:set ts=2 sw=2 et: Copied: iperf/repos/community-x86_64/PKGBUILD (from rev 191699, iperf/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-10-09 12:19:10 UTC (rev 191700) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Dale Blount <d...@archlinux.org> + +pkgname=iperf +pkgver=2.0.9 +pkgrel=1 +pkgdesc='A tool to measure maximum TCP bandwidth' +arch=('i686' 'x86_64') +license=('custom') +url='https://sourceforge.net/projects/iperf2/' +depends=('gcc-libs') +install=iperf.install +source=("http://downloads.sourceforge.net/iperf2/iperf-$pkgver.tar.gz" + 'iperf-tcp.service' + 'iperf-udp.service') +md5sums=('351b018b71176b8cb25f20eef6a9e37c' + '1d8660b540aa0db2e627d3d400cb8de4' + 'a27a8d27b1585bc999a04a2f082e2726') +prepare() { + cd $pkgname-$pkgver + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + msg2 "Applying patch $filename" + patch -p1 -N -i "$srcdir/$filename" + fi + done + : +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --enable-ipv6 \ + --enable-multicast \ + --enable-threads + make +} + +package() { + pushd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/iperf/LICENSE" + popd + # systemd + install -Dm644 iperf-tcp.service "$pkgdir/usr/lib/systemd/system/iperf-tcp.service" + install -Dm644 iperf-udp.service "$pkgdir/usr/lib/systemd/system/iperf-udp.service" +} + +# vim:set ts=2 sw=2 et: Deleted: community-x86_64/client.cpp.patch =================================================================== --- community-x86_64/client.cpp.patch 2016-10-09 12:18:47 UTC (rev 191699) +++ community-x86_64/client.cpp.patch 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,17 +0,0 @@ ---- 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 Deleted: community-x86_64/iperf-tcp.service =================================================================== --- community-x86_64/iperf-tcp.service 2016-10-09 12:18:47 UTC (rev 191699) +++ community-x86_64/iperf-tcp.service 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,9 +0,0 @@ -[Unit] -Description=Iperf TCP Server -After=network.target - -[Service] -ExecStart=/usr/bin/iperf -s -V - -[Install] -WantedBy=multi-user.target Copied: iperf/repos/community-x86_64/iperf-tcp.service (from rev 191699, iperf/trunk/iperf-tcp.service) =================================================================== --- community-x86_64/iperf-tcp.service (rev 0) +++ community-x86_64/iperf-tcp.service 2016-10-09 12:19:10 UTC (rev 191700) @@ -0,0 +1,9 @@ +[Unit] +Description=Iperf TCP Server +After=network.target + +[Service] +ExecStart=/usr/bin/iperf -s -V + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/iperf-udp.service =================================================================== --- community-x86_64/iperf-udp.service 2016-10-09 12:18:47 UTC (rev 191699) +++ community-x86_64/iperf-udp.service 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,9 +0,0 @@ -[Unit] -Description=Iperf UDP Server -After=network.target - -[Service] -ExecStart=/usr/bin/iperf -u -s -V - -[Install] -WantedBy=multi-user.target Copied: iperf/repos/community-x86_64/iperf-udp.service (from rev 191699, iperf/trunk/iperf-udp.service) =================================================================== --- community-x86_64/iperf-udp.service (rev 0) +++ community-x86_64/iperf-udp.service 2016-10-09 12:19:10 UTC (rev 191700) @@ -0,0 +1,9 @@ +[Unit] +Description=Iperf UDP Server +After=network.target + +[Service] +ExecStart=/usr/bin/iperf -u -s -V + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/iperf.install =================================================================== --- community-x86_64/iperf.install 2016-10-09 12:18:47 UTC (rev 191699) +++ community-x86_64/iperf.install 2016-10-09 12:19:10 UTC (rev 191700) @@ -1,11 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 2.0.5-6)" -lt 0 ]; then - cat << EOF -===> iperf.service unit has been moved to iperf-udp.service and iperf-tcp.service. -EOF - fi -} - -# vim:set ts=2 sw=2 ft=sh et: Copied: iperf/repos/community-x86_64/iperf.install (from rev 191699, iperf/trunk/iperf.install) =================================================================== --- community-x86_64/iperf.install (rev 0) +++ community-x86_64/iperf.install 2016-10-09 12:19:10 UTC (rev 191700) @@ -0,0 +1,11 @@ +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 2.0.5-6)" -lt 0 ]; then + cat << EOF +===> iperf.service unit has been moved to iperf-udp.service and iperf-tcp.service. +EOF + fi +} + +# vim:set ts=2 sw=2 ft=sh et: