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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C978158094 for ; Mon, 27 Jun 2022 23:21:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FAAFE0C4A; Mon, 27 Jun 2022 23:21:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28011E0C4A for ; Mon, 27 Jun 2022 23:21:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08A4A34158D for ; Mon, 27 Jun 2022 23:21:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75FBC4ED for ; Mon, 27 Jun 2022 23:21:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1656372048.840c8861d9d4aa90721853527d0325628d5b3c46.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild net-analyzer/tcpreplay/tcpreplay-9999.ebuild X-VCS-Directories: net-analyzer/tcpreplay/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 840c8861d9d4aa90721853527d0325628d5b3c46 X-VCS-Branch: master Date: Mon, 27 Jun 2022 23:21:12 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 758624d2-d3aa-4ef8-b631-7f4f887db167 X-Archives-Hash: 3e85e735eb13935578fb3c76e6a3e9d9 commit: 840c8861d9d4aa90721853527d0325628d5b3c46 Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Mon Jun 27 18:59:03 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 27 23:20:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840c8861 net-analyzer/tcpreplay: fix musl build * Add sys-libs/fts-standalone as dependency * Append the flag "-lfts" for compilation Signed-off-by: Cristian Othón Martínez Vera cfuga.mx> Bug: https://bugs.gentoo.org/836577 Signed-off-by: Sam James gentoo.org> net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild | 4 +++- net-analyzer/tcpreplay/tcpreplay-9999.ebuild | 29 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild index f3f9e2d4d05c..931ea85bf4a9 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Utilities for editing and replaying previously captured network traffic" HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" @@ -29,6 +29,7 @@ BDEPEND=" DEPEND=" dev-libs/libdnet >=net-libs/libpcap-0.9 + elibc_musl? ( sys-libs/fts-standalone ) pcapnav? ( net-libs/libpcapnav ) tcpdump? ( net-analyzer/tcpdump ) " @@ -57,6 +58,7 @@ src_prepare() { } src_configure() { + use elibc_musl && append-flags "-lfts" # By default it uses static linking. Avoid that, bug #252940 econf \ $(use_enable debug) \ diff --git a/net-analyzer/tcpreplay/tcpreplay-9999.ebuild b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild index ab3477f795b6..01eca400dbe0 100644 --- a/net-analyzer/tcpreplay/tcpreplay-9999.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild @@ -1,13 +1,20 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools git-r3 +inherit autotools flag-o-matic DESCRIPTION="Utilities for editing and replaying previously captured network traffic" HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" -EGIT_REPO_URI="https://github.com/appneta/tcpreplay" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/appneta/tcpreplay" + inherit git-r3 +else + SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~sparc ~x86" +fi + S="${WORKDIR}"/${P/_/-} LICENSE="BSD GPL-3" @@ -22,6 +29,7 @@ BDEPEND=" DEPEND=" dev-libs/libdnet >=net-libs/libpcap-0.9 + elibc_musl? ( sys-libs/fts-standalone ) pcapnav? ( net-libs/libpcapnav ) tcpdump? ( net-analyzer/tcpdump ) " @@ -31,6 +39,7 @@ DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) PATCHES=( "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch + "${FILESDIR}"/${PN}-4.4.1-fix-bashism-configure.patch ) src_prepare() { @@ -49,13 +58,14 @@ src_prepare() { } src_configure() { - # By default it uses static linking. Avoid that, bug 252940 + use elibc_musl && append-flags "-lfts" + # By default it uses static linking. Avoid that, bug #252940 econf \ $(use_enable debug) \ $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \ $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \ - --disable-local-libopts \ --enable-dynamic-link \ + --enable-local-libopts \ --enable-shared \ --with-libdnet \ --with-testnic2=lo \ @@ -63,14 +73,15 @@ src_configure() { } src_test() { - if [[ ! ${EUID} -eq 0 ]]; then - ewarn "Some tests will be disabled due to FEATURES=userpriv" + if [[ ! ${EUID} -eq 0 ]] ; then + ewarn "Some tests were disabled due to FEATURES=userpriv" ewarn "To run all tests issue the following command as root:" ewarn " # make -C ${S}/test" emake -j1 -C test tcpprep else emake -j1 test || { - ewarn "Note that some tests require eth0 iface to be up." ; - die "self test failed - see ${S}/test/test.log" ; } + ewarn "Note that some tests require eth0 iface to be up." + die "self test failed - see ${S}/test/test.log" + } fi }