gentoo auto-resync : 12:06:2023 - 02:18:43

6 files changed, 96 insertions, 6 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 49c44cceaabc..e1d5f440d150 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index fe623b8d13d6..f8444373a0ac 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,5 +1,7 @@
 AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
 DIST tcpreplay-4.4.3.tar.xz 750072 BLAKE2B 218fe1c5faab0fdd75a031afce8f468c85886a4cf21a4d9bd34089bd106756ee0e65e0df605efecb3260ccff266553a44d8ee10249b35524a044c6c5db86fcc7 SHA512 d8186a5faf3fbe5505da34cfc466c0375c4f298c997fe85505ea898c8c1241c16f98269596b682983a3e5cbd8493882334c925ff750d95995f3b13c5b83357cf
+DIST tcpreplay-4.4.4.tar.xz 748344 BLAKE2B 05f586c9d68e1ee47fc5dfdbf14d866ccbd921a5734a52de4ba6c1f33f37628e510eddbf9059130c9858207690ec2c14dfbf3819f923436aa64fcc3fc2ce074d SHA512 a6907c98779c96b2acf53e2f13e832f2c9a7ee840acc40d23c7290c2ceefb5885d314453dec9463069218011bee86bb7df057966120aacd6cddda942821aea9b
 EBUILD tcpreplay-4.4.3.ebuild 2131 BLAKE2B 07d302b1b525d49b2ca6a89faca08a55458ee6444e66914e73310aa749ba1934fff2bec38e01d986acfeefb2def4215ff7802042219527a2938adf7a32a6726b SHA512 727a8f56c3390ed18f54e89a14a0a2a066e0436522fc332d5f7a433e9c52a7671b7965efddb572c542004e06af847cf31d3a5c333a02879fc07de4465e63af6b
+EBUILD tcpreplay-4.4.4.ebuild 2133 BLAKE2B 3e3fa8a2093a3a203bba0a430367d9cd75fa56349c1079da3d08ec92c433f47ae4f0d5d0bb8ebedc9cd61498c9ee52d65dcf3165db54bd825ad7548be8de3248 SHA512 df38e0d80932a21a04d414a2f966be66d9477e8d6faa368170f89a4a5df4ab97cf51c23bb8a3d5b979476fe9de5e15c9f4a436f2806c2061db223964937f7655
 EBUILD tcpreplay-9999.ebuild 2133 BLAKE2B 24055b46b8746954e05cfaf88695389ef7e17171ba16f4b6de166f40e23ce3a7ef5f82f2915fc016bd6cc637ecf473fc90ed791111e87e7d905f83d0ca380629 SHA512 033159087ec5edb13a1c87a94489ffcf30b085b58707581b1de8d5f176511204a1e907e19c70b1aa46ec81678c0cb16b7bf086eb4d6c0f0562a6d74218d02718
 MISC metadata.xml 1117 BLAKE2B f269c4d3da94e3fb52ad80b840c6d5b8d4acb0181dd1c370bedd88bcf75e6933f21f304f3ed5435dc601978acbef6396410d9beb96e4ec1ba1a7a53458b540c9 SHA512 bff9425e1ae71f5d106a5b2c844591db726192f356f54c6347fb9a6c10fef6b7b11cc59695b4f712d87f0359112b98ec514ce481fd824d6e343975631b105ea5
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild
new file mode 100644
index 000000000000..f953a68c1c37
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+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"
+SLOT="0"
+IUSE="debug pcapnav +tcpdump"
+
+# libpcapnav for pcapnav-config
+BDEPEND="
+	net-libs/libpcapnav
+	>=sys-devel/autogen-5.18.4[libopts]
+"
+DEPEND="
+	dev-libs/libdnet
+	>=net-libs/libpcap-0.9
+	elibc_musl? ( sys-libs/fts-standalone )
+	pcapnav? ( net-libs/libpcapnav )
+	tcpdump? ( net-analyzer/tcpdump )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \
+		src/common/sendpacket.c || die
+	sed -i \
+		-e 's|@\([A-Z_]*\)@|$(\1)|g' \
+		-e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \
+		-e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \
+		src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	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) \
+		--enable-dynamic-link \
+		--enable-local-libopts \
+		--enable-shared \
+		--with-libdnet \
+		--with-testnic2=lo \
+		--with-testnic=lo
+}
+
+src_test() {
+	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"
+		}
+	fi
+}
diff --git a/net-analyzer/telegraf/Manifest b/net-analyzer/telegraf/Manifest
index 025829261b08..b01445691e42 100644
--- a/net-analyzer/telegraf/Manifest
+++ b/net-analyzer/telegraf/Manifest
@@ -5,5 +5,5 @@ DIST telegraf-1.18.3.tar.gz 2647798 BLAKE2B 82556544d6a3e1f349c711a4964d842fbe24
 DIST telegraf-1.26.3-deps.tar.xz 598542112 BLAKE2B 654e2543b79927409a7f51a3b13ca5d917ef35559351ee48a581b0699ec4fe1eece9f8a3278243b02c79e17b08557d6f3d23584050cdaf461077c61f3435743c SHA512 8afdec12df3105678fad3272d80ab86438546a7de5190b01cbb0bffc3443deb6f4fd9540432c3b6e06dbfbc0739167daf15934248dea73bd59b5b2376fe4b5d2
 DIST telegraf-1.26.3.tar.gz 3893039 BLAKE2B 4285416c2e2a6e63dfbb3261cb5ef90c5fc0d2752e78913a2d8cd59a45b990e9735d65e9c762188325cf5696ac6fb619ff1d88f0b0017445fe3039d56c488b27 SHA512 c153d7eb19319d669328a94eade041ecaa6a30cc180915ca2b51b67c2d1d2e98572573c8970b78f815e74dec814ea9c02f4170aff1021fcb9e97c8974a0d0d6e
 EBUILD telegraf-1.18.3.ebuild 1162 BLAKE2B 4b89a6a3039de26d2297d5ba8f2a88c5f82732fda54f0abd0b9eae36a5bc5041328825b7a210ac4d1867a62fe819cc9088b484d7be4727f0b9ed97eeb1e29a19 SHA512 e19ff1a8d76a7d1a06301bd4a8c6ee756165fdcb7c53649742cd9073743a11e663857c0a4cac757dbfd61360117a25a45362aa528bc91772319f21af72238dd6
