7 files changed, 116 insertions, 3 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4cb28c72d171..51aa2f911cab 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 82aa9aaa63e6..205852a65d31 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,8 +1,8 @@
 AUX 99_nagios4-r1.conf 309 BLAKE2B c539330d9f100045fc02d13061dd3b8e958370c8885ef8d28c38ee380b2043d86c9b0097c158dbc5d486f1c53e22ef6f52a96286d0c50d1d47d9eb025fb6b8a9 SHA512 cb93d6af5b6f43b172cec276f669ef786268c1ba51ffda994733c98a8ad5f625229aecaed68b5cb433a66257a8eb66ec16f9569aa87b6dcecf21d8339bd5fb8f
 AUX lighttpd_nagios4-r1.conf 297 BLAKE2B 8976123407c47be6023c5dae57c833f7e0b43ae2c70348dcd72b754453b5a84dd335daa222b4b75e5c19b3d5c18b64496739bdb61b8f2f67f5655b80a0ffb65f SHA512 2ef5268e9ba228d12e3dabb5a23ce73e49b7149a047acd4a2daac3cd3415b5233aaaf3b972c85780e71bd5fe3eefb6755a6222b40a509104fb318e219366867f
 DIST nagios-4.4.10.tar.gz 11339491 BLAKE2B 300ffe4abb41c1dc67b6a4976158eae503f9f55593ad492a70a6915e112ad3949d0e0cd0ec2f06a29540544fbcf79495652dd912f1a8e688056c21bbb58ed6d4 SHA512 fc8d8203d53c4ec87a831cec0564c9bdb553a43675b974616ce6444340b2170b82091259d495b458ab57b0cce0ab23ab30df09b05d71107ff264462c0ebb37fc
-DIST nagios-4.4.13.tar.gz 11341150 BLAKE2B 04e2b261536755806f54a4308ba7f615fe055182f91171ddbae47a23d8a0362c33ce2cb4ce50bb75d4a6f170a9ce5892f30181b7c77a6968707f8965ac5f3a28 SHA512 43808bf2f9460d2d0fcac6aea8492cf7abc18a527c671e3a8e776ee3563bb91be1f5f384cfc3943157a355596ce4e1516e3ebc54d51c30479054180b01dfe3e8
+DIST nagios-4.4.14.tar.gz 11341108 BLAKE2B 254b17fdd90670701d42f4bc90c741592bc21f0813903e5cdcaa671c9b4b7eb32964ae56acf56567198bb8b6d96ce7539bf343b870a4732a46d31557d161a1c1 SHA512 dd7ddaf114ac6451b5f157f36bdba27068e94dcfe583cc217f220162b013341984622828574feda8c3c0990388a03ab886791a3188e56bf2eb6b3f8c777c3641
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.4.10.ebuild 9243 BLAKE2B b3af2ee5c6f670a7fc7700c266d655d9cca4e56af2176a2177569b4ae70c088784cfbb4de438c168ebf33f310ded2d7d5043eb6e62191ae9d8862fcf96cf611b SHA512 a97ccba86cfeef8d844cbeca4ded6165a9d1f55d84fe090fa778f60256ae8576a56b5d7abd9aaad73b7eb4ac36b65d06dec750ffed8d835240c2f0cfae97d6f3
-EBUILD nagios-core-4.4.13.ebuild 9247 BLAKE2B 0b7f8376c20f46868ad77cc7530c0056f3352416433b21ef4c5d3a661121eb31e96adefd28a978644157e7e428f7acafcef70415e00d2e4d85a26159dc081645 SHA512 96e94b04a772de2220213f058e64ddf799f0bdfa197e33c50ab40e6dd3f75a5031bf180ea2911f19fcc3f717eae0146e190bd6683f17426854227d8f84a47c97
+EBUILD nagios-core-4.4.14.ebuild 9247 BLAKE2B 0b7f8376c20f46868ad77cc7530c0056f3352416433b21ef4c5d3a661121eb31e96adefd28a978644157e7e428f7acafcef70415e00d2e4d85a26159dc081645 SHA512 96e94b04a772de2220213f058e64ddf799f0bdfa197e33c50ab40e6dd3f75a5031bf180ea2911f19fcc3f717eae0146e190bd6683f17426854227d8f84a47c97
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.13.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
index 1f5a40a99885..1f5a40a99885 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.13.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 7793969ba08a..9482db81c48c 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,6 +1,8 @@
 AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec
 DIST nagios-plugins-2.4.0.tar.gz 2738643 BLAKE2B 695c3804aec592dad0ae1f2f19222a5ae066944de4169beba08dd1e7beee51c5082679dfc1cf5adc052758e3142f33187ebde9636af19ae313f1448867764878 SHA512 f6f4cd604d28161f36c1429dbfa8f07e9fa468d8d8c21925d53d7049f0765504cb785e1f1189a0c93aa1f0cd1fe3985409c420b7724aa39790836af5c3f725ff
 DIST nagios-plugins-2.4.2.tar.gz 2740092 BLAKE2B 73101f0d439a10bbc0e5d576fe1cf60f115eead00e4611e2f820ebde86390daf1904a45603389a6ad0a9fdb0f14fb49b429ad571159f605df5490f9798fc18d1 SHA512 43448483301c8f5fb9be9b496514a9e15199c320b2a320bb93c4fc6f6fcd35f2a469f980916b37b2b7e565edcb14eea1692f290b0a7bca9364e298eb42af63ce
