Update nagios-plugins and nagios-plugin-{ldap,pgsql,mysql,radius,snmp}

to 1.4.13. Approved by tonnerre@

main CHANGES since 1.4.11:
- lots of bug fixes
- Added ./check_nt -v INSTANCES to count number of instances (Alessandro Ren)
- New check_icmp -s option to specify the source IP address
- check_dns now sorts addresses for testing results for more than one
  returned IP (Matthias Urlichs)
- check_disk should now work with large file systems (2TB+) on all archs
  that supports it
- check_ntp_peer now checks for the LI_ALARM flag
- check_procs now accepts --ereg-argument-array for a regular expression
  match to the argument array
- check_dig can now pass arguments to dig by using -A/--dig-arguments
- check_dns now allow to repeat -a to match multiple possibly returned address
  (common with load balancers)
- check_mysql and check_radius now try clearing password in processlist
  just like check_mysql_query
- check_mysql and check_mysql_query now support sockets explicitely
  (-s, --socket)
- negate now has the ability to replace the status text as well
  (-s, --substitute)
- Added performance data to check_ping (Christian Schneemann)
- On non-skipped stderr, check_by_ssh now returns UNKNOWN or worse
  (result from command) instead of always UNKNOWN.
- check_dig now returns CRITICAL instead of WARNING when no answer section
  is found
- check_procs now captures stderr in external command and adds to plugin output
- check_snmp now only prints perfdata for non numeric values (#1867716)
- check_icmp now supports packet size modification
- check_http -e now accepts a comma-delimited list of expected status
  codes (Sven Nierlein)
- check_ntp_peer/check_ntp_time used to show port in --help but ignored
  the argument - now implemented

11 files changed, 47 insertions, 87 deletions

diff --git a/net/nagios-plugin-ldap/distinfo b/net/nagios-plugin-ldap/distinfo
index e4c4806f90d..3512c6e24d4 100644
--- a/net/nagios-plugin-ldap/distinfo
+++ b/net/nagios-plugin-ldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2008/05/27 21:22:02 tonnerre Exp $
+$NetBSD: distinfo,v 1.5 2009/03/24 19:54:53 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.11.tar.gz) = bc91a57ad6f5468b17f24429ba25225cfff45d59
-RMD160 (nagios-plugins-1.4.11.tar.gz) = 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15
-Size (nagios-plugins-1.4.11.tar.gz) = 1734230 bytes
+SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
+RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
+Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
 SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
 SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
diff --git a/net/nagios-plugin-mysql/distinfo b/net/nagios-plugin-mysql/distinfo
index e4c4806f90d..3512c6e24d4 100644
--- a/net/nagios-plugin-mysql/distinfo
+++ b/net/nagios-plugin-mysql/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2008/05/27 21:22:02 tonnerre Exp $
+$NetBSD: distinfo,v 1.5 2009/03/24 19:54:53 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.11.tar.gz) = bc91a57ad6f5468b17f24429ba25225cfff45d59
-RMD160 (nagios-plugins-1.4.11.tar.gz) = 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15
-Size (nagios-plugins-1.4.11.tar.gz) = 1734230 bytes
+SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
+RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
+Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
 SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
 SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
diff --git a/net/nagios-plugin-pgsql/distinfo b/net/nagios-plugin-pgsql/distinfo
index 8c8614902b8..9a703870b3e 100644
--- a/net/nagios-plugin-pgsql/distinfo
+++ b/net/nagios-plugin-pgsql/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/05/27 21:22:02 tonnerre Exp $
+$NetBSD: distinfo,v 1.6 2009/03/24 19:54:53 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.11.tar.gz) = bc91a57ad6f5468b17f24429ba25225cfff45d59
-RMD160 (nagios-plugins-1.4.11.tar.gz) = 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15
-Size (nagios-plugins-1.4.11.tar.gz) = 1734230 bytes
+SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
+RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
+Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
 SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
 SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
-SHA1 (patch-an) = 728d37331b2d5bee011abaefd37c9e17af06baf6
diff --git a/net/nagios-plugin-pgsql/patches/patch-an b/net/nagios-plugin-pgsql/patches/patch-an
deleted file mode 100644
index d593d591c03..00000000000
--- a/net/nagios-plugin-pgsql/patches/patch-an
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-an,v 1.1 2008/03/16 21:13:05 seb Exp $
-
-Fix build with PostgreSQL 8.3. From
-http://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk/plugins/check_pgsql.c
-revision 1951
-
---- plugins/check_pgsql.c.orig	2004-12-25 23:17:44.000000000 +0000
-+++ plugins/check_pgsql.c
-@@ -28,6 +28,7 @@ const char *email = "nagiosplug-devel@li
- 
- #include "netutils.h"
- #include <libpq-fe.h>
-+#include <pg_config_manual.h>
- 
- #define DEFAULT_DB "template1"
- #define DEFAULT_HOST "127.0.0.1"
diff --git a/net/nagios-plugin-radius/distinfo b/net/nagios-plugin-radius/distinfo
index 312ab490cc4..ba8907a803e 100644
--- a/net/nagios-plugin-radius/distinfo
+++ b/net/nagios-plugin-radius/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
+$NetBSD: distinfo,v 1.3 2009/03/24 19:54:53 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.11.tar.gz) = bc91a57ad6f5468b17f24429ba25225cfff45d59
-RMD160 (nagios-plugins-1.4.11.tar.gz) = 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15
-Size (nagios-plugins-1.4.11.tar.gz) = 1734230 bytes
+SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
+RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
+Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
 SHA1 (patch-aa) = eb39ca2fcbe857b48ec6a5a15a097a2e7fd635a2
 SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
 SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
