From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B483313832E for ; Tue, 9 Aug 2016 08:41:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE9FBE0B85; Tue, 9 Aug 2016 08:41:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7FE6AE0B85 for ; Tue, 9 Aug 2016 08:41:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B2E523409E6 for ; Tue, 9 Aug 2016 08:41:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24F3A2442 for ; Tue, 9 Aug 2016 08:41:25 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1470732083.2b395917741e52594a2c1c95f987fcb6ce9b7c19.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netperf/, net-analyzer/netperf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/netperf/files/netperf-2.7.0-init net-analyzer/netperf/files/netperf-2.7.0-space.patch net-analyzer/netperf/metadata.xml net-analyzer/netperf/netperf-2.7.0-r1.ebuild X-VCS-Directories: net-analyzer/netperf/files/ net-analyzer/netperf/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 2b395917741e52594a2c1c95f987fcb6ce9b7c19 X-VCS-Branch: master Date: Tue, 9 Aug 2016 08:41:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dc3f6e55-2df7-4074-91c8-7921f4bbf334 X-Archives-Hash: 41c0ea248bef8c71f2fbf06fde737a7f commit: 2b395917741e52594a2c1c95f987fcb6ce9b7c19 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Aug 9 08:41:00 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Tue Aug 9 08:41:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b395917 net-analyzer/netperf: Fix permissions on debug output file (bug #389975). Package-Manager: portage-2.3.0 net-analyzer/netperf/files/netperf-2.7.0-init | 23 +++++++ .../netperf/files/netperf-2.7.0-space.patch | 17 +++++ net-analyzer/netperf/metadata.xml | 11 ++++ net-analyzer/netperf/netperf-2.7.0-r1.ebuild | 76 ++++++++++++++++++++++ 4 files changed, 127 insertions(+) diff --git a/net-analyzer/netperf/files/netperf-2.7.0-init b/net-analyzer/netperf/files/netperf-2.7.0-init new file mode 100644 index 0000000..3d1bb0c --- /dev/null +++ b/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/net-analyzer/netperf/files/netperf-2.7.0-space.patch b/net-analyzer/netperf/files/netperf-2.7.0-space.patch new file mode 100644 index 0000000..9ad4327 --- /dev/null +++ b/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/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml index e00d443..8b0f127 100644 --- a/net-analyzer/netperf/metadata.xml +++ b/net-analyzer/netperf/metadata.xml @@ -5,6 +5,17 @@ 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 diff --git a/net-analyzer/netperf/netperf-2.7.0-r1.ebuild b/net-analyzer/netperf/netperf-2.7.0-r1.ebuild new file mode 100644 index 0000000..8f70f66 --- /dev/null +++ b/net-analyzer/netperf/netperf-2.7.0-r1.ebuild @@ -0,0 +1,76 @@ +# 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 + + # 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 +}