6 files changed, 5 insertions, 159 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 79a725ef0b4a..064c42f65c70 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index c8680e47d39a..2606a7bb7e35 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,7 +1,3 @@
-AUX monitoring-plugins-fix-check-http-segfault.patch 870 BLAKE2B 23e0d356fbb2ac071b488c49d846827292ad9fc6a2f7d5b1c1390d84db777e787d2f4d09f40ff297bab7da72c6b6b287ebfb01ca313923cca6d2bd44cad77f50 SHA512 c13325116a125f0af6299ec2d8f2ba109cc14fe5d315d944b3a3a7e8a5af731d40d84d57c9e1e29c9c9bb07212e67e943bcefb4706cd0b9c6bc0e9ec6760c2d2
-AUX monitoring-plugins-gnutls.patch 782 BLAKE2B 52f3ad417fbbf9b6fd021a42dfa2b547fcdf5f6709701732029c4bcca00793d83be9bc56f95100ded0cfe6ddaa026972b7ebd1451a7ce9a756d1cf27f595a1a7 SHA512 bc52716ad032215ce8dcd2b59b18b84eddede536280fdfd263ea7c0bb7be93f57a8efd5fcaedf6b803b435325fba8f3197ba2b17f0dd037c3beecbcaeb5cce75
-DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246 SHA512 502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f
 DIST monitoring-plugins-2.3.5.tar.gz 2876130 BLAKE2B 7029f6485ef73d29329bcb36e16cbbaa99c57ae20505f554af154b45cc1af6f623dabb35ee5b7f777d728bcae8eafd795f12aabc199cf1f45c9f2335f74b6d41 SHA512 bb04d547584a4aed82bfd605d129b652b45c7356c0610fb1da53a57b2ab889b67afccdd53998e2612ec06571bdc5fc238ef0d378b96e29ec072f657e74eabd55
-EBUILD monitoring-plugins-2.3.3-r2.ebuild 3169 BLAKE2B 7e6ddc621b94b560b18cdd33c4acabf234b534aa07ad6d239f38b95daa4c4f0f3582630cbda51fd2887492357eb8233dbcc34136e7b9a8fd1640f894c99876c8 SHA512 e17f1cf4619cc3cda54d7024dabc6cd6cb01028504489908110806fc449548297846441a0444b74d12693db182d125dd4e6016522ec9d858a005d0e194623373
 EBUILD monitoring-plugins-2.3.5.ebuild 3053 BLAKE2B fb5abb2f871578946e90eda375c9821c6dab7f87f650bfe8ee11f104c8715babe3ab04520feaa23819598fc227cb68497d027fdca12dbce333db32d87b3ffd65 SHA512 8626668a6504427a7958f3c3775660e1a5f4d7cb0ee7102a3287211ecf9c40132c999682c2b106fb192133a6fead16af19722857b703eda4cec71f1140541084
