gentoo (valentine's day) resync : 14.02.2021

3 files changed, 19 insertions, 120 deletions

diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest
index 9d4834e07ed3..8221747d0aa1 100644
--- a/net-analyzer/monitoring-plugins/Manifest
+++ b/net-analyzer/monitoring-plugins/Manifest
@@ -1,6 +1,6 @@
 AUX define-own-mysql-port-constant.patch 3296 BLAKE2B 7a7c88c6f2c71bc1fc2f802ad202c2d2dbf3ede5af55dbe46cc15a064d37178b27670e30aa7bea07147456ce4d3e1ce9f495fa6df9deb4095367a7427e217719 SHA512 3ead6340800ac15fbe76e223599a5b3dbc6b6b13b72b684919aa43487838564ad7117b4e67fa7f36f0f58554fd8b8d6233efbcb82e6927a0c31f22c6a9ab5dbb
 DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27
-EBUILD monitoring-plugins-2.2-r2.ebuild 3009 BLAKE2B 69a9d48f0d952aa06493cfd5e0bfe86e7d66f12a4211d0809fad6cd462a2fff617c8e9836ffe5af7d9d2c0072ab8d2f107f52e3fedf220fafa0a538649bbc27e SHA512 18f697f1b1737993dbe856a4ae761d133392693e38d5b39daf711988165c394af4365af2ca7e65e7aad23a45a93ff7d2edd465eda3ef35b5ff69eb3de8042e52
-EBUILD monitoring-plugins-2.2-r3.ebuild 3021 BLAKE2B ea60af62f811f8d15b982cdc9ec80994b6321a530f99081f26d60fad1636b9ac62b2258c4c5aab9aa4dcb5787bc29d22761f2fbef55edcd78a27fa916916367d SHA512 747e16b184b92b5fe3e00e8937c09d07a6eafc584d1234b453bfcf2c0c40e1158647b348e3209db6bf536bfe50ad7913fe2258f300d901573b77135a5afa2dbb
+DIST monitoring-plugins-2.3.tar.gz 2528556 BLAKE2B d8c8886aea900a172e5693de766edb6b7ef7aac5ee94fec1f5c14cb0e9873623b14a965cc8852abb4ed44934d5111a86e130e7c37201a03de42bc996797302de SHA512 926065667dff6c608ae5b7da39f6416bfc2443b9e1cdef68cd5d19be99da1b6fc6f23ef87b05731312b5d7ad76d01f0242fc9e544dbb4dd00dbafa0e27434d2e
 EBUILD monitoring-plugins-2.2-r4.ebuild 3026 BLAKE2B 5dcedf383de5985195d90e1d01194dd3414bc05f54b98a058d45bee42dfbcb3238b66d079d968e3912ef203a636182b11ff21c5328fd80359d56ccac965908ce SHA512 664b07c16bc3aae7b76202b4e446633c0df1832306bc315fffcad2f830a7b001a6829d9457b9d9cccf3230e9f49921229f4167b6ae3a407e23052468d4b2445f
+EBUILD monitoring-plugins-2.3.ebuild 3114 BLAKE2B 5d883fe08214a0bc3b41287b9c78f362d2e82c0938c9aff4c468e7eb78b237ee99b0bacd9ff99433c823bc7e964015984a0520267bc43c175715aa5d7583a26f SHA512 be04871537b6ded83dec3deae1dbd21381debdcdc35f9112ca25d9d58201a1443b8cbbce3851fd134d4c01e8347cd0f33a0fc76692724e0e546cf57c7981cb89
 MISC metadata.xml 1404 BLAKE2B 68d3a914681db790872872cee7114b053aaa118b9eacbf33b02db932d3b970a80b0fc1d79d9e3f836f7d0f8870066bdf78b6b688864cac753d5ddf42a7ad9f9c SHA512 766657a0c9a0d16fa9fc0c052342b65c1f5b32dbbc0eb4e8fb014274b92dd0370dc19a6821ceed3979a1def5f429e1e3f23ccbf2ca443f787a50e00b503acf42
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
deleted file mode 100644
index cf357d910b21..000000000000
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib user
-
-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="gnutls ipv6 ldap libressl 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
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-		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}
-	!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 -n -U -w %d -c %d %s" )
-
-	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/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"
-}
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
-		NEWS README REQUIREMENTS SUPPORT THANKS )
-
-pkg_preinst() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home 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 ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
-}
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
index 3670a8df9283..b91919ddf889 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic multilib user
+inherit eutils flag-o-matic multilib
 
 DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu"
 HOMEPAGE="https://www.monitoring-plugins.org/"
@@ -11,8 +11,8 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
-IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="curl gnutls ipv6 ldap libressl 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
@@ -24,8 +24,12 @@ IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp
 # 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? ( virtual/mysql )
+	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
 	postgres? ( dev-db/postgresql:= )
 	ssl? (
 		!gnutls? (
@@ -47,6 +51,8 @@ DEPEND="${REAL_DEPEND}
 
 # Basically everything collides with nagios-plugins.
 RDEPEND="${DEPEND}
+	acct-group/nagios
+	acct-user/nagios
 	!net-analyzer/nagios-plugins"
 
 # At least one test is interactive.
@@ -70,13 +76,15 @@ src_configure() {
 
 	# 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 -n -U -w %d -c %d %s" )
+	myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" )
 
 	if use ipv6; then
-		myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" )
+		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) \
@@ -90,15 +98,10 @@ src_configure() {
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
 		NEWS README REQUIREMENTS SUPPORT THANKS )
 
-pkg_preinst() {
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home 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 ${EROOT%/}/usr/$(get_libdir)/nagios/plugins"
+	elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins"
 }