gentoo auto-resync : 25:12:2024 - 06:31:02next

10 files changed, 263 insertions, 168 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1c25232a1ba9..85eb27793e1d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index 009d192f79ba..f3d07addadfa 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,9 +1,12 @@
 AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2adaa6a54536358e919065d1bd98a62b530ef698fed65be77749780320685f4f457718648bbcd3 SHA512 c9afa1d1629505e77f3a0ee282b0dec79572a9ac4dd31bb3161b36ed6036dd6a8345280c2db4a8f1fc763f88f86857d96edae997ecff8e540db448fbd9a4b101
 AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
+AUX nfdump-1.7.4-rrdtool-gcc14.patch 4958 BLAKE2B 403c485af06fdd8a6ba3b51dff67da01ed692aa1a726bbc484132f3b06fa4b02b9df9f6eff5a86d76274feb66c541b9650a94da686fdd327babdbba240b30046 SHA512 6d097ada7def8721f2a443b3f7a288b91fd687333c1bba49f494e63ca16b3702ceede599df76016f33eb4930ab9ef5834c18299cbd699effe9c6bfc19890d2ae
 AUX nfdump.service 365 BLAKE2B aae0d69b77b01e822430585988c148c0a497123b9a90421b8a3fda5c716b9022063aec9af1d3e6c302ba64d9b57421a3e5224eb6662374ac8277661543e1b076 SHA512 41eba6c45230957bb29c9d3325f5188c10a3123fe8580bf5da843757031ff930cede410ddb337c0899f70010d2b4937ab8a57831f395c80f40fc101e8f158a3c
 DIST nfdump-1.7.2.tar.gz 697405 BLAKE2B cf52f2cca5d80070bc00c7a7a87cc4820f04904ddeeebd4fc93cf3a2433bcf5798191daa86f0bfc7ee1f2f92e5d8bb087114d2c17e32b641a224189aeb54f822 SHA512 858d0aaae24f2e38f3708db9fd5cd40e99a6a50d5da5738c8ce4bf898fb153ce439c504d5fe8fb3c296d0069511a6f229ebdfc117f849a482e5ffdf457f06003
 DIST nfdump-1.7.4.tar.gz 756319 BLAKE2B 441fb5d3fcb4b83bfc42861eac67bf96ac7c7d6a44afd47c4e16615b22261e1628a1bffc645071817eb9085857ca3a3b632fd265dc897cf9af8fce2999f86787 SHA512 be65aeee9b982b30633102b3ca0f84eab280ca4fda4544be458a2387d051e62517127a2625bbc4329a844550a613df67f5015cc5a90a8e4b6a8c65d045650ee2
+DIST nfdump-1.7.5.tar.gz 835261 BLAKE2B 60b92395c7c3ccdd7b7d5a1b05bc2b69aeef872a40eb32cad76b99f6fd9e5960c1433812063ee7135f23f13031d5cde08ed60918bbb8688448515eabc97fc79e SHA512 80223a5bb28ccedd955bee94771284e845bbd76520cefb70f7c87bad2fb209885ae170fc710f03edabe06c61f4776c3789493358187cb3273bd4217ebcbbe1dd
 EBUILD nfdump-1.7.2.ebuild 1764 BLAKE2B 2926473aa8b71c4e1cc515174410fc8b67b5d82034e9c971a7c0d67172f3d03b933062fe91568c84fea23ef1c3a7519782ba69c460b09254ba090cd1f6bb55e1 SHA512 2d833098bfb8722079e54e29bb6448c7fe7657012d68e86099721d851f2bbd6570488499b93e73e45c558ead6a2e73ca5c892ba509e305bedc868ccfe5e7cbf9
