From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- net-analyzer/tcpreplay/Manifest | 4 ++-- net-analyzer/tcpreplay/tcpreplay-4.4.1.ebuild | 4 +++- net-analyzer/tcpreplay/tcpreplay-9999.ebuild | 29 ++++++++++++++++++--------- 3 files changed, 25 insertions(+), 12 deletions(-) (limited to 'net-analyzer/tcpreplay') diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 8951dbf9d6e2..6ae239696c91 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -3,6 +3,6 @@ AUX tcpreplay-4.4.1-fix-bashism-configure.patch 988 BLAKE2B 847d6f241a84b456f96c DIST tcpreplay-4.3.4.tar.xz 739280 BLAKE2B 8b680363ee182fc7581f99cc4587d50e36285446d07a5be370e2439b31582ad88c786c11d662e28dadc5b69aee376889b1c0f6a86d61c106426ab6ab2c085012 SHA512 6d19cf492114c68a9fafcf7790c08f31607d2c0112e02fa41eed8747255bbbef85f281f74348e1d51f1d476b88f07d64715224618ec15268688baefaf7cc7124 DIST tcpreplay-4.4.1.tar.xz 751036 BLAKE2B cf6a4e23f68fd0d6f23392c3ded14ea6486d275eeb8e278ce02d6b34e8b426e69841858cac49cc5ea952e0398f2960049789d16180b0896e38d665511237b352 SHA512 25a4a94b7c0c416b8ef57aba5640803dcd6e271fe8789f3f6e281529e336e326b35738d7673fd44ac4ded0faf577dc4c6255b926bd67b8ba5104a8bad81a98f1 EBUILD tcpreplay-4.3.4.ebuild 1925 BLAKE2B 00949edc8ccb707a26dd93ace9d298eeb1cf9167870d130f3b335e12ec88ae7842f13b560ea1e6005cc3892b94e1d7a7aff6ea958b82efa43e25a63c19951dec SHA512 2c64a85b0e9c6b6da59264d235c8c4025e2ffa58e0efa5f4b8325937a94fd3874bea8920043f28faae7eb408bf84140f1744e8fad58ed19eb9c6478bc0f83b7c -EBUILD tcpreplay-4.4.1.ebuild 2092 BLAKE2B 3d915076248fbe81ee43ae7221d3646caa73b47a05abe3b9821ef538b6fa5461d847bb4b0d706c0d8aa1c1a8f3c4d7ae69be287a6fb1316c3d32a9761aac51ca SHA512 e19ed257c2dfec8ecbb248635093fb2af1599e289f4be5c61a3b0cfb66e6b0f806835ef1b09a74a18c3fe3af1476463de80038d5af1afaa2697d287632a5b3de -EBUILD tcpreplay-9999.ebuild 1875 BLAKE2B 8244388ce37dce3dc063c1238d9302b702fb63a6d3972c37691e61f5ebe1c16312c00105862f41ffefcc520735392bd801ce8b9a626f20c32db8cebf354ea7fc SHA512 5694f8d1263a34d1dfd189a42b630f33fdec017cde7980eab1d530f3ffd00fa5fdadd050a46d42f1b56de53aeb4b6878dcb4d602724a6f59f35272d5fae00180 +EBUILD tcpreplay-4.4.1.ebuild 2186 BLAKE2B 8b055da62a027afe9482068b1027c4871f2047f5353bcbb8a921b7d4395a64116f480d6865e362a742f3163e45775b4be443c18b608c5c745dbe9bddb05a61af SHA512 3e52073f333de6fa15b52f5e124a555d2cef1eb6ff2b36cda45d675b6ca09bb368cfcec6f0055c68a09eb0cf8d0d861288f317ec1ce5c53ed37eefa07a12e56d +EBUILD tcpreplay-9999.ebuild 2188 BLAKE2B 5ae37f4026ad920def3c1a4ae748ff922025919ecf6f37019470df01508fcd896e3f14b28e3363ac11cf441a5c690b0aabfffd7a7b94e584284aeca1bd206a2a SHA512 dbc88dd393a1603c41e9ebfba50b2fe63fee5c4e02df856236c0d563fd5c9fbbaddd7b704cc57497562a2e8b48574fb94dca9c6b5d695be4e768e14d9bb5f54a MISC metadata.xml 1117 BLAKE2B f269c4d3da94e3fb52ad80b840c6d5b8d4acb0181dd1c370bedd88bcf75e6933f21f304f3ed5435dc601978acbef6396410d9beb96e4ec1ba1a7a53458b540c9 SHA512 bff9425e1ae71f5d106a5b2c844591db726192f356f54c6347fb9a6c10fef6b7b11cc59695b4f712d87f0359112b98ec514ce481fd824d6e343975631b105ea5 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 } -- cgit v1.2.3