Update the nagios-plugins package to version 1.4.11. This fixes various

crashes on various architectures and system, such as, for example,
the check_icmp bus error on sparc64.

Changes in 1.4.4:
 - check_ntp is now written in C instead of Perl.
 - check_disk bugfixes.
 - check_udp2, check_udp and check_tcp are now united.
 - check_mailq now reports mailq errors better.
 - check_snmp now compiles with a sane amount of effort.

Changes in 1.4.5:
 - Fixed bug in perl's is_hostname routine.

Changes in 1.4.6:
 - check_ping and netutils.c now do less DNS lookups.
 - alloca.h related compile fixes.
 - check_swap now works on Solaris too.
 - check_disk perf data can now be monitored.
 - check_procs had a buffer overflow.
 - Fixed UNIX socket error handling.
 - check_by_ssh now can pass -q and -o to ssh.
 - GNUlib sync.
 - check_jabber can now return things different from a warning.

Changes in 1.4.7:
 - check_procs uses /usr/ucb/ps on Solaris which fixes pst3 problems.
 - check_smtp does a non-broken HELO now.
 - check_icmp can now have a minimum number of required hosts and also
   works if running for a long time on BSDs.
 - check_ping timeout reduced.
 - Everybody can now execute SUID check plugins unless indicated otherwise
   to configure.

Changes in 1.4.8:
 - check_disk now has an extra option for regex matching and grouping of FSes.
 - check_ntp various fixes.

Changes in 1.4.9:
 - New plugin check_cluster (not built by pkgsrc).
 - check_by_ssh now has improved stderr/stdout handling options (-E/-S).
 - check_ldap, check_radius and check_pgsql compile fixes.
 - check_snmp 64-bit counter support.
 - Better underflow checking for check_time.
 - check_http output is more consistent now.
 - check_http HTTP redirect segfault fixes.
 - check_tcp doesn't segfault anymore when multiple expect strings are given.
 - check_tcp now supports -A to check if all expect strings match.

Changes in 1.4.10:
 - check_http redirect buffer overflow vulnerability fixed (was fixed
   in pkgsrc before).
 - check_http now shuts down HTTP/1.1 keepalive connections cleanly.
 - check_ldaps doesn't guess anymore whether to use SSL or STARTTLS.
 - check_disk now calls stat on all file systems.
 - check_disk now supports the -L flag for local file system checks.
 - check_disk now supports -i/-I for ignoring paths/partitions by regex.
 - check_disk now supports -A to select all file systems explicitly.
 - check_disk now needs to have the -E flag passed before -p or -r/-R.
 - check_disk is no longer buggy when case sensitive and insensitive regexes
   are mixed.
 - check_dhcp now supports -u (unicast) to emulate a relay.
 - check_dhcp now lets you specify the MAC address in the request using -m.
 - check_dhcp -r and -s options now accept host names.
 - check_icmp no longer bus errors on various platforms.
 - check_smtp now handles multiple-packet server responses properly.
 - Negate command line options are no longer evaluated twice by the shell.
 - Negate commands to be run must now be fully qualified.
 - Negate can now remap custom states.
 - check_radius now supports radius-client-ng (was already in pkgsrc).
 - check_by_ssh now supports multiline output.
 - check_ntp now honors ntp flags.

Changes in 1.4.10:
 - check_ntp returns UNKNOWN rather than WARNING if no jitter is available.
 - check_cluster now accept all valid characters in its thresholds.
 - check_ntp is now deprecated in favor of check_ntp_peer and check_ntp_time.
 - check_disk no longer reports OK if disk usage exceeds 100%.
 - check_load handles non-triplet arguments correctly now.
 - Nagios::Plugin updated to 0.22.

5 files changed, 30 insertions, 73 deletions

diff --git a/net/nagios-plugin-snmp/Makefile b/net/nagios-plugin-snmp/Makefile
index 7193a31bfc4..02c8463b545 100644
--- a/net/nagios-plugin-snmp/Makefile
+++ b/net/nagios-plugin-snmp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2008/03/22 15:00:14 tonnerre Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/27 21:22:02 tonnerre Exp $
 #
 
 PKGNAME=	nagios-plugin-snmp-${PLUGINSVERSION}
