Sync with net/nagios-plugins.

7 files changed, 117 insertions, 190 deletions

diff --git a/net/nagios-plugin-snmp/Makefile b/net/nagios-plugin-snmp/Makefile
index e434abe3807..ac210eb57b2 100644
--- a/net/nagios-plugin-snmp/Makefile
+++ b/net/nagios-plugin-snmp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2014/05/29 23:37:04 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/04/03 18:45:12 rodent Exp $
 #
 
 PKGNAME=	nagios-plugin-snmp-${PLUGINSVERSION}
-PKGREVISION=	6
 CATEGORIES=	net sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/net/nagios-plugin-snmp/distinfo b/net/nagios-plugin-snmp/distinfo
index a1447b89f37..d796881e88a 100644
--- a/net/nagios-plugin-snmp/distinfo
+++ b/net/nagios-plugin-snmp/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.11 2012/07/25 12:07:31 fhajny Exp $
+$NetBSD: distinfo,v 1.12 2015/04/03 18:45:12 rodent Exp $
 
-SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610
-RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736
-Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes
+SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
+RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
+Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes
 SHA1 (patch-ad) = 75bb44093f1fe0d18668cb9aec787d760fe16ad4
 SHA1 (patch-ae) = 42a2767b290e4a10c93f170e85138e8c639906dc
-SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b
-SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594
-SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62
-SHA1 (patch-configure) = 1b9f7c4014c0425cda5f93e9fa123a236728f003
-SHA1 (patch-lib_utils_base.c) = 7e315711f8ca9ec033841c8f0eb9e037625c84ca
+SHA1 (patch-ak) = cd052cfbe669cd64038ae23c624761dd3a7da188
+SHA1 (patch-configure) = 91bba469ceb22c7f7dae5a905669103f1ca21763
diff --git a/net/nagios-plugin-snmp/patches/patch-ak b/net/nagios-plugin-snmp/patches/patch-ak
index f873d9b23ea..20004bc3a57 100644
--- a/net/nagios-plugin-snmp/patches/patch-ak
+++ b/net/nagios-plugin-snmp/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.3 2011/04/08 22:50:17 morr Exp $
+$NetBSD: patch-ak,v 1.4 2015/04/03 18:45:12 rodent Exp $
 
---- gl/mountlist.c.orig	2010-07-27 20:47:15.000000000 +0000
+--- gl/mountlist.c.orig	2014-03-04 21:41:56.000000000 +0000
 +++ gl/mountlist.c
 @@ -52,7 +52,11 @@
  # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
@@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.3 2011/04/08 22:50:17 morr Exp $
  #ifdef MOUNTED_LISTMNTENT
  # include <mntent.h>
  #endif
-@@ -169,7 +177,7 @@
+@@ -223,7 +231,7 @@ me_remote (char const *fs_name, char con
  
  #if MOUNTED_GETMNTINFO
  
@@ -35,7 +35,7 @@ $NetBSD: patch-ak,v 1.3 2011/04/08 22:50:17 morr Exp $
  static char *
  fstype_to_string (short int t)
  {
-@@ -266,9 +274,13 @@ fstype_to_string (short int t)
+@@ -320,9 +328,13 @@ fstype_to_string (short int t)
  # endif
  
  static char *
@@ -50,7 +50,7 @@ $NetBSD: patch-ak,v 1.3 2011/04/08 22:50:17 morr Exp $
    return (char *) (fsp->f_fstypename);
  # else
    return fstype_to_string (fsp->f_type);
-@@ -592,9 +604,17 @@ read_file_system_list (bool need_fs_type
+@@ -648,7 +660,11 @@ read_file_system_list (bool need_fs_type
    {
      int numsys, counter;
      size_t bufsize;
@@ -60,11 +60,17 @@ $NetBSD: patch-ak,v 1.3 2011/04/08 22:50:17 morr Exp $
      struct statfs *stats;
 +#endif
  
+     numsys = getfsstat (NULL, 0L, MNT_NOWAIT);
+     if (numsys < 0)
+@@ -658,7 +674,11 @@ read_file_system_list (bool need_fs_type
+ 
+     bufsize = (1 + numsys) * sizeof *stats;
+     stats = xmalloc (bufsize);
 +#ifdef STAT_STATVFS
-+    numsys = getfsstat ((struct statvfs *)0, 0L, MNT_NOWAIT);
++    numsys = getfsstat ((struct statvfs *)stats, bufsize, MNT_NOWAIT);
 +#else
-     numsys = getfsstat ((struct statfs *)0, 0L, MNT_NOWAIT);
+     numsys = getfsstat (stats, bufsize, MNT_NOWAIT);
 +#endif
+ 
      if (numsys < 0)
-       return (NULL);
-     if (SIZE_MAX / sizeof *stats <= numsys)
+       {
diff --git a/net/nagios-plugin-snmp/patches/patch-al b/net/nagios-plugin-snmp/patches/patch-al
deleted file mode 100644
index fba98f4d902..00000000000
--- a/net/nagios-plugin-snmp/patches/patch-al
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-al,v 1.3 2011/04/08 22:50:17 morr Exp $
-
---- 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
- pass=$4
- 
--if [ ! "$#" == "4" ]; then
-+if [ ! "$#" = "4" ]; then
- 	echo -e "\nYou did not supply enough command line arguments. \nUsage: ./check_axis.sh <host> <port> <username> <password> \n \nCheck_axis.sh checks the status of LPT ports on Axis print servers. \nIt was written by Tom De Blende (tom.deblende@village.uunet.be) in 2002. \n" && exit "3"
- fi
- 
-@@ -27,7 +27,7 @@ fi
- 
- lines=`cat $tempfile | grep -i $port`
- status=`echo $lines | awk '{ print $3 }'`
--if [ "$status" == "Printing" ]; then
-+if [ "$status" = "Printing" ]; then
- 	bytes=`echo $lines | awk '{ print $4 }'`;
- 	comments=`echo $lines | tr -d "
- " | awk '{ print $5 " " $6 }'`;
-@@ -42,48 +42,48 @@ if [ "$comma" -eq "1" ]; then
- fi
- 	
- 
--if [ "$status" == "Available" ]; then
--	if [ "$comments" == "Paper out" ]; then
-+if [ "$status" = "Available" ]; then
-+	if [ "$comments" = "Paper out" ]; then
- 		exit="1" && stdio="WARNING - Out of paper.";
--        elif [ "$comments" == " " ]; then
-+        elif [ "$comments" = " " ]; then
-                 exit="0" && stdio="OK - Printer is available but returns no comments.";
--	elif [ "$comments" == "No error" ]; then
-+	elif [ "$comments" = "No error" ]; then
- 		exit="0" && stdio="OK - No error.";
--        elif [ "$comments" == "Ready " ]; then
-+        elif [ "$comments" = "Ready " ]; then
-                 exit="0" && stdio="OK - Ready.";
--        elif [ "$comments" == "Off line" ]; then
-+        elif [ "$comments" = "Off line" ]; then
-                 exit="1" && stdio="WARNING - Printer is off line.";        
--        elif [ "$comments" == "Out of" ]; then
-+        elif [ "$comments" = "Out of" ]; then
-                 exit="1" && stdio="WARNING - Out of paper.";	
--	elif [ "$comments" == "Busy Out" ]; then
-+	elif [ "$comments" = "Busy Out" ]; then
-                 exit="1" && stdio="WARNING - Busy, out of paper.";
--        elif [ "$comments" == "Printer off-line" ]; then
-+        elif [ "$comments" = "Printer off-line" ]; then
-                 exit="1" && stdio="WARNING - Printer is off line.";	
--        elif [ "$comments" == "Printer fault" ]; then
-+        elif [ "$comments" = "Printer fault" ]; then
-                 exit="2" && stdio="CRITICAL - Printer fault.";
- 	else
- 		exit="3" && stdio="Comments: $comments";
- 	fi
--elif [ "$status" == "Printing" ]; then
--	if [ "$comments" == "Printer busy" ]; then
-+elif [ "$status" = "Printing" ]; then
-+	if [ "$comments" = "Printer busy" ]; then
- 		exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";
--        elif [ "$comments" == "No error" ]; then
-+        elif [ "$comments" = "No error" ]; then
-                 exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";        
--	elif [ "$comments" == "Paper out" ]; then
-+	elif [ "$comments" = "Paper out" ]; then
-                 exit="1" && stdio="WARNING - PRINTING. Out of paper.";
--        elif [ "$comments" == "Out of" ]; then
-+        elif [ "$comments" = "Out of" ]; then
-                 exit="1" && stdio="WARNING - PRINTING. Out of paper. Bytes printed: $bytes.";        
--        elif [ "$comments" == "Busy Out" ]; then
-+        elif [ "$comments" = "Busy Out" ]; then
-                 exit="1" && stdio="WARNING - Busy, out of paper.";
--	elif [ "$comments" == "Ready " ]; then
-+	elif [ "$comments" = "Ready " ]; then
-                 exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";        
--        elif [ "$comments" == "Printer off-line" ]; then
-+        elif [ "$comments" = "Printer off-line" ]; then
-                 exit="1" && stdio="WARNING - PRINTING. Printer is off line.";
--        elif [ "$comments" == "Busy " ]; then
-+        elif [ "$comments" = "Busy " ]; then
-                 exit="0" && stdio="OK - PRINTING. Busy. Bytes printed: $bytes.";	
--	elif [ "$comments" == "Off line" ]; then
-+	elif [ "$comments" = "Off line" ]; then
-                 exit="1" && stdio="WARNING - PRINTING. Printer is off line.";
--        elif [ "$comments" == "Printer fault" ]; then
-+        elif [ "$comments" = "Printer fault" ]; then
-                 exit="2" && stdio="CRITICAL - PRINTING. Printer fault. Bytes printed: $bytes.";        
- 	else
-                 exit="3" && stdio="Comments: $comments.";
diff --git a/net/nagios-plugin-snmp/patches/patch-am b/net/nagios-plugin-snmp/patches/patch-am
deleted file mode 100644
index aab635bf6f9..00000000000
--- a/net/nagios-plugin-snmp/patches/patch-am
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-am,v 1.2 2011/04/08 22:50:17 morr Exp $
-
---- 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
- 
- 
--if [ ! "$#" == "4" ]; then
-+if [ ! "$#" = "4" ]; then
-         echo -e "\nYou did not supply enough arguments. \nUsage: $0 <host> <username> <password> <version> \n \n$0 checks Microsoft SQL Server connectivity. It works with versions 7 and 2000.\n\nYou need a working version of FreeTDS (http://www.freetds.org/) and tsql (included in FreeTDS 6.0+) to connect to the SQL server. \nIt was written by Tom De Blende (tom.deblende@village.uunet.be) in 2003. \n\nExample:\n $0 dbserver sa f00bar 2000\n" && exit "3"
- 
--elif [ $tsqlcmd == "" ]; then
-+elif [ $tsqlcmd = "" ]; then
- 	echo -e "tsql not found! Please verify you have a working version of tsql (included in the FreeTDS version 6.0+) and enter the full path in the script." && exit "3"
- 
- fi
-@@ -50,9 +50,9 @@ exit="3"
- 
- tmpfile=`$mktempcmd /tmp/$hostname.XXXXXX`
- 
--if [ $srv == "7" ]; then
-+if [ $srv = "7" ]; then
-         spid=7
--elif [ $srv == "2000" ]; then
-+elif [ $srv = "2000" ]; then
-         spid=50
- else
- 	echo -e "$srv is not a supported MS SQL Server version!" && exit "3"
-@@ -69,7 +69,7 @@ $tsqlcmd -S $hostname -U $usr -P $pswd <
- 
- $grepcmd -q "Login failed for user" $errorfile
- 
--if [ "$?" == "0" ]; then
-+if [ "$?" = "0" ]; then
- 	$rmcmd -f $tmpfile $resultfile $errorfile;
-         echo CRITICAL - Could not make connection to SQL server. Login failed.;
-         exit 2;
-@@ -77,7 +77,7 @@ fi
- 
- $grepcmd -q "There was a problem connecting to the server" $errorfile
- 
--if [ "$?" == "0" ]; then
-+if [ "$?" = "0" ]; then
-         $rmcmd -f $tmpfile $resultfile $errorfile;
-         echo CRITICAL - Could not make connection to SQL server. Incorrect server name or SQL service not running.;
-         exit 2;
-@@ -85,7 +85,7 @@ fi
- 
- resultfileln=`$catcmd $resultfile | $wccmd -l | $sedcmd 's/  //g'`
- 
--if [ "$resultfileln" == "2" ]; then
-+if [ "$resultfileln" = "2" ]; then
- 	$rmcmd -f $tmpfile $resultfile $errorfile;
-         echo CRITICAL - Could not make connection to SQL server. No data received from host.;
-         exit 2;
diff --git a/net/nagios-plugin-snmp/patches/patch-configure b/net/nagios-plugin-snmp/patches/patch-configure
index a35c0f1c113..765268b17fd 100644
--- a/net/nagios-plugin-snmp/patches/patch-configure
+++ b/net/nagios-plugin-snmp/patches/patch-configure
@@ -1,14 +1,101 @@
-$NetBSD: patch-configure,v 1.1 2012/07/25 12:07:32 fhajny Exp $
+$NetBSD: patch-configure,v 1.2 2015/04/03 18:45:12 rodent Exp $
 
-Only build 64bit when MACHINE_ARCH=x86_64, on SunOS.
---- configure.orig	2010-07-27 20:48:13.000000000 +0000
+--- configure.orig	2014-06-26 16:17:37.000000000 +0000
 +++ configure
-@@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
+@@ -17188,7 +17188,7 @@ _ACEOF
+ 
+ fi
+ 
+-  if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
++  if false; then
+     EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
+   	RADIUSLIBS="-lradiusclient"
+ 
+@@ -17363,7 +17363,7 @@ _ACEOF
+ 
+ fi
+ 
+-  if test "$ac_cv_lib_ldap_main" = "yes"; then
++  if false; then
+     LDAPLIBS="-lldap -llber"\
+     LDAPINCLUDE="-I/usr/include/ldap"
+ 
+@@ -18791,6 +18791,9 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #ifdef HAVE_UNISTD_H
++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
++#undef _FILE_OFFSET_BITS
++#endif
+ 			#include <unistd.h>
+ 			#endif
+ 			#include <netinet/in.h>
+@@ -21524,7 +21527,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
          ac_cv_ps_cols=9
-         { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
- echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; }
+         { $as_echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ $as_echo "using nagios-plugins internal ps command (pst3) for solaris" >&6; }
 -	if test `isainfo -b` = 64 ; then
 +	if test "$MACHINE_ARCH" = "x86_64" ; then
  		pst3_use_64bit=1
- 		{ echo "$as_me:$LINENO: using 64bit pst3" >&5
- echo "$as_me: using 64bit pst3" >&6;}
+ 		{ $as_echo "$as_me:$LINENO: using 64bit pst3" >&5
+ $as_echo "$as_me: using 64bit pst3" >&6;}
+@@ -22521,7 +22524,7 @@ fi
+ 	then
+ 		{ $as_echo "$as_me:$LINENO: checking for nslookup syntax" >&5
+ $as_echo_n "checking for nslookup syntax... " >&6; }
+-		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
++		if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep -F "Invalid option: sil" >/dev/null
+ 		then
+ 			ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
+ 			{ $as_echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
+@@ -23134,7 +23137,7 @@ IFS=$as_save_IFS
+ esac
+ fi
+ PATH_TO_FPING=$ac_cv_path_PATH_TO_FPING
+-if test -n "$PATH_TO_FPING"; then
++if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no"; then
+   { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING" >&5
+ $as_echo "$PATH_TO_FPING" >&6; }
+ else
+@@ -23174,7 +23177,7 @@ IFS=$as_save_IFS
+ esac
+ fi
+ PATH_TO_FPING6=$ac_cv_path_PATH_TO_FPING6
+-if test -n "$PATH_TO_FPING6"; then
++if test -n "$PATH_TO_FPING6" -a "$PATH_TO_FPING6" != "no"; then
+   { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING6" >&5
+ $as_echo "$PATH_TO_FPING6" >&6; }
+ else
+@@ -23750,6 +23753,10 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
++#undef _FILE_OFFSET_BITS
++#endif
++
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+@@ -23812,6 +23819,10 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
++#undef _FILE_OFFSET_BITS
++#endif
++
+                #include <unistd.h>
+                #include <sys/types.h>
+                #include <sys/param.h>
+@@ -24003,6 +24014,10 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64
++#undef _FILE_OFFSET_BITS
++#endif
++
+                #include <sys/types.h>
+                #include <sys/param.h>
+                #include <sys/stat.h>
diff --git a/net/nagios-plugin-snmp/patches/patch-lib_utils_base.c b/net/nagios-plugin-snmp/patches/patch-lib_utils_base.c
deleted file mode 100644
index 53f9713ee43..00000000000
--- a/net/nagios-plugin-snmp/patches/patch-lib_utils_base.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_utils_base.c,v 1.1 2012/05/24 15:29:43 marino Exp $
-
---- lib/utils_base.c.orig	2010-07-27 20:47:16.000000000 +0000
-+++ lib/utils_base.c
-@@ -28,6 +28,9 @@
- #include <stdarg.h>
- #include "utils_base.h"
- #include <fcntl.h>
-+#ifdef __DragonFly__
-+#include <sys/stat.h>
-+#endif
- 
- #define np_free(ptr) { if(ptr) { free(ptr); ptr = NULL; } }
-