-MISC metadata.xml 1541 BLAKE2B 979f2ab54aa6fd684023c25a2725f45ce1c3edfcc98f7b79e0bee72937f0c385c71c8f8a2caaa60231bdf26c4649ded397eeafb046a46fdcda5247ca030724be SHA512 a8d68c666fa3e9e181ab3d7f469395b19e26b47145fdf96f1135c3eb5001404f66a8c046a236d25238e4e31adb6269c1da7020b5b92262d3a7cb4f6f8a0f49d9
+MISC metadata.xml 1679 BLAKE2B e99ba6614df951268458260a1b8f02f40408dd2e41b65e77555fe1d1698bf4d5fbb8a35b5d640198c1feb74bdeb78c3efb9c2670c3d87bbadef16be66602d172 SHA512 1b24d36802f5efa30d4c289bbc231761d9a3a1149831ae913eea998d49782c9424e37d270ff2853a91a9d75d65e2991910aab986f7dc78e3a8132ca17be56d8a
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
deleted file mode 100644
index 34e539f51e2d..000000000000
--- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/893252
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1836
-https://github.com/monitoring-plugins/monitoring-plugins/commit/6d3e44d2d8395076060e9c741e9b173dc5d57b76
-
-diff --git a/plugins/check_http.c b/plugins/check_http.c
-index 5fa310f5d..8dda046ff 100644
---- a/plugins/check_http.c
-+++ b/plugins/check_http.c
-@@ -1462,7 +1462,13 @@ char *unchunk_content(const char *content) {
-     memcpy(result + (overall_size - size_of_chunk), start_of_chunk, size_of_chunk);
-   }
- 
--  result[overall_size] = '\0';
-+  if (overall_size == 0 && result == NULL) {
-+    // We might just have received the end chunk without previous content, so result is never allocated
-+    result = calloc(1, sizeof(char));
-+    // No error handling here, we can only return NULL anyway
-+  } else {
-+    result[overall_size] = '\0';
-+  }
-   return result;
- }
- 
diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
deleted file mode 100644
index 00415f0b7111..000000000000
--- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/880211
-https://github.com/monitoring-plugins/monitoring-plugins/issues/1834
-https://github.com/monitoring-plugins/monitoring-plugins/commit/31bdbfce92de2dc7717fe13a8d1ca8e7dbf850d4
-
-diff --git a/plugins/sslutils.c b/plugins/sslutils.c
-index 286273f6..c26c4fb3 100644
---- a/plugins/sslutils.c
-+++ b/plugins/sslutils.c
-@@ -134,7 +134,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
- 		return STATE_CRITICAL;
- 	}
- 	if (cert && privkey) {
-+#ifdef USE_GNUTLS
-+		SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM);
-+#endif
-+#ifdef USE_OPENSSL
- 		SSL_CTX_use_certificate_chain_file(c, cert);
-+#endif
- 		SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM);
- #ifdef USE_OPENSSL
- 		if (!SSL_CTX_check_private_key(c)) {
diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
index 37237fb7544c..b8ca2be8aea7 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -26,6 +26,10 @@
       Install <pkg>net-analyzer/fping</pkg> required for fancy ping
       monitoring. Disabling the flag does not remove any plugins.
     </flag>
+    <!-- leave this global flag defined here to avoid a pkgcheck warning -->
+    <flag name="ipv6">
+      Enable ipv6 checks.
+    </flag>
     <flag name="ssh">
       Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
       servers. Disabling the flag does not remove any plugins.
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild
deleted file mode 100644
index e364f28aa4cc..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic
-
-DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
-HOMEPAGE="https://www.monitoring-plugins.org/"
-SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc x86"
-IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba 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.
-#
-# REAL_DEPEND contains the dependencies that are actually needed to
-# build. DEPEND contains those plus the automagic dependencies.
-#
-REAL_DEPEND="dev-lang/perl
-	curl? (
-		dev-libs/uriparser
-		net-misc/curl
-	)
-	ldap? ( net-nds/openldap:= )
-	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-		gnutls? ( net-libs/gnutls )
-	)
-	radius? ( net-dialup/freeradius-client )"
-
-DEPEND="${REAL_DEPEND}
-	dns? ( net-dns/bind-tools )
-	game? ( games-util/qstat )
-	fping? ( net-analyzer/fping )
-	samba? ( net-fs/samba )
-	ssh? ( virtual/openssh )
-	snmp? ( dev-perl/Net-SNMP
-			net-analyzer/net-snmp[-minimal] )"
-
-# Basically everything collides with nagios-plugins.
-RDEPEND="${DEPEND}
-	acct-group/nagios
-	acct-user/nagios
-	!net-analyzer/nagios-plugins"
-
-# At least one test is interactive.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gnutls.patch" #880211
-	"${FILESDIR}/${PN}-fix-check-http-segfault.patch" #893252
-)
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# Use an array to prevent econf from mangling the ping args.
-	local myconf=()
-
-	if use ssl; then
-		myconf+=( $(use_with !gnutls openssl /usr)
-				  $(use_with gnutls gnutls /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 #883729).
-	myconf+=( --with-ping-command="$(command -v ping) -4 -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" )
-	fi
-
-	econf \
-		$(use_with curl libcurl) \
-		$(use_with curl uriparser) \
-		$(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"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-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 ${EROOT}/usr/$(get_libdir)/nagios/plugins"
-}