gentoo resync : 07.05.2021

8 files changed, 94 insertions, 15 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 7336f9f731bc..bc4ed076b715 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/hunt/Manifest b/net-analyzer/hunt/Manifest
index 67acd209a735..f11f06378920 100644
--- a/net-analyzer/hunt/Manifest
+++ b/net-analyzer/hunt/Manifest
@@ -1,8 +1,8 @@
 AUX hunt-1.5-exit.patch 208 BLAKE2B 0cb8afdb88649dc60e2d854a17cfc0ca5177257f101b25411c22707776369f9e758b3795d3c8d2a1f2bf68607371c3f7e99b6a0d5d850082800260febfb24267 SHA512 f268d172d1280bf1f05cb61da7295c74f0c60ba2c648058491cda7e89702f740648f9fc90c764867d6bb490a24ab318db95de594c1111b7c2b4d099dd113bae8
-AUX hunt-1.5-gentoo.patch 377 BLAKE2B 728df0a5a8eb29c039fab217825acd3162e9ec58ec1f73e854d3e10b981b6835f387592d0be81c622676fdeb6966b28243e4adb57d4e4e9863b9e3c759e4f542 SHA512 f2f499ee496112fd89e632565d393ce4af6e358481a47de4418490e87c90128870cf201274a39fe92b7e01044e3d182fb0c30d370161917bf2bdbb8961491799
+AUX hunt-1.5-gentoo.patch 417 BLAKE2B 32b8e48e939ade54053b08972077c3a86b1383c6f8e325dfb419c7464b390eaf688c944f189a038b9ed758a3e83dbfa5c851bf5539d1bb1c7a2da4d29f139c9d SHA512 7a7ad9f14f7012f9202adbdd3446d4be25f0ed19331f5f83e0b77ba448dddf04b70d6d904292365c2495695d7b69686558342f242ac66f1d902d3f6efab8fd30
 AUX hunt-1.5-log2.patch 387 BLAKE2B ba98751feb2a4c7544ac6c238016071fb01dbdbd81ab8a6a08df64b3adf8ac1896a8e883a4295c5681ee806c6528191ceb2ccef293705ab188ed5ea59efc872b SHA512 efb910e3149a97195323ddf35ab1a3e4ed075d7dcc0a1972e727b0107266b183bc09f7bd12f8dcf2735be1f6f76a5201caa1b7d1b50bce5464ef8f70a00f4bff
 AUX hunt-1.5-tpserv-log.patch 3426 BLAKE2B 23ef690623d82440e5749c42eb78c48e3226ffbe9b8aa1b59e1f63bf0595aa9f52c091c0897ecc8fa28d974d0356c472227416ed51d0909b3d3af9c22d94c1d4 SHA512 7690f0e1089b1767a1d4349fac66fc9897c542482677c54f77732b4377f561387301982c7aed60a15973ec2f08d2901d936fb86d6ad516594639441eeb81f289
 DIST hunt_1.5-6.1.diff.gz 4556 BLAKE2B 74c27722ae61494ca922b013cc691c0e835d7cdcc01399aaf7fe9bc7da4532954c4da2023fc92e3a4f664bb2b5ab8ef22ff1c04694dc1ab7c205125ccea1ff84 SHA512 45ff3f977a32202d8ab9b7daa76a0ebb507d0b73d635c0f3649cf3b2bcb9fdc3094c9631d696dfaf27371bc5fb5eb62dbdc258795979755c7713a45357938a05
 DIST hunt_1.5.orig.tar.gz 99241 BLAKE2B df9092cdf6de0016ae5fe8d360a712eccd3c0f71bead3c93142ba2c3c421031cb5e6ff8c3b4782856286fd41a61e40a6453b48f240365ba88f6805bb3bbdd909 SHA512 b016f7ae0ac7568b4a5006b7c5e6f3e80df71a67d94a1e62afc46fb0f10cb661df7e3bff1f0229836a2247ef368dc2681ad955821e97cb6a91fcfe489b871a61
