gentoo resync : 29.12.2022

3 files changed, 110 insertions, 0 deletions

diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 5f1009bb6606..74ab8fce716e 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,5 +1,6 @@
 AUX netperf-2.2-conf 103 BLAKE2B 330afd42dc9d4ecacf6d0a4e2d5fdb620100c5d664df4238edb01c3e3e191f96d045af5e22e0c4ec18d1c34265828badf1a55478a8e51a0e7bbe906249c0abb5 SHA512 88a0d19c59a054071f472e62e6afd8c5fe37a77802dedea3adc82df0701f280c0ad8b5410e7fab74302861bc45920d38d576cfea1d8baa01cd5739801acb3b60
 AUX netperf-2.6.0-log-dir.patch 261 BLAKE2B a0d4aeb9137bd9d33ee63e0a7eb704b0a18d3f50add352e9bfc2c483ecffbd4749c37412b17f8f9d84b8f59a0b6afd647a01d415e3ffe6f018a7bffdd706466f SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6
+AUX netperf-2.7.0-fcommon.patch 983 BLAKE2B d218ff37d053c09e09c337bc2f2463263e12799768ff549a70c17fe0e493eae2add8c589a28e14471a62d50e5ddc534b5a1390d7f30d068f14608d1d84b7ff4c SHA512 586828bdf07a3b5ac5c4dee983c0e6cb274513a8d4b26b90787207b37f5379c7deca885d713bfddf26421920ff02bde0b8832d352840e026aca414d3f5f49bfb
 AUX netperf-2.7.0-includes.patch 468 BLAKE2B 5e566c665d2d95b11015c9d38f10ec2b849251c8be321edf6decda7052b315e60d4525ab421373751f0966cbca970bfafd31ddeee8ec398cdf051a41eec1d0ff SHA512 aec77b7a97e83a93d847f0935bd599d7497b3b749bb0cdb722d96cb49535b3eef9b7b9f60388f5cb2de726b4084abd9cd48614d73bc63b34c7bc0fcfffb0fd3f
 AUX netperf-2.7.0-init 440 BLAKE2B 368f56d7b2d7b2648368ba745add3dd98dd43ee028897cd6cb324affcbaf16a8637615a1ac416d32f035a23d7510a0ca962285292c5bb935ec8abdde259b0d0e SHA512 ed5a56d77f47aa01545be64104decc2893179c80094c50bb023b96b751cb5aa34ec8f18d606b0570bef47037bedf415250d9b55157f5e24c97e246f6f9643a36
 AUX netperf-2.7.0-inline.patch 902 BLAKE2B d31b677da87044cc87779013e3c12b88ea82e93e7bc7c06d113acf785207861ae84c2ac232b6731d65a623b1b5d8b6f41477d40951030a84b996e3029abb5970 SHA512 0defbdc27edbd32a615f335f79380d8f9bdc03a400b8f18a12e1c61a5c7b2d05449c2ec040b80dece7f337e9a447f270b34b85fb81ed49b16d3277531bda0bbf
@@ -7,4 +8,5 @@ AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f7
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
 EBUILD netperf-2.7.0-r3.ebuild 1917 BLAKE2B fdb4b339cf43b49a4182a9a44facb02f3c32c0cff27e277b138ed1fbd5dd36bd87859eacb4c84ace8274376a4064fbb854645c6c6dbd629cad230c65117ae8a9 SHA512 9eae6cf5bc8de678e65a87b41b45193b8a5e82ea63c01a4abc142d9e40034f7b25a18bad80e5a78910bcc8350ed6ecac251fe7533c996c81e8343a736f1164a2
+EBUILD netperf-2.7.0-r4.ebuild 1939 BLAKE2B d79bb2b55260c65354823facdada3327ddc1735b83581b610c25f554dc39f8e3fae9f0ea4ba3e030f5eb5e56feeb2529932d355633dfa7024e3156e5532bf5a2 SHA512 13880542f70f228c5743d06bdece5d4df9c52dad8f551dc37561d2e46432fd4571025955856391ce01c8c3444efe9534637787c07019f6a97a86571ffb32b2b7
 MISC metadata.xml 856 BLAKE2B f1f2ac4a59c7c5e180ad68dd84bce5563a6ba32af6d5a0c6314e9ad153d5fa80ece9d5d9fecb4f7f62e4a615531e9ba7aed6cd180064e32d9f2951e655d5c337 SHA512 5f0e528830a267e8e2c900f670306d9d7602060fcce34b8367e9bf2be3e57a81be7a9e9b32e4457287224c9dd5d9e1915e9e8d67a55d0db85cea3ce7fa8c396b
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch b/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch
new file mode 100644
index 000000000000..0682c76cd89d
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch
@@ -0,0 +1,30 @@
+https://github.com/HewlettPackard/netperf/pull/46
+https://bugs.gentoo.org/706694
+
+From c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 12 Aug 2020 09:57:23 -0700
+Subject: [PATCH] nettest_omni: Remove duplicate variable definitions
+
+These defines are already defined in nettest_bsd.c and exported by
+nettest_bsd.h this should fix build with -fno-common
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/nettest_omni.c
++++ b/src/nettest_omni.c
+@@ -458,14 +458,6 @@ static int client_port_max = 65535;
+ 
+  /* different options for the sockets				*/
+ 
+-int
+-  loc_nodelay,		/* don't/do use NODELAY	locally		*/
+-  rem_nodelay,		/* don't/do use NODELAY remotely	*/
+-  loc_sndavoid,		/* avoid send copies locally		*/
+-  loc_rcvavoid,		/* avoid recv copies locally		*/
+-  rem_sndavoid,		/* avoid send copies remotely		*/
+-  rem_rcvavoid; 	/* avoid recv_copies remotely		*/
+-
+ extern int
+   loc_tcpcork,
+   rem_tcpcork,
+
diff --git a/net-analyzer/netperf/netperf-2.7.0-r4.ebuild b/net-analyzer/netperf/netperf-2.7.0-r4.ebuild
new file mode 100644
index 000000000000..51a9ab06b8d5
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Network performance benchmark"
+HOMEPAGE="http://www.netperf.org/"
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+LICENSE="netperf"
+SLOT="0"
+IUSE="demo sctp"
+
+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
+	"${FILESDIR}"/${PN}-2.7.0-fcommon.patch
+)
+
+src_prepare() {
+	# 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
+
+	default
+}
+
+src_configure() {
+	# 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() {
+	default
+
+	# Move netserver into sbin as we had it before 2.4 was released with its
+	# autoconf goodness
+	dodir /usr/sbin
+	mv "${ED}"/usr/{bin,sbin}/netserver || die
+
+	# init.d / conf.d
+	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 "${ED}"/usr/share/doc/${PF}/examples || die
+}