net-analyzer/nagios-plugins: new version 2.1.2.

This new version has an upstream workaround that should cause a
runtime error rather than a build failure if you build against
LibreSSL and then try to use SSLv3.

Gentoo-Bug: 587696

Package-Manager: portage-2.2.28
This commit is contained in:
Michael Orlitzky
2016-08-06 20:39:04 -04:00
parent ac28332d1c
commit a9a1f1e246
3 changed files with 21 additions and 107 deletions

View File

@@ -1,2 +1,2 @@
DIST nagios-plugins-2.0.3.tar.gz 2659772 SHA256 8f0021442dce0138f0285ca22960b870662e28ae8973d49d439463588aada04a SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 WHIRLPOOL 4b0e4024833373df3f0db44657345a1f4495c4022e56bf6b369cc2846f9127e565520f6b7cdf1b94384592e78327d584da7d939a3ac0586e0ae67fd1258c138b
DIST nagios-plugins-2.1.1.tar.gz 2677352 SHA256 c7daf95ecbf6909724258e55a319057b78dcca23b2a6cc0a640b90c90d4feae3 SHA512 6ef872a6aca50f4b575cae8b484766103bbeace7118090c81df3e62f9a30f9a156bb2bed4dbfa3e483e22a6b7505816e668b56bf3c91fcef8eafa9038c93dd26 WHIRLPOOL 80db3155ef0d31301822ac62fbc68a64f0ab79c7836b7592aab04a6e689fd96965ab45b58a5da7d687b58ce411c38d374b07e1ec82f23bad9b3981aae9dfe6e9
DIST nagios-plugins-2.1.2.tar.gz 2695301 SHA256 f2ed5d07b1823341f9db56b187ae5c0ee9018b6c69a152b6a240c5e14cd94ea4 SHA512 b7474ebf6ca4de67bb0383ba501deef6cdffde5d0f64a0c805394b52d96ab22051318ee272c682b4de665394b87978efc0f29692aa4d71d9af5dc927891c5755 WHIRLPOOL 316277197acc8b7c6d3a4cfcb019af273b1af45f0d8c9787f7a3f2d964c2641abd006f3fc61da1c8433387eabc72fc1a5fbb484f4d0fb6481f6488ca469dab46

View File

@@ -1,99 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils multilib user
DESCRIPTION="Official plugins for Nagios"
HOMEPAGE="http://nagios-plugins.org/"
SRC_URI="http://nagios-plugins.org/download/${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 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.
#
# 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? ( virtual/mysql )
postgres? ( dev-db/postgresql:* )
ssl? ( dev-libs/openssl:0 )"
DEPEND="${REAL_DEPEND}
nagios-dns? ( net-dns/bind-tools )
nagios-game? ( games-util/qstat )
nagios-ping? ( 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/monitoring-plugins
selinux? ( sec-policy/selinux-nagios )"
# At least one test is interactive.
RESTRICT="test"
src_prepare() {
# Fix the path to our perl interpreter
sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
"${S}"/plugins-scripts/*.pl || die
}
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.
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) \
"${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 ${ROOT}usr/$(get_libdir)/nagios/plugins"
}

View File

@@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EAPI=6
inherit eutils multilib user
inherit user
DESCRIPTION="Official plugins for Nagios"
HOMEPAGE="http://nagios-plugins.org/"
@@ -50,10 +50,26 @@ RDEPEND="${DEPEND}
# 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
"${S}"/plugins-scripts/*.pl \
|| die 'failed to fix perl interpreter path'
}
src_configure() {
@@ -85,9 +101,6 @@ src_configure() {
--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