Version bump to 1.4.6 for #154617

(Portage version: 2.1.2.2)

6 files changed, 240 insertions, 7 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 9bd5728c952d..59a7df5f169f 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.56 2007/01/04 15:39:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.57 2007/03/12 01:07:25 mjolnir Exp $
+
+*nagios-plugins-1.4.6 (12 Mar 2007)
+
+  12 Mar 2007; Martin Jackson <mjolnir@gentoo.org>
+  +files/nagios-plugins-1.4.6-po.patch, +nagios-plugins-1.4.6.ebuild:
+  Version bump to 1.4.6 for #154617, thanks to chris@donovanweb.org for reporting
 
   04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   nagios-plugins-1.4.3-r1.ebuild:
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 ab34bd0c4a74..ce8823564a5f 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,3 +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
+MD5 11b38b59f68fe2f9bf5d8129da6d21c0 nagios-plugins-1.4.2.tar.gz 492320
+RMD160 1926bd544999466737eb619fdcdbd946304aa999 nagios-plugins-1.4.2.tar.gz 492320
+SHA256 ba5fa649374c2353b67d3d6a51899c6819c7c54e14354de9488df0ef16e4df42 nagios-plugins-1.4.2.tar.gz 492320
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 ab34bd0c4a74..ce8823564a5f 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,3 +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
+MD5 11b38b59f68fe2f9bf5d8129da6d21c0 nagios-plugins-1.4.2.tar.gz 492320
+RMD160 1926bd544999466737eb619fdcdbd946304aa999 nagios-plugins-1.4.2.tar.gz 492320
+SHA256 ba5fa649374c2353b67d3d6a51899c6819c7c54e14354de9488df0ef16e4df42 nagios-plugins-1.4.2.tar.gz 492320
diff --git a/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.6 b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.6
new file mode 100644
index 000000000000..d9c7e5303f01
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/digest-nagios-plugins-1.4.6
@@ -0,0 +1,3 @@
+MD5 ea79fa91092d709aa6b2e732b1d55541 nagios-plugins-1.4.6.tar.gz 1349110
+RMD160 9ec598e8de28cb962b87337789ab3f8d41ca3d11 nagios-plugins-1.4.6.tar.gz 1349110
+SHA256 892adc5bde75c711dc63d6bde9caf9c5f93d7a6e6df8df24c160b427bb1d51ca nagios-plugins-1.4.6.tar.gz 1349110
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.6-po.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.6-po.patch
new file mode 100644
index 000000000000..1304e28cb75c
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.6-po.patch
@@ -0,0 +1,101 @@
+--- Makefile.in.in	2006/05/18 23:09:03	1.1
++++ Makefile.in.in	2007/02/09 14:35:41	1.2
+@@ -1,5 +1,7 @@
++# -*- buffer-read-only: t -*- vi: set ro:
++# DO NOT EDIT! GENERATED AUTOMATICALLY!
+ # Makefile for PO directory in any package using GNU gettext.
+-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
++# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+ #
+ # This file can be copied and used freely without restrictions.  It can
+ # be used in projects which are not available under the GNU General Public
+@@ -25,17 +27,26 @@
+ exec_prefix = @exec_prefix@
+ datarootdir = @datarootdir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = @localedir@
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
++mkinstalldirs = $(SHELL) @install_sh@ -d
++mkdir_p = @mkdir_p@
+ 
+-GMSGFMT = @GMSGFMT@
+-MSGFMT = @MSGFMT@
+-XGETTEXT = @XGETTEXT@
++GMSGFMT_ = @GMSGFMT@
++GMSGFMT_no = @GMSGFMT@
++GMSGFMT_yes = @GMSGFMT_015@
++GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
++MSGFMT_ = @MSGFMT@
++MSGFMT_no = @MSGFMT@
++MSGFMT_yes = @MSGFMT_015@
++MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
++XGETTEXT_ = @XGETTEXT@
++XGETTEXT_no = @XGETTEXT@
++XGETTEXT_yes = @XGETTEXT_015@
++XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+ MSGMERGE = msgmerge
+ MSGMERGE_UPDATE = @MSGMERGE@ --update
+ MSGINIT = msginit
+@@ -159,7 +170,7 @@
+ install-exec:
+ install-data: install-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+ 	    $(INSTALL_DATA) $(srcdir)/$$file \
+ 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+@@ -172,13 +183,13 @@
+ 	fi
+ install-data-no: all
+ install-data-yes: all
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+ 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+@@ -218,19 +229,19 @@
+ installdirs-exec:
+ installdirs-data: installdirs-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	else \
+ 	  : ; \
+ 	fi
+ installdirs-data-no:
+ installdirs-data-yes:
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ 	    if test -n "$$lc"; then \
+ 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+@@ -375,7 +386,7 @@
+ 
+ Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+ 	cd $(top_builddir) \
+-	  && $(SHELL) ./config.status $(subdir)/$@.in
++	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
+ 
+ force:
+ 
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.6.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.6.ebuild
new file mode 100644
index 000000000000..f137ef411d30
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.6.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2007 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.6.ebuild,v 1.1 2007/03/12 01:07:25 mjolnir 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 ~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? ( >=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}
+	cd "${S}"
+	if ! use radius; then
+		EPATCH_OPTS="-p0 -d ${S}" epatch \
+			${FILESDIR}/nagios-plugins-1.4-noradius.patch
+	fi
+
+	# Remove this after 1.4.6 since its been applied upstream
+	EPATCH_OPTS="-d ${S}/po" epatch \
+		${FILESDIR}/nagios-plugins-1.4.6-po.patch
+
+	AT_M4DIR="gl/m4" eautoreconf
+}
+
+src_compile() {
+
+	local conf
+	if use ssl; then
+		conf="${conf} --with-openssl=/usr"
+	else
+		conf="${conf} --without-openssl"
+	fi
+
+	econf \
+		$(use_with mysql) \
+		$(use_with postgres) \
+		$(use_with ipv6) \
+		${conf} \
+		--host=${CHOST} \
+		--prefix=/usr/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
+
+	emake 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"
+}
+