-EBUILD hunt-1.5_p6_p1.ebuild 1143 BLAKE2B 2b785ce5b583608ba118f3415f23dae20047a905053f4bf914a7dc0e1ab3d706deb281abff92f0d1b81c30ef446e47800260755e8d5930fc4e57b6dc46284ce9 SHA512 f1287e460f7197fd616c1f6492aa1cd6e2e10449033dc6397282366e621666090ecf902b7e9c7d26e18ce2bdbd4fa376907af0e2370d9533cc0613e0370cf22a
+EBUILD hunt-1.5_p6_p1.ebuild 1083 BLAKE2B 6dbd58ae39107bc4637e8b77fc75f1312232470b1c779cc8a9e91170281cefb07fa4a3c5dc68842ea6f5d3ab2ec498d0884e6b86d7ae24b693c86627adb66400 SHA512 59406d50995e5c80a62863615e8941d78afea97cff81b941b23ae8997971e39e915a13a1fb9c5b6284843ae7d854be33f72bc52851a3c767e3311afc622e61c5
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/hunt/files/hunt-1.5-gentoo.patch b/net-analyzer/hunt/files/hunt-1.5-gentoo.patch
index e0bcccae0aae..b5b49944f016 100644
--- a/net-analyzer/hunt/files/hunt-1.5-gentoo.patch
+++ b/net-analyzer/hunt/files/hunt-1.5-gentoo.patch
@@ -8,7 +8,10 @@
  
 --- a/tpserv/Makefile
 +++ b/tpserv/Makefile
-@@ -3,7 +3,7 @@
+@@ -1,9 +1,8 @@
+-CFLAGS=-Wall -O2 -g
+-
++CFLAGS += -Wall
  all: tpserv
  
  tpserv: tpserv.o
diff --git a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
index ec3c6e7a044a..3790bdef6529 100644
--- a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
+++ b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol"
+DESCRIPTION="Tool for checking well known weaknesses in the TCP/IP protocol"
 HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html"
 SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff.gz
