10 files changed, 511 insertions, 2 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 2166ad31d3e9..74aac8b3c584 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/hunt/Manifest b/net-analyzer/hunt/Manifest
index 7add357da095..449a5812e9a5 100644
--- a/net-analyzer/hunt/Manifest
+++ b/net-analyzer/hunt/Manifest
@@ -1,8 +1,10 @@
+AUX hunt-1.5-c99-build-fix.patch 2275 BLAKE2B 9efcfcc978bb1089df9b035f726024a658fcc99768e925029eccce9c1dcea5607446049dd48ab718792e9e8bf476495ae2ab409bb12e2a46f106d4d3ea53d7c7 SHA512 6a5990a8c98198fbcd4c9c7988b53cb8a4c2abdabea96378105a077749e8a2813e43b6cdc5626a2ced6b915b70f5781d007a42627a03d458daf7003ca64d4b67
 AUX hunt-1.5-exit.patch 208 BLAKE2B 0cb8afdb88649dc60e2d854a17cfc0ca5177257f101b25411c22707776369f9e758b3795d3c8d2a1f2bf68607371c3f7e99b6a0d5d850082800260febfb24267 SHA512 f268d172d1280bf1f05cb61da7295c74f0c60ba2c648058491cda7e89702f740648f9fc90c764867d6bb490a24ab318db95de594c1111b7c2b4d099dd113bae8
 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-r1.ebuild 1130 BLAKE2B 71371d46b710ebb98546eea65ab720271a52d92f899cd1e3cb692bddb1e7bab7ea3243752bc8385f80fad809ff1e1df4ed520030d1519cb73283f804653e0d84 SHA512 e7d74f9c764adf0656c64b74b3cf81dbe6d5af6c1bd09d6cb3aaec7d63dcf27d27729ed92597530971e532939250f0dbd117bb68e3051cc789c3042f0e3f492b
 EBUILD hunt-1.5_p6_p1.ebuild 1085 BLAKE2B 1fb63bf7238d94ee45bed9a2793e0c2260c401b9d18252c27c64815e04bb07afcf0c6d28b517d746de112979bc996ac6ef1c9f6de2e3975df17e258879e34c2f SHA512 dc4095c3d8807d6c059c8acc1e1ee02b8d5bb4a9c4bf21d485b104dd499c2c2f943173498114660338157373b282e8e544d4d605c6ec26b7cee571ce00812ed3
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/hunt/files/hunt-1.5-c99-build-fix.patch b/net-analyzer/hunt/files/hunt-1.5-c99-build-fix.patch
new file mode 100644
index 000000000000..ef031f45c4e9
--- /dev/null
+++ b/net-analyzer/hunt/files/hunt-1.5-c99-build-fix.patch
@@ -0,0 +1,59 @@
+Bug: https://bugs.gentoo.org/919471
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Fri, 3 May 2024 17:26:49 +0530
+Subject: [PATCH 1/1] Fix c99 build errors.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 14 (and above) has enabled some compiler flags by default,
+-Wincompatible-pointer-types being one of them. These results in build
+time errors such as
+
+tpserv.c:161:32: error: passing argument 2 of ‘connect’ from incompatible pointer type [-Wincompatible-pointer-types]
+  161 |         if (connect(fd_remote, to_addr, to_addr_len) < 0) {
+      |                                ^~~~~~~
+      |                                |
+      |                                struct sockaddr_in *
+In file included from tpserv.c:11:
+/usr/include/sys/socket.h:126:52: note: expected ‘const struct sockaddr *’ but argument is of type ‘struct sockaddr_in *’
+
+TODO: Find better ways other than type casting.
+Type casting is the only way for now, as chaning the parameter type in
+function defenition would require touching many other parts of the code
+that I'm unfamiliar with.
+
+First reported on Gentoo Linux with GCC 14, please reffer
+https://bugs.gentoo.org/919471 for more details.
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/tpserv/tpserv.c
++++ b/tpserv/tpserv.c
+@@ -148,7 +148,8 @@ static void process_request_connect(int fd, int pid, struct sockaddr_in *from_ad
+ {
+ 	char buf[BUFSIZE];
+ 	struct sockaddr_in local_addr;
+-	int to_addr_len, local_addr_len;
++	int to_addr_len;
++	socklen_t local_addr_len;
+ 	fd_set rset;
+ 	int maxfd, len;
+ 	int fd_remote;
+@@ -158,7 +159,13 @@ static void process_request_connect(int fd, int pid, struct sockaddr_in *from_ad
+ 		exit(1);
+ 	}
+ 	to_addr_len = sizeof(*to_addr);
+-	if (connect(fd_remote, to_addr, to_addr_len) < 0) {
++	/*
++	 *TODO: Find better ways other than type casting.
++	 *Type casting is the only way for now, as chaning the parameter type in
++	 *function defenition would require touching many other parts of the code
++	 *that I'm unfamiliar with.
++	 */
++	if (connect(fd_remote, (const struct sockaddr *)to_addr, to_addr_len) < 0) {
+ 		hunt_log(LOG_ERR, pid, "failed to connect to remote addr\n");
+ 		exit(1);
+ 	}
+-- 
+2.45.0.rc1.218.g7b19149425.dirty
+
diff --git a/net-analyzer/hunt/hunt-1.5_p6_p1-r1.ebuild b/net-analyzer/hunt/hunt-1.5_p6_p1-r1.ebuild
new file mode 100644
index 000000000000..362ad35f6ba9
--- /dev/null
+++ b/net-analyzer/hunt/hunt-1.5_p6_p1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+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"
+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
+	"${FILESDIR}"/${P/_p*}-c99-build-fix.patch
+)
+
+src_configure() {
+	append-cppflags -DSYNC_FAST
+}
+
+src_compile() {
+	local target
+	for target in . tpserv; do
+		emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}"
+	done
+}
+
+src_install() {
+	dosbin hunt tpserv/tpserv tpsetup/transproxy
+	doman man/hunt.1
+	dodoc CHANGES README* TODO tpsetup/transproxy
+	newdoc debian/changelog debian.changelog
+}
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index a26eb689ccfc..d96be2fac06f 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,3 +1,6 @@
+AUX nagios-plugins-2.4.12-postgresql-detection.patch 5855 BLAKE2B 31c680ded0b5fbdee12696931f2c878c79f46a403c0ff5ea84fd2088e8c9ed592bdce5203f93c3f7dec59700d32ca889f1643cc332975a14074c5ed11e26bc32 SHA512 fb21c0681cca866ce9223f253ff37633673604e0ec15062087ae806a158dc2c30db123220c12faec00499811ba63a5e0612a00c5b36c5343a4e90975183687ae
+AUX nagios-plugins-2.4.12-snmpgetnext.patch 4906 BLAKE2B 1b8e90857ed9e6b8af14ecaac7b32f620c128e22c6aa9121387bd259bd34321b0362207c5415fc6bf69c3f1be143c121d9432c8f48a1dbee5768fb3de8b48d00 SHA512 4f176f222c575691f4f3ddb435220f81d1a6da7f948b7497a888d19a43091006d2619fdb63d0c3327e5c7d55f31ab521ffff58c576a6689f83518dfcd191a6e3
 DIST nagios-plugins-2.4.12.tar.gz 2752829 BLAKE2B b72b9350e9c72c9cbe0cbca3effce16ec753887945455a1ac47975105e68f516923020cc88ee42da0c8cd815fe841a82ff5053c3ba5688888bec7be12c08fb8c SHA512 fbff697d0cea1cbeb83737f240a42c00e18bf443b8af303b5d7f7f735eb6faa5305d8740fb27472876dc1398735204e0d7a0e5863c2064ec2a37541253f91502
+EBUILD nagios-plugins-2.4.12-r1.ebuild 3413 BLAKE2B 677c4a0c0c025d97280c43f5b93d1618a41acf677892af4efd612bb10df9346c6a81a528810ca087471acd5f9200a6205f098f2d0d4c2c5f2d8a9499bc62cdcd SHA512 4772b858b014c1c10cca0ff2648d505afe8b83cef1952cf9490e1cbd8922d3fe23800434f92e2e9397ece0fed590d0266be73433a6deb8091874a5f4ccd6c256
 EBUILD nagios-plugins-2.4.12.ebuild 3277 BLAKE2B f9f479063baac76d00832adea82eee0d2e337d63a2e7b996d9d0f29bdcf9a103b8fa282ce7a2fb8139e8259449163582132b5ce02923b1de433f0200e153af26 SHA512 1252d0565d4c24fb6a109a526abc283f4e0f304b1d046f535182539ff8e5116851e3b87392ccb038489121de5b4e3fce7da41e730abd420bd585ef26d1dae900
 MISC metadata.xml 1569 BLAKE2B 4ebfd50870acac360fa2708dba05d3ea925e7d93444da82ca93067b4c8eeb177e8055cba4d12d690c8d9e1f5448447d6bf94a5991a09d0f4a2ee6126338bb707 SHA512 fffa8c7bc36e0cfd4ca35ab8c8f327749e0c6744a9567d9a6c88180c178a2a5bbf67df31b289d9319bc725d2fab4433a9d00443a87d0950777ed0c05031da193
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-2.4.12-postgresql-detection.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-2.4.12-postgresql-detection.patch
new file mode 100644
index 000000000000..570b0992bf7e
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-2.4.12-postgresql-detection.patch
@@ -0,0 +1,143 @@
+From be90a1d9ae5b5e10015619271337e3a2c731b3bb Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 Sep 2024 19:51:27 -0400
+Subject: [PATCH] configure.ac: rewrite PostgreSQL detection using pg_config
+
+PostgreSQL installs a pg_config program that spits out its "include"
+and "library" paths when called with --includedir and --libdir,
+respectively. Using this we can simplify the detection of PostgreSQL,
+since in theory the problem is reduced to that of finding pg_config.
+
+This commit replaces the existing PostgreSQL detection with a more
+straightforward search for pg_config. The change is backwards-
+compatible, in the sense that --with-pgsql=foo will still find the
+postgres installation in "foo," except now it will do so through
+foo/bin/pg_config rather than foo/include and foo/lib.
+
+This solves a rare problem: on systems where only one version of
+postgres is allowed, or on systems where multiple versions exist but a
+"default" version can be chosen, the most likely path for postgres is
+--with-pgsql=/usr. With the current implementation, this leads to
+"-I/usr/include" being added to CPPFLAGS, which is fine, and
+"-L/usr/lib" being added to LDFLAGS, which is not. On some of those
+same systems, /usr/lib is for 32-bit libraries while /usr/lib64 is the
+"normal" (64-bit) library path. So as a result of detecting postgres
+under /usr, the linker is pointed to the wrong set of libraries. This
+is known to crash lld (the LLVM linker).
+---
+ configure.ac | 100 ++++++++++++++++++++++++++-------------------------
+ 1 file changed, 52 insertions(+), 48 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b67a7805..c69246c0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -209,56 +209,60 @@ if test "$enable_extra_opts" = "yes" ; then
+ 	fi
+ fi
+ 
+-dnl Check for PostgreSQL libraries
+-_SAVEDLIBS="$LIBS"
+-_SAVEDCPPFLAGS="$CPPFLAGS"
++dnl Check for PostgreSQL libraries. Postgres ships a pg_config program
++dnl that gives us the -I and -L flags we need, so the problem is reduced
++dnl to finding pg_config. When the user passes --with-pgsql=foo, we expect
++dnl that "foo" is something like /usr/lib64/postgresql-16, i.e. that we
++dnl can locate "bin/pg_config" there. This supports choosing one particular
++dnl version of postgres when multiple versions are installed. If the "foo"
++dnl argument is omitted, we instead use whatever pg_config (if any) is present
++dnl on the PATH. It is an error to request postgres support when no usable
++dnl pg_config is provided and one cannot be found.
+ AC_ARG_WITH(pgsql,
+ 	ACX_HELP_STRING([--with-pgsql=DIR],
+-		[sets path to pgsql installation]),
+-	PGSQL=$withval,)
+-AC_CHECK_LIB(crypt,main)
+-if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then
+-  if test -n "$PGSQL"; then
+-    LDFLAGS="$LDFLAGS -L$PGSQL/lib"
+-    CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
+-  fi
+-  AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
+-  if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
+-    AC_CHECK_HEADERS(pgsql/libpq-fe.h)
+-    AC_CHECK_HEADERS(postgresql/libpq-fe.h)
+-    AC_CHECK_HEADERS(libpq-fe.h)
+-    if [[ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]]; then
+-      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
+-      PGINCLUDE="-I$PGSQL/include"
+-    elif test  "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
+-      PGLIBS="-lpq -lcrypt"
+-      PGINCLUDE="-I/usr/include/pgsql"
+-    elif test  "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
+-      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
+-      PGINCLUDE="-I/usr/include/postgresql"
+-    elif test  "$ac_cv_header_libpq_fe_h" = "yes"; then
+-      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
+-      PGINCLUDE="-I$PGSQL/include"
+-    fi
+-    if test -z "$PGINCLUDE"; then
+-      AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
+-      AC_MSG_WARN([install PostgreSQL headers to compile this plugin (see REQUIREMENTS).])
+-    else
+-      AC_SUBST(PGLIBS)
+-      AC_SUBST(PGINCLUDE)
+-      EXTRAS="$EXTRAS check_pgsql\$(EXEEXT)"
+-    fi
+-  else
+-    AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
+-    AC_MSG_WARN([LIBS="$LIBS" CPPFLAGS="$CPPFLAGS"])
+-    AC_MSG_WARN([install PostgreSQL libs to compile this plugin (see REQUIREMENTS).])
+-  fi
+-else
+-  AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
+-  AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).])
+-fi
+-LIBS="$_SAVEDLIBS"
+-CPPFLAGS="$_SAVEDCPPFLAGS"
++		[path to pgsql installation, i.e. path to bin/pg_config]),
++	PGSQL=$withval,PGSQL=no)
++
++dnl --with-pgsql sans argument gives "yes"
++dnl --without-pgsql gives "no" (this is also the default, see above)
++dnl --with-pgsql=foo gives "foo"
++AS_IF([test "x${PGSQL}" = xno],[
++  AC_MSG_WARN([Skipping PostgreSQL plugin])
++],[
++  _PG_CONFIG=""
++
++  AS_IF([test "x${PGSQL}" = xyes],[
++    AC_PATH_PROG(_PG_CONFIG, pg_config)
++    AS_IF([test -z "${_PG_CONFIG}"],[
++      AC_MSG_ERROR([postgres support requested but pg_config not found])
++    ])
++  ],[
++    AC_MSG_CHECKING([for usable ${PGSQL}/bin/pg_config])
++    AS_IF([test -f "${PGSQL}/bin/pg_config" -a -x "${PGSQL}/bin/pg_config"],[
++      AC_MSG_RESULT([yes])
++      _PG_CONFIG="${PGSQL}/bin/pg_config"
++    ],[
++      AC_MSG_RESULT([no])
++      AC_MSG_ERROR([${PGSQL}/bin/pg_config not found or not executable])
++    ])
++  ])
++
++  dnl Sanity check: look for a header using the -I flags
++  dnl that we get from pg_config.
++  _SAVED_CPPFLAGS="${CPPFLAGS}"
++  PGINCLUDE="-I$(${_PG_CONFIG} --includedir)"
++  CPPFLAGS="${CPPFLAGS} ${PGINCLUDE}"
++  AC_CHECK_HEADER(libpq-fe.h,[
++    PGLIBS="-L$(${_PG_CONFIG} --libdir) -lpq"
++    AC_SUBST(PGLIBS)
++    AC_SUBST(PGINCLUDE)
++    EXTRAS="$EXTRAS check_pgsql\$(EXEEXT)"
++  ],[
++    AC_MSG_ERROR([libpq-fe.h not found])
++  ])
++  CPPFLAGS="${_SAVED_CPPFLAGS}"
++])
++
+ 
+ AC_ARG_WITH([dbi], [AS_HELP_STRING([--without-dbi], [Skips the dbi plugin])])
+ dnl Check for DBI libraries
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-2.4.12-snmpgetnext.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-2.4.12-snmpgetnext.patch
new file mode 100644
index 000000000000..549ba3e30b71
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-2.4.12-snmpgetnext.patch
@@ -0,0 +1,128 @@
+From 37b27e058cc8a352a588c865e0319c23f6cb23d5 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 15 Feb 2025 17:45:53 -0500
+Subject: [PATCH 1/3] configure.ac: update net-snmp homepage
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b443263..0308f5cb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1491,7 +1491,7 @@ then
+ 	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
+ 	EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
+ else
+-	AC_MSG_WARN([Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins])
++	AC_MSG_WARN([Get snmpget from https://net-snmp.sourceforge.io/ to make check_hpjd and check_snmp plugins])
+ fi
+ 
+ AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
+
+From 8246d9c987b45586b5ceca2c81a671c642ad7106 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 15 Feb 2025 17:47:34 -0500
+Subject: [PATCH 2/3] configure.ac: use AS_IF in net-snmp tests
+
+Not strictly required here, but the AS_IF macro is generally safer
+because it handles (often unintentional) AC_REQUIRE calls.
+---
+ configure.ac | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0308f5cb..5aaf4eee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1486,23 +1486,21 @@ AC_ARG_WITH(snmpget_command,
+             ACX_HELP_STRING([--with-snmpget-command=PATH],
+                             [Path to snmpget command]),
+             PATH_TO_SNMPGET=$withval)
+-if test -n "$PATH_TO_SNMPGET"
+-then
++AS_IF([test -n "$PATH_TO_SNMPGET"], [
+ 	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
+ 	EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
+-else
++], [
+ 	AC_MSG_WARN([Get snmpget from https://net-snmp.sourceforge.io/ to make check_hpjd and check_snmp plugins])
+-fi
++])
+ 
+ AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
+ AC_ARG_WITH(snmpgetnext_command,
+             ACX_HELP_STRING([--with-snmpgetnext-command=PATH],
+                             [Path to snmpgetnext command]),
+             PATH_TO_SNMPGETNEXT=$withval)
+-if test -n "$PATH_TO_SNMPGETNEXT"
+-then
++AS_IF([test -n "$PATH_TO_SNMPGETNEXT"], [
+ 	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
+-fi
++])
+ 
+ if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null  )
+ then
+
+From 1ceac49405e77b28e75118c5b537db84d73866a5 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 15 Feb 2025 18:10:06 -0500
+Subject: [PATCH 3/3] configure.ac: require snmpgetnext for check_snmp
+
+PATH_TO_SNMPGETNEXT is used unconditionally in plugins/check_snmp.c,
+and the build will fail if it is left undefined (that is, if we are
+building check_snmp but snmpgetnext was neither found on the user's
+PATH or supplied manually).
+
+To avoid this build failure, we now test for snmpgetnext inside the
+case for snmpget, and skip check_snmp unless BOTH are found.
+
+Closes GH-788
+---
+ configure.ac | 25 +++++++++++++++++--------
+ 1 file changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5aaf4eee..ae2ea796 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1486,20 +1486,29 @@ AC_ARG_WITH(snmpget_command,
+             ACX_HELP_STRING([--with-snmpget-command=PATH],
+                             [Path to snmpget command]),
+             PATH_TO_SNMPGET=$withval)
+-AS_IF([test -n "$PATH_TO_SNMPGET"], [
+-	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
+-	EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
+-], [
+-	AC_MSG_WARN([Get snmpget from https://net-snmp.sourceforge.io/ to make check_hpjd and check_snmp plugins])
+-])
+ 
+ AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
+ AC_ARG_WITH(snmpgetnext_command,
+             ACX_HELP_STRING([--with-snmpgetnext-command=PATH],
+                             [Path to snmpgetnext command]),
+             PATH_TO_SNMPGETNEXT=$withval)
+-AS_IF([test -n "$PATH_TO_SNMPGETNEXT"], [
+-	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
++
++AS_IF([test -n "$PATH_TO_SNMPGET"], [
++	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
++	EXTRAS="$EXTRAS check_hpjd"
++
++	dnl PATH_TO_SNMPGETNEXT is used unconditionally in check_snmp:
++	dnl
++	dnl   https://github.com/nagios-plugins/nagios-plugins/issues/788
++	dnl
++	AS_IF([test -n "$PATH_TO_SNMPGETNEXT"], [
++		AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
++		EXTRAS="$EXTRAS check_snmp\$(EXEEXT)"
++	], [
++		AC_MSG_WARN([Get snmpgetnext from https://net-snmp.sourceforge.io/ to build the check_snmp plugin])
++	])
++], [
++	AC_MSG_WARN([Get snmpget from https://net-snmp.sourceforge.io/ to build the check_hpjd and check_snmp plugins])
+ ])
+ 
+ if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null  )
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.12-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.12-r1.ebuild
new file mode 100644
index 000000000000..add6fce1fcec
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.12-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="https://nagios-plugins.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+AUTOMAGIC_DEPEND="
+	nagios-dns? ( net-dns/bind )
+	nagios-game? ( games-util/qstat )
+	nagios-ping? ( net-analyzer/fping )
+	samba? ( net-fs/samba )
+	ssh? ( virtual/openssh )
+	snmp? ( dev-perl/Net-SNMP
+			net-analyzer/net-snmp[-minimal] )"
+
+# Perl really needs to run during the build...
+BDEPEND="${AUTOMAGIC_DEPEND}
+	dev-lang/perl"
+
+DEPEND="
+	ldap? ( net-nds/openldap:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	radius? ( net-dialup/freeradius-client )"
+
+# Basically everything in net-analyzer/monitoring-plugins collides with
+# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too.
+RDEPEND="${BDEPEND}
+	${DEPEND}
+	!net-analyzer/monitoring-plugins
+	selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-postgresql-detection.patch"
+	"${FILESDIR}/${P}-snmpgetnext.patch"
+)
+
+DOCS=(
+	ACKNOWLEDGEMENTS
+	AUTHORS
+	CODING
+	ChangeLog
+	FAQ
+	NEWS
+	README
+	REQUIREMENTS
+	SUPPORT
+	THANKS
+)
+
+# These all come from gnulib and the ./configure checks are working as
+# intended when the functions aren't present. Bugs 907755 and 924341.
+QA_CONFIG_IMPL_DECL_SKIP=(
+	statvfs64
+	re_set_syntax
+	re_compile_pattern
+	re_search
+	re_match
+)
+
+src_prepare() {
+	default
+
+	# Fix the path to our perl interpreter
+	sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+		"${S}"/plugins-scripts/*.pl \
+		|| die 'failed to fix perl interpreter path'
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use an array to prevent econf from mangling the ping args.
+	local myconf=()
+
+	if use ssl; then
+		myconf+=( $(use_with ssl openssl /usr) )
+	else
+		myconf+=( --without-openssl )
+		myconf+=( --without-gnutls )
+	fi
+
+	# The autodetection for these two commands can hang if localhost is
+	# down or ICMP traffic is filtered (bug #468296). But also the path
+	# likes to move around on us (bug #883765).
+	myconf+=( --with-ping-command="$(command -v ping) -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="$(command -v ping6) -n -U -w %d -c %d %s" )
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		$(use_with ldap) \
+		$(use_with postgres pgsql /usr) \
+		$(use_with radius) \
+		"${myconf[@]}" \
+		--libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="/etc/nagios"
+}
+
+pkg_postinst() {
+	elog "This ebuild has a number of USE flags that determine what you"
+	elog "are able to monitor. Depending on what you want to monitor, some"
+	elog "or all of these USE flags need to be set."
+	elog
+	elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins"
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1c356b8c9cca..d060cb043214 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,6 +5,6 @@ DIST wireshark-4.4.2.tar.xz 46763620 BLAKE2B ea5c48f06c2aeb5b51f6ba62fd57214e9dd
 DIST wireshark-4.4.5-signatures.txt 2706 BLAKE2B b36ef5768018188614e5d2fcade7d2eccbf7e494bcf9332b5721e49a322a2d8669bb940d38f9aad1d4957a59558ed6df4380710e83853edada6516b61515c42f SHA512 70e148023eb728bcbba3abe1848d56c699ce500ddfc6bf3d7406e3f155341bc12406d08c3d31654cee9d5df48632bf3998771d81d2dc4a268ee857f5f7efe8ce
 DIST wireshark-4.4.5.tar.xz 46776736 BLAKE2B 0cefe4330d1d0e40b101c33d767796d4657ed1cf7fc652732663b99d5849ef0c2f5905b1c07137dc306c18d66240701eefd8f018bf78c078caa1a04f642048da SHA512 09956fadb2ab80df136c6b35a1be2aa72eec20e1f11c94aaaabecff72d450239d09173ef3cc2bcd8c85c194816afb750e1d476538038ff612366a255ae4fece5
 EBUILD wireshark-4.4.2-r1.ebuild 9156 BLAKE2B 4c7fecb7777860cfb1ed7db10eb6d95419bbb64d83dda22149cf6d2561da385ade013956d0da299dc0d1ee7fe3d427a20128f68e1965a4d72198aa77f30c1973 SHA512 3d860990d78fadaa52bd429e494f392fe87837037c62fdd18d1359543e114a7214b5ef7e11b498c7f05138558ba0413902593adcb3d6a5be3a340cbfc4d5c0e4
-EBUILD wireshark-4.4.5.ebuild 8388 BLAKE2B 86cb989de9cd9e665d1bbc867ad2eceb7030cdce8c690f1b56392baa7eece18a1643d90ffe31ab7a618e7d33161e21adb90f25e279b8d0dbf0892d1978f89acc SHA512 49690d50f30e412da671c621671a8de7c48ebdfadf79bfac5540d3f5695401ec471e8fc17270f8a71ea88e46724e35f8c7439cc7b6b51f6de6e63cc311fa3c55
+EBUILD wireshark-4.4.5.ebuild 8383 BLAKE2B 19ba184d0ff7924a8cfc0b9fc2a13c0011b48c683c28d4e56b5e21b17010b404366209bbf54b150869d59d50bd8fc2502c4ec6afe729b2db5805c0f42dda5887 SHA512 d47f66d74c045db4ea0265bba111a13eca76196a4d1065c1f786e6f7000baf098616a345f1808fdb3e2a586de3381aa3cb31fc2b169b5e35481890714b2f6b81
 EBUILD wireshark-9999.ebuild 8301 BLAKE2B 72f949af4cd9e8ab06d5f28bff0d2dc3f14fe30a47ba0ba3506f837df1a28e6095d2066dbe557b45496b8690cc508963d9c01ae3f3850f82f4fdc2344a2f9da3 SHA512 05976eb0ca81b817f146dac5352b0c3f6981bf3b3c84802b71b6eb5db56ecb4cdd9a81a556be9579d738b769f42ef8057585f366d08b695b1a0fdca60832f5ee
 MISC metadata.xml 5531 BLAKE2B 207ea41db99c46e4434a7ad42e40324320387ecae4391425ad82e3f226806adb485a496571c966714eb3ab3713e08d30c8ed5d14cdfaa97bde130b5a88087d5f SHA512 ec77f0f412bf6fafd2e74ab9d5a21bb04a6cda9ea01437dea6fcac3d9ef453775e6a05b77f8c9724dcbc2aa23cb5924518029cf51a6d329a3361bee9fd45f78c
diff --git a/net-analyzer/wireshark/wireshark-4.4.5.ebuild b/net-analyzer/wireshark/wireshark-4.4.5.ebuild
index 224f229d4a46..556d77b3d23e 100644
--- a/net-analyzer/wireshark/wireshark-4.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.4.5.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+		KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86"
 	fi
 fi