Date: Tuesday, August 4, 2015 @ 20:39:56 Author: seblu Revision: 137949
archrelease: copy trunk to community-i686, community-x86_64 Added: netperf/repos/community-i686/001-fix-inlining.patch (from rev 137948, netperf/trunk/001-fix-inlining.patch) netperf/repos/community-i686/PKGBUILD (from rev 137948, netperf/trunk/PKGBUILD) netperf/repos/community-i686/netperf.install (from rev 137948, netperf/trunk/netperf.install) netperf/repos/community-i686/netperf.service (from rev 137948, netperf/trunk/netperf.service) netperf/repos/community-x86_64/001-fix-inlining.patch (from rev 137948, netperf/trunk/001-fix-inlining.patch) netperf/repos/community-x86_64/PKGBUILD (from rev 137948, netperf/trunk/PKGBUILD) netperf/repos/community-x86_64/netperf.install (from rev 137948, netperf/trunk/netperf.install) netperf/repos/community-x86_64/netperf.service (from rev 137948, netperf/trunk/netperf.service) Deleted: netperf/repos/community-i686/PKGBUILD netperf/repos/community-i686/netperf.install netperf/repos/community-i686/netperf.service netperf/repos/community-x86_64/PKGBUILD netperf/repos/community-x86_64/netperf.install netperf/repos/community-x86_64/netperf.service -----------------------------------------+ /PKGBUILD | 94 ++++++++++++++++++++++++++++++ /netperf.install | 40 ++++++++++++ /netperf.service | 18 +++++ community-i686/001-fix-inlining.patch | 32 ++++++++++ community-i686/PKGBUILD | 42 ------------- community-i686/netperf.install | 20 ------ community-i686/netperf.service | 9 -- community-x86_64/001-fix-inlining.patch | 32 ++++++++++ community-x86_64/PKGBUILD | 42 ------------- community-x86_64/netperf.install | 20 ------ community-x86_64/netperf.service | 9 -- 11 files changed, 216 insertions(+), 142 deletions(-) Copied: netperf/repos/community-i686/001-fix-inlining.patch (from rev 137948, netperf/trunk/001-fix-inlining.patch) =================================================================== --- community-i686/001-fix-inlining.patch (rev 0) +++ community-i686/001-fix-inlining.patch 2015-08-04 18:39:56 UTC (rev 137949) @@ -0,0 +1,32 @@ +# Copyright Seblu 2015 +--- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200 ++++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200 +@@ -3997,11 +3997,7 @@ + } + } + +-#ifdef WIN32 +-__forceinline void demo_interval_display(double actual_interval) +-#else +- inline void demo_interval_display(double actual_interval) +-#endif ++void demo_interval_display(double actual_interval) + { + static int count = 0; + struct timeval now; +@@ -4060,15 +4056,7 @@ + important compilers have supported such a construct so it should + not be a big deal. raj 2012-01-23 */ + +-#ifdef WIN32 +-/* It would seem that the Microsoft compiler will not inline across +- source files. So there is little point in having an inline +- directive in that situation. Of course that makes me wonder if an +- inline directive has to appear in netlib.h... */ + void demo_interval_tick(uint32_t units) +-#else +- inline void demo_interval_tick(uint32_t units) +-#endif + { + double actual_interval = 0.0; + Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-08-04 18:38:57 UTC (rev 137948) +++ community-i686/PKGBUILD 2015-08-04 18:39:56 UTC (rev 137949) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@archlinux.org> -# Contributor: Kaiting Chen <kaitocr...@gmail.com> -# Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net> - -pkgname=netperf -pkgver=2.6.0 -pkgrel=3 -pkgdesc='Benchmarking tool for many different types of networking' -url='http://www.netperf.org/' -license=('custom') -arch=('i686' 'x86_64') -depends=('glibc' 'libsmbios' 'lksctp-tools') -install=$pkgname.install -source=( - "ftp://ftp.netperf.org/netperf/$pkgname-$pkgver.tar.bz2" - "$pkgname.service") -md5sums=('9654ffdfd4c4f2c93ce3733cd9ed9236' - '7bce5056b2a24d76fcc0c20e4b527416') - -build() { - cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --enable-demo \ - --enable-unixdomain \ - --enable-dccp \ - --enable-sctp - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # license - install -D -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - # systemd - install -D -m 644 ../$pkgname.service \ - "$pkgdir/usr/lib/systemd/system/$pkgname.service" -} - -# vim:set ts=2 sw=2 et: Copied: netperf/repos/community-i686/PKGBUILD (from rev 137948, netperf/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-08-04 18:39:56 UTC (rev 137949) @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Kaiting Chen <kaitocr...@gmail.com> +# Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net> + +pkgname=netperf +pkgver=2.7.0 +pkgrel=1 +pkgdesc='Benchmarking tool for many different types of networking' +url='http://www.netperf.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('glibc' 'libsmbios' 'lksctp-tools') +install=$pkgname.install +source=("ftp://ftp.netperf.org/netperf/$pkgname-$pkgver.tar.bz2" + "$pkgname.service" + '001-fix-inlining.patch') +md5sums=('ad1c5342d61f297c417a93133aeba65a' + '7bce5056b2a24d76fcc0c20e4b527416' + '0160c47c86ff1fca8df64cfb4cd4d9f2') + +prepare() { + patch -d $pkgname-$pkgver -p1 < 001-fix-inlining.patch +} + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --enable-demo \ + --enable-unixdomain \ + --enable-dccp \ + --enable-sctp + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # license + install -D -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + # systemd + install -D -m 644 ../$pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" +} + +# vim:set ts=2 sw=2 et: Deleted: community-i686/netperf.install =================================================================== --- community-i686/netperf.install 2015-08-04 18:38:57 UTC (rev 137948) +++ community-i686/netperf.install 2015-08-04 18:39:56 UTC (rev 137949) @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(netperf.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in "${filelist[@]}"; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in "${filelist[@]}"; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} Copied: netperf/repos/community-i686/netperf.install (from rev 137948, netperf/trunk/netperf.install) =================================================================== --- community-i686/netperf.install (rev 0) +++ community-i686/netperf.install 2015-08-04 18:39:56 UTC (rev 137949) @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(netperf.info) + +post_install() { + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} Deleted: community-i686/netperf.service =================================================================== --- community-i686/netperf.service 2015-08-04 18:38:57 UTC (rev 137948) +++ community-i686/netperf.service 2015-08-04 18:39:56 UTC (rev 137949) @@ -1,9 +0,0 @@ -[Unit] -Description=Netperf Benchmark Server -After=network.target - -[Service] -ExecStart=/usr/bin/netserver -D - -[Install] -WantedBy=multi-user.target Copied: netperf/repos/community-i686/netperf.service (from rev 137948, netperf/trunk/netperf.service) =================================================================== --- community-i686/netperf.service (rev 0) +++ community-i686/netperf.service 2015-08-04 18:39:56 UTC (rev 137949) @@ -0,0 +1,9 @@ +[Unit] +Description=Netperf Benchmark Server +After=network.target + +[Service] +ExecStart=/usr/bin/netserver -D + +[Install] +WantedBy=multi-user.target Copied: netperf/repos/community-x86_64/001-fix-inlining.patch (from rev 137948, netperf/trunk/001-fix-inlining.patch) =================================================================== --- community-x86_64/001-fix-inlining.patch (rev 0) +++ community-x86_64/001-fix-inlining.patch 2015-08-04 18:39:56 UTC (rev 137949) @@ -0,0 +1,32 @@ +# Copyright Seblu 2015 +--- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200 ++++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200 +@@ -3997,11 +3997,7 @@ + } + } + +-#ifdef WIN32 +-__forceinline void demo_interval_display(double actual_interval) +-#else +- inline void demo_interval_display(double actual_interval) +-#endif ++void demo_interval_display(double actual_interval) + { + static int count = 0; + struct timeval now; +@@ -4060,15 +4056,7 @@ + important compilers have supported such a construct so it should + not be a big deal. raj 2012-01-23 */ + +-#ifdef WIN32 +-/* It would seem that the Microsoft compiler will not inline across +- source files. So there is little point in having an inline +- directive in that situation. Of course that makes me wonder if an +- inline directive has to appear in netlib.h... */ + void demo_interval_tick(uint32_t units) +-#else +- inline void demo_interval_tick(uint32_t units) +-#endif + { + double actual_interval = 0.0; + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-08-04 18:38:57 UTC (rev 137948) +++ community-x86_64/PKGBUILD 2015-08-04 18:39:56 UTC (rev 137949) @@ -1,42 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer <se...@archlinux.org> -# Contributor: Kaiting Chen <kaitocr...@gmail.com> -# Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net> - -pkgname=netperf -pkgver=2.6.0 -pkgrel=3 -pkgdesc='Benchmarking tool for many different types of networking' -url='http://www.netperf.org/' -license=('custom') -arch=('i686' 'x86_64') -depends=('glibc' 'libsmbios' 'lksctp-tools') -install=$pkgname.install -source=( - "ftp://ftp.netperf.org/netperf/$pkgname-$pkgver.tar.bz2" - "$pkgname.service") -md5sums=('9654ffdfd4c4f2c93ce3733cd9ed9236' - '7bce5056b2a24d76fcc0c20e4b527416') - -build() { - cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --enable-demo \ - --enable-unixdomain \ - --enable-dccp \ - --enable-sctp - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # license - install -D -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - # systemd - install -D -m 644 ../$pkgname.service \ - "$pkgdir/usr/lib/systemd/system/$pkgname.service" -} - -# vim:set ts=2 sw=2 et: Copied: netperf/repos/community-x86_64/PKGBUILD (from rev 137948, netperf/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-08-04 18:39:56 UTC (rev 137949) @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Kaiting Chen <kaitocr...@gmail.com> +# Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net> + +pkgname=netperf +pkgver=2.7.0 +pkgrel=1 +pkgdesc='Benchmarking tool for many different types of networking' +url='http://www.netperf.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('glibc' 'libsmbios' 'lksctp-tools') +install=$pkgname.install +source=("ftp://ftp.netperf.org/netperf/$pkgname-$pkgver.tar.bz2" + "$pkgname.service" + '001-fix-inlining.patch') +md5sums=('ad1c5342d61f297c417a93133aeba65a' + '7bce5056b2a24d76fcc0c20e4b527416' + '0160c47c86ff1fca8df64cfb4cd4d9f2') + +prepare() { + patch -d $pkgname-$pkgver -p1 < 001-fix-inlining.patch +} + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --enable-demo \ + --enable-unixdomain \ + --enable-dccp \ + --enable-sctp + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # license + install -D -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + # systemd + install -D -m 644 ../$pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" +} + +# vim:set ts=2 sw=2 et: Deleted: community-x86_64/netperf.install =================================================================== --- community-x86_64/netperf.install 2015-08-04 18:38:57 UTC (rev 137948) +++ community-x86_64/netperf.install 2015-08-04 18:39:56 UTC (rev 137949) @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(netperf.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in "${filelist[@]}"; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in "${filelist[@]}"; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} Copied: netperf/repos/community-x86_64/netperf.install (from rev 137948, netperf/trunk/netperf.install) =================================================================== --- community-x86_64/netperf.install (rev 0) +++ community-x86_64/netperf.install 2015-08-04 18:39:56 UTC (rev 137949) @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(netperf.info) + +post_install() { + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} Deleted: community-x86_64/netperf.service =================================================================== --- community-x86_64/netperf.service 2015-08-04 18:38:57 UTC (rev 137948) +++ community-x86_64/netperf.service 2015-08-04 18:39:56 UTC (rev 137949) @@ -1,9 +0,0 @@ -[Unit] -Description=Netperf Benchmark Server -After=network.target - -[Service] -ExecStart=/usr/bin/netserver -D - -[Install] -WantedBy=multi-user.target Copied: netperf/repos/community-x86_64/netperf.service (from rev 137948, netperf/trunk/netperf.service) =================================================================== --- community-x86_64/netperf.service (rev 0) +++ community-x86_64/netperf.service 2015-08-04 18:39:56 UTC (rev 137949) @@ -0,0 +1,9 @@ +[Unit] +Description=Netperf Benchmark Server +After=network.target + +[Service] +ExecStart=/usr/bin/netserver -D + +[Install] +WantedBy=multi-user.target