-"
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff.gz"
+S="${WORKDIR}/${P/_p*}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
+
 PATCHES=(
+	"${WORKDIR}"/${PN}_1.5-6.1.diff
 	"${FILESDIR}"/${P/_p*}-exit.patch
 	"${FILESDIR}"/${P/_p*}-gentoo.patch
 	"${FILESDIR}"/${P/_p*}-log2.patch
 	"${FILESDIR}"/${P/_p*}-tpserv-log.patch
 )
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
-	eapply "${WORKDIR}"/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff
-	default
-}
 
 src_configure() {
 	append-cppflags -DSYNC_FAST
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index fefde39b6731..948de5aa26fe 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.3.3.tar.xz 748220 BLAKE2B 2de09f75e6bb6035fc25f34f41d9ce2ccbb961d7464a9a6dae16ec417d629e4819593fd781d95075293ffa3a3db7c4a50ae8667c4e7d07c0b425361027c8df06 SHA512 110d7768a176d2126766829466a209cdd983afcf0c988f7e128baa5057b3ac1dc918fcaeb168a2e6654429100a146afcbdafcda8c3d67adf6b17892a48689a02
+DIST tcpreplay-4.3.4.tar.xz 739280 BLAKE2B 8b680363ee182fc7581f99cc4587d50e36285446d07a5be370e2439b31582ad88c786c11d662e28dadc5b69aee376889b1c0f6a86d61c106426ab6ab2c085012 SHA512 6d19cf492114c68a9fafcf7790c08f31607d2c0112e02fa41eed8747255bbbef85f281f74348e1d51f1d476b88f07d64715224618ec15268688baefaf7cc7124
 EBUILD tcpreplay-4.3.3.ebuild 1924 BLAKE2B 0eec7595c24499e9d2dd603d097613f3b1ca59a28c096d7ec8a9231be16ddd1e5d2ce8a56cb41086c6baf3fb08ff56d890b8aec553082e0c7272b49f8dd32285 SHA512 521491bb8e182f93ffa83bc50448e45f178881889af50371f6a770a9815b572d48721ba6b480c64d81fad2f8d2f90e772ea055adc990b98fbd99cc681e86afd9
+EBUILD tcpreplay-4.3.4.ebuild 1927 BLAKE2B 4839c1ba1f6aef0b4f276682b1bcd2d06cb8e95ace072444bfdb4d9943bcc8f59ab7ffb823e99bf535a254f40cb6d0f7a48174c6c0a221840085e1bd5a0a68b6 SHA512 a7c791e86b9fe9a98b8c4496ed48b245a136faaaa2ce60441fae141dac3a5e5363111111c1acb237bebfc3f478cb066fcf22957d090dde9476032fac186978a8
 EBUILD tcpreplay-999999.ebuild 1875 BLAKE2B acf0bc3fb3e2d84f598d8ed6e13c42bfc642da1aedf8036362e52ab0bc7709beb81d9e57517d26b2b9507ec1cf89c577b0c40993f8faa63babcfaa2d11dbdc6e SHA512 be4c895b20ee5898dc182fdf8f45de64bb9c28fb4b581c07ad29a1f03d3ed953f6bc2e6b596fac66a6290a83dcdfdab17fb01de0042b82cdae86deefcf6be062
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.4.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.4.ebuild
new file mode 100644
index 000000000000..d15c8f13c99e
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Utilities for editing and replaying previously captured network traffic"
+HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay"
+SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz"
+S="${WORKDIR}"/${P/_/-}
+
+LICENSE="BSD GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+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
+	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() {
+	# 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/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 565bc0185f6c..7d2ac9cdf145 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -8,6 +8,6 @@ DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 85930709ab666794ba6f4a00a895d41b25c
 DIST wireshark-3.4.5.tar.xz 32300144 BLAKE2B 061da39322627ff49c0c7320049e4f5d795cf4def623efbab9a62107e6a19322049e39ed95519479e6e3a4283b2e53cfc31a5549a109ced74fea7deeef794399 SHA512 f54d9287a48f09bbc085170791b5ca2dcc84cda55040f45f2c4a6abbe828548391e4a931536163c781e69843765a598bd29a240ad43276d0d1bb42d1cd23972a
 EBUILD wireshark-3.4.3.ebuild 7060 BLAKE2B a1fbc00d217ce8ad232dfe2f3ca53dd78f5b12927af0bfa87d65cddc48a861fffe94d706e93d13e168ff89abc30593e215bc03663ec491dfadd321fc6ee517a0 SHA512 7e2944802986fffaabafd0f10eb9a504505c896ccc0b612d583eb2bca3bcca67560a31e4b23f6b765da975c2485b627f090bf0f82b3335e91e7884572af3fcd1
 EBUILD wireshark-3.4.4.ebuild 7405 BLAKE2B cbf335dc1ddcf90eee9df1b7ebf0693401b7c932592afab7e2fc3d2a9ac3c7bdc207876691159d0d3946d927af2acd2979af5c6c557be2ab97b0b8dbaa8e46b1 SHA512 6d8ab483ba6b8af4bcee06fa903123fb6a349af300552dda662795a319e97933101fc9e6e4a83eb02ba4c8fe6e597608193d4ae274c002347e906d61f4063b1e
-EBUILD wireshark-3.4.5.ebuild 7211 BLAKE2B 1777dc913003253d12da947db992439d02897edc59de2a1fcc05d0504d6c72ff8d4a7db8912e8d6cf02498b0f7dc9525cf111d837252a14c0c55c0be96a35af2 SHA512 a7e50a1464efa1160e9927798b059796529f8b32e6da6762f20f3e582f1a0bf43746f1f5af3bd95bcc33b9f77e52b2557d32ed99f7784c59d04ed2035e0598bb
+EBUILD wireshark-3.4.5.ebuild 7206 BLAKE2B 79a328e8d05370dcf7685a955ffde5d4edf073738ff643598ff7afd7000df5aca7ae4ac49639eb9c42b9d7c9d1714e257544b930ef8911e876d2146f724a7589 SHA512 58e84bb0ba2f577a76e4d92cff014d2a48f1cd661a3dba75f4613095a1a9ac1daa580157bbf54d834568001a752cdf0c2f362ea3b604362fc40520a06bb13873
 EBUILD wireshark-9999.ebuild 7211 BLAKE2B 1777dc913003253d12da947db992439d02897edc59de2a1fcc05d0504d6c72ff8d4a7db8912e8d6cf02498b0f7dc9525cf111d837252a14c0c55c0be96a35af2 SHA512 a7e50a1464efa1160e9927798b059796529f8b32e6da6762f20f3e582f1a0bf43746f1f5af3bd95bcc33b9f77e52b2557d32ed99f7784c59d04ed2035e0598bb
 MISC metadata.xml 5327 BLAKE2B f3e047c03a849bfdfded710eccb1e05fbcf00407bbe3eb2a2b63b562e7d583a3ca66de214c17350bec56451f69453fc819921119c7954ef6ea01cfe134ac4783 SHA512 9e514634a6017be1e5c2752c107c33f231e019ce9ffd239042d8f3d426263aea88052748749b7359a9c4c2e591d379c8faf895192358cea20601887b784529ba
diff --git a/net-analyzer/wireshark/wireshark-3.4.5.ebuild b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
index 32f8fdef83b9..5e3828b57219 100644
--- a/net-analyzer/wireshark/wireshark-3.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.5.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"