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.

6 files changed, 34 insertions, 138 deletions

diff --git a/net/nagios-plugin-radius/Makefile b/net/nagios-plugin-radius/Makefile
index c2fad5f95b5..3c367472f70 100644
--- a/net/nagios-plugin-radius/Makefile
+++ b/net/nagios-plugin-radius/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/01/18 05:08:45 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2008/05/27 21:22:02 tonnerre Exp $
 #
 
 PKGNAME=	nagios-plugin-radius-${PLUGINSVERSION}
-PKGREVISION=	1
 CATEGORIES=	net sysutils
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/net/nagios-plugin-radius/distinfo b/net/nagios-plugin-radius/distinfo
index 88bd4a9dde8..312ab490cc4 100644
--- a/net/nagios-plugin-radius/distinfo
+++ b/net/nagios-plugin-radius/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $
+$NetBSD: distinfo,v 1.2 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) = a1ae2a0b138bb421408997cf0c00c515ebb84ec4
-SHA1 (patch-ab) = 773faf9ec0e3783334e38b7e301a90189de73aa9
-SHA1 (patch-ak) = c3d9f6ea9a971c45ec4159f800c2a975a3013c82
-SHA1 (patch-al) = cfeef69928795681f17e1faa1639fb3e57a31c32
+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) = eb39ca2fcbe857b48ec6a5a15a097a2e7fd635a2
+SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac
+SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01
 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436
diff --git a/net/nagios-plugin-radius/patches/patch-aa b/net/nagios-plugin-radius/patches/patch-aa
index 670ce407b00..6650bc764e7 100644
--- a/net/nagios-plugin-radius/patches/patch-aa
+++ b/net/nagios-plugin-radius/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2008/05/27 21:22:02 tonnerre Exp $
 
---- plugins/check_radius.c.orig	2004-12-26 00:17:44.000000000 +0100
-+++ plugins/check_radius.c	2007-04-13 15:03:20.000000000 +0200
-@@ -27,7 +27,7 @@
- #include "utils.h"
- #include "netutils.h"
- 
--#include <radiusclient.h>
-+#include <radiusclient-ng.h>
- 
- int process_arguments (int, char **);
- void print_help (void);
-@@ -38,7 +38,7 @@
+--- plugins/check_radius.c.orig	2007-12-10 08:52:00.000000000 +0100
++++ plugins/check_radius.c
+@@ -77,7 +77,7 @@ char *username = NULL;
  char *password = NULL;
  char *nasid = NULL;
  char *expect = NULL;
@@ -20,55 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $
  unsigned short port = PW_AUTH_UDP_PORT;
  int retries = 1;
  int verbose = FALSE;
-@@ -108,6 +108,7 @@
- 	int result = STATE_UNKNOWN;
- 	UINT4 client_id;
- 	char *str;
-+	rc_handle *handle;
- 
- 	setlocale (LC_ALL, "");
- 	bindtextdomain (PACKAGE, LOCALEDIR);
-@@ -117,32 +118,33 @@
- 		usage4 (_("Could not parse arguments"));
- 
- 	str = strdup ("dictionary");
--	if ((config_file && rc_read_config (config_file)) ||
--			rc_read_dictionary (rc_conf_str (str)))
-+	handle = rc_read_config (config_file);
-+	if (handle == NULL  ||
-+	    rc_read_dictionary (handle, rc_conf_str (handle, str)))
- 		die (STATE_UNKNOWN, _("Config file error"));
- 
- 	service = PW_AUTHENTICATE_ONLY;
- 
--	if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
--				rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
--				rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
--				(nasid==NULL || rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
-+	if (!(rc_avpair_add (handle, &data.send_pairs, PW_SERVICE_TYPE, &service, -1, 0) &&
-+				rc_avpair_add (handle, &data.send_pairs, PW_USER_NAME, username, -1, 0) &&
-+				rc_avpair_add (handle, &data.send_pairs, PW_USER_PASSWORD, password, -1, 0) &&
-+				(nasid==NULL || rc_avpair_add (handle, &data.send_pairs, PW_NAS_IDENTIFIER, nasid, -1, 0))))
- 		die (STATE_UNKNOWN, _("Out of Memory?"));
- 
- 	/* 
- 	 * Fill in NAS-IP-Address 
- 	 */
- 
--	if ((client_id = rc_own_ipaddress ()) == 0)
-+	if ((client_id = rc_own_ipaddress (handle)) == 0)
- 		return (ERROR_RC);
- 
--	if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
-+	if (rc_avpair_add (handle, &(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, -1, 0) ==
- 			NULL) return (ERROR_RC);
- 
--	rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
-+	rc_buildreq (handle, &data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
- 	             retries);
- 
--	result = rc_send_server (&data, msg);
-+	result = rc_send_server (handle, &data, msg);
- 	rc_avpair_free (data.send_pairs);
- 	if (data.receive_pairs)
- 		rc_avpair_free (data.receive_pairs);
diff --git a/net/nagios-plugin-radius/patches/patch-ab b/net/nagios-plugin-radius/patches/patch-ab
deleted file mode 100644
index 682aa6ad901..00000000000
--- a/net/nagios-plugin-radius/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $
-
---- configure.orig	2007-04-13 15:02:05.000000000 +0200
-+++ configure	2007-04-13 15:02:49.000000000 +0200
-@@ -24967,13 +24967,13 @@
- 
- _SAVEDLIBS="$LIBS"
- 
--echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient" >&5
--echo $ECHO_N "checking for rc_read_config in -lradiusclient... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for rc_read_config in -lradiusclient-ng" >&5
-+echo $ECHO_N "checking for rc_read_config in -lradiusclient-ng... $ECHO_C" >&6
- if test "${ac_cv_lib_radiusclient_rc_read_config+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lradiusclient  $LIBS"
-+LIBS="-lradiusclient-ng  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25036,13 +25036,13 @@
- #define HAVE_LIBRADIUSCLIENT 1
- _ACEOF
- 
--  LIBS="-lradiusclient $LIBS"
-+  LIBS="-lradiusclient-ng $LIBS"
- 
- fi
- 
- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-   EXTRAS="$EXTRAS check_radius"
--	RADIUSLIBS="-lradiusclient"
-+	RADIUSLIBS="-lradiusclient-ng"
- 
- else
-   { echo "$as_me:$LINENO: WARNING: Skipping radius plugin" >&5
diff --git a/net/nagios-plugin-radius/patches/patch-ak b/net/nagios-plugin-radius/patches/patch-ak
index 1a01470639c..c3b74c269cd 100644
--- a/net/nagios-plugin-radius/patches/patch-ak
+++ b/net/nagios-plugin-radius/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 2007/04/13 20:06:21 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 2007/04/13 20:06:21 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 2007/04/13 20:06:21 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 2007/04/13 20:06:21 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 2007/04/13 20:06:21 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 2007/04/13 20:06:21 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-radius/patches/patch-al b/net/nagios-plugin-radius/patches/patch-al
index 892078c1d3c..a88fb89ef0b 100644
--- a/net/nagios-plugin-radius/patches/patch-al
+++ b/net/nagios-plugin-radius/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1.1.1 2007/04/13 20:06:21 bouyer 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.1.1 2007/04/13 20:06:21 bouyer 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