* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/
@ 2016-11-04 16:28 Jason Donenfeld
0 siblings, 0 replies; 5+ messages in thread
From: Jason Donenfeld @ 2016-11-04 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 8990401a1a125f47986d724ddd42885fe647b130
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 16:28:22 2016 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 4 16:28:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8990401a
net-analyzer/netperf: fix build with USE=demo
Package-Manager: portage-2.3.2
.../netperf/files/netperf-2.7.0-inline.patch | 32 +++++++++
net-analyzer/netperf/netperf-2.7.0-r2.ebuild | 77 ++++++++++++++++++++++
2 files changed, 109 insertions(+)
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
new file mode 100644
index 00000000..eb8c09b
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
@@ -0,0 +1,32 @@
+# Copyright Seblu 2015
+--- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200
++++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200
+@@ -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/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
new file mode 100644
index 00000000..c741503
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic user
+
+DESCRIPTION="Network performance benchmark"
+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"
+
+pkg_setup() {
+ enewuser netperf
+ enewgroup netperf
+}
+
+src_prepare() {
+ eapply \
+ "${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
+
+ # 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
+
+ eapply_user
+}
+
+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.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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/
@ 2018-07-02 11:22 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2018-07-02 11:22 UTC (permalink / raw
To: gentoo-commits
commit: 8866ee9ebbed912406bec8af2896b3d0421254db
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 2 11:22:06 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jul 2 11:22:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8866ee9e
net-analyzer/netperf: Old.
Package-Manager: Portage-2.3.41, Repoman-2.3.9
net-analyzer/netperf/Manifest | 1 -
net-analyzer/netperf/files/netperf-2.2-init | 21 ----------
net-analyzer/netperf/netperf-2.6.0-r1.ebuild | 62 ---------------------------
net-analyzer/netperf/netperf-2.7.0.ebuild | 63 ----------------------------
4 files changed, 147 deletions(-)
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index fa201cf029b..f378f80376d 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1,2 +1 @@
-DIST netperf-2.6.0.tar.bz2 1032953 BLAKE2B c13e6c49b975273e2de97a32e1fbcc2265639b450b532f67aa07cf34a86ae23a34c1e4f90ad1d51c49e8aae5fdfcf97671bcd5969a0fd1bfc4333dd37021da88 SHA512 b3921d2e887088b14a8bbe5ace9b1cc0c8b29951eeaa7857ce3f324933397c8ff6b56eeacfe755181ce1a56c982fe431955f6db55bd20f2343324e22ee23c9b3
DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
diff --git a/net-analyzer/netperf/files/netperf-2.2-init b/net-analyzer/netperf/files/netperf-2.2-init
deleted file mode 100644
index cd2fb35cdd2..00000000000
--- a/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/net-analyzer/netperf/netperf-2.6.0-r1.ebuild b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
deleted file mode 100644
index 869d878465b..00000000000
--- a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/net-analyzer/netperf/netperf-2.7.0.ebuild b/net-analyzer/netperf/netperf-2.7.0.ebuild
deleted file mode 100644
index 7c1622c9fe9..00000000000
--- a/net-analyzer/netperf/netperf-2.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}"/${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":' \
- 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/
@ 2021-04-03 15:57 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-04-03 15:57 UTC (permalink / raw
To: gentoo-commits
commit: 87b31524f9a546c261cc7d81cbed4069aaf3882d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 2 02:08:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 3 15:54:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b31524
net-analyzer/netperf: EAPI 7, eutils--
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../netperf/files/netperf-2.7.0-inline.patch | 4 +--
net-analyzer/netperf/netperf-2.7.0-r2.ebuild | 32 +++++++++++-----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
index eb8c09b8469..eb89d34f3e8 100644
--- a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
+++ b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
@@ -1,6 +1,6 @@
# Copyright Seblu 2015
---- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200
-+++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200
+--- a/src/netlib.c
++++ b/src/netlib.c
@@ -3997,11 +3997,7 @@
}
}
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
index ac656a889e7..6a56ebb79e3 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic user
+EAPI=7
+
+inherit flag-o-matic user
DESCRIPTION="Network performance benchmark"
SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
@@ -13,7 +14,13 @@ LICENSE="netperf"
SLOT="0"
IUSE="demo sctp"
-DEPEND=">=sys-apps/sed-4"
+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
+)
pkg_setup() {
enewuser netperf
@@ -21,13 +28,6 @@ pkg_setup() {
}
src_prepare() {
- eapply \
- "${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
-
# Fixing paths in scripts
sed -i \
-e 's:^\(NETHOME=\).*:\1"/usr/bin":' \
@@ -39,7 +39,7 @@ src_prepare() {
doc/examples/udp_stream_script \
|| die
- eapply_user
+ default
}
src_configure() {
@@ -57,10 +57,10 @@ src_configure() {
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.7.0-init netperf
@@ -73,6 +73,6 @@ src_install() {
# 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
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/
@ 2022-05-23 0:04 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-05-23 0:04 UTC (permalink / raw
To: gentoo-commits
commit: fd6e19dfb9706f594796bfd04cc0db289aa15032
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 00:00:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 23 00:04:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd6e19df
net-analyzer/netperf: update EAPI 7 -> 8
Also throw in fcommon patch vs appending -fcommon.
Bug: https://bugs.gentoo.org/706694
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../netperf/files/netperf-2.7.0-fcommon.patch | 30 +++++++++
net-analyzer/netperf/netperf-2.7.0-r4.ebuild | 78 ++++++++++++++++++++++
2 files changed, 108 insertions(+)
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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/
@ 2024-06-07 10:25 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2024-06-07 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 83af425887161b94bace866e5a054cf6ac05f0a7
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 12:53:41 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 10:24:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83af4258
net-analyzer/netperf: Bump to 2.7.0_p20210121 to avoid license issue
The last release, 2.7.0, had an awkward non-commercial use clause in its
license. The license was changed to straight MIT three years ago, but there
still hasn't been a new release since. Upstream is effectively dead.
There have been relatively few other changes, but we can now drop some of the
patches we were carrying.
Closes: https://github.com/gentoo/gentoo/pull/36917
Co-authored-by: Jeremi Piotrowski <jpiotrowski <AT> microsoft.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
net-analyzer/netperf/Manifest | 1 +
net-analyzer/netperf/files/netperf-log-dir.patch | 12 ++++
net-analyzer/netperf/metadata.xml | 41 +++++------
.../netperf/netperf-2.7.0_p20210121.ebuild | 84 ++++++++++++++++++++++
4 files changed, 118 insertions(+), 20 deletions(-)
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index f378f80376d4..96ec2d577205 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -1 +1,2 @@
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
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..cc84bc361fc4
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild
@@ -0,0 +1,84 @@
+# 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
+
+ # 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 doc/${PN}.txt
+ docinto html
+ dodoc doc/${PN}.html
+ exeinto /usr/share/${PN}/examples
+ doexe doc/examples/*_script
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-07 10:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-02 11:22 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2024-06-07 10:25 James Le Cuirot
2022-05-23 0:04 Sam James
2021-04-03 15:57 Sam James
2016-11-04 16:28 Jason Donenfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox