diff options
Diffstat (limited to 'net/nagios-plugin-radius/patches/patch-ak')
| -rw-r--r-- | net/nagios-plugin-radius/patches/patch-ak | 38 |
1 files changed, 17 insertions, 21 deletions
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) { |