From 364764baecbe3877feeebd7480877910ce01b258 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 3 Feb 2022 10:36:13 +0100 Subject: [PATCH] net-analyzer/netperf: update to 2.7.0-r3 Update net-analyzer/netperf to 2.7.0-r3, as needed by gcc 10. Without that update, build fails like: ``` /usr/libexec/gcc/x86_64-cros-linux-gnu/ld: nettest_omni.o:.../src/nettest_omni.c:455: multiple definition of `loc_nodelay'; nettest_omni.o:.../src/nettest_omni.c:455: multiple definition of `loc_nodelay'; nettest_bsd.o:.../src/nettest_bsd.c:206: first defined here ``` --- .../net-analyzer/netperf/ChangeLog | 79 ----- .../net-analyzer/netperf/ChangeLog-2015 | 290 ------------------ .../net-analyzer/netperf/Manifest | 13 +- .../netperf/files/netperf-2.2-init | 21 -- .../netperf/files/netperf-2.7.0-init | 23 ++ .../netperf/files/netperf-2.7.0-inline.patch | 32 ++ .../netperf/files/netperf-2.7.0-space.patch | 17 + .../net-analyzer/netperf/metadata.xml | 17 +- .../netperf/netperf-2.6.0-r1.ebuild | 63 ---- ...f-2.7.0.ebuild => netperf-2.7.0-r3.ebuild} | 57 ++-- 10 files changed, 124 insertions(+), 488 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog-2015 delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.2-init create mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-init create mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-inline.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-space.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild rename sdk_container/src/third_party/portage-stable/net-analyzer/netperf/{netperf-2.7.0.ebuild => netperf-2.7.0-r3.ebuild} (54%) 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 deleted file mode 100644 index ce86892601..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog +++ /dev/null @@ -1,79 +0,0 @@ -# ChangeLog for net-analyzer/netperf -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*netperf-2.7.0 (09 Aug 2015) -*netperf-2.6.0-r1 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +files/netperf-2.2-conf, - +files/netperf-2.2-init, +files/netperf-2.6.0-log-dir.patch, - +files/netperf-2.7.0-includes.patch, +files/netperf-fix-scripts.patch, - +metadata.xml, +netperf-2.6.0-r1.ebuild, +netperf-2.7.0.ebuild: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 24 Jan 2016; Michał Górny metadata.xml: - Unify quoting in metadata.xml files for machine processing - - Force unified quoting in all metadata.xml files since lxml does not - preserve original use of single and double quotes. Ensuring unified - quoting before the process allows distinguishing the GLEP 67-related - metadata.xml changes from unrelated quoting changes. - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - - 18 May 2016; Austin English files/netperf-2.2-init: - use #!/sbin/openrc-run instead of #!/sbin/runscript - diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog-2015 deleted file mode 100644 index 14b0d1eb14..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog-2015 +++ /dev/null @@ -1,290 +0,0 @@ -# ChangeLog for net-analyzer/netperf -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.72 2015/07/25 08:26:32 jer Exp $ - -*netperf-2.7.0 (25 Jul 2015) - - 25 Jul 2015; Jeroen Roovers +netperf-2.7.0.ebuild, - +files/netperf-2.7.0-includes.patch: - Version bump. - - 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: - Add USE=demo to enable reporting interim results by Michał Górny (bug - #304651). - -*netperf-2.6.0-r1 (27 Sep 2012) - - 27 Sep 2012; Jeroen Roovers +netperf-2.6.0-r1.ebuild, - metadata.xml: - Add support for SCTP performance tests by K. Sanborn (bug #436398). - - 05 Aug 2012; Jeroen Roovers - -files/netperf-2.4.0-gcc41.patch, -netperf-2.4.4-r1.ebuild, - -netperf-2.4.5-r2.ebuild, -files/netperf-2.4.5-netserver.patch, - -files/netperf-CVE-2007-1444.patch: - Old. - - 05 Aug 2012; Raúl Porcel netperf-2.5.0-r1.ebuild: - alpha/ia64/sparc stable wrt #419221 - - 03 Jul 2012; Jeroen Roovers netperf-2.5.0-r1.ebuild: - Stable for HPPA (bug #419221). - -*netperf-2.6.0 (28 Jun 2012) - - 28 Jun 2012; Jeroen Roovers +netperf-2.6.0.ebuild: - Version bump. - - 13 Jun 2012; Jeff Horelick netperf-2.5.0-r1.ebuild: - marked x86 per bug 419221 - - 07 Jun 2012; Brent Baude netperf-2.5.0-r1.ebuild: - Marking netperf-2.5.0-r1 ppc for bug 419221 - - 05 Jun 2012; Brent Baude netperf-2.5.0-r1.ebuild: - Marking netperf-2.5.0-r1 ppc64 for bug 419221 - - 04 Jun 2012; Agostino Sarubbo netperf-2.5.0-r1.ebuild: - Stable for amd64, wrt bug #419221 - -*netperf-2.5.0-r1 (31 Dec 2011) -*netperf-2.4.5-r2 (31 Dec 2011) -*netperf-2.4.4-r1 (31 Dec 2011) - - 31 Dec 2011; Christian Ruppert -netperf-2.4.4.ebuild, - +netperf-2.4.4-r1.ebuild, -netperf-2.4.5-r1.ebuild, +netperf-2.4.5-r2.ebuild, - -netperf-2.5.0.ebuild, +netperf-2.5.0-r1.ebuild, files/netperf-2.2-init: - Revbump. Don't use deprecated start-stop-daemon options, bug 389975. - - 14 Aug 2011; Fabio Erculiani netperf-2.4.4.ebuild, - netperf-2.4.5-r1.ebuild, netperf-2.5.0.ebuild: - sci-mathematics/snns blocker is no longer required as per bug 248322 - -*netperf-2.5.0 (30 Jul 2011) - - 30 Jul 2011; Jeroen Roovers netperf-2.4.5-r1.ebuild, - +netperf-2.5.0.ebuild: - Version bump. Remove testing cruft. - -*netperf-2.4.5-r1 (01 Dec 2010) - - 01 Dec 2010; Jeroen Roovers -netperf-2.4.5.ebuild, - +netperf-2.4.5-r1.ebuild, +files/netperf-2.4.5-netserver.patch: - Fix buffer overflow, compiler warnings (bug #337422). - - 28 Jun 2010; Guy Martin netperf-2.4.4.ebuild: - hppa stable. - - 24 Jun 2010; Jeroen Roovers netperf-2.4.4.ebuild, - netperf-2.4.5.ebuild: - Marked ~hppa too. - -*netperf-2.4.5 (26 Aug 2009) - - 26 Aug 2009; Jeroen Roovers netperf-2.4.4.ebuild, - +netperf-2.4.5.ebuild: - Version bump. Drop useless MY_P. Block sci-mathematics/snns (bug #248322). - Drop autotools since the gcc41 patch is no longer needed, incidentally fix - maintainer-mode (bug #255896). Drop unused flag-o-matic. Depend on sed. - - 31 Mar 2008; Markus Meier netperf-2.4.4.ebuild: - amd64 stable, bug #209035 - - 11 Feb 2008; Raúl Porcel netperf-2.4.4.ebuild: - alpha/ia64 stable wrt #209035 - - 06 Feb 2008; Ferris McCormick netperf-2.4.4.ebuild: - Sparc stable, Bug #209035 --- appears to work. - - 06 Feb 2008; nixnut netperf-2.4.4.ebuild: - stable on ppc wrt bug #209035 - - 06 Feb 2008; Brent Baude netperf-2.4.4.ebuild: - stable ppc64, bug 209035 - - 05 Feb 2008; Christian Faulhammer netperf-2.4.4.ebuild: - stable x86, bug 209035 - -*netperf-2.4.4 (31 Jan 2008) - - 31 Jan 2008; -files/netperf-2.2alpha.diff, - +files/netperf-CVE-2007-1444.patch, files/netperf-fix-scripts.patch, - -netperf-2.2.4.ebuild, -netperf-2.3.ebuild, -netperf-2.4.2-r1.ebuild, - +netperf-2.4.4.ebuild: - Version bump. Fixed security issue (CVE-2007-1444), bug 170569, reported by - Pierre-Yves Rofes . Patch for vulnerability taken from - bugs.debian.org/413658, thank you Nico Golde for the - fix! Removed old vulnerables ebuidls. - - 16 Jan 2008; Fabian Groffen netperf-2.2.4.ebuild, - netperf-2.3.ebuild, netperf-2.4.2-r1.ebuild: - Dropped ppc-macos keyword, see you in prefix - - 16 Apr 2007; Markus Rothe netperf-2.4.2-r1.ebuild: - Stable on ppc64 - - 22 Mar 2007; Gustavo Zacarias - netperf-2.4.2-r1.ebuild: - Stable on sparc - - 20 Mar 2007; Raúl Porcel netperf-2.4.2-r1.ebuild: - x86 stable - -*netperf-2.4.2-r1 (29 Jan 2007) - - 29 Jan 2007; Gustavo Felisberto ; - -netperf-2.4.2.ebuild, +netperf-2.4.2-r1.ebuild: - Example scripts where not being installed. - -*netperf-2.4.2 (01 Nov 2006) - - 01 Nov 2006; Markus Ullmann netperf-2.2.4.ebuild, - netperf-2.3.ebuild, -netperf-2.4.0_rc2.ebuild, -netperf-2.4.0_rc3.ebuild, - -netperf-2.4.0.ebuild, -netperf-2.4.0-r1.ebuild, +netperf-2.4.2.ebuild: - Version bump and SRC_URI udate wrt bug #152704 thanks to Francisco Javier - for reporting - - 05 Jun 2006; Peter Volkov netperf-2.4.0-r1.ebuild: - Fixed eutils inheritance as we use epatch. - -*netperf-2.4.0-r1 (27 Mar 2006) - - 27 Mar 2006; Markus Ullmann - +files/netperf-2.4.0-gcc41.patch, +netperf-2.4.0-r1.ebuild: - glibc 2.4 / gcc 4.1 compatibility, thanks to Mikko Tiihonen - wrt bug #126334 - -*netperf-2.4.0 (30 May 2005) - - 30 May 2005; Benjamin Smee +netperf-2.4.0.ebuild: - Version bump for bug 94517 - - 19 Apr 2005; Aron Griffis netperf-2.4.0_rc2.ebuild, - netperf-2.4.0_rc3.ebuild: - Remove bogus sed dep and non-functional use_enable ipv6. The 2.4.x stream - does ipv6 detection and doesn't supply an option to explicitly - enable/disable it - -*netperf-2.4.0_rc3 (19 Apr 2005) - - 19 Apr 2005; Aron Griffis +netperf-2.4.0_rc3.ebuild: - Update to 2.4.0_rc3 - - 09 Apr 2005; Markus Rothe netperf-2.3.ebuild: - Stable on ppc64 - -*netperf-2.4.0_rc2 (05 Apr 2005) - - 05 Apr 2005; Aron Griffis netperf-2.3.ebuild, - +netperf-2.4.0_rc2.ebuild: - Version bump, plus mark 2.3 stable on amd64 - - 01 Apr 2005; Aron Griffis netperf-2.3.ebuild: - stable on ia64 - - 19 Mar 2005; Bryan Østergaard netperf-2.3.ebuild: - Stable on alpha. - - 07 Mar 2005; Gustavo Zacarias netperf-2.3.ebuild: - Stable on sparc - - 25 Feb 2005; Aaron Walker netperf-2.3.ebuild: - Marked stable on x86. - -*netperf-2.3 (03 Jan 2005) - - 03 Jan 2005; Martin Holzer +netperf-2.3.ebuild: - Version bumped. Closes 75198 - - 03 Aug 2004; David Holm netperf-2.2.4.ebuild: - Added to ~ppc. - - 26 Jul 2004; Michael Sterrett netperf-2.2.4.ebuild: - fix use invocation - - 25 Jul 2004; Lina Pezzella - Fixed Manifest. - - 23 Jul 2004; Hasan Khalil netperf-2.2.4.ebuild: - Stable on macos. - - 15 Jul 2004; Tom Gall netperf-2.2.4.ebuild: - stable on ppc64, bug #55547 - - 01 Jul 2004; Jon Hood +metadata.xml, - netperf-2.2.4.ebuild, netperf-2.2.ebuild: - change virtual/glibc to virtual/libc, add metadata.xml - - 21 Apr 2004; Aron Griffis netperf-2.2.4.ebuild: - Stable on amd64 - - 11 Mar 2004; Jason Wever netperf-2.2.4.ebuild: - Marked stable on sparc. - - 10 Mar 2004; Aron Griffis netperf-2.2.4.ebuild: - stable on alpha, ia64 and x86 - - 04 Feb 2004; Aron Griffis netperf-2.2.4.ebuild: - Fix NETHOME in the example scripts to point to /usr/bin - -*netperf-2.2.4 (28 Jan 2004) - - 28 Jan 2004; netperf-2.2.4.ebuild, - files/netperf-2.2-conf, files/netperf-2.2-init: - update to netperf-2.2pl4 for bug 19463. Thanks to Jyrki Muukkonen for some - good ideas in this ebuild - - 27 Jan 2004; netperf-2.2.ebuild: - stable on alpha and ia64 - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*netperf-2.2 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. 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 880929b255..f378f80376 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 @@ -1,12 +1 @@ -AUX netperf-2.2-conf 103 SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340 SHA512 88a0d19c59a054071f472e62e6afd8c5fe37a77802dedea3adc82df0701f280c0ad8b5410e7fab74302861bc45920d38d576cfea1d8baa01cd5739801acb3b60 WHIRLPOOL 30bb26aab461eb024e80fdbb663ea334f0112d7bb1c6d6d4c83ccd017efab4a945a1ed2f6073a122de7a9e6888a4fd11787744ce8d236f22ab3b88a93ad61eb2 -AUX netperf-2.2-init 434 SHA256 2c0a09d31fc45c53d5362a97fc0f443c574b520d4613dc944fab540699bd6ad4 SHA512 ec09907d7e3bf9c38e6d142dd605c71620b790ece71685a347906fe1de103a6317345ab9181a618a14173380b155ceaa6a629fe3e33b571f038bde9074dfc112 WHIRLPOOL 9cd4f78fde842cbd7f7ab4271fda3b59216520fa459f9d8934d7124210413768c92ea7ad17759dc92523b025244707c7de5f3bbd6c6c6d2e00ca6ed3ba064a1d -AUX netperf-2.6.0-log-dir.patch 261 SHA256 c5449f723cc26e3ebada62d954e5b8dbad3b0996db18401c816fa756905eedbb SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6 WHIRLPOOL 197919f1204465ad813849ab6b6f4ee24f7fe2f5aaf7072ab6f4159a5713163041dffa6e721a066552b0b7746b353b84255a0aceca478993ee229f37dbbb20fd -AUX netperf-2.7.0-includes.patch 468 SHA256 dcd9ca94d89cf6624d52b9dd8aa7e68d7ac47032ce964049d0faa591731f6270 SHA512 aec77b7a97e83a93d847f0935bd599d7497b3b749bb0cdb722d96cb49535b3eef9b7b9f60388f5cb2de726b4084abd9cd48614d73bc63b34c7bc0fcfffb0fd3f WHIRLPOOL cd740bf0a4a3029f63b44ff0f33e55ae4e7c09a897ff5eb4770269a36c342be7c8c0c77f7a55eb0c277fdc75890a3ca8cd0bc83ad5dcca3b0305f489491ec3c8 -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 -DIST netperf-2.7.0.tar.bz2 1024430 SHA256 842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad WHIRLPOOL 66c81e418750d67bfa15d6f1e3cd7a3a65f1168ebb080263cf70e0f3fe023a8128bfc559249268ec8e597ef3db5acdf5509861f12f8f49c6b2586e679014e34a -EBUILD netperf-2.6.0-r1.ebuild 1673 SHA256 abd37e1d088733645ae24224eca458ae2acc9d339f0b06b3fc1a53e705aab745 SHA512 5107a19e6917e12e35aeb25f0100240ffd597a29f1a4b39a28b41544d5b7bb82429459363eb4d0869d39ed85d37d75e96ac0fe1fb40ed97a27733f82668e2dae WHIRLPOOL 5a862a5e521bf15664336a6682e387637f14f03a8d953ea0544e9c2809a047ec1bcfc286dcf5bc49cb6d178e96090eb550533f47f85f66156ee7b6a38da2d340 -EBUILD netperf-2.7.0.ebuild 1734 SHA256 670b1dc3bf2c367a74ce472c0357f4ee3c59585f592c359b8c7c3e02d4002c57 SHA512 89e289ea59504e23a86b68a0c6d29ebace56ca7d4da95bd74a579515a51cb79c8eda0d3b5c0fc3d84ffa723854b8f159391a107e675486ca69f1396fa1ff3a5a WHIRLPOOL 16140df86109bc7616004c11421be367c05c86498c8e02b0cc9e53b90dd60ed8e8f551f104e15aaf49107a5d536562771f0316d8a8bad61ce25637348a2deabf -MISC ChangeLog 3176 SHA256 a44374ed71572da9d918a7b3738487c03831f6fac26f1d6aef39cf8e2997cafb SHA512 9680fc4c343cb692c28cc88b22abd62abf318581bd2bea954ea264a9efbd071e63ddcab6ff9fb7acbc24dcdf513f44ddc79a7fc7daa9d32baea6f690f3d44050 WHIRLPOOL 06831f389bb28407d39756418fda39599fa99642b0fc9ba1b70d8ac42d95b32f2a15f688c2853bd62ff0f770ed72f9d7297f5c6941d012e311c46a22a8e35245 -MISC ChangeLog-2015 10406 SHA256 526c3eff24ed9f2f0c19e644def228b125b9e4927c8f1112cdf1680c0fecab69 SHA512 3e7c21a4d2532f6099b7dc4471fb6d1980f3c91448f02798e799a7e82a8843e66c17b8199b79f0386fee5f177a743aef2924b94bd17cc03e31dd4fa323f5569b WHIRLPOOL 3b1dda403052008ea7e1ca1f3adf42667dc29dc5eef255c9389e71ad4892d8cb48d52463893cce0180eff1223316b4c21326594a86add9e7a79a2001e8488574 -MISC metadata.xml 435 SHA256 573c052effa861260f739ba05087f642946a350f846469138db7d003abe4b5e5 SHA512 e5e97976eb62dee72e974ebab4d117a09e6f76d5e9a456b12db4ad59c76fc079cf88f1d3505db535c99ced6037bee2c261463c0f07ac487534797e3347fbcb42 WHIRLPOOL 68df937e76e4c97259d582b16f1f5dc1a6be9f04cfde3a0270490395f666aa3e8f598e0b456fe7497a5d6538f0d519cda144c7ab913f3ba527a7b2b4011607a2 +DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.2-init b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.2-init deleted file mode 100644 index cd2fb35cdd..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.2-init +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# -# init.d script for net-analyzer/netperf's netserver -# - -depend() { - use net -} - -start() { - ebegin 'Starting netperf server (netserver)' - start-stop-daemon --start --quiet --user nobody \ - --exec /usr/sbin/netserver -- ${NETSERVER_ARGS} >/dev/null - eend $? -} - -stop() { - ebegin 'Stopping netperf server (netserver)' - start-stop-daemon --stop --quiet --exec /usr/sbin/netserver - eend $? -} diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-init b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-init new file mode 100644 index 0000000000..3d1bb0c159 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-init @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# +# init.d script for net-analyzer/netperf's netserver +# + +depend() { + use net +} + +start() { + checkpath -o netperf:netperf -d /var/log/netperf + + ebegin 'Starting netperf server (netserver)' + start-stop-daemon --start --user netperf \ + --exec /usr/sbin/netserver -- ${NETSERVER_ARGS} + eend $? +} + +stop() { + ebegin 'Stopping netperf server (netserver)' + start-stop-daemon --stop --quiet --exec /usr/sbin/netserver + eend $? +} diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-inline.patch new file mode 100644 index 0000000000..eb89d34f3e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-inline.patch @@ -0,0 +1,32 @@ +# Copyright Seblu 2015 +--- a/src/netlib.c ++++ b/src/netlib.c +@@ -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; + diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-space.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-space.patch new file mode 100644 index 0000000000..9ad43270b1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-space.patch @@ -0,0 +1,17 @@ +--- a/src/netserver.c ++++ b/src/netserver.c +@@ -165,12 +165,12 @@ + #elif defined(ANDROID) + #define DEBUG_LOG_FILE_DIR "/data/local/tmp/" + #else +-#define DEBUG_LOG_FILE_DIR "/var/log/" ++#define DEBUG_LOG_FILE_DIR "/var/log/netperf/" + #endif + #endif /* DEBUG_LOG_FILE_DIR */ + + #ifndef DEBUG_LOG_FILE +-#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR"netserver.debug" ++#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR "/netserver.debug" + #endif + + #if !defined(PATH_MAX) diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/metadata.xml b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/metadata.xml index a4f8a9ad47..3e35e2cbd3 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/metadata.xml @@ -1,12 +1,25 @@ - + netmon@gentoo.org Gentoo network monitoring and analysis project + +Netperf is a benchmark that can be used to measure the performance of many +different types of networking. It provides tests for both unidirectional +throughput, and end-to-end latency. The environments currently measureable by +netperf include: + + - TCP and UDP via BSD Sockets for both IPv4 and IPv6 + - DLPI + - Unix Domain Sockets + - SCTP for both IPv4 and IPv6 + Emit interim results during the run. May affect results -Include tests to measure SCTP performance + +cpe:/a:netperf:netperf + 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 deleted file mode 100644 index 2aaa038e72..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -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 arm64 hppa ia64 ppc ppc64 sparc x86" - -HOMEPAGE="http://www.netperf.org/" -LICENSE="netperf" -SLOT="0" -IUSE="demo sctp" - -DEPEND=">=sys-apps/sed-4" - -src_prepare() { - 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 \ - || die - - # 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 demo) \ - $(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 || die -} diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0-r3.ebuild similarity index 54% rename from sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0.ebuild rename to sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0-r3.ebuild index 3a312bbb16..93441fc7cb 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0-r3.ebuild @@ -1,27 +1,34 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 -inherit eutils flag-o-matic +EAPI=7 -DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more" +inherit flag-o-matic + +DESCRIPTION="Network performance benchmark" SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86" HOMEPAGE="http://www.netperf.org/" LICENSE="netperf" SLOT="0" IUSE="demo sctp" -DEPEND=">=sys-apps/sed-4" +DEPEND=" + acct-group/netperf + acct-user/netperf +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-fix-scripts.patch + "${FILESDIR}"/${PN}-2.6.0-log-dir.patch + "${FILESDIR}"/${PN}-2.7.0-includes.patch + "${FILESDIR}"/${PN}-2.7.0-space.patch + "${FILESDIR}"/${PN}-2.7.0-inline.patch +) src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-fix-scripts.patch \ - "${FILESDIR}"/${PN}-2.6.0-log-dir.patch \ - "${FILESDIR}"/${PN}-2.7.0-includes.patch - # Fixing paths in scripts sed -i \ -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \ @@ -33,32 +40,40 @@ src_prepare() { 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’ - append-cppflags -D_GNU_SOURCE + default } src_configure() { + append-cflags -fcommon + + # 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 + econf \ $(use_enable demo) \ $(use_enable sctp) } -src_install () { +src_install() { default - # move netserver into sbin as we had it before 2.4 was released with its + # 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 + mv "${ED}"/usr/{bin,sbin}/netserver || die # init.d / conf.d - newinitd "${FILESDIR}"/${PN}-2.2-init netperf + newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf newconfd "${FILESDIR}"/${PN}-2.2-conf netperf + keepdir /var/log/${PN} + fowners netperf:netperf /var/log/${PN} + fperms 0755 /var/log/${PN} + # 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 || die + # Scripts no longer get installed by einstall + cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die }