gentoo auto-resync : 01:10:2022 - 07:10:12

21 files changed, 261 insertions, 403 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 889874dcda47..061d7b07dde3 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest
index 8354a70e8bbe..2f9830a26384 100644
--- a/net-analyzer/ike-scan/Manifest
+++ b/net-analyzer/ike-scan/Manifest
@@ -1,4 +1,6 @@
+AUX ike-scan-1.9.5-clang-16.patch 3150 BLAKE2B 1ed607aee9003ddb07a49c96ad14e882d3e5135ca5f0af07212bb60dff25854b5104ce35b2bc9c7c286b34d1feb1fcd2a0b8ee6da18a35c04f800671431352ca SHA512 9e84734e60ba0bcd2ef714e5051d486ed7594b33e99447fe8ee9a6b59eda57ccd7311b01781d5e5096b98df45ed141644a94bc78d69747e5639b19cd89b0df79
 DIST ike-scan-1.9.4.tar.gz 1360202 BLAKE2B abe206b22a23a6d4eaa2218204657d6c47f22ac8009df1f1e7918fbb55575033f237462ed57ba89aee8bed28e47a4dacf69e443dac5cd3b506842e26e71f97e9 SHA512 d7dde6d3d76a2e3ddeb9ed1f0dee3e2c3a13d4afa57ebb8ff19f6af094f7334b464509cee6ffc385d2703bcf9bc1c503bc604506279518f692f82c8f12f146be
+DIST ike-scan-1.9.5.tar.gz 1542264 BLAKE2B 3095c2929c7f24da43852402a3e5cfe73dd65100773283ef08b791784be2e2f04bba24843469e407695a027e76e1e0aa18effabc210643414677a35df7f2614c SHA512 5eb98e41c639bc30996041f4e759a6ada7f4baa5b8102992ac2313ed8ff51032d877b116bc24972e0ecd652290849aa67a63523d92ee63af6577112350ee5590
 EBUILD ike-scan-1.9.4.ebuild 738 BLAKE2B f73bc5fb1a446a3f9cf97ad85a1cd68db0be95bbf3200ac4530763d0c696569092ef7032c03633cf051fb2a7d01eb7cd106c0718a76b619cbaf341e1122683a0 SHA512 aed95ea1d8511de9b542394d5f5ae41df0408dde189e95a1a255d554524e0099b0d262b1b32daaab8fc15121120400d2767dd2a57763b1bc5ec22894c75089c9
-EBUILD ike-scan-99999.ebuild 700 BLAKE2B d808a7c999fbb3bd203134643b76ef627eebe81e9c23bd5c889a68199482441cc4b9f05e46a4411b00f3ca5fcbe815b09206def835c4d6af8553fdff146f5161 SHA512 72c46f8bc360ab68bb47391b65fc59086aaac5c2bc4cd4a27c795f8f494298ec1c36eac99a2b98bbcc31b9968f1e874ed53323829d131cefe95db826e9093403
+EBUILD ike-scan-1.9.5.ebuild 784 BLAKE2B 82997a6df4449ab79ceb62d06d6605e57c04a7374d70128780f2f7772066451b7b035f48662f7b7a3dead619707a01a61f682d3f89694b01443640e41cd168c0 SHA512 b8d8a1744aa6f3107384d78dfa77f4c00f15c0185085ea40040eb18d83e1f3b810e038bc690332ccb987bdbe9c93195125ea750762e2966810a7141176665635
 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch
