adding custom fixes to nagios-plugins

svn path=/; revision=84

6 files changed, 197 insertions, 6 deletions

diff --git a/dev-util/devkitarm-bin/Manifest b/dev-util/devkitarm-bin/Manifest
index f4484d4..8895861 100644
--- a/dev-util/devkitarm-bin/Manifest
+++ b/dev-util/devkitarm-bin/Manifest
@@ -1,8 +1,8 @@
 DIST devkitARM_r19b-linux.tar.bz2 12738122 RMD160 6253688d02350c2be86c54bee2b00490633ac2b2 SHA1 a027a67d5e83e7fa94274cf1588eddf85eee75b3 SHA256 d6616cec15d428e06ed5454703ce01130cba593fe678b89d6103183df760ac02
-EBUILD devkitarm-bin-19b.ebuild 729 RMD160 abb956a7c03fea3bf5f20068427df23bf7a85a48 SHA1 64bd44a554f1a65f6464c784e82065696a07eb15 SHA256 3a6754601d8cb4ab1ce0991075b121fdef10dec13f9fe410c89c10a38c60303d
-MD5 ebe1cf7f8283cb39844da191affe7504 devkitarm-bin-19b.ebuild 729
-RMD160 abb956a7c03fea3bf5f20068427df23bf7a85a48 devkitarm-bin-19b.ebuild 729
-SHA256 3a6754601d8cb4ab1ce0991075b121fdef10dec13f9fe410c89c10a38c60303d devkitarm-bin-19b.ebuild 729
+EBUILD devkitarm-bin-19b.ebuild 790 RMD160 b0bc13a24080ce3790385ba16552ded47e0dcbf5 SHA1 c0136e305b18db36627faa338930325d12ab1c4d SHA256 d05f9ca8c9cd620b576c31a2a807112a3f8cdfb42ee7204f06ec7700c9203024
+MD5 4e356dfabd5c3659aa8b8fe939c6ce00 devkitarm-bin-19b.ebuild 790
+RMD160 b0bc13a24080ce3790385ba16552ded47e0dcbf5 devkitarm-bin-19b.ebuild 790
+SHA256 d05f9ca8c9cd620b576c31a2a807112a3f8cdfb42ee7204f06ec7700c9203024 devkitarm-bin-19b.ebuild 790
 MD5 e7446efabb1c385a09737f80dc6a238c files/digest-devkitarm-bin-19b 271
 RMD160 9013238561362f257d6f6d7f2ffea1942063b5b6 files/digest-devkitarm-bin-19b 271
 SHA256 2a6455074975fe0203dd2f22a2dd141566dd77f00bc769beb6c10f48022261c1 files/digest-devkitarm-bin-19b 271