-EBUILD nfdump-1.7.4.ebuild 2061 BLAKE2B 10fbac1d91fe23c87fd53297d16248aa3dee2dabb9808bd638920ea35597c94106a798712527504c8360a4b7b98c7edaf03a81b7be689290142905cf7b88b56b SHA512 cd126740f2985fb7ae12441142c1a756219dba197f23e01416ba486aa95817f006bcc3de497ca7f1b72dd5675312bea71dba3321b3e49a95ed5de4b09bdb1273
+EBUILD nfdump-1.7.4.ebuild 2108 BLAKE2B 5f09a5053d3e81e916038b9f18ac6a4fba10ca187841fe128a7f0469abb8e8ddea8d4078039269466580cfeaaf4f3e5d49b6775b7dea4b1b7af6689d4cd000a2 SHA512 03822f965843fe221176d267591bb1b67e2d4d4ce31872c00172124f0908bcff22c7b540129ed308bbdd52812b2226fcbc276d23d4618e9d0ced740279841adb
+EBUILD nfdump-1.7.5.ebuild 2137 BLAKE2B 221c432780c0802794d893c7c4ec917fe3d6f05675ab83e57dc158fdf90d6c1242b512567a4ac5330eb5f0066494e905a9027837d3ba4c9c23da23ad2834c045 SHA512 7099af71a38be8601f6586beaecc408890602dc5fbd24bfc7216631285b0a3e810456ade159664f16d729aeb6472a65cdaa5cc34f3a2d2cf84711b99377f378a
 MISC metadata.xml 1278 BLAKE2B ad9d73532114eb0942a2b5262fe8e5f2b787993950fcd7c8bcb926f9e9e8d93ab94476265976b2e0cc41f3ea46fc6699a0bbb591d0c929208ec5e85d1b399617 SHA512 0bdbda9ccce4611ab88b746f4907dbb0c96d1e5f0dac909e2318c8bdf77de87321f65baadbb886f0c2e1b231cc30c50c70e5363cc9084285d1eaf5897c6f38cd
