gentoo auto-resync : 08:06:2024 - 00:08:11

4 files changed, 116 insertions, 21 deletions

diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index a321131add91..55455da809c6 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -6,6 +6,9 @@ AUX netperf-2.7.0-init 440 BLAKE2B 368f56d7b2d7b2648368ba745add3dd98dd43ee028897
 AUX netperf-2.7.0-inline.patch 902 BLAKE2B d31b677da87044cc87779013e3c12b88ea82e93e7bc7c06d113acf785207861ae84c2ac232b6731d65a623b1b5d8b6f41477d40951030a84b996e3029abb5970 SHA512 0defbdc27edbd32a615f335f79380d8f9bdc03a400b8f18a12e1c61a5c7b2d05449c2ec040b80dece7f337e9a447f270b34b85fb81ed49b16d3277531bda0bbf
 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
+AUX netperf-log-dir.patch 461 BLAKE2B 94ad6f6b6d3a7a15fb422fde97a77071d9195ed7a7edf92a492739fe378a829c9998a32068fcb3216b8544bd3a091756d1c22ddbb15b8183e54298cc8931b2e7 SHA512 96eb123aca38206941d439e2b4d8f3a357d2f05141a5d98ced7ac2951657cc4a12ef999ea176acaf41df28d63abbfacf6595ad956ded2bb94968b94bf4f27862
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
+DIST netperf-2.7.0_p20210121.tar.gz 1914186 BLAKE2B 14d3a769a049443d8bf62b58c93c2b9563a16b69bb151d35926aa8831167b8a31bdd7d820c80a0c0511a78e519742005bdfa2079d403a514e2ec17f41a1b8e7c SHA512 8d9908fe2cd778eae719265b67938ab44e18de960c845f976e80d6b419c08b11ae47d8b4b906c6ccaf280f9f66bcdcb0be2ab379b0dca8d62d86671d57057e20
 EBUILD netperf-2.7.0-r5.ebuild 2035 BLAKE2B 85ff351995cd6cc6f7dd95454a74fdb351dbfd80b008d665e815b88508fb074f3af032c795f3aeca8ab579d9816711fdec2678e0a0f89bf9ba036e0b8482f5bf SHA512 86eb7fcf2e4300c9f077e6c3150b04725486d9597ce662f80d88ad9e0aa5da5674d0db9cd3b271e656cf95a1c28765564d5db4b7e88af50eb53724a50ef06f4a
-MISC metadata.xml 856 BLAKE2B f1f2ac4a59c7c5e180ad68dd84bce5563a6ba32af6d5a0c6314e9ad153d5fa80ece9d5d9fecb4f7f62e4a615531e9ba7aed6cd180064e32d9f2951e655d5c337 SHA512 5f0e528830a267e8e2c900f670306d9d7602060fcce34b8367e9bf2be3e57a81be7a9e9b32e4457287224c9dd5d9e1915e9e8d67a55d0db85cea3ce7fa8c396b
+EBUILD netperf-2.7.0_p20210121.ebuild 1952 BLAKE2B 2d6e6682943986887dead4b5025c0d6cf3fb2df721645c28d18d593ee682ef237220eb97c2cad45650860b70985150b66d6d287da1e9cf411516aa9eba9420a5 SHA512 a60d6cc129c2290addbec5f92e7badae3b68ed51a015209a79890f21fadd5cac4f6536e93ac30264c63693bf99d10ba31e012556b7cbd671db6c094e33a0466f
+MISC metadata.xml 946 BLAKE2B ca011dc4a1e358fb1e8b643a6a56e6246e88b5c3ab94e731bee00d26e145b6544522445b4c80506cb39d96688e325e7ba677f92d31862a3b3d31d969e8d94937 SHA512 e0ce10c4a561e59e373b09b6a138e028ad944df850966e5dff00463ec4fcb9adf98942748753eaf4d00bb39fc3739b371374647de21b07f1f23af876163dbf97
diff --git a/net-analyzer/netperf/files/netperf-log-dir.patch b/net-analyzer/netperf/files/netperf-log-dir.patch
new file mode 100644
index 000000000000..f1d11e7163e0
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-log-dir.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/netserver.c b/src/netserver.c
+--- a/src/netserver.c	2021-01-21 16:02:24.000000000 +0000
++++ b/src/netserver.c	2024-05-31 12:48:38.770331476 +0100
+@@ -153,7 +153,7 @@
+ #define   FILE_SEP       "/"
+ #else
+ /* comply with FHS: http://www.pathname.com/fhs/pub/fhs-2.3.html */
+-#define   DEBUG_LOG_FILE_DIR "/var/log/"
++#define   DEBUG_LOG_FILE_DIR "/var/log/netperf/"
+ #define   NETPERF_NULL       "/dev/null"
+ #define   FILE_SEP       "/"
+ #endif
diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml
index 3e35e2cbd3a3..38f0fed98332 100644
--- a/net-analyzer/netperf/metadata.xml
+++ b/net-analyzer/netperf/metadata.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<longdescription lang="en">
-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:
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
+		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
-</longdescription>
-<use>
-<flag name="demo">Emit interim results during the run. May affect results</flag>
-</use>
-<upstream>
-<remote-id type="cpe">cpe:/a:netperf:netperf</remote-id>
-</upstream>
+		- TCP and UDP via BSD Sockets for both IPv4 and IPv6
+		- DLPI
+		- Unix Domain Sockets
+		- SCTP for both IPv4 and IPv6
+	</longdescription>
+	<use>
+		<flag name="demo">Emit interim results during the run. May affect results</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:netperf:netperf</remote-id>
+		<remote-id type="github">HewlettPackard/netperf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild b/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild
new file mode 100644
index 000000000000..26f455ffdac0
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+COMMIT="3bc455b23f901dae377ca0a558e1e32aa56b31c4"
+DESCRIPTION="Network performance benchmark"
+HOMEPAGE="https://github.com/HewlettPackard/netperf"
+SRC_URI="https://github.com/HewlettPackard/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="demo sctp"
+
+RDEPEND="
+	acct-group/netperf
+	acct-user/netperf
+"
+BDEPEND="
+	${RDEPEND}
+	sys-devel/gnuconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-scripts.patch
+	"${FILESDIR}"/${PN}-log-dir.patch
+	"${FILESDIR}"/${PN}-2.7.0-includes.patch
+	"${FILESDIR}"/${PN}-2.7.0-fcommon.patch
+)
+
+src_prepare() {
+	# Fixing paths in scripts
+	sed -i \
+		-e "s:^\(NETHOME=\).*:\1\"${EPREFIX}/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
+	AT_M4DIR=src/missing/m4 eautoreconf
+}
+
+src_configure() {
+	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+	# TODO: drop once https://github.com/HewlettPackard/netperf/pull/73 merged
+	append-cppflags -D_GNU_SOURCE
+
+	econf \
+		$(use_enable demo) \
+		$(use_enable sctp)
+}
+
+src_install() {
+	default
+
+	# 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 doc/${PN}.txt
+	docinto html
+	dodoc doc/${PN}.html
+	exeinto /usr/share/${PN}/examples
+	doexe doc/examples/*_script
+}