diff --git a/net/nagios-plugin-snmp/distinfo b/net/nagios-plugin-snmp/distinfo
index 679f2ab0431..b5ebf65f6d3 100644
--- a/net/nagios-plugin-snmp/distinfo
+++ b/net/nagios-plugin-snmp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/05/27 21:22:02 tonnerre Exp $
+$NetBSD: distinfo,v 1.6 2009/03/24 19:54:53 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.11.tar.gz) = bc91a57ad6f5468b17f24429ba25225cfff45d59
-RMD160 (nagios-plugins-1.4.11.tar.gz) = 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15
-Size (nagios-plugins-1.4.11.tar.gz) = 1734230 bytes
+SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
+RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
+Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
 SHA1 (patch-aa) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ad) = 75bb44093f1fe0d18668cb9aec787d760fe16ad4
 SHA1 (patch-ae) = 42a2767b290e4a10c93f170e85138e8c639906dc
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index 3d9ccf8ced4..d320868a474 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2009/01/13 17:11:33 shattered Exp $
+# $NetBSD: Makefile,v 1.17 2009/03/24 19:54:54 bouyer Exp $
 #
 
 CATEGORIES=	net sysutils
 
 MAINTAINER=	tonnerre@NetBSD.org
-PKGREVISION=	2
 HOMEPAGE=	http://sourceforge.net/projects/nagiosplug/
 COMMENT=	Nagios plugins
 
diff --git a/net/nagios-plugins/Makefile.common b/net/nagios-plugins/Makefile.common
index 5f47c6ef8de..61b20101ea7 100644
--- a/net/nagios-plugins/Makefile.common
+++ b/net/nagios-plugins/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2008/05/27 21:22:03 tonnerre Exp $
+# $NetBSD: Makefile.common,v 1.6 2009/03/24 19:54:54 bouyer Exp $
 #
 
-PLUGINSVERSION=	1.4.11
+PLUGINSVERSION=	1.4.13
 DISTNAME=	nagios-plugins-${PLUGINSVERSION}
 MASTER_SITES?=	${MASTER_SITE_SOURCEFORGE:=nagiosplug/}
 
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo
index 961155b720b..38cf1a0842a 100644
--- a/net/nagios-plugins/distinfo
+++ b/net/nagios-plugins/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2008/06/08 14:08:47 tonnerre Exp $
+$NetBSD: distinfo,v 1.8 2009/03/24 19:54:54 bouyer Exp $
 
-SHA1 (nagios-plugins-1.4.11.tar.gz) = bc91a57ad6f5468b17f24429ba25225cfff45d59
-RMD160 (nagios-plugins-1.4.11.tar.gz) = 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15
-Size (nagios-plugins-1.4.11.tar.gz) = 1734230 bytes
-SHA1 (patch-aa) = 9097c99ecb20b1e12099a9bae77b6d38ed76c331
-SHA1 (patch-ab) = aaa6938dd165cf348e798e02c34ee82a86eedf7c
+SHA1 (nagios-plugins-1.4.13.tar.gz) = fb22eba22095bdd709a65b1477bfb566aac9077e
+RMD160 (nagios-plugins-1.4.13.tar.gz) = 38de32581581b21e36e047138a94a70a9a031a02
+Size (nagios-plugins-1.4.13.tar.gz) = 2279556 bytes
+SHA1 (patch-aa) = 021c2dbcd2ff0404a44cbbf3ccd42bd7400646bb
+SHA1 (patch-ab) = 44d127ac3571614642f8523a210c33b04a95e5de
 SHA1 (patch-ad) = edf12abc20e8dfe4095e4515c27046579639d1ae
 SHA1 (patch-ae) = 775fc9d8c25eec6050d709e8a377c8deb17bcf66
 SHA1 (patch-af) = 186eec6496ea2659756897e5833510cb6a39009f
diff --git a/net/nagios-plugins/patches/patch-aa b/net/nagios-plugins/patches/patch-aa
index 7407e1a7a0f..a05b0157cb9 100644
--- a/net/nagios-plugins/patches/patch-aa
+++ b/net/nagios-plugins/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2008/06/08 14:08:47 tonnerre Exp $
+$NetBSD: patch-aa,v 1.4 2009/03/24 19:54:54 bouyer Exp $
 
