Update to nagios-plugins 1.4.15.

This release contains several enhancements, including rate calculation in check_snmp. There are also lots of bug fixes.
* New check_ntp_peer -m and -n options to check the number of usable time sources ("truechimers")
* New check_disk_smb -a option which allows for specifying the IP address of the remote server

10 files changed, 53 insertions, 93 deletions

diff --git a/net/nagios-plugins/patches/patch-ab b/net/nagios-plugins/patches/patch-ab
index 651587e14b3..62800adbb70 100644
--- a/net/nagios-plugins/patches/patch-ab
+++ b/net/nagios-plugins/patches/patch-ab
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered Exp $
+$NetBSD: patch-ab,v 1.7 2011/04/08 22:56:12 morr Exp $
 
---- configure.orig	2009-09-16 10:38:03.000000000 +0200
-+++ configure	2009-12-15 17:29:32.000000000 +0100
-@@ -1443,7 +1443,7 @@
- pdfdir='${docdir}'
- psdir='${docdir}'
- libdir='${exec_prefix}/lib'
--localedir='${datarootdir}/locale'
-+localedir='${datarootdir}/nagios/locale'
- mandir='${datarootdir}/man'
- 
- ac_prev=
-@@ -22562,7 +22562,7 @@
+--- configure.orig	2010-07-27 20:48:13.000000000 +0000
++++ configure
+@@ -14688,7 +14688,7 @@ _ACEOF
  
  fi
  
@@ -20,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered Exp $
    EXTRAS="$EXTRAS check_radius"
  	RADIUSLIBS="-lradiusclient"
  
-@@ -22717,7 +22717,7 @@
+@@ -14843,7 +14843,7 @@ _ACEOF
  
  fi
  
@@ -29,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered Exp $
    LDAPLIBS="-lldap -llber"\
    LDAPINCLUDE="-I/usr/include/ldap"
  
-@@ -26671,7 +26671,7 @@
+@@ -19037,7 +19037,7 @@ fi
  	then
  		{ echo "$as_me:$LINENO: checking for nslookup syntax" >&5
  echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6; }
@@ -38,7 +29,7 @@ $NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered Exp $
  		then
  			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
  			{ echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-@@ -26894,7 +26894,7 @@
+@@ -19260,7 +19260,7 @@ echo "${ECHO_T}no" >&6; }
  fi
  
  
@@ -47,7 +38,7 @@ $NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -27065,7 +27065,7 @@
+@@ -19431,7 +19431,7 @@ if test "${with_snmpget_command+set}" = 
    withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval
  fi
  
@@ -56,7 +47,7 @@ $NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -27124,7 +27124,7 @@
+@@ -19490,7 +19490,7 @@ if test "${with_snmpgetnext_command+set}
    withval=$with_snmpgetnext_command; PATH_TO_SNMPGETNEXT=$withval
  fi
  
@@ -65,7 +56,7 @@ $NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -27133,7 +27133,7 @@
+@@ -19499,7 +19499,7 @@ _ACEOF
  
  fi
  
@@ -74,7 +65,7 @@ $NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered 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; }
-@@ -27300,7 +27300,7 @@
+@@ -19666,7 +19666,7 @@ if test "${with_fping_command+set}" = se
    withval=$with_fping_command; PATH_TO_FPING=$withval
  fi
  
@@ -83,12 +74,12 @@ $NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered Exp $
  then
  
  cat >>confdefs.h <<_ACEOF
-@@ -28516,7 +28516,7 @@
+@@ -20882,7 +20882,7 @@ if test -n "$PATH_TO_APTGET" ; then
  fi
  
  
--if test -f plugins/check_nt.c ; then
+-if test -f $srcdir/plugins/check_nt.c ; then
 +if false ; then
    EXTRAS="$EXTRAS check_nt"
- elif test -f ../plugins/check_nt.c ; then
-   EXTRAS="$EXTRAS check_nt"
+ fi
+ 
diff --git a/net/nagios-plugins/patches/patch-ad b/net/nagios-plugins/patches/patch-ad
index 22ecace710b..e348206edcb 100644
--- a/net/nagios-plugins/patches/patch-ad
+++ b/net/nagios-plugins/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.3 2009/12/15 18:59:54 bouyer Exp $
+$NetBSD: patch-ad,v 1.4 2011/04/08 22:56:12 morr Exp $
 
---- plugins-scripts/Makefile.in.orig	2009-09-16 10:38:00.000000000 +0200
-+++ plugins-scripts/Makefile.in	2009-12-15 17:30:07.000000000 +0100
-@@ -724,15 +724,11 @@
+--- plugins-scripts/Makefile.in.orig	2010-07-27 20:48:10.000000000 +0000
++++ plugins-scripts/Makefile.in
+@@ -963,15 +963,11 @@ top_srcdir = @top_srcdir@
  with_trusted_path = @with_trusted_path@
- @RELEASE_PRESENT_TRUE@NP_VERSION = $(PACKAGE_VERSION)
+ @RELEASE_PRESENT_TRUE@NP_VERSION = @NP_RELEASE@
  SUFFIXES = .pl .sh
 -libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
 -	check_log check_oracle check_rpc check_sensors check_wave \
@@ -16,10 +16,10 @@ $NetBSD: patch-ad,v 1.3 2009/12/15 18:59:54 bouyer Exp $
 -	check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
 -	utils.sh.in utils.pm.in t
 +libexec_SCRIPTS = check_ircd check_log check_ntp check_rpc check_mailq \
-+	check_file_age utils.sh utils.pm
-+
++	check_file_age utils.sh utils.pm                                                                                                                                                                            
++                                                                                                                                                                                                                   
 +EXTRA_DIST = check_ircd.pl check_log.sh check_ntp.pl check_rpc.pl \
-+	check_mailq.pl check_file_age.pl utils.sh.in utils.pm.in t
++	check_mailq.pl check_file_age.pl utils.sh.in utils.pm.in t                                                                                                                                                  
  
  TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
  TESTS = @SCRIPT_TEST@
diff --git a/net/nagios-plugins/patches/patch-ae b/net/nagios-plugins/patches/patch-ae
index 017bbebe147..ff160bb69a6 100644
--- a/net/nagios-plugins/patches/patch-ae
+++ b/net/nagios-plugins/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2009/12/15 18:59:54 bouyer Exp $
+$NetBSD: patch-ae,v 1.5 2011/04/08 22:56:12 morr Exp $
 
---- plugins/Makefile.am.orig	2009-06-06 09:04:48.000000000 +0200
-+++ plugins/Makefile.am	2009-12-15 17:30:29.000000000 +0100
-@@ -170,7 +170,7 @@
+--- plugins/Makefile.am.orig	2010-07-27 20:47:16.000000000 +0000
++++ plugins/Makefile.am
+@@ -170,7 +170,7 @@ install-exec-hook:
  	cd $(DESTDIR)$(libexecdir) && \
  	for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
  	if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
diff --git a/net/nagios-plugins/patches/patch-af b/net/nagios-plugins/patches/patch-af
index f21b56f5b0a..b3141bbabbb 100644
--- a/net/nagios-plugins/patches/patch-af
+++ b/net/nagios-plugins/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2009/12/15 18:59:54 bouyer Exp $
+$NetBSD: patch-af,v 1.5 2011/04/08 22:56:12 morr Exp $
 
---- plugins/Makefile.in.orig	2009-09-16 10:38:00.000000000 +0200
-+++ plugins/Makefile.in	2009-12-15 17:30:49.000000000 +0100
-@@ -31,7 +31,7 @@
+--- plugins/Makefile.in.orig	2010-07-27 20:48:10.000000000 +0000
++++ plugins/Makefile.in
+@@ -31,7 +31,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.4 2009/12/15 18:59:54 bouyer Exp $
  	check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
  	check_load$(EXEEXT) check_mrtg$(EXEEXT) \
  	check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
-@@ -1539,7 +1539,7 @@
+@@ -1778,7 +1778,7 @@ $(check_tcp_programs): check_tcp
  install-exec-hook:
  	cd $(DESTDIR)$(libexecdir) && \
  	for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
diff --git a/net/nagios-plugins/patches/patch-ah b/net/nagios-plugins/patches/patch-ah
index 8ac326a86ec..7ce9db5d811 100644
--- a/net/nagios-plugins/patches/patch-ah
+++ b/net/nagios-plugins/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2009/12/15 18:59:54 bouyer Exp $
+$NetBSD: patch-ah,v 1.3 2011/04/08 22:56:12 morr Exp $
 
---- plugins-scripts/check_ntp.pl.orig	2008-11-30 22:23:18.000000000 +0100
-+++ plugins-scripts/check_ntp.pl	2009-12-15 17:31:18.000000000 +0100
-@@ -311,6 +311,7 @@
+--- plugins-scripts/check_ntp.pl.orig	2010-07-27 20:47:16.000000000 +0000
++++ plugins-scripts/check_ntp.pl
+@@ -311,6 +311,7 @@ if ($have_ntpq) {
  				} else {
  					$jitter_error = $ERRORS{'OK'};
  				}
diff --git a/net/nagios-plugins/patches/patch-ai b/net/nagios-plugins/patches/patch-ai
index 93e7860ec59..6dc9dc9a392 100644
--- a/net/nagios-plugins/patches/patch-ai
+++ b/net/nagios-plugins/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $
+$NetBSD: patch-ai,v 1.2 2011/04/08 22:56:12 morr Exp $
 
