Sync these too.

2 files changed, 119 insertions, 17 deletions

diff --git a/net/nagios-plugin-mysql/patches/patch-ak b/net/nagios-plugin-mysql/patches/patch-ak
index 3d1509c55ba..85596527534 100644
--- a/net/nagios-plugin-mysql/patches/patch-ak
+++ b/net/nagios-plugin-mysql/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.3 2011/04/08 22:48:41 morr Exp $
+$NetBSD: patch-ak,v 1.4 2015/04/03 18:32:09 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:48:41 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:48:41 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:48:41 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:48:41 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-mysql/patches/patch-configure b/net/nagios-plugin-mysql/patches/patch-configure
index d3465703a12..6bd25530251 100644
--- a/net/nagios-plugin-mysql/patches/patch-configure
+++ b/net/nagios-plugin-mysql/patches/patch-configure
@@ -1,14 +1,110 @@
-$NetBSD: patch-configure,v 1.1 2012/07/25 12:07:30 fhajny Exp $
+$NetBSD: patch-configure,v 1.2 2015/04/03 18:32:09 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
+@@ -22982,7 +22985,7 @@ _ACEOF
+ 
+ fi
+ 
+-if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null  )
++if false
+ then
+ 	{ $as_echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
+ $as_echo_n "checking for Net::SNMP perl module... " >&6; }
+@@ -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>