[gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/files/, net-libs/nDPI/

[John Helmert III]

commit:     264f9235c9e09fa072e972c5587c4373d8c015f1
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 21:23:11 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 21:23:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264f9235

net-libs/nDPI: drop 3.4

Bug: https://bugs.gentoo.org/799782
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 net-libs/nDPI/Manifest                             |  1 -
 .../files/nDPI-3.4-configure-fail-libcap.patch     | 19 -------
 .../nDPI-3.4-fix-oob-in-kerberos-dissector.patch   | 16 ------
 net-libs/nDPI/nDPI-3.4.ebuild                      | 65 ----------------------
 4 files changed, 101 deletions(-)

diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 04012ad463f1..b74a4f2bad03 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,4 +1,3 @@
-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

diff --git a/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch b/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch
deleted file mode 100644
index 7ae5a04d4e8c..000000000000
--- a/net-libs/nDPI/files/nDPI-3.4-configure-fail-libcap.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Ensure that we fail if libpcap can't be detected, rather than exiting with a success return code.
---- a/configure.seed
-+++ b/configure.seed
-@@ -126,12 +126,9 @@ case "$host" in
-          AC_CHECK_LIB([dl], [dlopen, dlsym],   [DL_LIB="-ldl"],[AC_CHECK_LIB([c], [dlopen, dlsym], [DL_LIB="-lc"],[AC_MSG_ERROR([unable to find the dlopen(), dlsym() functions]) ]) ])
-       else
-          AC_CHECK_LIB([pcap], [pcap_open_live], [PCAP_LIB="-lpcap"])
--	 if test $ac_cv_lib_pcap_pcap_open_live = "no"; then :
--            echo ""
--            echo "ERROR: Missing libpcap(-dev) library required to compile the example application"
--            echo "ERROR: Please install it and try again"
--            exit
--	 fi
-+         if test $ac_cv_lib_pcap_pcap_open_live = "no"; then :
-+            AC_MSG_ERROR([Cannot find libpcap which is required to compile the example application])
-+         fi
-       fi
-       ;;
- esac

diff --git a/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch b/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch
deleted file mode 100644
index 7e8f381cdeab..000000000000
--- a/net-libs/nDPI/files/nDPI-3.4-fix-oob-in-kerberos-dissector.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Sourced from https://github.com/gentoo/gentoo/commit/c02681fcb7839ac1829ec09394334ddbca1b0aea
-
-diff --git a/src/lib/protocols/kerberos.c b/src/lib/protocols/kerberos.c
-index fa0ab6cb..32319668 100644
---- a/src/lib/protocols/kerberos.c
-+++ b/src/lib/protocols/kerberos.c
-@@ -189,7 +189,8 @@ void ndpi_search_kerberos(struct ndpi_detection_module_struct *ndpi_struct,
- 
- 	      body_offset = koffsetp + 1 + pad_len;
- 
--	      for(i=0; i<10; i++) if(body_offset<packet->payload_packet_len && packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
-+	      for(i=0; i<10 && body_offset < packet->payload_packet_len; i++)
-+  	        if(packet->payload[body_offset] != 0x05) body_offset++; /* ASN.1 */
- #ifdef KERBEROS_DEBUG
- 	      printf("body_offset=%u [%02X %02X] [byte 0 must be 0x05]\n", body_offset, packet->payload[body_offset], packet->payload[body_offset+1]);
- #endif

diff --git a/net-libs/nDPI/nDPI-3.4.ebuild b/net-libs/nDPI/nDPI-3.4.ebuild
deleted file mode 100644
index cb053734cf39..000000000000
--- a/net-libs/nDPI/nDPI-3.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
-HOMEPAGE="https://www.ntop.org/"
-SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/json-c:=
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4-fix-oob-in-kerberos-dissector.patch"
-	"${FILESDIR}/${PN}-3.4-configure-fail-libcap.patch"
-)
-
-src_prepare() {
-	eval $(grep '^NDPI_MAJOR=' autogen.sh)
-	eval $(grep '^NDPI_MINOR=' autogen.sh)
-	eval $(grep '^NDPI_PATCH=' autogen.sh)
-	NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
-
-	default
-
-	sed \
-		-e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
-		-e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
-		-e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
-		-e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
-		-e "s/@FUZZY@//g" \
-		< "${S}/configure.seed" \
-		> "${S}/configure.ac" || die
-
-	sed -i \
-		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
-		src/lib/Makefile.in || die
-
-	eautoreconf
-
-	# Taken from autogen.sh (bug #704074):
-	sed -i \
-		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
-		-e "s/#define VERSION/#define NDPI_VERSION/g" \
-		configure || die
-}
-
-src_install() {
-	default
-	rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-}
-
-src_test() {
-	pushd tests || die
-	./do.sh || die "Failed tests"
-	./do-unit.sh || die "Failed tests"
-	popd || die
-}