-PKGREVISION=	2
 CATEGORIES=	net sysutils
 
 MAINTAINER=	tonnerre@NetBSD.org
diff --git a/net/nagios-plugin-snmp/distinfo b/net/nagios-plugin-snmp/distinfo
index 2144e8a0250..679f2ab0431 100644
--- a/net/nagios-plugin-snmp/distinfo
+++ b/net/nagios-plugin-snmp/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2008/03/22 15:00:14 tonnerre Exp $
+$NetBSD: distinfo,v 1.5 2008/05/27 21:22:02 tonnerre Exp $
 
-SHA1 (nagios-plugins-1.4.3.tar.gz) = c26fc2f31d7579c3a8174dcd1965046c4b1c8d37
-RMD160 (nagios-plugins-1.4.3.tar.gz) = bc1d4f8cddd481775c514758a462fe533e01e846
-Size (nagios-plugins-1.4.3.tar.gz) = 1257775 bytes
-SHA1 (patch-aa) = 90672697d121f4fba242d50e87bffd3a4fce8921
+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) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-ad) = 75bb44093f1fe0d18668cb9aec787d760fe16ad4
 SHA1 (patch-ae) = 42a2767b290e4a10c93f170e85138e8c639906dc
-SHA1 (patch-ak) = c3d9f6ea9a971c45ec4159f800c2a975a3013c82
-SHA1 (patch-al) = cfeef69928795681f17e1faa1639fb3e57a31c32
+SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
+SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
diff --git a/net/nagios-plugin-snmp/patches/patch-aa b/net/nagios-plugin-snmp/patches/patch-aa
index 6f370f6eb3c..e69de29bb2d 100644
--- a/net/nagios-plugin-snmp/patches/patch-aa
+++ b/net/nagios-plugin-snmp/patches/patch-aa
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2008/03/22 15:00:14 tonnerre Exp $
-
---- plugins/check_snmp.c.orig	2005-10-31 21:03:19.000000000 +0100
-+++ plugins/check_snmp.c
-@@ -203,12 +203,16 @@ main (int argc, char **argv)
- 
- 	ptr = output;
- 
--	strcat(perfstr, "| ");
-+	strncat(perfstr, "| ", sizeof(perfstr)-strlen(perfstr)-1);
- 	while (ptr) {
- 		char *foo;
-+		size_t copylen;
- 
- 		foo = strstr (ptr, delimiter);
--		strncat(perfstr, ptr, foo-ptr);
-+		copylen = foo-ptr;
-+		if (copylen > sizeof(perfstr)-strlen(perfstr)-1)
-+			copylen = sizeof(perfstr)-strlen(perfstr)-1;
-+		strncat(perfstr, ptr, copylen);
- 		ptr = foo; 
- 
- 		if (ptr == NULL)
-@@ -338,9 +342,11 @@ main (int argc, char **argv)
- 
- 		i++;
- 
--		char *str[MAX_INPUT_BUFFER];
--		asprintf(str, "=%s%s;;;; ", show, type ? type : "");
--		strcat(perfstr, *str);
-+		strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
-+		strncat(perfstr, show, sizeof(perfstr)-strlen(perfstr)-1);
-+		if (type)
-+			strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
-+		strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
- 
- 	}	/* end while (ptr) */
- 
diff --git a/net/nagios-plugin-snmp/patches/patch-ak b/net/nagios-plugin-snmp/patches/patch-ak
index 2dd1f0d7dfe..c3b74c269cd 100644
--- a/net/nagios-plugin-snmp/patches/patch-ak
+++ b/net/nagios-plugin-snmp/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:23:43 bouyer Exp $
+$NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
 
---- lib/mountlist.c.orig	2005-10-14 22:09:29.000000000 +0200
-+++ lib/mountlist.c	2005-10-14 22:23:14.000000000 +0200
-@@ -66,7 +66,11 @@
+--- gl/mountlist.c.orig	2007-01-24 23:47:25.000000000 +0100
++++ gl/mountlist.c
+@@ -57,7 +57,11 @@ char *strstr ();
  # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
  #  define FS_TYPE(Ent) ((Ent).f_fstypename)
  # else
@@ -15,7 +15,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:23:43 bouyer Exp $
  # endif
  #endif /* MOUNTED_GETFSSTAT */
  
