fix bug 138690 and 138731, clean out old ebuild

Package-Manager: portage-2.1-r1

9 files changed, 222 insertions, 1 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 893e8f56c701..bd9dc37ccfc3 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.49 2006/05/15 23:52:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.50 2006/07/18 16:30:34 ramereth Exp $
+
+*nagios-plugins-1.4.3-r1 (18 Jul 2006)
+
+  18 Jul 2006; Lance Albertson <ramereth@gentoo.org>
+  +files/nagios-plugins-1.4.3-check_disk-fix.patch,
+  +files/nagios-plugins-1.4-autoconf-fix.patch,
+  -nagios-plugins-1.4.3.ebuild, +nagios-plugins-1.4.3-r1.ebuild:
+  * Fix configure.in, bug #138690
+  * Add patch for check_disk, bug #138731
+  * Clean up old ebuild
 
   15 May 2006; Robin H. Johnson <robbat2@gentoo.org>
   nagios-plugins-1.4.ebuild, nagios-plugins-1.4.1.ebuild,
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4
index 9fb7cff4db57..2c00b65a8836 100644
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4
+++ b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4
@@ -1 +1,3 @@
 MD5 9b21b92acc4b2b0dbb2d12bca6b27582 nagios-plugins-1.4.tar.gz 972810
+RMD160 e50c16b07754b146483cdeecb04ab86b03f1c84d nagios-plugins-1.4.tar.gz 972810
+SHA256 ea01cfa18151ac7e23bd6ede54b6ee2438185b35df6bb1130c68ba765df04831 nagios-plugins-1.4.tar.gz 972810
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.1
index 87fdfcee9dae..00530ee5a63c 100644
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.1
+++ b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.1
@@ -1 +1,3 @@
 MD5 5bdd5dd7fca92a2aeb29683866ee42f1 nagios-plugins-1.4.1.tar.gz 967552
+RMD160 fe02a63fe99635552376736ab445957d374fb38b nagios-plugins-1.4.1.tar.gz 967552
+SHA256 e64a4fdad256f5b2a3717390e4195e642f3985fdc8d74998ad231a6a30cfcb9b nagios-plugins-1.4.1.tar.gz 967552
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2
index 3b387f8d2ec1..ab34bd0c4a74 100644
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2
+++ b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2
@@ -1 +1,3 @@
 MD5 1f2bee15ade3d98ec79964a43479e328 nagios-plugins-1.4.2.tar.gz 971447
+RMD160 93d747bb445e4e59cdb72ef210feb052b7855cac nagios-plugins-1.4.2.tar.gz 971447
+SHA256 a329b3e1c7daf79dc002eacc44af9d4706555342b7d20227cc8eb3139767e652 nagios-plugins-1.4.2.tar.gz 971447
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1
index 3b387f8d2ec1..ab34bd0c4a74 100644
--- a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1
+++ b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.2-r1
@@ -1 +1,3 @@
 MD5 1f2bee15ade3d98ec79964a43479e328 nagios-plugins-1.4.2.tar.gz 971447
+RMD160 93d747bb445e4e59cdb72ef210feb052b7855cac nagios-plugins-1.4.2.tar.gz 971447
+SHA256 a329b3e1c7daf79dc002eacc44af9d4706555342b7d20227cc8eb3139767e652 nagios-plugins-1.4.2.tar.gz 971447
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.3-r1 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.3-r1
new file mode 100644
index 000000000000..85576d7d879e
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.3-r1
@@ -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-autoconf-fix.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-autoconf-fix.patch
new file mode 100644
index 000000000000..d3f316a04b4e
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4-autoconf-fix.patch
@@ -0,0 +1,13 @@
+--- configure.in.old	2006-07-14 23:41:39.000000000 -0500
++++ configure.in	2006-07-14 23:43:40.000000000 -0500
+@@ -1626,7 +1626,9 @@
+ 		#endif],
+ 		[va_list args;],
+ 		[AC_MSG_RESULT(yes)],
+-		[NEED_VA_LIST=-DNEED_VA_LIST AC_SUBST(NEED_VA_LIST) AC_MSG_RESULT(no)])
++		[NEED_VA_LIST=-DNEED_VA_LIST 
++		 AC_SUBST(NEED_VA_LIST) 
++		 AC_MSG_RESULT(no)])
+ 
+ case $host in
+ 	*bsd*)
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 000000000000..b32a09a946f5
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.3-check_disk-fix.patch
@@ -0,0 +1,65 @@
+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
+@@ -14,13 +14,13 @@
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+- $Id: nagios-plugins-1.4.3-check_disk-fix.patch,v 1.1 2006/07/18 16:30:34 ramereth Exp $
++ $Id: nagios-plugins-1.4.3-check_disk-fix.patch,v 1.1 2006/07/18 16:30:34 ramereth Exp $
+  
+ *****************************************************************************/
+ 
+ const char *progname = "check_disk";
+ const char *program_name = "check_disk";  /* Required for coreutils libs */
+-const char *revision = "$Revision: 1.1 $";
++const char *revision = "$Revision: 1.1 $";
+ const char *copyright = "1999-2005";
+ const char *email = "nagiosplug-devel@lists.sourceforge.net";
+ 
+@@ -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-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..745af15e8969
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.3-r1.ebuild
@@ -0,0 +1,122 @@
+# 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.1 2006/07/18 16:30:34 ramereth 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.58
+		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"
+}
+
+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"
+}
+