head 1.5; access; symbols pkgsrc-2017Q2:1.4.0.18 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.16 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.14 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.12 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.10 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.8 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.6 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.4 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.2 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.3.0.32 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.30 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.28 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.26 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.24 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.22 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.20 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.18 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.16 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.14 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.12 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.10 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.8 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.6 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.4 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.2.0.28 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.26 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.24 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.22 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.20 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.18 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.16 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.14 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.12 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.10 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.8 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.6 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.4 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.2 pkgsrc-2008Q1:1.1.1.1.0.8 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.6 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.4 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.2 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc_base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2017.07.04.19.48.19; author jperkin; state dead; branches; next 1.4; commitid rccqh5HfhVtRQWXz; 1.4 date 2015.04.03.18.37.32; author rodent; state Exp; branches; next 1.3; commitid NBqi1hIGmMFGUagy; 1.3 date 2011.04.08.22.49.49; author morr; state Exp; branches; next 1.2; 1.2 date 2008.05.27.21.22.02; author tonnerre; state Exp; branches; next 1.1; 1.1 date 2007.04.13.20.06.21; author bouyer; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.04.13.20.06.21; author bouyer; state Exp; branches; next ; desc @@ 1.5 log @Use common patches and reset PKGREVISION. @ text @$NetBSD: patch-ak,v 1.4 2015/04/03 18:37:32 rodent Exp $ --- 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 # define FS_TYPE(Ent) ((Ent).f_fstypename) # else -# define FS_TYPE(Ent) mnt_names[(Ent).f_type] +# ifdef STAT_STATVFS +# define FS_TYPE(Ent) mnt_names[(Ent).f_fsid] +# else +# define FS_TYPE(Ent) mnt_names[(Ent).f_type] +# endif # endif #endif /* MOUNTED_GETFSSTAT */ @@@@ -99,6 +103,10 @@@@ # include #endif +#ifdef HAVE_SYS_STATVFS_H +#include +#endif + #ifdef MOUNTED_LISTMNTENT # include #endif @@@@ -223,7 +231,7 @@@@ me_remote (char const *fs_name, char con #if MOUNTED_GETMNTINFO -# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME +# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME && ! STAT_STATVFS static char * fstype_to_string (short int t) { @@@@ -320,9 +328,13 @@@@ fstype_to_string (short int t) # endif static char * +#ifdef STAT_STATVFS +fsp_to_string (const struct statvfs *fsp) +#else fsp_to_string (const struct statfs *fsp) +#endif { -# 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); @@@@ -648,7 +660,11 @@@@ read_file_system_list (bool need_fs_type { int numsys, counter; size_t bufsize; +#ifdef STAT_STATVFS + struct statvfs *stats; +#else 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 *)stats, bufsize, MNT_NOWAIT); +#else numsys = getfsstat (stats, bufsize, MNT_NOWAIT); +#endif if (numsys < 0) { @ 1.4 log @Sync with net/nagios-plugins. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.4 2011/04/08 22:56:12 morr Exp $ @ 1.3 log @Add DESTDIR support and LICENSE @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.3 2009/12/15 18:59:54 bouyer Exp $ d3 1 a3 1 --- gl/mountlist.c.orig 2010-07-27 20:47:15.000000000 +0000 d29 1 a29 1 @@@@ -169,7 +177,7 @@@@ d38 1 a38 1 @@@@ -266,9 +274,13 @@@@ fstype_to_string (short int t) d53 1 a53 1 @@@@ -592,9 +604,17 @@@@ read_file_system_list (bool need_fs_type d63 6 d70 1 a70 1 + numsys = getfsstat ((struct statvfs *)0, 0L, MNT_NOWAIT); d72 1 a72 1 numsys = getfsstat ((struct statfs *)0, 0L, MNT_NOWAIT); d74 1 d76 1 a76 2 return (NULL); if (SIZE_MAX / sizeof *stats <= numsys) @ 1.2 log @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. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- gl/mountlist.c.orig 2007-01-24 23:47:25.000000000 +0100 d5 1 a5 1 @@@@ -57,7 +57,11 @@@@ char *strstr (); d18 1 a18 1 @@@@ -104,6 +108,10 @@@@ char *strstr (); d29 1 a29 1 @@@@ -178,7 +186,7 @@@@ char *strstr (); d38 1 a38 1 @@@@ -275,9 +283,13 @@@@ fstype_to_string (short int t) d53 1 a53 13 @@@@ -413,7 +425,11 @@@@ read_file_system_list (bool need_fs_type #ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */ { +#ifdef STAT_STATVFS + struct statvfs *fsp; +#else struct statfs *fsp; +#endif int entries; entries = getmntinfo (&fsp, MNT_NOWAIT); @@@@ -601,9 +617,17 @@@@ read_file_system_list (bool need_fs_type a70 19 @@@@ -666,10 +690,18 @@@@ read_file_system_list (bool need_fs_type # ifdef GETFSTYP /* SVR3. */ if (need_fs_type) { +#ifdef STAT_STATVFS + struct statvfs fsd; +#else struct statfs fsd; +#endif char typebuf[FSTYPSZ]; +#ifdef STAT_STATVFS + if (statvfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1 +#else if (statfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1 +#endif && sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1) { me->me_type = xstrdup (typebuf); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:20:43 bouyer Exp $ d3 3 a5 3 --- 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 @@@@ d18 1 a18 1 @@@@ -109,6 +113,10 @@@@ d29 1 a29 1 @@@@ -173,7 +181,7 @@@@ d33 2 a34 2 -# if ! HAVE_F_FSTYPENAME_IN_STATFS +# if ! HAVE_F_FSTYPENAME_IN_STATFS && ! STAT_STATVFS d36 1 a36 1 fstype_to_string (short t) d38 2 a39 1 @@@@ -271,12 +279,16 @@@@ a40 1 /* __NetBSD__ || BSD_NET2 || __OpenBSD__ */ d48 2 a49 2 -# if defined HAVE_F_FSTYPENAME_IN_STATFS +# if defined HAVE_F_FSTYPENAME_IN_STATFS || defined STAT_STATVFS d52 2 a53 6 - return fstype_to_string (fsp->f_type); + return fstype_to_string (fsp->f_type); # endif } @@@@ -381,7 +393,11 @@@@ d65 1 a65 1 @@@@ -543,9 +559,17 @@@@ d83 1 a83 1 @@@@ -608,10 +632,18 @@@@ @ 1.1.1.1 log @import nagios-plugin-radius, a package for the nagios radius plugin from nagios-plugins-1.4.3. @ text @@