-@@ -109,6 +113,10 @@
+@@ -104,6 +108,10 @@ char *strstr ();
  # include <sys/statfs.h>
  #endif
  
@@ -26,18 +26,18 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:23:43 bouyer Exp $
  #ifdef MOUNTED_LISTMNTENT
  # include <mntent.h>
  #endif
-@@ -173,7 +181,7 @@
+@@ -178,7 +186,7 @@ char *strstr ();
  
  #if MOUNTED_GETMNTINFO
  
--# if ! HAVE_F_FSTYPENAME_IN_STATFS
-+# if ! HAVE_F_FSTYPENAME_IN_STATFS && ! STAT_STATVFS
+-# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
++# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME && ! STAT_STATVFS
  static char *
- fstype_to_string (short t)
+ fstype_to_string (short int t)
  {
-@@ -271,12 +279,16 @@
+@@ -275,9 +283,13 @@ fstype_to_string (short int t)
+ # endif
  
- /* __NetBSD__ || BSD_NET2 || __OpenBSD__ */
  static char *
 +#ifdef STAT_STATVFS
 +fsp_to_string (const struct statvfs *fsp)
@@ -45,16 +45,12 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:23:43 bouyer Exp $
  fsp_to_string (const struct statfs *fsp)
 +#endif
  {
--# if defined HAVE_F_FSTYPENAME_IN_STATFS
-+# if defined HAVE_F_FSTYPENAME_IN_STATFS || defined STAT_STATVFS
+-# if HAVE_STRUCT_STATFS_F_FSTYPENAME
++# if defined HAVE_STRUCT_STATFS_F_FSTYPENAME || defined STAT_STATVFS
    return (char *) (fsp->f_fstypename);
  # else
--  return fstype_to_string (fsp->f_type);
-+   return fstype_to_string (fsp->f_type);
- # endif
- }
- 
-@@ -381,7 +393,11 @@
+   return fstype_to_string (fsp->f_type);
+@@ -413,7 +425,11 @@ read_file_system_list (bool need_fs_type
  
  #ifdef MOUNTED_GETMNTINFO	/* 4.4BSD.  */
    {
@@ -66,7 +62,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:23:43 bouyer Exp $
      int entries;
  
      entries = getmntinfo (&fsp, MNT_NOWAIT);
-@@ -543,9 +559,17 @@
+@@ -601,9 +617,17 @@ read_file_system_list (bool need_fs_type
    {
      int numsys, counter;
      size_t bufsize;
@@ -84,7 +80,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:23:43 bouyer Exp $
      if (numsys < 0)
        return (NULL);
      if (SIZE_MAX / sizeof *stats <= numsys)
-@@ -608,10 +632,18 @@
+@@ -666,10 +690,18 @@ read_file_system_list (bool need_fs_type
  # ifdef GETFSTYP			/* SVR3.  */
  	if (need_fs_type)
  	  {
diff --git a/net/nagios-plugin-snmp/patches/patch-al b/net/nagios-plugin-snmp/patches/patch-al
index b3f944d580c..a88fb89ef0b 100644
--- a/net/nagios-plugin-snmp/patches/patch-al
+++ b/net/nagios-plugin-snmp/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2006/10/16 08:40:45 seb Exp $
+$NetBSD: patch-al,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
 
---- contrib/check_axis.sh.orig	2003-05-26 10:09:23.000000000 +0000
+--- contrib/check_axis.sh.orig	2003-05-26 12:09:23.000000000 +0200
 +++ contrib/check_axis.sh
 @@ -5,7 +5,7 @@ port=$2
  usr=$3
@@ -18,9 +18,9 @@ $NetBSD: patch-al,v 1.1 2006/10/16 08:40:45 seb Exp $
 -if [ "$status" == "Printing" ]; then
 +if [ "$status" = "Printing" ]; then
  	bytes=`echo $lines | awk '{ print $4 }'`;
- 	comments=`echo $lines | tr -d "
" | awk '{ print $5 " " $6 }'`;
- else
-@@ -40,48 +40,48 @@ if [ "$comma" -eq "1" ]; then
+ 	comments=`echo $lines | tr -d "
+ " | awk '{ print $5 " " $6 }'`;
+@@ -42,48 +42,48 @@ if [ "$comma" -eq "1" ]; then
  fi