Add support for SCTP performance tests by K. Sanborn (bug #436398).

Package-Manager: portage-2.2.0_alpha133/cvs/Linux x86_64

4 files changed, 80 insertions, 6 deletions

diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 537faa70c26b..338e034f135c 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netperf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.57 2012/08/05 22:52:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.58 2012/09/27 15:35:16 jer Exp $
+
+*netperf-2.6.0-r1 (27 Sep 2012)
+
+  27 Sep 2012; Jeroen Roovers <jer@gentoo.org> +netperf-2.6.0-r1.ebuild,
+  metadata.xml:
+  Add support for SCTP performance tests by K. Sanborn (bug #436398).
 
   05 Aug 2012; Jeroen Roovers <jer@gentoo.org>
   -files/netperf-2.4.0-gcc41.patch, -netperf-2.4.4-r1.ebuild,
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 411cd66d540d..ce412b03bc30 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -7,13 +7,14 @@ AUX netperf-fix-scripts.patch 1424 SHA256 16668469ac82bda63c2e9c17431c983368b04c
 DIST netperf-2.5.0.tar.bz2 1025246 SHA256 8594bc4ea4427c721a89d9901ae0327cd849eece681d2270b58e9395d25a06d0 SHA512 e06d1a90aa89786b189c5dca2bb85991315975a9f1c9f1236c79938fd3299cf6374d93ec5a6de8791c5f7ce9d73bee4482949d08e1d5487a523a6d006c42448b WHIRLPOOL 276de22c022fe3bbadbcb1350577a4643450fb2548694a7a519f49e99a907aafb9bb9ff5d114c18b7313dfb46b9663de6cacbe41bd6cf6ec8a127685bbfbf7f0
 DIST netperf-2.6.0.tar.bz2 1032953 SHA256 cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a SHA512 b3921d2e887088b14a8bbe5ace9b1cc0c8b29951eeaa7857ce3f324933397c8ff6b56eeacfe755181ce1a56c982fe431955f6db55bd20f2343324e22ee23c9b3 WHIRLPOOL b602c8660bae59648cbbe9eed47ee9d86b0ae714bc0c2906e80a14d0ce18951f125f3331f90acd776850b04506e37030545084677f6be512477ea37f76d972e7
 EBUILD netperf-2.5.0-r1.ebuild 1594 SHA256 51d2a78fd06973bdc7ae99295b59c535b6cb778c6286c648c08d184cd064346a SHA512 d34815771e9f84a81e9dd0d5af087efeeb8297fcc364a6bb6c50638dbe4df00c889bd209b88184eb9243a36aeaaba5ab43dbe5cc159b91de8e6a76242c949a43 WHIRLPOOL 3e0dddfe88eaf4a0d36f8f676ecf2422c4cc3884afc549babc3d04832885943a8656444b36bc3f2a3cf40a0891ecfc5f24fb14e4c75ad919a3df879c558529cd
+EBUILD netperf-2.6.0-r1.ebuild 1862 SHA256 884eba694544bf3c7340b42892ea01b9a30599485581a5cdf310b136fbbb458c SHA512 5f954eff76ee8d9440d643b0d7ab4cc026223cd7ec80b791600c398789a6397eb191ab28a308049e762bba7ed5b63c60a3d6f3aa5741528b8fbca0c69510f81d WHIRLPOOL 6d8373944470beb5422793feaa700bceb143d54a7dd1288b5d2e2fafca5bcfd1206aced791bc72cf7cd482331aedee0d64e6e82d19364097fdb5d3c7ad3eeeea
 EBUILD netperf-2.6.0.ebuild 1804 SHA256 e6c1aab984dd5735de84344005039f54060a3965552908b06e0068d855fb0a18 SHA512 453f6718f0bb546c9c19fab2e7ea3e5a0f4537d65b4518810b954316361a6287e76dd29fff60490d992638f86786c8a533da5199bf9b0ba8f1aae8a283a52fa2 WHIRLPOOL d95dda1253d55e1e0ca169ebe7f5013bc126ee5788b4b7d0bf05746cfa9c0c562806c7f8e21f21e2d1bd7578a0f682946122451a5c281187d1f369ae3e7ea983
-MISC ChangeLog 8452 SHA256 c085c13326ed20d7a9b3798e36bd42e3c1c2a369b72f982d48bc9947439ba11d SHA512 7e284969beba7ab29e3f0327c4e30bb879253e3c5a8656bf88e83f126de21a58fac107a79acd284ff274783fd18015c2020e5c59cb8bfb944f6cc6a1b9ac807b WHIRLPOOL 44bac2509a6ab57f14c68b7cb6e2d27132ca47d099e2d391e93dd8b4564cb622dc95d32b0029a6ecfa8a272a5588d33f3796639388bed386eb3b99a037706e68
-MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+MISC ChangeLog 8645 SHA256 1a1572390f4651beb6ab654357044cb70a51677bbb2ba2a6462df55af0194d1b SHA512 b8dc05854ed9a924eca11e625cda45df93c4209ff40dec3c645ec531780d4a8ffc5d92aee18b9dc42673fc0b363165d34d25d31bdb0370f707fa85c2dcbea91a WHIRLPOOL a4bcad8b642f9289d577bef1b69346e2d87eee0af255c3f424a3d714e4b896dcb57fe9cd95f304d56dd8cae72f8b362677b4e354fb6221e4ff57679bee576941
+MISC metadata.xml 239 SHA256 32bc585d37986f5586a0a792c25074b4631821eaea2b48546d4b901eed00d150 SHA512 ec43eec0a9418672b22f417eee850d1493d203690de7695c61347c43cd21577d8311fb3322a687276cbe20f54e501cb2df234d6fb732a8014bc692c449691117 WHIRLPOOL 647467d70046b421ed3db0c2bae5a5158b703a483df563be2aeb8c17ae05301135718586b9361ca390e3b3dbfc13a9a304d549b46532ca80c266b6231e5af999
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAe+ScACgkQVWmRsqeSphOy/wCfV7c5zggyBcq3Q3iYhu4JSfbB
-Cf4An1g1P2vcODVQw9uvmZzMgREm4Y1Z
-=tTxv
+iEYEAREIAAYFAlBkcjoACgkQVWmRsqeSphNYzgCeLyxxfOHjzhhC4d1R+gy3FOnk
+9DgAn3ZxzgW6X2ZHlm8qMhs/hyiJG2iz
+=gG/S
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml
index 03aa50bab7e3..f85310499342 100644
--- a/net-analyzer/netperf/metadata.xml
+++ b/net-analyzer/netperf/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<use>
+<flag name='sctp'>Include tests to measure SCTP performance</flag>
+</use>
 </pkgmetadata>
diff --git a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..154a25f51947
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild,v 1.1 2012/09/27 15:35:17 jer Exp $
+
+EAPI=4
+inherit eutils flag-o-matic
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+IUSE="sctp"
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND=""
+
+src_prepare() {
+	sed -i src/netserver.c \
+		-e '/^#define DEBUG_LOG_FILE_DIR/s:"/tmp/":"/var/log/":' \
+		-e 's:sizeof(netperf_response) - 7:MAXSPECDATA:g' \
+		|| die
+
+	epatch "${FILESDIR}"/${PN}-fix-scripts.patch
+
+	# Fixing paths in scripts
+	sed -i -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
+			doc/examples/sctp_stream_script \
+			doc/examples/tcp_range_script \
+			doc/examples/tcp_rr_script \
+			doc/examples/tcp_stream_script \
+			doc/examples/udp_rr_script \
+			doc/examples/udp_stream_script
+
+	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+	append-cppflags -D_GNU_SOURCE
+}
+
+src_configure() {
+	econf \
+		$(use_enable sctp)
+}
+
+src_install () {
+	default
+
+	# move netserver into sbin as we had it before 2.4 was released with its
+	# autoconf goodness
+	dodir /usr/sbin
+	mv "${D}"/usr/{bin,sbin}/netserver || die
+
+	# init.d / conf.d
+	newinitd "${FILESDIR}"/${PN}-2.2-init netperf
+	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
+
+	# documentation and example scripts
+	dodoc AUTHORS ChangeLog NEWS README Release_Notes
+	dodir /usr/share/doc/${PF}/examples
+	#Scripts no longer get installed by einstall
+	cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples
+}