From 8d8f0ea627f8a6863f6268c8bd8f9a02548b7cbf Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Wed, 24 Jun 2015 12:13:58 -0700 Subject: [PATCH] bump(net-analyzer/netperf): sync with upstream for arm64 Signed-off-by: Geoff Levand --- .../md5-cache/net-analyzer/netperf-2.5.0-r1 | 11 --- .../md5-cache/net-analyzer/netperf-2.6.0 | 11 --- .../md5-cache/net-analyzer/netperf-2.6.0-r1 | 8 +-- .../net-analyzer/netperf/ChangeLog | 43 ++++++++++- .../net-analyzer/netperf/Manifest | 18 +++-- .../netperf/files/netperf-2.4.0-gcc41.patch | 11 --- .../netperf/files/netperf-2.6.0-log-dir.patch | 11 +++ .../netperf/files/netperf-CVE-2007-1444.patch | 71 ------------------- .../netperf/files/netperf-fix-scripts.patch | 15 ++-- .../netperf/netperf-2.5.0-r1.ebuild | 56 --------------- .../netperf/netperf-2.6.0-r1.ebuild | 38 +++++----- .../net-analyzer/netperf/netperf-2.6.0.ebuild | 59 --------------- 12 files changed, 88 insertions(+), 264 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.5.0-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.6.0 delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-CVE-2007-1444.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.5.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.5.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.5.0-r1 deleted file mode 100644 index 1d9fbdfde8..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.5.0-r1 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=>=sys-apps/sed-4 -DESCRIPTION=Network performance benchmark including tests for TCP, UDP, sockets, ATM and more. -EAPI=4 -HOMEPAGE=http://www.netperf.org/ -KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 -LICENSE=netperf -SLOT=0 -SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.5.0.tar.bz2 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=29e5d7ee014d406d13e9015b548d32c9 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.6.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.6.0 deleted file mode 100644 index 3fb334fd23..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.6.0 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=>=sys-apps/sed-4 -DESCRIPTION=Network performance benchmark including tests for TCP, UDP, sockets, ATM and more. -EAPI=4 -HOMEPAGE=http://www.netperf.org/ -KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 -LICENSE=netperf -SLOT=0 -SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.bz2 -_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=6818c3c33018f8d32c2c2c7cb787bafd diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.6.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.6.0-r1 index 7a5dd85524..0c0ae93319 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.6.0-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/net-analyzer/netperf-2.6.0-r1 @@ -1,12 +1,12 @@ DEFINED_PHASES=configure install prepare DEPEND=>=sys-apps/sed-4 -DESCRIPTION=Network performance benchmark including tests for TCP, UDP, sockets, ATM and more. -EAPI=4 +DESCRIPTION=Network performance benchmark including tests for TCP, UDP, sockets, ATM and more +EAPI=5 HOMEPAGE=http://www.netperf.org/ IUSE=demo sctp -KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 +KEYWORDS=alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86 LICENSE=netperf SLOT=0 SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.bz2 _eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=551604e25a11cb5673fc5aa7e5bb48d7 +_md5_=b68ef200b671b852371c07b66e0c3218 diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog index 2e55171805..971e2e434a 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog @@ -1,6 +1,45 @@ # 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.59 2012/09/27 15:52:23 jer Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.71 2014/10/29 09:40:30 jer Exp $ + + 29 Oct 2014; Jeroen Roovers -netperf-2.5.0-r1.ebuild: + Old. + + 29 Oct 2014; Agostino Sarubbo netperf-2.6.0-r1.ebuild: + Stable for sparc, wrt bug #517128 + + 28 Oct 2014; Agostino Sarubbo netperf-2.6.0-r1.ebuild: + Stable for ia64, wrt bug #517128 + + 17 Oct 2014; Tobias Klausmann netperf-2.6.0-r1.ebuild: + Stable on alpha, bug 517128 + + 14 Sep 2014; Agostino Sarubbo netperf-2.6.0-r1.ebuild: + Stable for ppc64, wrt bug #517128 + + 30 Aug 2014; Chema Alonso netperf-2.6.0-r1.ebuild: + Stable for amd64 wrt bug #517128 + + 10 Aug 2014; Sergei Trofimovich netperf-2.5.0-r1.ebuild, + netperf-2.6.0-r1.ebuild: + QA: drop trailing '.' from DESCRIPTION + + 09 Aug 2014; Agostino Sarubbo netperf-2.6.0-r1.ebuild: + Stable for ppc, wrt bug #517128 + + 03 Aug 2014; netperf-2.6.0-r1.ebuild: + arm64, initial support + + 31 Jul 2014; Jeroen Roovers netperf-2.6.0-r1.ebuild: + Stable for HPPA (bug #517128). + + 26 Jul 2014; Pawel Hajdan jr netperf-2.6.0-r1.ebuild: + x86 stable wrt bug #517128 + + 14 Jul 2014; Jeroen Roovers -netperf-2.6.0.ebuild, + netperf-2.6.0-r1.ebuild, +files/netperf-2.6.0-log-dir.patch, + files/netperf-fix-scripts.patch: + EAPI bump. Whitespace. cp must die(). Change sed script into patch. 27 Sep 2012; Jeroen Roovers netperf-2.6.0-r1.ebuild, metadata.xml: diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/Manifest b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/Manifest index 93ec30692c..7a805eb607 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/Manifest @@ -3,18 +3,16 @@ Hash: SHA256 AUX netperf-2.2-conf 103 SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340 SHA512 88a0d19c59a054071f472e62e6afd8c5fe37a77802dedea3adc82df0701f280c0ad8b5410e7fab74302861bc45920d38d576cfea1d8baa01cd5739801acb3b60 WHIRLPOOL 30bb26aab461eb024e80fdbb663ea334f0112d7bb1c6d6d4c83ccd017efab4a945a1ed2f6073a122de7a9e6888a4fd11787744ce8d236f22ab3b88a93ad61eb2 AUX netperf-2.2-init 433 SHA256 82df403bbf2dcb0086f4e7563b7ac678b65f8f7b5411312abadaa1594af659b7 SHA512 8151488c05001f2475201f3ebff3213d8a5afef5f75a2b726bae363c688f6c2363a756a9514921bffaf9eb7d7405114d27c8e5b98d3f53eb3a52db75a5236760 WHIRLPOOL 995662769c2ea31bcd0b45c987dddcec536f9df69d4f6d6c062123e30834dc96c482627592ce9b97811548a9edcfb6660aef0cdfb844ae49ff4ec92ec02e0b39 -AUX netperf-fix-scripts.patch 1424 SHA256 16668469ac82bda63c2e9c17431c983368b04c328c4cdc2ab1f973ba22f3c354 SHA512 2dbafd5dfbaea196fa4e5b2669cff151c9837c5ebd07889bf027d7f7de3995c757f3d6a20d96eeb88300ef8ce93d27c78ce24dcd3f363062dfa1f31b6818072d WHIRLPOOL d138b876089a93c593305be941dc7bb22a15c0a5a116940e38fb8d0292317efa76c548d518add9f549efb8dcaa6bacb7950b5ee0bae2c4584fcba04b7fc6da14 -DIST netperf-2.5.0.tar.bz2 1025246 SHA256 8594bc4ea4427c721a89d9901ae0327cd849eece681d2270b58e9395d25a06d0 SHA512 e06d1a90aa89786b189c5dca2bb85991315975a9f1c9f1236c79938fd3299cf6374d93ec5a6de8791c5f7ce9d73bee4482949d08e1d5487a523a6d006c42448b WHIRLPOOL 276de22c022fe3bbadbcb1350577a4643450fb2548694a7a519f49e99a907aafb9bb9ff5d114c18b7313dfb46b9663de6cacbe41bd6cf6ec8a127685bbfbf7f0 +AUX netperf-2.6.0-log-dir.patch 261 SHA256 c5449f723cc26e3ebada62d954e5b8dbad3b0996db18401c816fa756905eedbb SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6 WHIRLPOOL 197919f1204465ad813849ab6b6f4ee24f7fe2f5aaf7072ab6f4159a5713163041dffa6e721a066552b0b7746b353b84255a0aceca478993ee229f37dbbb20fd +AUX netperf-fix-scripts.patch 819 SHA256 2dd29e6134f769cfff036945ebbb63e6f10338c95a1d5705c374f63c2d81ac30 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a WHIRLPOOL eaf301c87e6fd04fbeb6bc2eb33f69036f885dfc8025257a0494d15bb201472d8e2e2b806e01f4634c5f52e3dd43c0f8a13d3b8010b84129ccb808c3ea68a2f0 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 1890 SHA256 9c4ef964512fcba0457898d2295d77881967e138fa35db6548acd63d4b515bb2 SHA512 a39b23b889f83fab3bc5633f9779c7c2e6529191b251a30da363923f664b5e400af835611083eae3bcae333f6d079220fd131d309578ff26bb4d45b0af49e71c WHIRLPOOL ce0c71decf84e451f0dd80a513708379d5a9d169316497a21b46fb1244b323c3b8489c3bd2166300050b438d108deb840a83e9967a7629682327d226514e08b5 -EBUILD netperf-2.6.0.ebuild 1804 SHA256 e6c1aab984dd5735de84344005039f54060a3965552908b06e0068d855fb0a18 SHA512 453f6718f0bb546c9c19fab2e7ea3e5a0f4537d65b4518810b954316361a6287e76dd29fff60490d992638f86786c8a533da5199bf9b0ba8f1aae8a283a52fa2 WHIRLPOOL d95dda1253d55e1e0ca169ebe7f5013bc126ee5788b4b7d0bf05746cfa9c0c562806c7f8e21f21e2d1bd7578a0f682946122451a5c281187d1f369ae3e7ea983 -MISC ChangeLog 8820 SHA256 85cb65156308092e8e87c96a282b6eceb12332594336fb054b1a6813bde4ecf2 SHA512 44665ebd22e330808d14f82c5120ce8236e5fcc31c8e3a998975743fb7edbdd067585311b088e1b1220ecc4e458decb8fc461663ccc3cba6796594d675312a16 WHIRLPOOL 689880ca1ecf56315cffb61bcaa13e2ed3a1d66a6d5f408d9648086e33ada22e167459af013b8efb987ed2c64a6c272de7278f38dad3983b0413daa94140eb93 +EBUILD netperf-2.6.0-r1.ebuild 1783 SHA256 ed5d725ee9383b4326246c73936a5211b8d63d4978f83312f0136fa146f823f0 SHA512 3d88d05fd77a75ab2c375a85ae9639fcde42efdca44c1c45a5fb3cf9fad9ed964b1ff3f96b12efc0881bc9ceba11ea4162fc561bbca28528123237d9e5cffac1 WHIRLPOOL 058965d2d4c973c96740c1bf0230f2f7208b82b34a485038932db2171d7fc1b12483f57d208fdab20733100743fff450986c5853508c9ce8b9b4d2e809f3e003 +MISC ChangeLog 10250 SHA256 5d025bcd9389e3dbe25010ca31144d3257d8f6e3fb75cad0d333960350545090 SHA512 82c59fc3806e9265f21ca881f797044628fef41c4fe9462e680d9107e4cfebe469d45ad30f585967074f4dfdda2845007ed81ebd7ef8dd621c29a5441ecda712 WHIRLPOOL 8f17782fbf4f5fd6ffcd09d5128ccae91311677460bdda7d4c32e486039d8f7bb4cdde889a6eb405df2bf75341a5a66e042862d3014b158c9e73b630e083f3fe MISC metadata.xml 320 SHA256 6eed60337859b545349520e6129046903f8bc2d0a88f6fd766e2eefa7ff37c9c SHA512 d4e3e554fcf15505996ba787a0f25764a1579a5e363baba742c131f8874ba48b8e4991fb5c7ad7f5a2f3d3469ede3823cb4745787a7c4ca24e2b2826917177e9 WHIRLPOOL beece57646dca4b5bdf342129266ed690658885f6e7aea3c8cc3d6485a2fe54e91208a487bfbc97764230173888f10ad71985c99f377e2ca9586f8f81564f433 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlBkdj0ACgkQVWmRsqeSphNUCwCcD8ZY7PL2gUvBApIYs5BfLyGP -U6QAn1RSpKHstIE5tXATd3OsUEp0A6ib -=2pSU +iEYEAREIAAYFAlRQtg8ACgkQVWmRsqeSphM50wCdFLG7hkh9L29c/xVuFfbxwYWE +MYMAn1jRNuqx121bMylyO26764zl7fiy +=r8x0 -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch deleted file mode 100644 index 72da7e4cbc..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.4.0-gcc41.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- aclocal.m4 2005-05-11 19:57:20.000000000 +0300 -+++ aclocal.m4 2006-03-19 19:42:03.000000000 +0200 -@@ -906,7 +906,7 @@ - # "void *" as the second argument to getpeername - curl_cv_socklen_t_equiv= - for arg2 in "struct sockaddr" void; do -- for t in int size_t unsigned long "unsigned long" socklen_t; do -+ for t in socklen_t int size_t unsigned long "unsigned long"; do - AC_TRY_COMPILE([ - #ifdef HAVE_SYS_TYPES_H - #include diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch new file mode 100644 index 0000000000..00554cc0b5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch @@ -0,0 +1,11 @@ +--- a/src/netserver.c ++++ b/src/netserver.c +@@ -165,7 +165,7 @@ + #elif defined(ANDROID) + #define DEBUG_LOG_FILE_DIR "/data/local/tmp/" + #else +-#define DEBUG_LOG_FILE_DIR "/tmp/" ++#define DEBUG_LOG_FILE_DIR "/var/log/" + #endif + #endif /* DEBUG_LOG_FILE_DIR */ + diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-CVE-2007-1444.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-CVE-2007-1444.patch deleted file mode 100644 index ca8a33dee4..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-CVE-2007-1444.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur netperf-2.4.4.orig/src/netlib.c netperf-2.4.4.patched/src/netlib.c ---- netperf-2.4.4.orig/src/netlib.c 2007-10-18 01:16:02.000000000 +0400 -+++ netperf-2.4.4.patched/src/netlib.c 2008-01-30 22:03:01.000000000 +0300 -@@ -244,6 +244,7 @@ - union netperf_response_struct netperf_response; - - FILE *where; -+int fd = -1; - - char libfmt = '?'; - -diff -Naur netperf-2.4.4.orig/src/netlib.h netperf-2.4.4.patched/src/netlib.h ---- netperf-2.4.4.orig/src/netlib.h 2007-10-18 01:17:37.000000000 +0400 -+++ netperf-2.4.4.patched/src/netlib.h 2008-01-30 21:46:34.000000000 +0300 -@@ -445,6 +445,7 @@ - extern SOCKET server_sock; - extern int times_up; - extern FILE *where; -+extern int fd; - extern int loops_per_msec; - extern float lib_local_per_cpu_util[]; - -diff -Naur netperf-2.4.4.orig/src/netserver.c netperf-2.4.4.patched/src/netserver.c ---- netperf-2.4.4.orig/src/netserver.c 2007-10-18 01:09:12.000000000 +0400 -+++ netperf-2.4.4.patched/src/netserver.c 2008-01-30 21:57:56.000000000 +0300 -@@ -153,6 +153,9 @@ - char listen_port[10]; - extern char *optarg; - extern int optind, opterr; -+#if !defined(WIN_32) -+char debuglog[] = "/tmp/netperf.debugXXXXXX"; -+#endif - - #ifndef WIN32 - #define SERVER_ARGS "dL:n:p:v:V46" -@@ -225,6 +228,10 @@ - if (!debug) - { - fclose(where); -+#if !defined(WIN32) -+ unlink(debuglog); -+ close(fd); -+#endif - #if !defined(WIN32) && !defined(MPE) && !defined(__VMS) - /* For Unix: reopen the debug write file descriptor to "/dev/null" */ - /* and redirect stdout to it. */ -@@ -918,8 +925,11 @@ - strcpy(FileName, DEBUG_LOG_FILE); - - #ifndef WIN32 -- snprintf(&FileName[strlen(FileName)], sizeof(FileName) - strlen(FileName), "_%d", getpid()); -- if ((where = fopen(FileName, "w")) == NULL) { -+ if((fd = mkstemp(debuglog)) == -1 || (where = fdopen(fd, "w+")) == NULL){ -+ if(fd != -1){ -+ unlink(debuglog); -+ close(fd); -+ } - perror("netserver: debug file"); - exit(1); - } -@@ -947,10 +957,6 @@ - } - } - #endif -- --#ifndef WIN32 -- chmod(DEBUG_LOG_FILE,0644); --#endif - - #if WIN32 - if (child) { diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-fix-scripts.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-fix-scripts.patch index 2d797c7c55..27e041fd7a 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-fix-scripts.patch +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-fix-scripts.patch @@ -1,6 +1,5 @@ -diff -Naur netperf-2.4.4.orig/doc/examples/arr_script netperf-2.4.4/doc/examples/arr_script ---- netperf-2.4.4.orig/doc/examples/arr_script 2007-06-02 02:06:03.000000000 +0400 -+++ netperf-2.4.4/doc/examples/arr_script 2008-01-31 15:34:54.000000000 +0300 +--- a/doc/examples/arr_script ++++ b/doc/examples/arr_script @@ -12,8 +12,7 @@ TOLERANCE=15 MAX_RETRIES=3 @@ -11,9 +10,8 @@ diff -Naur netperf-2.4.4.orig/doc/examples/arr_script netperf-2.4.4/doc/examples NPROC_LIST="" RR_SIZES="" -diff -Naur netperf-2.4.4.orig/doc/examples/packet_byte_script netperf-2.4.4/doc/examples/packet_byte_script ---- netperf-2.4.4.orig/doc/examples/packet_byte_script 2008-01-31 15:23:26.000000000 +0300 -+++ netperf-2.4.4/doc/examples/packet_byte_script 2008-01-31 15:35:21.000000000 +0300 +--- a/doc/examples/packet_byte_script ++++ b/doc/examples/packet_byte_script @@ -25,7 +25,7 @@ fi @@ -23,9 +21,8 @@ diff -Naur netperf-2.4.4.orig/doc/examples/packet_byte_script netperf-2.4.4/doc/ # at what port will netserver be waiting? If you decide to run -diff -Naur netperf-2.4.4.orig/doc/examples/snapshot_script netperf-2.4.4/doc/examples/snapshot_script ---- netperf-2.4.4.orig/doc/examples/snapshot_script 2007-06-02 02:06:03.000000000 +0400 -+++ netperf-2.4.4/doc/examples/snapshot_script 2008-01-31 15:35:38.000000000 +0300 +--- a/doc/examples/snapshot_script ++++ b/doc/examples/snapshot_script @@ -37,7 +37,7 @@ # # where is netperf installed, there are a few possible places: diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.5.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.5.0-r1.ebuild deleted file mode 100644 index 2bac860b73..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.5.0-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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.5.0-r1.ebuild,v 1.7 2012/08/05 18:05:42 armin76 Exp $ - -EAPI="4" - -inherit eutils - -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="" - -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 -} - -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 -} diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild index 2b5d0aeb56..00e8bdc42c 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 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.2 2012/09/27 15:52:23 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild,v 1.13 2014/10/29 09:30:51 ago Exp $ -EAPI=4 +EAPI=5 inherit eutils flag-o-matic -DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more." +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" +KEYWORDS="alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86" HOMEPAGE="http://www.netperf.org/" LICENSE="netperf" @@ -15,24 +15,22 @@ SLOT="0" IUSE="demo 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 + epatch \ + "${FILESDIR}"/${PN}-fix-scripts.patch \ + "${FILESDIR}"/${P}-log-dir.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 + 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 \ + || die # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ @@ -61,5 +59,5 @@ src_install () { 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 + cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die } diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0.ebuild deleted file mode 100644 index 17101bcc0e..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# 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.ebuild,v 1.1 2012/06/28 02:11:41 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="" - -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_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 -}