diff --git a/net-analyzer/nfdump/files/nfdump-1.7.4-rrdtool-gcc14.patch b/net-analyzer/nfdump/files/nfdump-1.7.4-rrdtool-gcc14.patch
new file mode 100644
index 000000000000..05e7b255ea09
--- /dev/null
+++ b/net-analyzer/nfdump/files/nfdump-1.7.4-rrdtool-gcc14.patch
@@ -0,0 +1,156 @@
+https://github.com/phaag/nfdump/issues/507
+https://github.com/phaag/nfdump/commit/5e08f546877be781bff279ca45981c844eb85f50
+
+From: Peter Haag <peter@people.ops-trust.net>
+Date: Thu, 22 Aug 2024 21:38:53 +0200
+Subject: [PATCH] Fix #507 - gcc-14 issues with rrd version 1.9.x
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,6 +206,8 @@ cat >>config.h <<_ACEOF
+ #define HAVE_LIBRRD 1
+ _ACEOF
+ RRD_LIBS="-lrrd"
++saved_LIBS=$LIBS
++LIBS="${LIBS} -lrrd"
+ AC_SUBST(RRD_LIBS)
+ ]
+ , AC_MSG_ERROR(Can not link librrd. Please specify --with-rrdpath=.. configure failed! ))
+@@ -215,17 +217,29 @@ AC_SUBST(RRD_LIBS)
+ 	else
+ 		AC_MSG_ERROR(Required rrd.h header file not found!)
+ 	fi
+-	AC_RUN_IFELSE(
+-		[ AC_LANG_PROGRAM(
+-			[[
++	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 				#include <stdio.h>
++				#include <stdlib.h>
+ 				#include <rrd.h>
+-			]],
+-            [[ 
+-				rrd_value_t d; 
++      
++			int main(int argc, char **argv) {
++
++				char *s = rrd_strversion();
++    		if ( s != NULL && strlen(s) == 5 ) {
++        	if ( s[0] == '1' && s[1] == '.' ) {
++            int ver = s[2] - 0x30;
++            if ( argc > 1 ) printf("%d\n", ver);
++        	}
++    		} else {
++					exit(255);
++    		}
++				return 0;
++			}
+ 			]])
+-		],, AC_MSG_ERROR(Can not load rrd library. Not in loader search path! ))
+-
++		],rrdversion=$(./conftest$EXEEXT print 2>&1)
++		LIBS=$saved_LIBS
++    AC_DEFINE_UNQUOTED(HAVE_RRDVERSION, $rrdversion, [ ])
++		, AC_MSG_ERROR(Can not load rrd library. Not in loader search path! ))
+ ]
+ ,
+ build_nfprofile="no"
+--- a/src/nfsen/nftrack_rrd.c
++++ b/src/nfsen/nftrack_rrd.c
+@@ -48,6 +48,12 @@
+ #include "rrd.h"
+ #include "util.h"
+ 
++#if HAVE_RRDVERSION > 8
++#define rrdchar const char
++#else
++#define rrdchar char
++#endif
++
+ #define BUFF_CHECK(num, buffsize)                               \
+     if ((num) >= (buffsize)) {                                  \
+         fprintf(stderr, "No enough space to create RRD arg\n"); \
+@@ -153,7 +159,7 @@ static void CreateRRDB(char *filename, time_t when) {
+     */
+ 
+     rrd_clear_error();
+-    if ((i = rrd_create(argc, rrd_arg))) {
++    if ((i = rrd_create(argc, (rrdchar **)rrd_arg))) {
+         fprintf(stderr, "Create DB Error: %ld %s\n", i, rrd_get_error());
+     }
+ 
+@@ -329,12 +335,12 @@ int RRD_StoreDataRow(char *path, char *iso_time, data_row *row) {
+                 optind = 0;
+                 opterr = 0;
+                 rrd_clear_error();
+-                if ((i = rrd_update(argc, rrd_arg))) {
++                if ((i = rrd_update(argc, (rrdchar **)rrd_arg))) {
+                     fprintf(stderr, "RRD: %s Insert Error: %d %s\n", rrd_filename, i, rrd_get_error());
+                 }
+             }  // for all 64 rrd files
+-        }      // for every type flows - packets - bytes
+-    }          // for every protocol TCP - UDP
++        }  // for every type flows - packets - bytes
++    }  // for every protocol TCP - UDP
+ 
+     return 1;
+ }  // End of RRD_StoreDataRow
+@@ -423,7 +429,7 @@ data_row *RRD_GetDataRow(char *path, time_t when) {
+                 optind = 0;
+                 opterr = 0;
+                 rrd_clear_error();
+-                if ((ret = rrd_fetch(argc, rrd_arg, &when, &when, &step, &ds_cnt, &ds_namv, &data))) {
++                if ((ret = rrd_fetch(argc, (rrdchar **)rrd_arg, &when, &when, &step, &ds_cnt, &ds_namv, &data))) {
+                     fprintf(stderr, "RRD: %s Fetch Error: %d %s\n", rrd_filename, ret, rrd_get_error());
+                 }
+                 if (ds_cnt != 1024) {
+@@ -442,8 +448,8 @@ data_row *RRD_GetDataRow(char *path, time_t when) {
+                 free(data);
+ 
+             }  // for all 64 rrd files
+-        }      // for every type flows - packets - bytes
+-    }          // for every protocol TCP - UDP
++        }  // for every type flows - packets - bytes
++    }  // for every protocol TCP - UDP
+ 
+     return row;
+ 
+@@ -474,7 +480,7 @@ time_t RRD_LastUpdate(char *path) {
+     rrd_arg[argc++] = rrd_filename;
+     rrd_arg[argc] = NULL;
+ 
+-    when = rrd_last(argc, rrd_arg);
++    when = rrd_last(argc, (rrdchar **)rrd_arg);
+ 
+     return when;
+ 
+--- a/src/nfsen/profile.c
++++ b/src/nfsen/profile.c
+@@ -1,5 +1,5 @@
+ /*
+- *  Copyright (c) 2009-2023, Peter Haag
++ *  Copyright (c) 2009-2024, Peter Haag
+  *  Copyright (c) 2004-2008, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
+  *  All rights reserved.
+  *
+@@ -59,6 +59,12 @@ extern char influxdb_url[1024];
+ static char influxdb_measurement[] = "nfsen_stats";
+ #endif
+ 
++#if HAVE_RRDVERSION > 8
++#define rrdchar const char
++#else
++#define rrdchar char
++#endif
++
+ /* imported vars */
+ extern char yyerror_buff[256];
+ 
+@@ -449,7 +455,7 @@ void UpdateRRD(time_t tslot, profile_channel_info_t *channel) {
+     opterr = 0;
+     rrd_clear_error();
+     int i = 0;
+-    if ((i = rrd_update(argc, rrd_arg)) != 0) {
++    if ((i = rrd_update(argc, (rrdchar **)rrd_arg)) != 0) {
+         LogError("RRD: %s Insert Error: %d %s\n", channel->rrdfile, i, rrd_get_error());
+     }
+ 
diff --git a/net-analyzer/nfdump/nfdump-1.7.4.ebuild b/net-analyzer/nfdump/nfdump-1.7.4.ebuild
index 9a070e2a7643..25ed77c194fe 100644
--- a/net-analyzer/nfdump/nfdump-1.7.4.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.7.4.ebuild
@@ -45,6 +45,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.19-libft.patch
+	"${FILESDIR}"/${PN}-1.7.4-rrdtool-gcc14.patch
 )
 
 DOCS=( AUTHORS ChangeLog README.md )
diff --git a/net-analyzer/nfdump/nfdump-1.7.5.ebuild b/net-analyzer/nfdump/nfdump-1.7.5.ebuild
new file mode 100644
index 000000000000..547fac45f4ec
--- /dev/null
+++ b/net-analyzer/nfdump/nfdump-1.7.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs systemd
+
+DESCRIPTION="A set of tools to collect and process netflow data"
+HOMEPAGE="https://github.com/phaag/nfdump"
+SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow zstd"
+
+REQUIRED_USE="?? ( jnat nsel )"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/lz4:=
+	sys-libs/zlib
+	elibc_musl? ( sys-libs/fts-standalone )
+	ftconv? ( net-analyzer/flow-tools )
+	nfpcapd? ( net-libs/libpcap )
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	readpcap? ( net-libs/libpcap )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-alternatives/lex
+	app-alternatives/yacc
+	doc? (
+		app-text/doxygen
+		media-gfx/graphviz
+	)
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Not available on Linux, with fallback at src/libnffile/util.h, bug #904952
+	htonll
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.19-libft.patch
+)
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use doc; then
+		doxygen -u doc/Doxyfile.in || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	# bug #853763
+	use elibc_musl && append-libs "-lfts"
+
+	# --without-ftconf is not handled well, bug #322201
+	local myeconfargs=(
+		$(usex ftconv "--enable-ftconv --with-ftpath=${EPREFIX}/usr")
+		$(usex nfpcapd --enable-nfpcapd)
+		$(usex nfprofile --enable-nfprofile)
+		$(usex nftrack --enable-nftrack)
+		$(use_enable debug devel)
+		$(use_enable jnat)
+		$(use_enable nsel)
+		$(use_enable readpcap)
+		$(use_enable sflow)
+		$(use_with zstd "zstdpath" "${EPREFIX}/usr")
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test(){
+	pushd src/test || die
+	emake -j1 check-TESTS
+	popd || die
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	newinitd "${FILESDIR}"/nfcapd.initd nfcapd
+	newconfd "${FILESDIR}"/nfcapd.confd nfcapd
+	systemd_newunit "${FILESDIR}/nfdump.service" nfdump@.service
+
+	if use doc; then
+		dodoc -r doc/html
+	fi
+}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 4aa47772e424..9899f5ef767a 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,3 @@
-DIST testssl-3.0.8.tar.gz 9372229 BLAKE2B cf463236fb0812c2bc5fd5673d0d2d395fc405697817827ee8c660c96d789601a090b57febd48400e33fd9f28b23d42d432734b176b23a8e8ddf710c9b275485 SHA512 4634bc5dc57ad8910ca097b22d86511a26e855fb4dc7bef9550a795cb1f53a959b8472008756b40a670d7433ad56236b5a36fe0c88c15de99fdf586e9919b080
 DIST testssl-3.0.9.tar.gz 9381651 BLAKE2B 424569411022b68f105a20ad5b60db7c8994d1170482612ae7aed741230bd3fca43cd853dfb00660d5ba7cfdc717fa887a2fe9b6c59bbcef881f8f6473ccad3e SHA512 006180d175492f1cba6d056a92a57247725d4b68cddbebeea80a5d339d542f5103ddc8226f3a554775cb83bbef836a5d5bfc1bcf4fba7b18b9541473122ff720
-EBUILD testssl-3.0.8.ebuild 1521 BLAKE2B 377253f88b6625e808870f4c23fc82feaefdda48a8826e23c7966c94d6c348475b75874158975476ced07275b9084743726e44214b0490c3df903d765746e363 SHA512 431a1cd03d774629f95208d690b50b076c92e67a2fac2df7864e50bc30bd337fb7985d056b09c7ea0c77d186bfef5793e3ce07f207e58e21ead72fa5144c511e
 EBUILD testssl-3.0.9.ebuild 1520 BLAKE2B 2d96c3a0d1970ccd9ac3ea429c4c45b5c8746f3120663ac90cb961b6c7df0ac3c5f45d6b2fa1e7c3d1f8d24e872ab8b36eec300006b0db3445428821bc844213 SHA512 afb578500893d4ff41902fc346df00e53595ea1c6d22e67ff257bebccf60a62b16015d9195dc19f5885e9eb51cd4bb397de2c761f53bf5bbc7deff0c14944f02
 MISC metadata.xml 374 BLAKE2B a4554be687cb1b711340474d9b08b97cc2b5b5a54b4556010deef35d67a408118ccea72caa48a076d9bcf87b230b196f362757137fb9e6e9115f35b8fac026b2 SHA512 efd06f3175b36a607e4bbf97dd26802b09cad1442a2e0d3cdacf28a98db99e93aebb97687212122723d78b03dfd98082cb955c1a8de88bdf405210cdb3ff0e6f
diff --git a/net-analyzer/testssl/testssl-3.0.8.ebuild b/net-analyzer/testssl/testssl-3.0.8.ebuild
deleted file mode 100644
index 59df413e58c6..000000000000
--- a/net-analyzer/testssl/testssl-3.0.8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN}.sh"
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="bundled-openssl kerberos"
-
-RDEPEND="
-	app-shells/bash[net]
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-	bundled-openssl? (
-		kerberos? (
-			sys-libs/zlib
-			virtual/krb5
-		)
-	)
-	!bundled-openssl? ( dev-libs/openssl:0 )
-"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	if use amd64; then
-		if use kerberos; then
-			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb"
-		else
-			BUNDLED_OPENSSL="openssl.Linux.x86_64"
-		fi
-	elif use x86; then
-		BUNDLED_OPENSSL="openssl.Linux.i686"
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i ${PN}.sh \
-		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-
-	if use bundled-openssl; then
-		sed -i ${PN}.sh \
-			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
-	fi
-}
-
-src_install() {
-	dodoc CHANGELOG.md CREDITS.md Readme.md
-	dodoc openssl-iana.mapping.html
-
-	dobin ${PN}.sh
-
-	insinto /etc/${PN}
-	doins etc/*
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 7b0ccbde1030..2162b008e10f 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,8 +1,5 @@
 AUX zmap-2.1.1-always-install-config.patch 973 BLAKE2B cdba75ff09b19c851234745cce6ff4a82bbca3b944b442885aab81eb7a10221cfe62f34d2842f3c4c7c8e38f19c25dcf2aacf155aed3bb8251840f9690175a9e SHA512 c583fd3acdbfb21ab613fac1c4cf0da82e2e0d1d7f537415f6eb5f0b7e5f0101c518c336590590f4a153c191c12fed1ba35c934bacc95cbf63053f43a80c8485
-AUX zmap-2.1.1-json-c.patch 1084 BLAKE2B 524f7525695eeb542db33c3bb547f235558a4e0cc1fc48ace8c9f3c302d4db2e14d0edcae283dbc9306a5c7bca165e376422bcbf3c9ccbeafcbf17803b98bad7 SHA512 8aa5456885a6725a8004b5009f43ae7cf58dd6a454e581b03d9d6cb86125f023ea5ef359d907fd7ebe8122a0a71ea81d1ac9ebd878a5ba684bfd5809c1aca3b9
-DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857
 DIST zmap-4.1.1.tar.gz 202697 BLAKE2B 35bc21e4d4c4c452deb2e34ac837ee4ae728b3adf97aefb5b88f55dde719bd78787b8a2826a89eaff92170b3eb2e5003194e3dc636616a845efef82bea663114 SHA512 eff32c9bda7b28a48fce85e3acb598c6adc8dc952ffec21cd4d581462e481a3cf61a6285a71c16741d8e9deedf7c8e3b71d4f375a931244b96acc8779c225929
-EBUILD zmap-2.1.1-r5.ebuild 1110 BLAKE2B 78761eb99e5f25ad78597edcb8b25441f7b9eb4a3f018a28dd67b0f9f47576444a407ff12ae3227ee8ba0b50584deaf86a0b8290bde8c30a8d890a9fc7a92eaa SHA512 d47a6bf16166049b63193e1492ad1c2d8d4e1f8061a8b4b757b8933f22bf8ddf21a45bd9c1d0c20e7f991caa77673508002e26d7aff5c4cf6e11463be61473f9
 EBUILD zmap-4.1.1.ebuild 938 BLAKE2B c085da7cfeb4039401f11e283eb4d089e03016c1824ad64f4aeb0a7ae9423e4761d0604f9e22448ba013a07af8889e713e0da87fb50cd679260c8946ac30598b SHA512 a9bfe256787319f19f587280123973fdc0393cbd19a3d4d720a17496ee77eb31255e596871c10482ec1b04d764e033aae0b285852f8aa638557ce08a412e1b99
 EBUILD zmap-9999.ebuild 783 BLAKE2B 88d5404704dcfbb926a6e6667ebc182ab1624dc075dff4695a306555fdb8a3536876b9da52b95379de4d3839eff6ea977573d6a0c88a44e02b34eaf37feb9cfa SHA512 484f739745c3e5029c70a346f8727deb58db4eb17b33be51aa12430439cbef0b3975a9cc1be902bea9502ee3c056ee3158b08360831e4122822f2e46a520f6f0
 MISC metadata.xml 1018 BLAKE2B 6fc528ec8899c2c3bd9bd4ac1398e17293abe54de6d200f4b88ff5a977fa7ce0da23be70a56a259d96a70dd07272750a14903e16e223709ae7b99cc6a5942bbc SHA512 c650e83b8db50447bbb9e39f7bda0c8c312ebfcf9f3a1a204d9eecf7512f086dcd3c5c9411d8a2c2929cea6634822ab6a2a32b5a72e6b164ffe230244a3e5257
diff --git a/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch b/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch
deleted file mode 100644
index 78a80b801218..000000000000
--- a/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5473b6a907ff47e813e8ac3509a0f63d1253023b Mon Sep 17 00:00:00 2001
-From: Martin Milata <martin@martinmilata.cz>
-Date: Wed, 1 Jul 2020 16:47:18 +0200
-Subject: [PATCH] Fix build against json-c-0.14 (#609)
-
-The new pkgconfig file contains two include directories:
-
-  Cflags: -I${includedir} -I${includedir}/json-c
-
-Apparently pkg_check_modules returns them as a semicolon-separated
-string ("CMake list"), which causes the build to fail when appended
-directly to CMAKE_C_FLAGS.
-
-Origin: backport, https://github.com/zmap/zmap/commit/5473b6a907ff47e813e8ac3509a0f63d1253023b
-Applied-Upstream: 3.0
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: zmap-2.1.1/CMakeLists.txt
-===================================================================
---- zmap-2.1.1.orig/CMakeLists.txt	2024-01-23 15:29:55.436869754 -0500
-+++ zmap-2.1.1/CMakeLists.txt	2024-01-23 15:30:32.505023070 -0500
-@@ -72,6 +72,7 @@
-     endif()
- 
-     add_definitions("-DJSON")
-+    string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}")
- endif()
- 
diff --git a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild
deleted file mode 100644
index 2a7eb5b56829..000000000000
--- a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake fcaps
-
-DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
-HOMEPAGE="https://zmap.io/"
-SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="mongo redis"
-
-RDEPEND="
-	dev-libs/gmp:=
-	net-libs/libpcap
-	dev-libs/json-c:=
-	mongo? (
-		dev-db/mongodb
-		dev-libs/mongo-c-driver
-	)
-	redis? ( dev-libs/hiredis:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gengetopt
-	app-alternatives/lex
-	dev-util/byacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-always-install-config.patch
-	"${FILESDIR}"/${PN}-2.1.1-json-c.patch
-)
-
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
-
-src_prepare() {
-	sed \
-		-e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \
-		-i src/CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEVELOPMENT=OFF
-		-DWITH_WERROR=OFF
-		-DWITH_MONGO="$(usex mongo)"
-		-DWITH_REDIS="$(usex redis)"
-	)
-
-	cmake_src_configure
-}