Revbump, fix pluginpath for contrib/ plugins. #259468

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 146 insertions, 2 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index b9cd1ae191d8..032952521286 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.108 2009/02/06 04:15:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.109 2009/02/18 18:35:06 dertobi123 Exp $
+
+*nagios-plugins-1.4.13-r2 (18 Feb 2009)
+
+  18 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  +nagios-plugins-1.4.13-r2.ebuild:
+  Revbump, fix pluginpath for contrib/ plugins. #259468
 
   06 Feb 2009; Jeroen Roovers <jer@gentoo.org>
   nagios-plugins-1.4.13-r1.ebuild:
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index df0c1b11908b..9f4198f5dc34 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -13,6 +13,7 @@ EBUILD nagios-plugins-1.4.11.ebuild 3640 RMD160 11a70d7a45d583a3e7b39097bc08cb63
 EBUILD nagios-plugins-1.4.12-r101.ebuild 3781 RMD160 5a1dfd1b94ec06036af3abc45ad49c4004059468 SHA1 42c879dff93a503dd1c2edc9bed9c650055083f5 SHA256 8bb2e176527d577d3e28ffe9ae70509fcd038560fe15ae6fcf5c33ecb1a44635
 EBUILD nagios-plugins-1.4.12.ebuild 3650 RMD160 907380ea8b98ed870808a0673df53f8d1d395476 SHA1 1de8a69f532dc5e9bb740bfa253b5b6a726b56d3 SHA256 13322e3edd69ab93fdd802fbe380a3ba278edd10bdf81f84cde639b7126ffc58
 EBUILD nagios-plugins-1.4.13-r1.ebuild 4096 RMD160 90c823e2d21ccaa3da177acacf04043437bd29f8 SHA1 441f920aa6989e1399da80018a0c7633e50cd5c1 SHA256 2924e570852cbc1ec157da00734a200bb38456f7033ad2c4e8198d36715fb25e
+EBUILD nagios-plugins-1.4.13-r2.ebuild 4215 RMD160 7c0f085d510d633d487a9f93f9a408620ab5f756 SHA1 c8b2efda890d9bb10bc30cb236e2a9defb5389bb SHA256 c934d9c36188252f2a5471dc1fea1e0fc2c34ca4fea76db376847ec9964fc88b
 EBUILD nagios-plugins-1.4.13.ebuild 3740 RMD160 d2000e9fec552e81f0b55a0f1261d6c4022e9c02 SHA1 d0c1e7da27d3336c11539a42eac2f44de6f74121 SHA256 04769c24d9261012679d7a4d8b625b82074b87dc7aa093f98c350e85c212581a
-MISC ChangeLog 3964 RMD160 d110e14c43e59efc4ecc33d3d6af6e4d72b10ee8 SHA1 c95828867727fe73164336b7f5dc5117356b508e SHA256 836970c1af764cf9fca9aa6b8313d0e698ed0357c1dc8148062a4e566918344c
+MISC ChangeLog 4161 RMD160 f37f3b519ef899a02a424aae916900900d37f02a SHA1 804e3764f0d858dd1fddf8ebda9bb981bb3c068b SHA256 bc48ca58fc46083b77fa55508ad9eab55f1c6473ad90ccacd24a97008db194b8
 MISC metadata.xml 846 RMD160 c586646ae8e50e5530570a9e7dbdc3bfef074d89 SHA1 4a58e0ba3dde6f44a5227c0c232a0f2d2f06ed1d SHA256 ca1e7a175629f4ce6866ca6408744e222216e12c4ce37c6075bf2ded87916ff7
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r2.ebuild
new file mode 100644
index 000000000000..9e5491a76a40
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r2.ebuild,v 1.1 2009/02/18 18:35:07 dertobi123 Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools
+
+DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
+nagios-ssh nagios-game ups ipv6 radius"
+
+DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( virtual/mysql )
+	postgres? ( >=virtual/postgresql-base-7.2 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	radius? ( >=net-dialup/radiusclient-0.3.2 )"
+
+RESTRICT="test"
+
+RDEPEND="${DEPEND}
+	>=dev-lang/perl-5.6.1-r7
+	samba? ( >=net-fs/samba-2.2.5-r1 )
+	snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1
+			>=net-analyzer/net-snmp-5.0.6
+			)
+	mysql? ( dev-perl/DBI
+			 dev-perl/DBD-mysql )
+	nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 )
+	nagios-ntp? ( >=net-misc/ntp-4.1.1a )
+	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
+	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )
+	ups? ( >=sys-power/nut-1.4 )
+	!sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )"
+
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if ! use radius; then
+		EPATCH_OPTS="-p1 -d ${S}" epatch \
+		"${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch
+	fi
+
+	epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
+	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
+
+	eautoreconf
+}
+
+src_compile() {
+
+	local conf
+	if use ssl; then
+		conf="${conf} --with-openssl=/usr"
+	else
+		conf="${conf} --without-openssl"
+	fi
+
+	if use postgres; then
+		conf="${conf} --with-pgsql=/usr"
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with ipv6) \
+		${conf} \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
+		--sysconfdir=/etc/nagios || die "econf failed"
+
+	# fix problem with additional -
+	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg
+	chmod +x "${S}"/contrib/*.pl
+
+	sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed"
+	sed -i -e s#/usr/nagios/libexec#/usr/$(get_libdir)/nagios/plugins#g "${S}"/contrib/*.pl || die "sed failed"
+	sed -i -e '30s/use lib utils.pm;/use utils;/' \
+		"${S}"/plugins-scripts/check_file_age.pl || die "sed failed"
+
+	dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \
+		ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if use mysql || use postgres; then
+		dodir /usr/$(get_libdir)/nagios/plugins
+		exeinto /usr/$(get_libdir)/nagios/plugins
+		doexe "${S}"/contrib/check_nagios_db.pl
+	fi
+
+	if ! use snmp; then
+		rm "${D}"/usr/$(get_libdir)/nagios/plugins/check_if{operstatus,status} \
+			|| die "Failed to remove SNMP check plugins"
+	fi
+
+	mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib
+
+	chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \
+		|| die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins"
+
+	chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \
+		|| die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins"
+
+	chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/check_icmp \
+		|| die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins/check_icmp"
+
+	dosym /usr/$(get_libdir)/nagios/plugins/utils.sh /usr/$(get_libdir)/nagios/plugins/contrib/utils.sh
+	dosym /usr/$(get_libdir)/nagios/plugins/utils.pm /usr/$(get_libdir)/nagios/plugins/contrib/utils.pm
+}
+
+pkg_postinst() {
+	einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor."
+	einfo "Depending on what you want to monitor with nagios, some or all of these USE"
+	einfo "flags need to be set for nagios to function correctly."
+	echo
+	einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib"
+}