gentoo resync : 20.03.2022

3 files changed, 53 insertions, 5 deletions

diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index e5155c9cd56a..e1fd96ce8d69 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -3,7 +3,9 @@ AUX nDPI-3.4-fix-oob-in-kerberos-dissector.patch 882 BLAKE2B 189f3bbd5b209d7b7ea
 DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
 DIST nDPI-4.0-patches.tar.bz2 8744 BLAKE2B 48bfb2cf240823b64ab15a3f8a21acece878102ebb4cc807648b264ef091107a05d66fc672cccd1bc721ad3ea0edde786a1f133dfc84c91422604a9929e327ed SHA512 99a780c18c048ceec29c42828c420fe3f9624906eaef70f92af6abdbf7bc29133e048d7f8de85d8b73aa6667066e7ab5843fa293221d5ec8bbe87803dde83db6
 DIST nDPI-4.0.tar.gz 120053617 BLAKE2B ea0f333bd62622c1ab792137f9bbf2e35cb3790aae191c5caeaea36c7ce376bfa84633e99e321c16bcfbe5812d6674b825bdc4197297cee76064ed88f344a577 SHA512 2526041bc02a210e65bad31323a66167d79a37d14697cf4459054cc54715e53f9673b0000cefa6b452bbe3b3e6c25f0bafcf59d24323d210e2ce6782d9153f81
+DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8
 EBUILD nDPI-3.4.ebuild 1542 BLAKE2B c33be0c27e0521e4b75b10a0fd49b8f208120fff45653c9f9da4f8320c7d31b25df5374e33fb8517551bdda081029eb14e5db2278fdaa1c6ab28ed45e13ce9de SHA512 e3825dab00f2e399df07f6753f2e53900d5caaf9f41da325f30ee4c2ed7669f08278b2b96e12c06fad6057eae4587c909de3222b50982f63afb26cec7e206e11
 EBUILD nDPI-4.0-r1.ebuild 1425 BLAKE2B 5085e685f10038dad0b6f22f4e03cb933725f2dcdec5e011065ad1ad21413ef11fed9b82b2e6ff9d5ab142c9d15f6e9a558579c2503d7b21dab4459e9bebae4e SHA512 6eb175d07df79f2750721f3d4c5880bbdb6aa6106e052c4b5ecea2192a034e95c9f18543f36171992e67536bd0c482246eb12fd1e72c50c48f38b3e2a1e5d82f
-EBUILD nDPI-9999.ebuild 1081 BLAKE2B 13d97c80b4ef0d209d96ddeb72a02d7fe89c4822cb33de424135e96ca13380ffc7f09c11b34dff83200550399736280133193a1861a9efcfd57dad9fc074d23f SHA512 71b5f86c2ee6eb43a9b8d5cb6ed3960238887b763a32c12f66b8adf8a8704abc08c46e1b966521e31db1706bad2e38f4c60273da2f100b25fa8cf1f90a85bd2e
+EBUILD nDPI-4.2.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
+EBUILD nDPI-9999.ebuild 952 BLAKE2B 3f03833a58e9c44b22f52a07375747a7a7074f1e1a653c4f5f03fdbf27378b1cafc6863cb319493d278c2f2f0b7b8109fb8c5920fedd7f2b11579d7c12f0228e SHA512 dde8f9eaf6db619331209f0e66a60a265c9f5c4967e80011b88d19337cdfc8191188d355aed081c7fa5e3198a75df7e482b3d2721ba3db78ed8eee45ade70b82
 MISC metadata.xml 293 BLAKE2B 9a139bc75f89728980d35a12c076b25ba8d0f95a6ec0815646588d8f602f2cf6b19c5fbcf6d4eef08b9b7967197e34c7f337b55aa052ccd30ac1cb6d30ef3357 SHA512 32b7db90abc45b9550430d5696f292e16cc467243c289d721b92f1fbec771bbccad095a46de98997fbb16f916f85c801a1139ea90d10d48cb89c2285a7d10d63
diff --git a/net-libs/nDPI/nDPI-4.2.ebuild b/net-libs/nDPI/nDPI-4.2.ebuild
new file mode 100644
index 000000000000..a7730e61c252
--- /dev/null
+++ b/net-libs/nDPI/nDPI-4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ntop/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	eautoreconf
+}
+
+src_test() {
+	pushd tests || die
+
+	./do.sh || die "Failed tests"
+	./do-unit.sh || die "Failed unit tests"
+
+	popd || die
+}
+
+src_install() {
+	default
+
+	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
index ea288e57ec66..a7730e61c252 100644
--- a/net-libs/nDPI/nDPI-9999.ebuild
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -12,7 +12,6 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -25,9 +24,6 @@ DEPEND="dev-libs/json-c:=
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
-# Also sent a patch upstream https://github.com/ntop/nDPI/pull/1392 for
-# AR/CC etc but doesn't apply cleanly (at all) to 4.0.
-
 src_prepare() {
 	default