[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/

2022-05-22 Thread Sam James 
commit: fd6e19dfb9706f594796bfd04cc0db289aa15032
Author: Sam James  gentoo  org>
AuthorDate: Mon May 23 00:00:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 23 00:04:23 2022 +
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  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 ..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 
+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 
+--- 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 ..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
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/

2021-04-03 Thread Sam James 
commit: 87b31524f9a546c261cc7d81cbed4069aaf3882d
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  2 02:08:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  3 15:54:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b31524

net-analyzer/netperf: EAPI 7, eutils--

Signed-off-by: Sam James  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
 }

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/

2018-07-02 Thread Jeroen Roovers 
commit: 8866ee9ebbed912406bec8af2896b3d0421254db
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jul  2 11:22:06 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jul  2 11:22:30 2018 +
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..000
--- 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..000
--- 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..000
--- 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;

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/files/, net-analyzer/netperf/

2016-11-04 Thread Jason Donenfeld 
commit: 8990401a1a125f47986d724ddd42885fe647b130
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Fri Nov  4 16:28:22 2016 +
Commit: Jason Donenfeld  gentoo  org>
CommitDate: Fri Nov  4 16:28:28 2016 +
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 ..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 ..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
+}