---- plugins-scripts/subst.in.orig	2005-08-04 10:24:09.000000000 -0700
-+++ plugins-scripts/subst.in	2005-08-04 10:24:23.000000000 -0700
-@@ -9,13 +9,14 @@
+--- plugins-scripts/subst.in.orig	2010-07-27 20:47:16.000000000 +0000
++++ plugins-scripts/subst.in
+@@ -9,13 +9,14 @@ function which(c,path) {
  
  	sub(/\/.*\//,"",c);
    for (dir in path) {
diff --git a/net/nagios-plugins/patches/patch-ak b/net/nagios-plugins/patches/patch-ak
index 51affb7a505..77d36668f6f 100644
--- a/net/nagios-plugins/patches/patch-ak
+++ b/net/nagios-plugins/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.3 2009/12/15 18:59:54 bouyer Exp $
+$NetBSD: patch-ak,v 1.4 2011/04/08 22:56:12 morr Exp $
 
---- gl/mountlist.c.orig	2009-05-21 23:11:51.000000000 +0200
-+++ gl/mountlist.c	2009-12-15 17:31:57.000000000 +0100
+--- gl/mountlist.c.orig	2010-07-27 20:47:15.000000000 +0000
++++ gl/mountlist.c
 @@ -52,7 +52,11 @@
  # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
  #  define FS_TYPE(Ent) ((Ent).f_fstypename)
@@ -35,7 +35,7 @@ $NetBSD: patch-ak,v 1.3 2009/12/15 18:59:54 bouyer Exp $
  static char *
  fstype_to_string (short int t)
  {
-@@ -266,9 +274,13 @@
+@@ -266,9 +274,13 @@ fstype_to_string (short int t)
  # endif
  
  static char *
@@ -50,19 +50,7 @@ $NetBSD: patch-ak,v 1.3 2009/12/15 18:59:54 bouyer Exp $
    return (char *) (fsp->f_fstypename);
  # else
    return fstype_to_string (fsp->f_type);
-@@ -404,7 +416,11 @@
- 
- #ifdef MOUNTED_GETMNTINFO	/* 4.4BSD.  */
-   {
-+#ifdef STAT_STATVFS
-+    struct statvfs *fsp;
-+#else
-     struct statfs *fsp;
-+#endif
-     int entries;
- 
-     entries = getmntinfo (&fsp, MNT_NOWAIT);
-@@ -592,9 +608,17 @@
+@@ -592,9 +604,17 @@ read_file_system_list (bool need_fs_type
    {
      int numsys, counter;
      size_t bufsize;
@@ -80,22 +68,3 @@ $NetBSD: patch-ak,v 1.3 2009/12/15 18:59:54 bouyer Exp $
      if (numsys < 0)
        return (NULL);
      if (SIZE_MAX / sizeof *stats <= numsys)
-@@ -657,10 +681,18 @@
- # ifdef GETFSTYP			/* SVR3.  */
- 	if (need_fs_type)
- 	  {
-+#ifdef STAT_STATVFS
-+	    struct statvfs fsd;
-+#else
- 	    struct statfs fsd;
-+#endif
- 	    char typebuf[FSTYPSZ];
- 
-+#ifdef STAT_STATVFS
-+	    if (statvfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1
-+#else
- 	    if (statfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1
-+#endif
- 		&& sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1)
- 	      {
- 		me->me_type = xstrdup (typebuf);
diff --git a/net/nagios-plugins/patches/patch-al b/net/nagios-plugins/patches/patch-al
index a8fc97d2c20..a9061f9b1d7 100644
--- a/net/nagios-plugins/patches/patch-al
+++ b/net/nagios-plugins/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.2 2008/05/27 21:22:03 tonnerre Exp $
+$NetBSD: patch-al,v 1.3 2011/04/08 22:56:12 morr Exp $
 
---- contrib/check_axis.sh.orig	2003-05-26 12:09:23.000000000 +0200
+--- contrib/check_axis.sh.orig	2010-07-27 20:47:15.000000000 +0000
 +++ contrib/check_axis.sh
 @@ -5,7 +5,7 @@ port=$2
  usr=$3
diff --git a/net/nagios-plugins/patches/patch-am b/net/nagios-plugins/patches/patch-am
index 83ca5e86cd0..38dfaa7fbe1 100644
--- a/net/nagios-plugins/patches/patch-am
+++ b/net/nagios-plugins/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2006/10/16 05:29:40 seb Exp $
+$NetBSD: patch-am,v 1.2 2011/04/08 22:56:12 morr Exp $
 
---- contrib/check_mssql.sh.orig	2003-08-05 09:56:13.000000000 +0000
+--- contrib/check_mssql.sh.orig	2010-07-27 20:47:15.000000000 +0000
 +++ contrib/check_mssql.sh
 @@ -35,10 +35,10 @@ pswd=$3
  srv=$4
diff --git a/net/nagios-plugins/patches/patch-an b/net/nagios-plugins/patches/patch-an
index 52e9ea688bc..f690be14c7b 100644
--- a/net/nagios-plugins/patches/patch-an
+++ b/net/nagios-plugins/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.3 2009/12/15 18:59:54 bouyer Exp $
+$NetBSD: patch-an,v 1.4 2011/04/08 22:56:12 morr Exp $
 
---- lib/Makefile.in.orig	2009-09-16 10:37:59.000000000 +0200
-+++ lib/Makefile.in	2009-12-15 17:33:17.000000000 +0100
-@@ -127,7 +127,7 @@
+--- lib/Makefile.in.orig	2010-07-27 20:48:09.000000000 +0000
++++ lib/Makefile.in
+@@ -146,7 +146,7 @@ DEFAULT_INCLUDES = -I. -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__depfiles_maybe = depfiles
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \