From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 129B1138334 for ; Sun, 3 Mar 2019 00:53:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C0F7E08E0; Sun, 3 Mar 2019 00:53:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9FF2E08E0 for ; Sun, 3 Mar 2019 00:53:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA711335D05 for ; Sun, 3 Mar 2019 00:53:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB063542 for ; Sun, 3 Mar 2019 00:53:48 +0000 (UTC) From: "Louis Sautier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Louis Sautier" Message-ID: <1551574260.31cbd149b087f323dd75bd0c4db9fefae47a084b.sbraz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/monitoring-plugins/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild X-VCS-Directories: net-analyzer/monitoring-plugins/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: 31cbd149b087f323dd75bd0c4db9fefae47a084b X-VCS-Branch: master Date: Sun, 3 Mar 2019 00:53:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 89e9a26d-40f6-4ca0-b73b-76d0205c15fe X-Archives-Hash: 75c63e87be4aa817a16d7e224b345f50 commit: 31cbd149b087f323dd75bd0c4db9fefae47a084b Author: Louis Sautier gentoo org> AuthorDate: Wed Feb 27 11:21:43 2019 +0000 Commit: Louis Sautier gentoo org> CommitDate: Sun Mar 3 00:51:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31cbd149 net-analyzer/monitoring-plugins: make 'check_ping -4' call 'ping -4' Currently, when calling 'check_ping -4' on a host that has both A and AAAA records, the AAAA record is used. This is because the IPv4 ping command is set to 'ping' at configure-time, when it should be 'ping -4'. For consistency, this commit also changes the IPv6 ping command from 'ping6' to 'ping -6'. The upstream issue is https://github.com/monitoring-plugins/monitoring-plugins/issues/898. Changing the ping command at configure-time was proposed in https://github.com/monitoring-plugins/monitoring-plugins/pull/1531. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Louis Sautier gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/11169 .../monitoring-plugins-2.2-r4.ebuild | 104 +++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild new file mode 100644 index 00000000000..ae1073c7cae --- /dev/null +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2019 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 -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 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" +}