new file mode 100644
index 000000000000..c4aec2836ba0
--- /dev/null
+++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch
@@ -0,0 +1,92 @@
+https://github.com/royhills/ike-scan/pull/39
+
+From 9949ce4bdf9f4bcb616b2a5d273708a7ea9ee93d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 05:22:18 +0100
+Subject: [PATCH 1/3] acinclude.m4: fix -Wimplicit-int errors (Clang 16+
+ compat)
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -144,7 +144,7 @@ int does_int64_work()
+     return 0;
+   return 1;
+ }
+-main() {
++int main() {
+   return ! does_int64_work();
+ }],
+ [Ac_cachevar=yes],
+@@ -200,7 +200,7 @@ int does_int64_snprintf_work()
+     return 0;			/* either multiply or snprintf is busted */
+   return 1;
+ }
+-main() {
++int main() {
+   return ! does_int64_snprintf_work();
+ }],
+ [pgac_cv_snprintf_long_long_int_format=$pgac_format; break],
+
+From 6a931ca559a937cb9f7917b9131ec1aca4919683 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 05:23:06 +0100
+Subject: [PATCH 2/3] acinclude.m4: fix typo in 'x' if check
+
+Case doesn't matter but case does need to match on left & right
+hand side, so just choose uppercase everywhere to match what
+the rest of the file does.
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -278,7 +278,7 @@ dnl in <features.h>. We don't use __GNUC_PREREQ directly because <features.h>
+ dnl is not present on all the operating systems that we support, e.g. OpenBSD.
+ dnl
+ AC_DEFUN([GCC_FORTIFY_SOURCE],[
+-   if test "x$CC" != "X"; then
++   if test "X$CC" != "X"; then
+       AC_MSG_CHECKING([whether ${CC} accepts -D_FORTIFY_SOURCE])
+       AC_TRY_COMPILE(,[
+          #define GNUC_PREREQ(maj, min) ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+@@ -311,7 +311,7 @@ dnl If it is not supported, then the test program will compile without
+ dnl warnings.
+ dnl
+ AC_DEFUN([GCC_FORMAT_SECURITY],[
+-   if test "x$CC" != "X"; then
++   if test "X$CC" != "X"; then
+       AC_MSG_CHECKING([whether ${CC} accepts -Wformat-security])
+       wfs_old_cflags="$CFLAGS"
+       CFLAGS="$CFLAGS -Wall -Werror -Wformat -Wformat-security"
+
+From fbc40c7b117b523eceb9aa58d6086bde701f1299 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 1 Oct 2022 01:24:04 +0100
+Subject: [PATCH 3/3] configure.ac: Fix recognising -Wformat-security with
+ Clang
+
+Before:
+```
+checking whether clang accepts -fstack-protector... yes
+checking whether clang accepts -D_FORTIFY_SOURCE... yes
+checking whether clang accepts -Wformat-security... no
+```
+
+After:
+```
+checking whether clang accepts -fstack-protector... yes
+checking whether clang accepts -Wformat-security... yes
+checking whether clang accepts -D_FORTIFY_SOURCE... yes
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,8 +34,8 @@ if test -n "$GCC"; then
+    CFLAGS="$CFLAGS -Wall -Wshadow -Wwrite-strings"
+    GCC_WEXTRA
+    GCC_STACK_PROTECT_CC
+-   GCC_FORTIFY_SOURCE
+    GCC_FORMAT_SECURITY
++   GCC_FORTIFY_SOURCE
+ dnl Uncomment the lines below for testing with stricter warnings.
+ dnl CFLAGS="$CFLAGS -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline "
+ dnl Uncomment the line below to check malloc/free with electric fence
+
diff --git a/net-analyzer/ike-scan/ike-scan-99999.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
index 4e89ede7807a..acfffd464bb0 100644
--- a/net-analyzer/ike-scan/ike-scan-99999.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild
@@ -1,35 +1,34 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools git-r3
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers"
-HOMEPAGE="https://github.com/royhills/ike-scan/"
-EGIT_REPO_URI="https://github.com/royhills/ike-scan"
+HOMEPAGE="https://github.com/royhills/ike-scan"
+SRC_URI="https://github.com/royhills/ike-scan/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl"
-KEYWORDS=""
 
-DEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
+DEPEND="ssl? ( dev-libs/openssl:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.5-clang-16.patch
+)
 
 src_prepare() {
+	default
+
 	# Fix buffer overflow, bug #277556
 	sed \
 		-e "/MAXLINE/s:255:511:g" \
 		-i ike-scan.h || die
 
-	default
-
 	eautoreconf
 }
 
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest
index d797cdf18f0d..57c0e934e22b 100644
--- a/net-analyzer/nfdump/Manifest
+++ b/net-analyzer/nfdump/Manifest
@@ -1,13 +1,8 @@
 AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2adaa6a54536358e919065d1bd98a62b530ef698fed65be77749780320685f4f457718648bbcd3 SHA512 c9afa1d1629505e77f3a0ee282b0dec79572a9ac4dd31bb3161b36ed6036dd6a8345280c2db4a8f1fc763f88f86857d96edae997ecff8e540db448fbd9a4b101
 AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab
-AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8
 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4
-AUX nfdump-1.6.23-autotools.patch 6579 BLAKE2B ea194c79ad584007b5c2e19a4b7b5cb94f381220e5c04120c5700b33075da831428d98af0b3fac574d61414c6285da05268660033d2411a87eaf047156af4442 SHA512 c7bcc7645542d1d3273def4a7fa5881e30763b38773ceb3fa5eef3e7f0a60fc0aaa14cf66df7f72dd154a3ccce1ab9dfaf2ef955d149136a1bb8e014ffe7574f
-AUX nfdump-1.6.23-m4-dir-automake.patch 579 BLAKE2B f77f624bfcd108e048ee215d85968fdde380720de90979cca81c45c64e022c872983f0d0d370bec8c16c1111948748d959662eab494a2c660fdb8d63377bd3ab SHA512 90df4adaba5deaf79d93eb05dcf3f364837bf7b60175a325ac08bad056bb356dd23f414132e23c068579a9fa9ad46ec74ccab7178022e8fe3bbead3f8f0be07f
-AUX nfdump-1.6.23-m4-dir.patch 477 BLAKE2B 1ef4634ad61efc372da5bb92657826ed45112121e98dbb8971e51df33d50ce312e841659cf01fe949f5ce9998b75bd1037be9ffe1a95a6dbb2aca73e5be6bfac SHA512 b50cb179373a6b37b4122a0b77e6d321b6e992430f4fbc5178cbf867bf4cc0740e2c7a4b01c075f3d8c4339b0690781f1df74f773993cedbe44ff041c9bb6091
-DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168
 DIST nfdump-1.6.24.tar.gz 647945 BLAKE2B 6f054c7ccdbc6c5052d1c4655509414b9acc7de320152e932dd31d6cc9eb915b73efa29e42a212ea206c4619c9e025bfd751762808fd8136c38d4edb72f4fabf SHA512 b1e092663ce245247af721565139eb0a264918747e6c0695c59f0b70a99049e92d79674d75c248f60aa832949d7e13027887cc825e393fce7dc5571771bce1d7
-EBUILD nfdump-1.6.23-r1.ebuild 1719 BLAKE2B bd83dea93bc0d33639a92015249f15ccebda61c0870481c30fae667516a8dc279a69eea0008e1490d4d81b123b3c7edb8189c5460774f1e44d9d7c49d2d9b2a3 SHA512 ac32eaa741fe3482056fed7481b087806ad3b2fa8cbd94ad945e982871f35bfb8031d61a73b2e54ab08bda7e30d46ea1acc9eaafda9953a9a0bf0270a79b817c
-EBUILD nfdump-1.6.23.ebuild 1713 BLAKE2B b0a76ab56f3a696d1828cd8241de89238d824c13f7cdd3ab22b052732c76f9660d60ef6114e54ab7f2ccb30c0608fc33ae448df1a4fd191b9e7c74347c477804 SHA512 013079b47e1346c7b057572687cda6a1b39e5966da05674e2329cd55e14fa8ea36a894f18b18c7a4485841da54201ebe5e7d0832355e4e01447b524cc56d5f74
+DIST nfdump-1.7.0.1.tar.gz 740435 BLAKE2B dd3d3e63aa076b32e0c9e897b40d3ee8368990792b1a483b69a448dadd7389c23df9800910baad0c5a241a480c5961616c70040fdce992b2a67e3be6680e715b SHA512 5b5da57016dc826650ba80a80a881ab89034778316f47c6797dbc902ed6af6d77cfb722356c3a1d92a4239a934178df56ff4c6cb3bf77e029232e02b905ec1a8
 EBUILD nfdump-1.6.24.ebuild 1748 BLAKE2B 3a58d5995e4a54416486998612d5e4c028efd51a77a7aba6aa68d699714ecc66ad392aae75ffe936bb77dc13871b30b199a0c991f7836bd17f7a2033f25b2d6b SHA512 c1a1b1f67d544f0f6176b006d6ae9fb0d00e34e14c2073634d0385afa47f641e6f730fa9a238f1a2d54fea54c57809d8fa63e77a887d80942ae39721b148437a
+EBUILD nfdump-1.7.0.1.ebuild 1750 BLAKE2B 0e45b982a493537ae16e62621f3b855b84cb603a62906a3c493fda0661f2e5597268b72cac8aa172bb7c8f85ec4c25b7e599d5f322800373ab2c923642690963 SHA512 58ac64c1cb777dfa68bca64270337168350308663f125613fb675723a673e15fc6c31712de8c0f5a12799c0d5a6d925fd5b9989682efcc11a1dbb7ab9ee848f6
 MISC metadata.xml 1278 BLAKE2B ad9d73532114eb0942a2b5262fe8e5f2b787993950fcd7c8bcb926f9e9e8d93ab94476265976b2e0cc41f3ea46fc6699a0bbb591d0c929208ec5e85d1b399617 SHA512 0bdbda9ccce4611ab88b746f4907dbb0c96d1e5f0dac909e2318c8bdf77de87321f65baadbb886f0c2e1b231cc30c50c70e5363cc9084285d1eaf5897c6f38cd
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch
deleted file mode 100644
index 8826c50c9dc2..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,8 +9,6 @@
- AM_INIT_AUTOMAKE([subdir-objects])
- 
- # Checks for programs.
--CFLAGS="-g -O3"
--AC_PROG_CC([clang gcc])
- AX_CHECK_C11
- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
- 
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -30,7 +30,6 @@
- LDADD = $(DEPS_LIBS)
- 
- #Add extra debug info for gdb
--AM_CFLAGS = -ggdb 
- 
- # libnfdump sources
- output =  output_util.h output_util.c output_raw.h output_raw.c 
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
deleted file mode 100644
index 65558bbe7dfa..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-autotools.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-https://github.com/phaag/nfdump/commit/e6261098570f69ad973a7a4ea7aaebb1663712e8
-https://github.com/phaag/nfdump/commit/67da975f20076751bce49caf57c89ed21ed92ad0
-https://github.com/phaag/nfdump/commit/4652c2014012a81438f53cb590687c8c93419140
-
-From: Peter Haag <flow-dev@pyxis.ch>
-Date: Tue, 22 Feb 2022 10:54:19 +0100
-Subject: [PATCH] Fix issue #304 - accept CFLAGS
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,8 +8,11 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
- AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
- 
-+if test "x$CFLAGS" = "x"; then
-+    CFLAGS="-g -O3"
-+fi 
-+
- # Checks for programs.
--CFLAGS="-g -O3"
- AC_PROG_CC([clang gcc])
- AX_CHECK_C11
- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
-
-From: Peter Haag <peter@people.ops-trust.net>
-Date: Fri, 25 Feb 2022 09:12:27 +0100
-Subject: [PATCH] Cleanup automake files. Fixes #304.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,12 +1,13 @@
- #                                               -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
- 
--AC_PREREQ(2.59)
-+AC_PREREQ([2.71])
- AC_REVISION($Revision: 244 $)dnl 
--AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
-+AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
- 
--AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
-+AC_CONFIG_MACRO_DIRS([m4])
- 
- if test "x$CFLAGS" = "x"; then
-     CFLAGS="-g -O3"
-@@ -15,7 +16,12 @@ fi
- # Checks for programs.
- AC_PROG_CC([clang gcc])
- AX_CHECK_C11
--CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
-+AX_APPEND_FLAG([-Wall], [CFLAGS])
-+AX_APPEND_FLAG([-Wstrict-prototypes], [CFLAGS])
-+AX_APPEND_FLAG([-Wmissing-prototypes], [CFLAGS])
-+AX_APPEND_FLAG([-Wmissing-declarations], [CFLAGS])
-+AX_APPEND_FLAG([-Wmissing-noreturn], [CFLAGS])
-+AX_APPEND_FLAG([-fno-strict-aliasing], [CFLAGS])
- 
- LT_INIT
- 
-@@ -59,7 +65,7 @@ if test "${enable_fixtimebug}" = "yes" ; then
- fi
- 
- AC_PROG_YACC
--AC_PROG_LEX
-+AC_PROG_LEX(yywrap)
- which $LEX > /dev/null 2>&1
- if test $? = 1; then
- 	AC_MSG_ERROR(No lex or flex found on system)
-@@ -312,7 +318,11 @@ AC_LINK_IFELSE(
- 
- # Checks for header files.
- AC_HEADER_DIRENT
--AC_HEADER_STDC
-+# Autoupdate added the next two lines to ensure that your configure
-+# script's behavior did not change.  They are probably safe to remove.
-+AC_CHECK_INCLUDES_DEFAULT
-+AC_PROG_EGREP
-+
- AC_CHECK_HEADERS(stdio_ext.h)
- AC_CHECK_HEADERS([nameser8_compat.h])
- AC_CHECK_HEADERS([features.h arpa/inet.h fcntl.h netinet/in.h fts.h stdint.h stdlib.h stddef.h string.h sys/socket.h syslog.h unistd.h iso/limits_iso.h])
-@@ -404,17 +414,14 @@ AC_CHECK_FUNCS(memcmp memcpy memmove memset)
- AC_MSG_CHECKING([for union semun])
- AC_CACHE_VAL(ac_cv_struct_semun,
- 	[
--		AC_TRY_COMPILE(
--		[
-+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- 			#include <sys/types.h>
- 	 		#include <sys/ipc.h>
- 			#include <sys/sem.h>;
--		],
--		[
-+		]], [[
- 			union semun semdat;
--		],
--		ac_cv_struct_semun=yes, ac_cv_struct_semun=no
--		)
-+		]])],[ac_cv_struct_semun=yes],[ac_cv_struct_semun=no
-+		])
- 	]
- )
- 
-@@ -424,7 +431,7 @@ if test "$ac_cv_struct_semun" = "yes"; then
- fi
- 
- AC_MSG_CHECKING(for the %z format string in printf())
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <sys/types.h>
- 
-@@ -438,28 +445,38 @@ char	string[16];
- 
- 	return i == 5 ? 0 : 1;
- }
--],
--[
-+]])],[
- 	AC_MSG_RESULT(yes)
- 	AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
-                                       [Define to 1 if you have a printf() that supports the %z format string.])
--],
--[
-+],[
- 	AC_MSG_RESULT(no)
--],
--[
-+],[
- 	AC_MSG_RESULT(no)
--]
--)
- 
-+])
-+
-+AC_CONFIG_FILES([Makefile bin/Makefile man/Makefile])
-+AC_CONFIG_FILES([doc/Makefile])
- AC_PATH_PROG([DOXYGEN], [doxygen], [])
- AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"])
- AM_COND_IF([HAVE_DOXYGEN], AC_CONFIG_FILES([doc/Doxyfile]))
--AC_OUTPUT(doc/Makefile)
--
--#AC_CONFIG_FILES([Makefile])
--AC_OUTPUT(Makefile bin/Makefile man/Makefile)
-+AC_OUTPUT
- 
-+echo ""
-+echo "----------------------------------"
-+echo " Build Settings for ${PACKAGE_TARNAME} v${PACKAGE_VERSION}"
-+echo "----------------------------------"
-+echo "  host type            = $host_os"
-+echo "  install dir          = $prefix"
-+echo "  CC                   = $CC"
-+echo "  CFLAGS               = $AM_CFLAGS $CFLAGS"
-+echo "  CPPFLAGS             = $AM_CPPFLAGS $CPPFLAGS"
-+echo "  LDFLAGS              = $AM_LDFLAGS $LDFLAGS"
-+echo "  LIBS                 = $LIBS"
-+echo "----------------------------------"
-+echo ""
-+echo " You can run ./make now." 
- echo ""
- echo "* Many thanks for using nfdump tools"
- echo "* Please send bug reports back to me: peter@people.ops-trust.net"
-
-From: Peter Haag <peter@people.ops-trust.net>
-Date: Thu, 3 Mar 2022 09:25:15 +0100
-Subject: [PATCH] Make configure.ac autoconf 2.69 compatible
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,7 +1,7 @@
- #                                               -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
- 
--AC_PREREQ([2.71])
-+AC_PREREQ([2.69])
- AC_REVISION($Revision: 244 $)dnl 
- AC_INIT([nfdump],[1.6.23],[peter@people.ops-trust.net])
- 
-@@ -47,7 +47,7 @@ if test "${enable_jnat}" = "yes" ; then
- fi
- 
- if test "${enable_nsel}" = "yes" -a "${enable_jnat}" = "yes"; then
--	AC_MSG_ERROR(You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.)
-+	AC_MSG_ERROR([You can use only one of --enable-nsel or --enable-jnat. CISCO and Juniper are not compatible.])
- fi
- 
- AC_ARG_ENABLE(nel,
-@@ -287,7 +287,6 @@ AC_SUBST(FT_INCLUDES)
- AC_SUBST(FT_LDFLAGS)
- AC_SUBST(LFLAGS)
- 
--
- # Checks for libraries.
- AC_CHECK_FUNCS(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname,,[AC_CHECK_LIB(socket,gethostbyname)])])
- AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
-@@ -447,8 +446,7 @@ char	string[16];
- }
- ]])],[
- 	AC_MSG_RESULT(yes)
--	AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1],
--                                      [Define to 1 if you have a printf() that supports the %z format string.])
-+	AC_DEFINE([HAVE_SIZE_T_Z_FORMAT], [1], [Define to 1 if you have a printf() that supports the %z format string.])
- ],[
- 	AC_MSG_RESULT(no)
- ],[
---- /dev/null
-+++ b/m4/extensions.m4
-@@ -0,0 +1,4 @@
-+dnl Define to empty for the benefit of Autoconf 2.69 
-+dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+.
-+m4_ifndef([AC_CHECK_INCLUDES_DEFAULT],
-+  [AC_DEFUN([AC_CHECK_INCLUDES_DEFAULT], [])])
-
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
deleted file mode 100644
index 755db8b7cf5d..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir-automake.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/phaag/nfdump/pull/336
-
-From e882722e4e006d0440fb5a37fb051d4747e4f225 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 24 Mar 2022 22:50:13 +0000
-Subject: [PATCH] Makefile.am: add ACLOCAL_AMFLAGS
-
-Per autoconf docs [0], if using automake and AC_CONFIG_MACRO_DIR,
-we need to include ACLOCAL_AMFLAGS in Makefile.am.
-
-So, let's set ACLOCAL_AMFLAGS = -I m4.
-
-This sorts out an automake warning.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
- 
- SUBDIRS = . bin man doc
- 
-
diff --git a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch b/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
deleted file mode 100644
index ac25ee094653..000000000000
--- a/net-analyzer/nfdump/files/nfdump-1.6.23-m4-dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Variant sent upstream (configure.ac hunk irrelevant now): https://github.com/phaag/nfdump/pull/336
-https://bugs.gentoo.org/832420
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,4 @@
-+ACLOCAL_AMFLAGS = -I m4
- 
- SUBDIRS = . bin man doc
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AC_INIT(nfdump, 1.6.23, peter@people.ops-trust.net)
- 
- AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- # Checks for programs.
- AX_CHECK_C11
diff --git a/net-analyzer/nfdump/nfdump-1.6.23.ebuild b/net-analyzer/nfdump/nfdump-1.6.23.ebuild
deleted file mode 100644
index dca53c21054e..000000000000
--- a/net-analyzer/nfdump/nfdump-1.6.23.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-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"
-
-REQUIRED_USE="?? ( jnat nsel )"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	ftconv? ( net-analyzer/flow-tools )
-	nfpcapd? ( net-libs/libpcap )
-	nfprofile? ( net-analyzer/rrdtool )
-	nftrack? ( net-analyzer/rrdtool )
-	readpcap? ( net-libs/libpcap )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-compiler.patch
-	"${FILESDIR}"/${PN}-1.6.19-libft.patch
-	"${FILESDIR}"/${PN}-1.6.23-m4-dir.patch
-)
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if use doc; then
-		doxygen -u doc/Doxyfile.in || die
-	fi
-}
-
-src_configure() {
-	# --without-ftconf is not handled well, bug #322201
-	econf \
-		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
-		$(use nfpcapd && echo --enable-nfpcapd) \
-		$(use nfprofile && echo --enable-nfprofile) \
-		$(use nftrack && echo --enable-nftrack) \
-		$(use_enable debug devel) \
-		$(use_enable jnat) \
-		$(use_enable nsel) \
-		$(use_enable readpcap) \
-		$(use_enable sflow) \
-		--disable-static
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/nfcapd.initd nfcapd
-	newconfd "${FILESDIR}"/nfcapd.confd nfcapd
-
-	if use doc; then
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild b/net-analyzer/nfdump/nfdump-1.7.0.1.ebuild
index 34bb2bd90adb..db24ffe43a66 100644
--- a/net-analyzer/nfdump/nfdump-1.6.23-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.7.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="A set of tools to collect and process netflow data"
 HOMEPAGE="https://github.com/phaag/nfdump"
@@ -19,6 +19,7 @@ REQUIRED_USE="?? ( jnat nsel )"
 RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
+	elibc_musl? ( sys-libs/fts-standalone )
 	ftconv? ( net-analyzer/flow-tools )
 	nfpcapd? ( net-libs/libpcap )
 	nfprofile? ( net-analyzer/rrdtool )
@@ -36,8 +37,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-autotools.patch
-	"${FILESDIR}"/${P}-m4-dir-automake.patch
 	"${FILESDIR}"/${PN}-1.6.19-libft.patch
 )
 
@@ -56,6 +55,9 @@ src_prepare() {
 src_configure() {
 	tc-export CC
 
+	# bug #853763
+	use elibc_musl && append-libs "-lfts"
+
 	# --without-ftconf is not handled well, bug #322201
 	econf \
 		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
index 383f77603abb..1ce2eb8b456d 100644
--- a/net-analyzer/sniffit/Manifest
+++ b/net-analyzer/sniffit/Manifest
@@ -1,4 +1,5 @@
 AUX sniffit-0.4.0-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6
+AUX sniffit-0.5.0-implicit-func-decl.patch 1225 BLAKE2B bdcbb01058a2cf973bab5272de76f837c34e83e78034bc4fa7c11917efe09542c18a27c45e7c052fde3347104d70fd6cdcc2d3051b0b8baab792b12bac116b49 SHA512 26f995be95f5debfb551e0d45aef181cdd934a64381250c74cf0807ff208a87740cc8c11040c02280ea5a9dd716c9815c00c0f0c1f1902397efd6b26481c62fe
 DIST sniffit-0.5.tar.gz 60074 BLAKE2B 55d2a65da3801cab4e612a8d1a1770c00abfa44555779ee29dc7358d9636e0b2a3f1e291bc64234588089967510bff99f5a9831d8acc01dacb080d7341081372 SHA512 cf6f4a1d396d47e0fa51cb527e8f64cc4f9af5f83121728ce6cbfb6a11509899e52a6c01f0dd20b0d3b92a567991390d9a616151c9496d4f2d764608ef3542bc
-EBUILD sniffit-0.5.ebuild 583 BLAKE2B 2203a79bd787f3669c808478a1b3cad5593fb7b2b68b9b856f674f41fa5cc8cb6c3f05fe064a59b3099bb3b2f241fbdac618738d25e7b980d33053f41a37966e SHA512 63dc04674e45be650d1376afee4306005e8815cd3e32009575aab5f50c689e4832bb250fa884beb4c1aefc1c9bbdfd475eb82559e3fd513b2f89d06527d4b660
+EBUILD sniffit-0.5-r1.ebuild 637 BLAKE2B b075c7035505c04199aec242fe2b155f9eff125c1b9b19762e595c8f6a03a18488fe1248ac6dc71aa7617d7c29195197886a112b552f90d87d51e56ea0231406 SHA512 d25bef1176604296913e2fd0f9422139ed8afade3fb4744110d3fb0b8970488dd7cc9063f4d2e19ff6812158fe0e77830b4e41588b96a423e5128c90155e8d4c
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch
new file mode 100644
index 000000000000..e6ee580d6e33
--- /dev/null
+++ b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch
@@ -0,0 +1,50 @@
+https://github.com/resurrecting-open-source-projects/sniffit/pull/3
+
+From a05340968343d9f61f57506ed00bff0a62d3f38e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 28 Jul 2022 12:14:44 +0100
+Subject: [PATCH] Fix -Wimplicit-function-declaration
+
+--- a/src/sn_cfgfile.c
++++ b/src/sn_cfgfile.c
+@@ -2,6 +2,7 @@
+ /*   - by          : Brecht Claerhout                                     */
+ /*   - improvements: Shudoh Kazuyuki                                      */
+ 
++#include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+--- a/src/sn_generation.c
++++ b/src/sn_generation.c
+@@ -13,7 +13,9 @@
+ #include "sn_curses.h"
+ #include "sn_defines.h"
+ #include "sn_structs.h"
++#include "sn_packets.h"
+ #include "sn_generation.h"
++#include "sn_interface.h"
+ 
+ extern volatile int screen_busy;
+ 
+--- a/src/sn_interface.c
++++ b/src/sn_interface.c
+@@ -4,6 +4,7 @@
+ #include "sn_config.h"
+ 
+ #ifdef INCLUDE_INTERFACE
++#include <ctype.h>
+ #include <signal.h>
+ #include <termios.h>
+ #include <stdlib.h>
+--- a/src/sniffit.c
++++ b/src/sniffit.c
+@@ -3,6 +3,7 @@
+ 
+ #include "sn_config.h"		/* Config header file */
+ 
++#include <ctype.h>
+ #include <unistd.h>
+ #include <signal.h>
+ #include <stdlib.h>
+
diff --git a/net-analyzer/sniffit/sniffit-0.5.ebuild b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild
index 3be66ceda23e..1247440f794f 100644
--- a/net-analyzer/sniffit/sniffit-0.5.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools
 
 DESCRIPTION="Interactive Packet Sniffer"
 HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit"
 SRC_URI="https://github.com/resurrecting-open-source-projects/sniffit/archive/${P}.tar.gz"
-SLOT="0"
+S="${WORKDIR}"/${PN}-${P}
+
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND="
 	net-libs/libpcap
 	>=sys-libs/ncurses-5.2
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.4.0-tinfo.patch
+	"${FILESDIR}"/${PN}-0.5.0-implicit-func-decl.patch
 )
-S=${WORKDIR}/${PN}-${P}
 
 src_prepare() {
 	default
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index 339237d102a3..9aa1058ac30d 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -2,5 +2,5 @@ AUX tcptrace-6.6.7-_DEFAULT_SOURCE.patch 315 BLAKE2B b2024c742405be706c0ff6dfb8c
 AUX tcptrace-6.6.7-cross-compile.patch 1348 BLAKE2B f38a64ed02c45482db7b0fb18865c9584481f5875a9703cf010db603f977bf1bc7696391d3c135060f2b9160b76ebd8986c4a17091b4634e757772b690977377 SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e
 DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432
 DIST tcptrace_6.6.7-6.debian.tar.xz 6056 BLAKE2B a46a8a8a8f804066486566bccd10e33dc372a1fc30f37f401913c2b3038cf917891472e93a509cac8bdd2928d473c3ce21d0c4048c96ae54967fc48780384221 SHA512 82eebc2e297130cbafab0bb1757402d8b210885320ded1cd9b7ff064248d145c93196820564d4d1d7f1b1f7391cc5f734a0e0bf6275ddcae106d0bd540e32b61
-EBUILD tcptrace-6.6.7_p6.ebuild 1247 BLAKE2B 56e12c7951701d56ddbd5302bab3cf6c483d962cf79c144ad1488c998cdb27e0026a8602f1100c80f8b921bf5454c5877df345ece9f5b652a6f9f28880ce740c SHA512 b78443aae2c40aa7d9276ecae12496af52c0939f346562062968619c05ed97d6b680fe64ad79d0bce3688403d031594975d8f28868b19e951527256e5bcb0490
+EBUILD tcptrace-6.6.7_p6.ebuild 1258 BLAKE2B 50e31667149561f66e255ffc1679c5b10dca42d209b4cfdf60b6eb8a27dbc0414b5415d803abaf0e09c303a4738a01bca431f0b5fa516d331e922f3e0fd5a33d SHA512 5e11ec5bdc8bb3a85b0e3ffb4ca896e2d71a66599e9be97e99260cafdc6d64ebc84955cea753a875c6cf0e151f0696150855f68c5c253c8e1d35d535014df64e
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
index a96afb76f58e..fe3dd350d447 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="A Tool for analyzing network packet dumps"
 HOMEPAGE="http://www.tcptrace.org/"
 SRC_URI="
 	http://www.tcptrace.org/download/${P/_p*}.tar.gz
-	http://www.tcptrace.org/download/old/6.6/${P/_p*}.tar.gz
+	http://www.tcptrace.org/download/old/$(ver_cut 1-2)/${P/_p*}.tar.gz
 	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
 "
 
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index d57b7c727ac6..eeefd5b2c516 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,7 @@
 DIST testssl-3.0.5.tar.gz 9224554 BLAKE2B fed4f02f4c5db3975f711e5e1fa0f0018b5e89f8a3afbd94763ec86dc4f739ee25504769b61fc1dd0000ce7ce400f4d3267116cd21d14b003d9b6fd5706a84cb SHA512 0f3fa081f047bf2d3fb2f3b65fcdbec976af54143a2d8ffbece6eff7545cc2a6e134247f9533fb1614d52d900fc66d7f50c97f02678b5dfb9842c3c69c0f81f0
 DIST testssl-3.0.7.tar.gz 9219774 BLAKE2B d3b6abd5bb46e26ccb13afd9c9440e80fd80566db2bf04bb72b254dbebdc69957a0bae82436ce0b3f826f7c829a0cf73589eedc60735c629d010c8cb76e196a0 SHA512 703099f3c7d7d040f064466c721e30ee594a8d495add113b899b14d21848c8488e2d447c1af87ecd3d0d2b00dbeecc3a7914c26721b5b1936cfa818cf6599d53
+DIST testssl-3.0.8.tar.gz 9372229 BLAKE2B cf463236fb0812c2bc5fd5673d0d2d395fc405697817827ee8c660c96d789601a090b57febd48400e33fd9f28b23d42d432734b176b23a8e8ddf710c9b275485 SHA512 4634bc5dc57ad8910ca097b22d86511a26e855fb4dc7bef9550a795cb1f53a959b8472008756b40a670d7433ad56236b5a36fe0c88c15de99fdf586e9919b080
 EBUILD testssl-3.0.5.ebuild 1508 BLAKE2B afa8231522f3c74583cf7797859ef851eee280702d7d5c642188add2114e2ead7d653e1837f0f973ec77861be077f11ead26a05bd0743e7e8a13a4adf3e998f5 SHA512 8f60fce722b2dc13c5c1079f7434c55fa497261bae039bcceba1ba728c0c39910c87a174f2b58a68be1fc6013c9eeb926ddf208dfc432338f1062323e7a81359
 EBUILD testssl-3.0.7.ebuild 1525 BLAKE2B 2d08576b382583963ee09a8d8e16e43c7645e797cb53908172574358a5a9b87053a8540218ae62fc4faaabee12787ca17f86e3dbcd9b02f2f16cb3ebc403810b SHA512 4d2f3b6d8214134c7fe5c1336e178e885a6b9b065673b5dadd5e313aa649cbc1d0f3a7927a450589b12cc84b98ca37e0b576fa74749bfdb0c908060ae8343190
+EBUILD testssl-3.0.8.ebuild 1525 BLAKE2B 2d08576b382583963ee09a8d8e16e43c7645e797cb53908172574358a5a9b87053a8540218ae62fc4faaabee12787ca17f86e3dbcd9b02f2f16cb3ebc403810b SHA512 4d2f3b6d8214134c7fe5c1336e178e885a6b9b065673b5dadd5e313aa649cbc1d0f3a7927a450589b12cc84b98ca37e0b576fa74749bfdb0c908060ae8343190
 MISC metadata.xml 460 BLAKE2B 110fe91ebd724eaed5e5cd10273c420b16bd410189b58166a7f922ce5495785d26afe44e7da288c1ee1c17e6740d1fad55d3c0c2d0f325f572f63cd4318539ad SHA512 c30db71d85634df9484b943a4651f0e0d04352ba3c80c84a93ebb5fd538a131817771c8e7d1a51a02f96205449ff23cb5a6567c38ee5c38b6c0743023e5afacd
diff --git a/net-analyzer/testssl/testssl-3.0.8.ebuild b/net-analyzer/testssl/testssl-3.0.8.ebuild
new file mode 100644
index 000000000000..a3a082296157
--- /dev/null
+++ b/net-analyzer/testssl/testssl-3.0.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 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/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 526bf70b930e..de9941a1f178 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -36,8 +36,8 @@ DIST zabbix-6.2.2-go-deps.tar.xz 35354668 BLAKE2B 2fba7e9ee2c04f74d0fe041489136a
 DIST zabbix-6.2.2.tar.gz 34995538 BLAKE2B 749e43f23e06f9ad84bea2bae82fc1b8a499df3b873d26fd4fbfefd28288a3f17c1f05207d143516787cb1417107dd8594c704ea79b1a3d745affc787e723ff9 SHA512 b9ea0fb8fbfba6ecba54ad3abb68b10a005098cbbdf7130c6f9321cabcfe60a3b3094214a84e1c9d18fc4a0c959cf238eea43b400af027b9f200fb99c088658a
 DIST zabbix-6.2.3-go-deps.tar.xz 35349056 BLAKE2B 1548167558be12e7519e59e011eb6e761a0a5e1625fb460bbf3106ca5a895277789ce4b2f649884ebb0f236997771378ea47919f3e6fb6a4f4908a29ef34385e SHA512 a8934a5bb2367395c1ba6bf7ccd830c951fb585e7dc054d29f2667bfc45d18eed13889f4c31f8f417aba1920df06512e927c77975f70ab419e7525768caece7f
 DIST zabbix-6.2.3.tar.gz 35252249 BLAKE2B fdc9bd32c1aa632b266d26d88cdc08ac40d2663823730298ae2a136730ad4646a38921b0425ac87ef2c4dad7c62f5d41c2955cdf6b275204e26306b115ae3568 SHA512 9a8d3021f0e2929897c2f6d3e05721a9dd55ec5778c39edf7af9fb99590f8eece6bba40cb085426373837409d690646254fd2a3f0b151224532226dc46df14f4
-EBUILD zabbix-4.0.43.ebuild 9414 BLAKE2B b0abe7853c37cd78b5c2176eaafb891407b2a0cd9e7dea933d313a6f0f71188f59d1c86951bed73c445c954215bdec48fce47373d842d5e1cc6268e0e1b678c5 SHA512 509a7802245e0605ebc5424806594fa8ff9d73af492761f65a70985a86236f367358d40c67f1ca644647d5c4930b48f3351b4daae53cc2a39b89a79decac925e
-EBUILD zabbix-4.0.44.ebuild 9416 BLAKE2B c594ca9fb069ef5dc5ef2dfa4f5136e0a66257dd171b056a9073391451b4742e04d4bb38da379f0c0998a30d3a1c0ca8138f62909bba57ba06cb4130521f9b0b SHA512 a650f9c0496c8e2ffd76bd2e1b37071c097aba69f6bb71612570fca5c71049b8f51e3865152205e73c1889a2b1fbdaca192c36109ab1ebd111698f0f90b1eebd
+EBUILD zabbix-4.0.43.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
+EBUILD zabbix-4.0.44.ebuild 9427 BLAKE2B 7bb30080c7b1c389f9728ab2b936d86b040ead567e94b8f28bdf046a3f1831ee7c2a54738121242469b480650090131bd2e44e5aa0d5450e2855c16397391950 SHA512 0716dbad6709d88b4b39583d7ad82365b1242fed4c74a9941f4fa328cb246a290f76ecb27cfe631cbe4e0665a66e1b15e043a5214f2b6e1be1919600c2a907a4
 EBUILD zabbix-5.0.26.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
 EBUILD zabbix-5.0.27.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
 EBUILD zabbix-5.0.28.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
diff --git a/net-analyzer/zabbix/zabbix-4.0.43.ebuild b/net-analyzer/zabbix/zabbix-4.0.43.ebuild
index b6f830af64d9..8436fd2d7b37 100644
--- a/net-analyzer/zabbix/zabbix-4.0.43.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.43.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
 HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/net-analyzer/zabbix/zabbix-4.0.44.ebuild b/net-analyzer/zabbix/zabbix-4.0.44.ebuild
index 1e0af68937f8..b24c08490b7a 100644
--- a/net-analyzer/zabbix/zabbix-4.0.44.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.44.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
 HOMEPAGE="https://www.zabbix.com/"
 MY_P=${P/_/}
 MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/4.0/${P}.tar.gz"
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/$(ver_cut 1-2)"
 WEBAPP_MANUAL_SLOT="yes"