Revbump to fix bug #468296 and bug #481926.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x6F48D3DA05C2DADB!

3 files changed, 119 insertions, 16 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index c838509060b8..28c03749bc81 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.168 2014/11/22 21:19:19 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.169 2014/11/26 02:04:33 mjo Exp $
+
+*nagios-plugins-2.0.3-r1 (26 Nov 2014)
+
+  26 Nov 2014; Michael Orlitzky <mjo@gentoo.org>
+  +nagios-plugins-2.0.3-r1.ebuild:
+  Revbump to fix bug #468296 and bug #481926.
 
 *nagios-plugins-2.0.3 (22 Nov 2014)
 
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 9f2d9fa1a112..94db694c50cb 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -6,25 +6,26 @@ DIST nagios-plugins-1.4.16.tar.gz 2087089 SHA256 b0caf07e0084e9b7f10fdd71cbd3eba
 DIST nagios-plugins-2.0.3.tar.gz 2659772 SHA256 8f0021442dce0138f0285ca22960b870662e28ae8973d49d439463588aada04a SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 WHIRLPOOL 4b0e4024833373df3f0db44657345a1f4495c4022e56bf6b369cc2846f9127e565520f6b7cdf1b94384592e78327d584da7d939a3ac0586e0ae67fd1258c138b
 EBUILD nagios-plugins-1.4.16-r2.ebuild 3937 SHA256 f9005b55437d97d9d7061c1d9647cc79074fc9125a9fe734570a728eb4d42de7 SHA512 88f1ce60d271c18c9bfdcae50b881cbf07d92263b4254058536a45080d186819f9b4b8508a8f5314d384f7061ba6b27e31c023316d29203f9c22822e1ac3bdc2 WHIRLPOOL 075536701968d745948af7c9f6d100add7b6827f7a35845dc121b4f87fd20ba92c6f208f63a9a885253469c6e37a98bbb675665e830c0c3b99f3b0f309a58625
 EBUILD nagios-plugins-1.4.16-r3.ebuild 3944 SHA256 d97626b747e82da3ce45eae1debe19161ae80ba61b847a5f79a29eb051b721ff SHA512 1b150bb851e92c32f266db346266a9a73c966e960d8202e183b01521de1ee1edd9c7afae24c6f5c44a27b9f004b5c068eafcd669f8370698b855a042c1190792 WHIRLPOOL 0ccb1550c3204fddf2b88f20d06235dc2ceb3d2588ae39c24ec1d3589a5a4aa2dcf59a5056fc0d3e9f9a33b3465c27410cf0b73a684ebd430ee6bd15b653e1b9
+EBUILD nagios-plugins-2.0.3-r1.ebuild 2911 SHA256 98df0326b022cf4f2ff275c05fc9229408f13b2410f39ed0804411aa7377fb6b SHA512 83f1e775eabda617daa13e7d8d31f32bdc493501a23cb258b775476f5948a1d92aa0b449c75e466ddc44e7b4e6b25ddee97c60d7da89ae2e43839d346ac568bf WHIRLPOOL 49fcc596c006f238f9178d9d0e9ce120b34deb48b5e35309c5ba0a5dbc649c806648c94653288af23641a1ab3cc245d4e92709dda2f6dffd1a15050f78209aa6
 EBUILD nagios-plugins-2.0.3.ebuild 2051 SHA256 30caeaaad86b7d10d69dbe21a238981c462eec234baca4dbc28133d4fabe8f78 SHA512 30ad2d6e1c3d3332d8acc1950407856f3721bb837160b169c968941a533c04edf68823fc4f3d6bd6412a8251e1ec87fe80c48a254a371e791cca0eb24828b27f WHIRLPOOL 912a0b38a98455649ebbd685bd53c1db26a7f4134626d33fb45cf47a0c179e757fe630c78220f855446c96545cf9a580c1a6ecd285c14f32f7ea75f9a5474ca2
-MISC ChangeLog 14035 SHA256 cdeccd71bf8137a57def4a590e6e266bded977c3681bbe36b329bf955a2fd5b4 SHA512 decad2eaad6130c056e23e3c95803ccc689ae80286424093e871b13429962c1dcea40f00ed066bfd54abe38f6b8e56884a45b920e7abff961acb1c4da869140f WHIRLPOOL 353b4f405b16757cdd2bd0a81df375b090da8aa9aff53c2112f87daca6e58fca1c7a7f96a33c3439eb16098f6bcd46b2977f2c72c9626492b4f0b13486f4b848
+MISC ChangeLog 14206 SHA256 37a90a589a180ac342afe38affaae3a7142213024a4f19c8003792b0c511d462 SHA512 37ff3bb66675ed8b56801a6351a48d0cad63a950cc255d03a3febee16c60000c43e9aa148e523a79cb44b0291f0125d6b623795de9ea4e91b3fa839df1d0ee98 WHIRLPOOL 309e8b20a2aec6515e36d1cd09f637a3bdc5c7a85b6178449c6340969c200bb16dd93739ef5db8fa850e12e8100c9cf80b665c01a8e2ebb2e51e3667abc0a33f
 MISC metadata.xml 2897 SHA256 685531987bdd9a0cc9d9248550a76428ef316d0316dd8cdfd1788e0bafb2d8ca SHA512 46fffe3335f5a6fcae546337f39d2821b13e5dab260923762daf7f93bf6fd0e2a5d7589877228925b726a8c44365037dfd6ef0b1a165f0be9e607de68cbad383 WHIRLPOOL d6e299583d056d8c905560d5da06134c44a1762a28c167f858f53e2e0489d1fbecae14f5802e7e5f216b6a2cc668b6f849ebb99b7b2daf41f7d589ff76f376cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUcP3cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUdTU2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
-RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbdCgQAINyxea1HvIT+/LWmoeilIAr
-PT38Sxi6Q9T4oNZgOUkrU/u1xwMvUomjbu4Z2ltfTUrkeUT4N9xoXQkzzgAZOoX3
-afxbw5EG2tHlnVpUgoov2sY/H/F/ZGRsZzzdCt4vkuac5vOEHaUAtEKoHpltZ0qI
-IpuUEblyn42bVoLXjaMMuDTK6Iov9Ui8kCyiwgK9Rb1VTfiYnaspUP8ZeOgnflUx
-yjrasq+RvWNuqBj05Ei42NIQvDTDELWbO3TCwp7yf7UebnDnl2a6WJAiaDEl+Ikt
-vjey1Ig/Qt6ai6y5niqrKTQ5zE8AQ6gYIVAFgro7GW3ubR2PHXYGxJdzkYtxTVe0
-57nZf26abwl66yNFFapaec8tCN3sMH+AhAzN14byaYv4NBdMc2oLfMspLjjIKO0Y
-rL/3WnXzn0x8zQtcbZb8iiPmpf2rh2tUx/33bzbgk0P4lV4cYqn40h+HKr4JQVHk
-cSe5L4GOmh54a8JPv8tpIXrHxEs1iOV3rV+ta8CtQz6bUBG5k7B2gJcbrtzK+RuR
-DU+r9rDby7/cPE6z5SD5GZCThzZub/zbHgDsd0tOcIQNLwuJOyKLNfbQPBwOGQCX
-7USXxSL0drSv4AodQ/tgAESGrDhXq7Lq2Bq43GWnOsG70Sj7NltfC6K7m9nr7mmp
-MHz6+EF3Ir5rjHYk4Jkb
-=vI8U
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbp3sP/0c72Gmq31AoIIfm2s1DVRF9
+3ebBgtLvEHKgT0Etj6YF5F7pNXev3g50ePdXqerkQ0t0UFR+Z1OknfECs2vq2gwU
+sDsqzSIoWaV7+CtkhfM/vIwAdHpJsxiZVSDmBqIV8Ilp0VTVobetn+LgnRYvj+CS
+EO3Dql76/3My88Fa1bFD0oDDPHw75CKOQjea+BC6CDQY0+zqZVMxFQ3x5arIj/Ez
+7/ZrS8C5w0QJlyUtf1ESrK3W5SL0iCfB5gJT0xZOAVeSIQ5+XSSIVrlm9HO/gEPL
+ofOdwYprn2CYy4LxUxr4qDKXEgjxQGZbENAjgYVYgVSqjaGss32jO/ZK9YGD0eM+
+a17zcfbchWp2zm7+9zEmQMeR6X07HKjYZ8LUqwuPCXDiFdK+1VTIIVEpBKWWEN1X
++e/l+tbCpMfRX+tpQ3PHHuHUb7TzvsKg3jIEBz0gvbxkx9S4DauP4YyRYg1mfjHj
+xj6X7KV/+6/eawGsYHFBWsm73sfS0qOIrDsjqW4Hh0fuCvNGnYWLZspO3Jzm1L1Y
+qsWMnLdD+SOmFf7RK/qGHmfREicUefal97KcR8RdCefWuRx0UpdQrUDtxik1G+8e
+drxNR7NivaleYZ//h+tQPuDOnTtUlGjK/vOTVqjCkMpo2Hr+Ib0TuP5PxfsAat/O
+OZeXGWfEt5zN5Y9FyUWn
+=geRY
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..31a3db4b62d9
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r1.ebuild,v 1.1 2014/11/26 02:04:33 mjo Exp $
+
+EAPI=5
+
+inherit eutils multilib user
+
+DESCRIPTION="Official set of 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 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-base )
+	ssl? ( dev-libs/openssl )"
+
+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] )"
+
+RDEPEND="${DEPEND}"
+
+# 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:${ROOT}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="${ROOT}bin/ping -n -U -w %d -c %d %s" )
+
+	if use ipv6; then
+		myconf+=( --with-ping6-command="${ROOT}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="${ROOT}usr/$(get_libdir)/nagios/plugins" \
+		--sysconfdir="${ROOT}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 Nagios"
+	elog "is 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"
+}