-EBUILD telegraf-1.26.3.ebuild 1125 BLAKE2B d21186b61f4992b5c326cab1915825dd720987cdf56649b39070db5be9a2aa8001020c25cf516fe2ab746faddf47ebfb5843baa2a8a757644201040fdb83add2 SHA512 dfa3c8c8f978f1efbdd5440ec6784660727f55d2b99d9e914e2ecffc92cc9c41696ff2f43d056531cc4bb6008289ef316c4d0c9433ad5a03ca3ab7671f1e438c
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+EBUILD telegraf-1.26.3-r1.ebuild 1119 BLAKE2B f2240b4fcca163c06c19b7ba7fe8b47264b1dc726f7a617cbc03cfc91f909c6c0a1e3a394e0eb94088fcc92197c2dcbafa40d3933125c2cc720521235c8b8a11 SHA512 8f5f70c15f310e2eda1a4e2a61895c22e08eed3a0dd79ade492f16ea2d656895b71f24b5cc5e580e9adb81cba0e356168e82dfd5e6bf30445f0e376446503955
+MISC metadata.xml 333 BLAKE2B cff1e99d054f97df13cda5d847be17fdbd2afc3d918994705f3df65f756ba4b3921e379fb150b7fb5ac1e58f7de53eb411b1233fd19c428adfd29a47b43225b8 SHA512 484eb9576de179cf933439238b388670b2a3df4a8f4689777b5c055526be1f58cddd967d83d667cc3c63f95b195db99bc77e55967310074a3528f2fd1501f4bc
diff --git a/net-analyzer/telegraf/metadata.xml b/net-analyzer/telegraf/metadata.xml
index db463f3eeb66..894d232badaa 100644
--- a/net-analyzer/telegraf/metadata.xml
+++ b/net-analyzer/telegraf/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">influxdata/telegraf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/telegraf/telegraf-1.26.3.ebuild b/net-analyzer/telegraf/telegraf-1.26.3-r1.ebuild
index c164d70c7d37..7cef4e8b9482 100644
--- a/net-analyzer/telegraf/telegraf-1.26.3.ebuild
+++ b/net-analyzer/telegraf/telegraf-1.26.3-r1.ebuild
@@ -26,11 +26,10 @@ DEPEND="acct-group/telegraf
 
 src_compile() {
 	unset LDFLAGS
-	emake \
+	emake -j1 \
 		COMMIT=${COMMIT} \
 		BRANCH=${BRANCH} \
-		VERSION=v${MY_PV} \
-		telegraf
+		VERSION=v${MY_PV}
 }
 
 src_install() {
@@ -42,7 +41,7 @@ src_install() {
 	systemd_dounit scripts/telegraf.service
 	newconfd "${FILESDIR}"/telegraf.confd telegraf
 	newinitd "${FILESDIR}"/telegraf.rc telegraf
-	dodoc -r docs/*
+	dodoc -r *.md docs
 	keepdir /var/log/telegraf
 	fowners telegraf:telegraf /var/log/telegraf
 }