+DIST nagios-plugins-2.4.6.tar.gz 2751770 BLAKE2B a85da8eaa8d926e2ccae3451d9faa680b75ebd736ba1306c69e7d3b2b8749787743dd6e26013d3a72fba12ef49fdf635c60052791fab558eb49c379bdbb6bac7 SHA512 f2a12a5b6a70849d7233debd1ca95667df981d3627287e3b8813d8fd709c4f4a26cf2128851837f33e0df3132132a4f891edef90e220bc16b1a6351d514faa43
 EBUILD nagios-plugins-2.4.0-r3.ebuild 3104 BLAKE2B 2b920abe2259ca3e64a29a63079755b23e6619291e99f32d84aae2d28b05ab6c9459a40858bd7ede633a02391edf3695c9050c91f8efc5e4aacb993dbbed9318 SHA512 fc71484e2825a43f394e6d4fab2561a1ec29e8e0bc4d3b6a6b6bb1735cb14811e1de151e1f5b57dea4aa9474168632a55d1f0859cbec66080bffe7c23096f551
 EBUILD nagios-plugins-2.4.2-r3.ebuild 3039 BLAKE2B dabc166f9755ed296c24cde0b138ce6e5016f2a308d29d698d4fc151abe8d22e69dc513f4b8e25d4ea8854bdc729fbfbbbb09c033fca1ed6f7746eb379999fe9 SHA512 527008c686e9d74ebdfd037abcead491baf41427d47179467ada562cf892bf0f71c5df034bf4e1408732a56e1400c306c0c25cbc80a9dba97b88cb2723c718c4
+EBUILD nagios-plugins-2.4.6.ebuild 3043 BLAKE2B cf36595ff337f7923df6013b1e0c5e4049182bb07b9c2147412921879218fa53fb2aff9963cc1328abd8ec6d6a6bcd1817a98b43d1dbed163669587b3fca0e31 SHA512 b0ff95a48fff06fac25b61231d1be903e055803409a4c2f7d749f770fab1cdc35b4d173f0d121faa09cdb03c5cae7ea7e27ec1cc741534c9ecba7fa25a98edeb
 MISC metadata.xml 1431 BLAKE2B 7a5b71bb1d5acc47492a8ac0414c5de789e2fff607a1602c8e464dd4285adb1acd71f152dc9dae18bade31623d78ca2ebe796b871f62542d2d29a75a3b5e4ce6 SHA512 5aa293f0fd8f810b3b750772e260009cbf10bb68aae1f8cbb9e02f7565204f8ae14da3f6a18db58e9fdff5fd97ba8566d07a421ff8bc35f07747338ced13b92c
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild
new file mode 100644
index 000000000000..2eb6ce8a7ee6
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~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-tools )
+	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"
+
+DOCS=(
+	ACKNOWLEDGEMENTS
+	AUTHORS
+	CODING
+	ChangeLog
+	FAQ
+	NEWS
+	README
+	REQUIREMENTS
+	SUPPORT
+	THANKS
+)
+
+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'
+}
+
+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/nagios/Manifest b/net-analyzer/nagios/Manifest
index d0c026d3b7e6..d7e811c0fd5b 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,3 @@
 EBUILD nagios-4.4.10.ebuild 393 BLAKE2B 0859182a3e1c1974b254a6775c51e84bc93d9cc21eedde2be3157dcf38edba12d896de6b927a61e690c72ed1ce0cd9f7e5d148d8ad486ac3caf2123c4a62dbc6 SHA512 75b82a94729a05cff3cd79a56043a71b7c7a0a1824ede66b6601db6c8f862d94a641df652d734ccc54aba734559d6a75f84c2384a37a5222ae9a1d762ca219ff
-EBUILD nagios-4.4.13.ebuild 397 BLAKE2B 34478d5d1a47532d8d7bc8b9f1d76f7559dbf685357ff1d9c790b9ffe27a53e926ebe15d6e5a1bbf0e75b45acb73cdde97a4ca647d3a2c5b9de972dc87ca5002 SHA512 e46b8a078d75784e962a6aff1e4ab64f460051edbe6e6121c2c72f32eceea57da9f206d67fcc4cf540ef9568705b769e6a727057e8f062ea55a3ec6a129aff8f
+EBUILD nagios-4.4.14.ebuild 397 BLAKE2B 34478d5d1a47532d8d7bc8b9f1d76f7559dbf685357ff1d9c790b9ffe27a53e926ebe15d6e5a1bbf0e75b45acb73cdde97a4ca647d3a2c5b9de972dc87ca5002 SHA512 e46b8a078d75784e962a6aff1e4ab64f460051edbe6e6121c2c72f32eceea57da9f206d67fcc4cf540ef9568705b769e6a727057e8f062ea55a3ec6a129aff8f
 MISC metadata.xml 1111 BLAKE2B d2c8f269fe7ef92c656219c0c93efca6083c09ea1ea402ccab7cf37f415931ad5abdf46a20b568ec82883a574005a4788617c0786c20c2d326b2d481195261e0 SHA512 e6c32f8405e79a4a3cf03d21dce3539c28454d75929348efb30f5c7c2b55f5346e3cd39f9d64f4e276aaad12f1fbf274f2fc08c255c03df1a5a7f0356031d66e
diff --git a/net-analyzer/nagios/nagios-4.4.13.ebuild b/net-analyzer/nagios/nagios-4.4.14.ebuild
index 917c4e712c90..917c4e712c90 100644
--- a/net-analyzer/nagios/nagios-4.4.13.ebuild
+++ b/net-analyzer/nagios/nagios-4.4.14.ebuild