---- lib/utils_base.c.orig	2007-07-29 14:42:05.000000000 +0200
-+++ lib/utils_base.c
-@@ -89,7 +89,7 @@ _set_thresholds(thresholds **my_threshol
+--- lib/utils_base.c.orig	2008-03-11 01:10:23.000000000 +0100
++++ lib/utils_base.c	2009-03-23 12:39:57.000000000 +0100
+@@ -104,7 +104,7 @@
  {
  	thresholds *temp_thresholds = NULL;
  
@@ -11,16 +11,3 @@ $NetBSD: patch-aa,v 1.3 2008/06/08 14:08:47 tonnerre Exp $
  
  	temp_thresholds->warning = NULL;
  	temp_thresholds->critical = NULL;
-@@ -105,10 +105,9 @@ _set_thresholds(thresholds **my_threshol
- 		}
- 	}
- 
--	if (*my_thresholds > 0) {	/* Not sure why, but sometimes could be -1 */
--		/* printf("Freeing here: %d\n", *my_thresholds); */
-+	if (*my_thresholds)
- 		free(*my_thresholds);
--	}
-+
- 	*my_thresholds = temp_thresholds;
- 
- 	return 0;
diff --git a/net/nagios-plugins/patches/patch-ab b/net/nagios-plugins/patches/patch-ab
index 54743f0c16e..ce3af6f5c48 100644
--- a/net/nagios-plugins/patches/patch-ab
+++ b/net/nagios-plugins/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
+$NetBSD: patch-ab,v 1.4 2009/03/24 19:54:54 bouyer Exp $
 
---- configure.orig	2007-12-13 23:42:38.000000000 +0100
-+++ configure
-@@ -1058,7 +1058,7 @@ dvidir='${docdir}'
+--- configure.orig	2008-09-25 10:33:24.000000000 +0200
++++ configure	2009-03-23 12:39:57.000000000 +0100
+@@ -1268,7 +1268,7 @@
  pdfdir='${docdir}'
  psdir='${docdir}'
  libdir='${exec_prefix}/lib'
@@ -11,16 +11,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
  mandir='${datarootdir}/man'
  
  ac_prev=
-@@ -21137,7 +21137,7 @@ _ACEOF
- 
- fi
- 
--if test "$ac_cv_lib_crypt_main" = "yes"; then
-+if false; then
-   if test -n "$PGSQL"; then
-     LDFLAGS="$LDFLAGS -L$PGSQL/lib"
-     CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
-@@ -21746,7 +21746,7 @@ _ACEOF
+@@ -22225,7 +22225,7 @@
  
  fi
  
@@ -29,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
    EXTRAS="$EXTRAS check_radius"
  	RADIUSLIBS="-lradiusclient"
  
-@@ -21901,7 +21901,7 @@ _ACEOF
+@@ -22380,7 +22380,7 @@
  
  fi
  
@@ -38,7 +29,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
    LDAPLIBS="-lldap -llber"\
    LDAPINCLUDE="-I/usr/include/ldap"
  
-@@ -25688,7 +25688,7 @@ fi
+@@ -26397,7 +26397,7 @@
  	then
  		{ echo "$as_me:$LINENO: checking for nslookup syntax" >&5
  echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6; }
@@ -47,7 +38,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
  		then
  			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
  			{ echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-@@ -25911,7 +25911,7 @@ echo "${ECHO_T}no" >&6; }
+@@ -26620,7 +26620,7 @@
  fi
  
  
@@ -56,7 +47,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -26082,7 +26082,7 @@ if test "${with_snmpget_command+set}" = 
+@@ -26791,7 +26791,7 @@
    withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval
  fi
  
@@ -65,7 +56,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -26141,7 +26141,7 @@ if test "${with_snmpgetnext_command+set}
+@@ -26850,7 +26850,7 @@
    withval=$with_snmpgetnext_command; PATH_TO_SNMPGETNEXT=$withval
  fi
  
@@ -74,7 +65,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -26150,7 +26150,7 @@ _ACEOF
+@@ -26859,7 +26859,7 @@
  
  fi
  
@@ -83,7 +74,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
  then
  	{ echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
  echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6; }
-@@ -26317,7 +26317,7 @@ if test "${with_fping_command+set}" = se
+@@ -27026,7 +27026,7 @@
    withval=$with_fping_command; PATH_TO_FPING=$withval
  fi
  
@@ -92,7 +83,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -27533,7 +27533,7 @@ if test -n "$PATH_TO_APTGET" ; then
+@@ -28242,7 +28242,7 @@
  fi
  
  
@@ -101,7 +92,7 @@ $NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $
    EXTRAS="$EXTRAS check_nt"
  elif test -f ../plugins/check_nt.c ; then
    EXTRAS="$EXTRAS check_nt"
-@@ -45418,6 +45418,10 @@ do
+@@ -47646,6 +47646,10 @@
    case $ac_option in
    # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)