gentoo auto-resync : 01:12:2022 - 20:53:45

4 files changed, 10 insertions, 115 deletions

diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 17cc6818b8cd..321d7e0d2e1c 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -2,7 +2,6 @@ AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad2
 AUX monitoring-plugins-fix-check-disk-on-btrfs.patch 913 BLAKE2B 7fb50e4b83a64da3ebfbe94eafcb03ffc39b6ec1440112c7c1e98c9dfb020466dddecee074cf61fbcdacecae58982456bab99d6e1d771148bb6f111ec9db0900 SHA512 8e4ab9eb474413b22a6893bbcab01edd655bf354c263cfba339c37b2c14093ab22aac05d732576266fa3e98880b29473cf5ff29494c54e954215f58a5768409e
 DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7
 DIST monitoring-plugins-2.3.2.tar.gz 2766966 BLAKE2B 1a9c35e8df22d5666005b4b79f5a7ee878c0d4be1e98039f341b198a658747010e8c9d1c0a1818d67a402e5c302ec5eb5073628d52c29caf41dbc2ce57c18f6c SHA512 d155f09ddd99f4e0d065627d3bf8768e13ae3f58ed25912f33b070cd24d6f3f43243616ec3e2d496dec633feee6b1f14950035a928034a1413f725814e850765
-EBUILD monitoring-plugins-2.3.1-r2.ebuild 3036 BLAKE2B 7428b5713ceb286428f3b680393c9d1a223cf7e5d096433040a2efe0c8e0cc4cd50041f6fe70bcd8c9c2df02497a6a1b70da0a7b1310dc53efd11ec67389ac42 SHA512 cf86c9664d7dc43923441176aa3cf1e960137c94c9b83374c0fa32d04aa9f1460face47f3f4621a544e5a0cfe285fc412e86fdd6d39c004b4bb3afd798687953
-EBUILD monitoring-plugins-2.3.1-r3.ebuild 3046 BLAKE2B b3ae12e1527c6e02491dcdaeff811b727cc9ac083dca737e8acf03cacad56450402627e2407e1f616a410fd32f88c5545ba3d81e4819ede55e42e5361ad4a7fd SHA512 27938ca4a072e93c33de7544f840baeb45042c5d7ecd650c7eea5452ab4da4ec13f710bb55acb194ef93340a62a6a2307cff69c679bd473c08b3f3586e35c4e1
-EBUILD monitoring-plugins-2.3.2.ebuild 2977 BLAKE2B d075be742695b4e37361c8268f33742162a90c0e227a6c15681e8eb49a087362555bca64fd76bf5d2ca1956995b85b3ffac6e8a033dc3b0e8bc8f8050b40f370 SHA512 1110e2a98caa018f6ea0ca75e767e42c6ffa4582d672b7a6bd566450c92d4139a9b546745b960bff5a1ff27b010a715e6e67dbd5590e84d2d8e5768a71970966
+EBUILD monitoring-plugins-2.3.1-r4.ebuild 3128 BLAKE2B e98bc4bfd457e4d634560bf72b2edee08b47ed1b909bc691ade912ec5671da16f098d30ac62b1acb7512629f4da154836a9d01a7fca742f87b71f6cb8e0676e0 SHA512 f94963c668a11d67be9ab488ad39382d614bc0e246704fea51ca18bc3ec1dcf77c87fe36a3d3ab07b2d841fa7cbdb94db90d3bbca030458130b2087304e6c20f
+EBUILD monitoring-plugins-2.3.2-r1.ebuild 3059 BLAKE2B 2e8012fd6e9d24ec0ab8ad865b0c2c2c6cc4a836da5659f31187a710a03c2dbf01a82b430306e3aeb093a21250728c5220b756db391d2f9f2d6b06a24c1d855e SHA512 53821ecb5bc782684a6b6b8d85cd40393dfb2871fb60bacb199606e8bfb01108f28652c49bb147c43d09ebbd4f768b26d35e32cd84ebf1f17ac08afbebceffb6
 MISC metadata.xml 1435 BLAKE2B 19cf3223867cee4899e5bdaf33948497c5cd66e94198b6a0c081ea440bf7ecfc7dcf4855b44a7ead5fc983756490f3a79059d51202be9d9f2eea24c6857eb165 SHA512 c781d735ced89fe81d49f400ada6916702ad2825c35c6bb589199902917df415a50335ce058eea45e6eb3fe66813ed2f4009cc6831e15d2b7369fcc12e8c0b26
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild
deleted file mode 100644
index 98c4b1592214..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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? ( net-misc/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}/define-own-mysql-port-constant.patch" )
-
-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.
-	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/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"
-}
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild
index 70689ddedd5c..bee2b77ec739 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild
@@ -76,11 +76,12 @@ src_configure() {
 	fi
 
 	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
+	# 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="/bin/ping -6 -n -U -w %d -c %d %s" )
+		myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" )
 	fi
 
 	econf \
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
index 68ba0969bbbc..27bd712c16c3 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild
@@ -72,11 +72,12 @@ src_configure() {
 	fi
 
 	# The autodetection for these two commands can hang if localhost is
-	# down or ICMP traffic is filtered. Bug #468296.
-	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
+	# 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="/bin/ping -6 -n -U -w %d -c %d %s" )
+		myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" )
 	fi
 
 	econf \