diff --git a/dev-util/devkitarm-bin/devkitarm-bin-19b.ebuild b/dev-util/devkitarm-bin/devkitarm-bin-19b.ebuild
index 798c671..3cd67cf 100644
--- a/dev-util/devkitarm-bin/devkitarm-bin-19b.ebuild
+++ b/dev-util/devkitarm-bin/devkitarm-bin-19b.ebuild
@@ -25,6 +25,7 @@ src_install() {
 	tar -cvf - . | tar -xvf - -C ${D}${INSTDIR}
 
 	dodir /etc/env.d
-	echo "DEVKITPRO=${INSTDIR}" > ${D}/etc/env.d/99devkitarm
-	echo "PATH=${INSTDIR}/bin" >> ${D}/etc/env.d/99devkitarm
+	echo "DEVKITPRO=${INSTDIR}"  > ${D}/etc/env.d/99devkitarm
+	echo "DEVKITARM=${INSTDIR}" >> ${D}/etc/env.d/99devkitarm
+	echo "PATH=${INSTDIR}/bin"  >> ${D}/etc/env.d/99devkitarm
  }
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
new file mode 100644
index 0000000..829cde3
--- /dev/null
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -0,0 +1,12 @@
+AUX nagios-plugins-1.4.3-check_disk-fix.patch 1407 RMD160 94974e74f702f9602649e7288c3db31dcba55ba2 SHA1 097d7b5e6a6ce0ac396200aa80cbb6d03816ff92 SHA256 526c58157a927cdaa634dd0d6f3ebcaded99020e4a3a9201259a66460b95e470
+MD5 677500c14fa4b3f9cfdf21ec6ba5c45f files/nagios-plugins-1.4.3-check_disk-fix.patch 1407
+RMD160 94974e74f702f9602649e7288c3db31dcba55ba2 files/nagios-plugins-1.4.3-check_disk-fix.patch 1407
+SHA256 526c58157a927cdaa634dd0d6f3ebcaded99020e4a3a9201259a66460b95e470 files/nagios-plugins-1.4.3-check_disk-fix.patch 1407
+DIST nagios-plugins-1.4.3.tar.gz 1257775 RMD160 bc1d4f8cddd481775c514758a462fe533e01e846 SHA1 c26fc2f31d7579c3a8174dcd1965046c4b1c8d37 SHA256 e1178d639bef1b45a7bddb61899217122840382ee180594f0262fb4a1e6a8c70
+EBUILD nagios-plugins-1.4.3-r2.ebuild 3850 RMD160 4ae623d6135a1eb135a575319056acaee9e1c515 SHA1 5447242b2af62f54b469dddf8a87eaa75121a885 SHA256 0910ff69429454c852274133e56a6c704432522575c7f9b2ac5c4409a81b5b01
+MD5 9ea52417261b17d36046db4e43dca5cc nagios-plugins-1.4.3-r2.ebuild 3850
+RMD160 4ae623d6135a1eb135a575319056acaee9e1c515 nagios-plugins-1.4.3-r2.ebuild 3850
+SHA256 0910ff69429454c852274133e56a6c704432522575c7f9b2ac5c4409a81b5b01 nagios-plugins-1.4.3-r2.ebuild 3850
+MD5 14609c0043bbaa5758ec7e0d8b493852 files/digest-nagios-plugins-1.4.3-r2 265
+RMD160 99dbce32bafd79a2ac02e52eb46ddcc1d4cdb278 files/digest-nagios-plugins-1.4.3-r2 265
+SHA256 af133333dcdd11e4751e725017e70417f8a3b6201a675abe7a471695f6030601 files/digest-nagios-plugins-1.4.3-r2 265
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.3-r2 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.3-r2
new file mode 100644
index 0000000..85576d7
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.3-r2
@@ -0,0 +1,3 @@
+MD5 2c40fc69d51cc979e85150870a1daa93 nagios-plugins-1.4.3.tar.gz 1257775
+RMD160 bc1d4f8cddd481775c514758a462fe533e01e846 nagios-plugins-1.4.3.tar.gz 1257775
+SHA256 e1178d639bef1b45a7bddb61899217122840382ee180594f0262fb4a1e6a8c70 nagios-plugins-1.4.3.tar.gz 1257775
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.3-check_disk-fix.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.3-check_disk-fix.patch
new file mode 100644
index 0000000..9bdc29a
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.3-check_disk-fix.patch
@@ -0,0 +1,49 @@
+Source: <URL:http://nagiosplug.cvs.sourceforge.net/nagiosplug/nagiosplug/plugins/check_disk.c?r1=1.64&r2=1.65&diff_format=u>
+
+--- nagiosplug-old/plugins/check_disk.c	2006/03/27 08:19:01	1.64
++++ nagiosplug-new/plugins/check_disk.c	2006/05/02 08:30:21	1.65
+@@ -462,6 +462,8 @@
+       se->c_df = c_df;
+       se->w_dfp = w_dfp;
+       se->c_dfp = c_dfp;
++      se->w_idfp = w_idfp;
++      se->c_idfp = c_idfp;
+       se->found = 0;
+       se->found_len = 0;
+       *pathtail = se;
+@@ -480,6 +482,8 @@
+                         se->c_df = 0;
+                         se->w_dfp = 0;
+                         se->c_dfp = 0;
++			se->w_idfp = 0;
++			se->c_idfp = 0;
+       se->found = 0;
+       se->found_len = 0;
+       *dptail = se;
+@@ -497,6 +501,8 @@
+                         se->c_df = 0;
+                         se->w_dfp = 0;
+                         se->c_dfp = 0;
++			se->w_idfp = 0;
++			se->c_idfp = 0;
+       se->found = 0;
+       se->found_len = 0;
+       *fstail = se;
+@@ -519,6 +525,8 @@
+       c_df = 0;
+       w_dfp = -1.0;
+       c_dfp = -1.0;
++      w_idfp = -1.0;
++      c_idfp = -1.0;
+       break;
+     case 'V':                 /* version */
+       print_revision (progname, revision);
+@@ -547,6 +555,8 @@
+     se->c_df = c_df;
+     se->w_dfp = w_dfp;
+     se->c_dfp = c_dfp;
++    se->w_idfp = w_idfp;
++    se->c_idfp = c_idfp;
+     se->found =0;
+     se->found_len = 0;
+     *pathtail = se;
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r2.ebuild
new file mode 100644
index 0000000..8da0e6f
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2006 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.3-r1.ebuild,v 1.2 2006/08/14 09:49:25 dragonheart Exp $
+
+inherit eutils
+
+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="~amd64 ~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? ( >=dev-db/mysql-3.23.52-r1 )
+	postgres? ( >=dev-db/postgresql-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 /dev/null nagios
+}
+
+src_unpack() {
+	unpack ${A}
+	if ! use radius; then
+		EPATCH_OPTS="-p0 -d ${S}" epatch \
+			${FILESDIR}/nagios-plugins-1.4-noradius.patch \
+			${FILESDIR}/nagios-plugins-1.4-autoconf-fix.patch
+	fi
+
+	# Remove this after 1.4.3 since its been applied upstream
+	EPATCH_OPTS="-d ${S}" epatch \
+	${FILESDIR}/nagios-plugins-1.4.3-check_disk-fix.patch
+
+	if ! use radius; then
+		export WANT_AUTOCONF=2.5
+		export WANT_AUTMAKE=1.8
+		cd ${S}
+		aclocal -I m4 || die "Failed to run aclocal"
+		autoconf || die "Failed to run autoconf"
+		automake || die "Failed to run automake"
+		libtoolize --copy --force
+	fi
+}
+
+src_compile() {
+
+	econf \
+		$(use_with mysql) \
+		$(use_with postgres) \
+		$(use_with ssl openssl) \
+		$(use_with ipv6) \
+		--host=${CHOST} \
+		--prefix=/usr/nagios \
+		--with-nagios-user=nagios \
+		--sysconfdir=/etc/nagios \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || 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 '30s/use lib utils.pm;/use utils;/' \
+		${S}/plugins-scripts/check_file_age.pl || die "sed failed"
+
+	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
+		Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	if use mysql || use postgres; then
+		dodir /usr/nagios/libexec
+		exeinto /usr/nagios/libexec
+		doexe ${S}/contrib/check_nagios_db.pl
+	fi
+
+	dodir /usr/nagios/libexec/
+	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
+
+	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec"
+
+	chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}usr/nagios/libexec"
+
+	# these will not run as the nagios user
+	chown root ${D}/usr/nagios/libexec/{check_icmp,check_fping}
+	chmod u+s ${D}/usr/nagios/libexec/{check_icmp,check_fping}
+}
+
+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/nagios/libexec/contrib"
+}
+