diff options
Diffstat (limited to 'net')
35 files changed, 274 insertions, 531 deletions
diff --git a/net/nagios-plugin-ldap/Makefile b/net/nagios-plugin-ldap/Makefile index d54b3bab141..7f71d075331 100644 --- a/net/nagios-plugin-ldap/Makefile +++ b/net/nagios-plugin-ldap/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2008/01/18 05:08:44 tnn Exp $ +# $NetBSD: Makefile,v 1.8 2008/05/27 21:22:02 tonnerre Exp $ # PKGNAME= nagios-plugin-ldap-${PLUGINSVERSION} -PKGREVISION= 1 CATEGORIES= net sysutils databases MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/net/nagios-plugin-ldap/distinfo b/net/nagios-plugin-ldap/distinfo index 956afc0ad1d..e4c4806f90d 100644 --- a/net/nagios-plugin-ldap/distinfo +++ b/net/nagios-plugin-ldap/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2006/10/16 08:40:45 seb Exp $ +$NetBSD: distinfo,v 1.4 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-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-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac +SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 diff --git a/net/nagios-plugin-ldap/patches/patch-ak b/net/nagios-plugin-ldap/patches/patch-ak index 1ced0c7d7b3..c3b74c269cd 100644 --- a/net/nagios-plugin-ldap/patches/patch-ak +++ b/net/nagios-plugin-ldap/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:20: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:20: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:20: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:20: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:20: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:20: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-ldap/patches/patch-al b/net/nagios-plugin-ldap/patches/patch-al index b3f944d580c..a88fb89ef0b 100644 --- a/net/nagios-plugin-ldap/patches/patch-al +++ b/net/nagios-plugin-ldap/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 diff --git a/net/nagios-plugin-mysql/Makefile b/net/nagios-plugin-mysql/Makefile index 43f581615e8..30baf59e656 100644 --- a/net/nagios-plugin-mysql/Makefile +++ b/net/nagios-plugin-mysql/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2008/01/18 05:08:44 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2008/05/27 21:22:02 tonnerre Exp $ # PKGNAME= nagios-plugin-mysql-${PLUGINSVERSION} -PKGREVISION= 1 CATEGORIES= net sysutils databases MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/net/nagios-plugin-mysql/distinfo b/net/nagios-plugin-mysql/distinfo index 956afc0ad1d..e4c4806f90d 100644 --- a/net/nagios-plugin-mysql/distinfo +++ b/net/nagios-plugin-mysql/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2006/10/16 08:40:45 seb Exp $ +$NetBSD: distinfo,v 1.4 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-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-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac +SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 diff --git a/net/nagios-plugin-mysql/patches/patch-ak b/net/nagios-plugin-mysql/patches/patch-ak index 4ca0c1c61ef..c3b74c269cd 100644 --- a/net/nagios-plugin-mysql/patches/patch-ak +++ b/net/nagios-plugin-mysql/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:21:58 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:21:58 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:21:58 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:21:58 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:21:58 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:21:58 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-mysql/patches/patch-al b/net/nagios-plugin-mysql/patches/patch-al index b3f944d580c..a88fb89ef0b 100644 --- a/net/nagios-plugin-mysql/patches/patch-al +++ b/net/nagios-plugin-mysql/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 diff --git a/net/nagios-plugin-pgsql/distinfo b/net/nagios-plugin-pgsql/distinfo index 7c60a0cbb8b..8c8614902b8 100644 --- a/net/nagios-plugin-pgsql/distinfo +++ b/net/nagios-plugin-pgsql/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2008/03/16 21:13:05 seb 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-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-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac +SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 SHA1 (patch-an) = 728d37331b2d5bee011abaefd37c9e17af06baf6 diff --git a/net/nagios-plugin-pgsql/patches/patch-ak b/net/nagios-plugin-pgsql/patches/patch-ak index fcf8b069a00..c3b74c269cd 100644 --- a/net/nagios-plugin-pgsql/patches/patch-ak +++ b/net/nagios-plugin-pgsql/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:22:57 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:22:57 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:22:57 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:22:57 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:22:57 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:22:57 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-pgsql/patches/patch-al b/net/nagios-plugin-pgsql/patches/patch-al index b3f944d580c..a88fb89ef0b 100644 --- a/net/nagios-plugin-pgsql/patches/patch-al +++ b/net/nagios-plugin-pgsql/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 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 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 diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile index f6b8069b597..be4ebf43243 100644 --- a/net/nagios-plugins/Makefile +++ b/net/nagios-plugins/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2008/03/22 14:52:21 tonnerre Exp $ +# $NetBSD: Makefile,v 1.14 2008/05/27 21:22:03 tonnerre Exp $ # -PKGREVISION= 5 CATEGORIES= net sysutils MAINTAINER= tonnerre@NetBSD.org diff --git a/net/nagios-plugins/Makefile.common b/net/nagios-plugins/Makefile.common index 6138d513109..5f47c6ef8de 100644 --- a/net/nagios-plugins/Makefile.common +++ b/net/nagios-plugins/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.4 2006/08/23 18:45:31 wiz Exp $ +# $NetBSD: Makefile.common,v 1.5 2008/05/27 21:22:03 tonnerre Exp $ # -PLUGINSVERSION= 1.4.3 +PLUGINSVERSION= 1.4.11 DISTNAME= nagios-plugins-${PLUGINSVERSION} MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=nagiosplug/} diff --git a/net/nagios-plugins/Makefile.plugin b/net/nagios-plugins/Makefile.plugin index fd04781b451..e0421cf6536 100644 --- a/net/nagios-plugins/Makefile.plugin +++ b/net/nagios-plugins/Makefile.plugin @@ -1,9 +1,11 @@ -# $NetBSD: Makefile.plugin,v 1.2 2006/09/09 02:43:11 obache Exp $ +# $NetBSD: Makefile.plugin,v 1.3 2008/05/27 21:22:03 tonnerre Exp $ # do-build: cd ${WRKSRC}/lib && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} + cd ${WRKSRC}/gl && ${SETENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} .if ${BINARY_TARGET:D1} cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BINARY_TARGET} diff --git a/net/nagios-plugins/PLIST b/net/nagios-plugins/PLIST index 580b7401f82..2f92f612986 100644 --- a/net/nagios-plugins/PLIST +++ b/net/nagios-plugins/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2006/08/17 14:20:14 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/05/27 21:22:03 tonnerre Exp $ libexec/nagios/check_by_ssh libexec/nagios/check_clamd libexec/nagios/check_dhcp @@ -22,6 +22,8 @@ libexec/nagios/check_nagios libexec/nagios/check_nntp libexec/nagios/check_nntps libexec/nagios/check_ntp +libexec/nagios/check_ntp_peer +libexec/nagios/check_ntp_time libexec/nagios/check_nwstat libexec/nagios/check_overcr libexec/nagios/check_ping @@ -38,7 +40,6 @@ libexec/nagios/check_swap libexec/nagios/check_tcp libexec/nagios/check_time libexec/nagios/check_udp -libexec/nagios/check_udp2 libexec/nagios/check_ups libexec/nagios/check_users libexec/nagios/negate diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo index cea411a62e0..37b03624a5e 100644 --- a/net/nagios-plugins/distinfo +++ b/net/nagios-plugins/distinfo @@ -1,16 +1,15 @@ -$NetBSD: distinfo,v 1.5 2008/03/22 14:52:21 tonnerre Exp $ +$NetBSD: distinfo,v 1.6 2008/05/27 21:22:03 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) = b0db6110edb7e75121bbee7c996e36454e820a41 -SHA1 (patch-ab) = 1bcd6ddd5ef77c4ab726de4d6ac0a50fd525fa47 -SHA1 (patch-ad) = 2b88b23b790b454cb1f5e2dc1b6735a43534834c -SHA1 (patch-ae) = c22cbbaece4c9145356f96abd9d72192c226b19f -SHA1 (patch-af) = 626810863f909652202ead6bcf4b00494d1d758f +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-ab) = aaa6938dd165cf348e798e02c34ee82a86eedf7c +SHA1 (patch-ad) = edf12abc20e8dfe4095e4515c27046579639d1ae +SHA1 (patch-ae) = 775fc9d8c25eec6050d709e8a377c8deb17bcf66 +SHA1 (patch-af) = 186eec6496ea2659756897e5833510cb6a39009f SHA1 (patch-ah) = b9f9f36d2c77ac08213dfea4df443872230f8099 SHA1 (patch-ai) = 383f5b19466c82454e198e1b9cdbec2dcfd04047 -SHA1 (patch-ak) = c3d9f6ea9a971c45ec4159f800c2a975a3013c82 -SHA1 (patch-al) = cfeef69928795681f17e1faa1639fb3e57a31c32 +SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac +SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01 SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 -SHA1 (patch-an) = 36321b622aacb1e195e7557b9a2e00ae32953f77 +SHA1 (patch-an) = da7addcb3b9aaac0422ae7fa29afb26fe8bbd6a1 diff --git a/net/nagios-plugins/patches/patch-aa b/net/nagios-plugins/patches/patch-aa deleted file mode 100644 index 479b56fb232..00000000000 --- a/net/nagios-plugins/patches/patch-aa +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2008/03/22 14:52:21 tonnerre Exp $ - ---- plugins/check_http.c.orig 2006-04-05 09:58:27.000000000 +0200 -+++ plugins/check_http.c -@@ -34,7 +34,8 @@ const char *email = "nagiosplug-devel@li - enum { - MAX_IPV4_HOSTLENGTH = 255, - HTTP_PORT = 80, -- HTTPS_PORT = 443 -+ HTTPS_PORT = 443, -+ MAX_PORT = 65535 - }; - - #ifdef HAVE_SSL -@@ -1043,14 +1044,14 @@ check_http (void) - - /* per RFC 2396 */ - #define HDR_LOCATION "%*[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]: " --#define URI_HTTP "%[HTPShtps]://" --#define URI_HOST "%[-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]" --#define URI_PORT ":%[0123456789]" -+#define URI_HTTP "%5[HTPShtps]" -+#define URI_HOST "%255[-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]" -+#define URI_PORT "%6d" /* MAX_PORT's width is 5 chars, 6 to detect overflow */ - #define URI_PATH "%[-_.!~*'();/?:@&=+$,%#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]" --#define HD1 URI_HTTP URI_HOST URI_PORT URI_PATH --#define HD2 URI_HTTP URI_HOST URI_PATH --#define HD3 URI_HTTP URI_HOST URI_PORT --#define HD4 URI_HTTP URI_HOST -+#define HD1 URI_HTTP "://" URI_HOST ":" URI_PORT "/" URI_PATH -+#define HD2 URI_HTTP "://" URI_HOST "/" URI_PATH -+#define HD3 URI_HTTP "://" URI_HOST ":" URI_PORT -+#define HD4 URI_HTTP "://" URI_HOST - #define HD5 URI_PATH - - void -@@ -1061,7 +1062,6 @@ redir (char *pos, char *status_line) - char xx[2]; - char type[6]; - char *addr; -- char port[6]; - char *url; - - addr = malloc (MAX_IPV4_HOSTLENGTH + 1); -@@ -1093,10 +1093,8 @@ redir (char *pos, char *status_line) - die (STATE_UNKNOWN, _("could not allocate url\n")); - - /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */ -- if (sscanf (pos, HD1, type, addr, port, url) == 4) { -+ if (sscanf (pos, HD1, type, addr, &i, url) == 4) - use_ssl = server_type_check (type); -- i = atoi (port); -- } - - /* URI_HTTP URI_HOST URI_PATH */ - else if (sscanf (pos, HD2, type, addr, url) == 3 ) { -@@ -1105,10 +1103,9 @@ redir (char *pos, char *status_line) - } - - /* URI_HTTP URI_HOST URI_PORT */ -- else if(sscanf (pos, HD3, type, addr, port) == 3) { -+ else if(sscanf (pos, HD3, type, addr, &i) == 3) { - strcpy (url, HTTP_URL); - use_ssl = server_type_check (type); -- i = atoi (port); - } - - /* URI_HTTP URI_HOST */ -@@ -1154,7 +1151,6 @@ redir (char *pos, char *status_line) - _("WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"), - type, addr, i, url, (display_html ? "</A>" : "")); - -- server_port = i; - strcpy (server_type, type); - - free (host_name); -@@ -1164,7 +1160,22 @@ redir (char *pos, char *status_line) - server_address = strdup (addr); - - free (server_url); -- server_url = strdup (url); -+ if ((url[0] == '/')) -+ server_url = strdup (url); -+ else if (asprintf(&server_url, "/%s", url) == -1) -+ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate server_url%s\n"), -+ display_html ? "</A>" : ""); -+ free(url); -+ -+ if ((server_port = i) > MAX_PORT) -+ die (STATE_UNKNOWN, -+ _("HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"), -+ MAX_PORT, server_type, server_address, server_port, server_url, -+ display_html ? "</A>" : ""); -+ -+ if (verbose) -+ printf ("Redirection to %s://%s:%d%s\n", server_type, server_address, -+ server_port, server_url); - - check_http (); - } diff --git a/net/nagios-plugins/patches/patch-ab b/net/nagios-plugins/patches/patch-ab index 0390e11ef48..54743f0c16e 100644 --- a/net/nagios-plugins/patches/patch-ab +++ b/net/nagios-plugins/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2006/08/17 14:20:14 taca Exp $ +$NetBSD: patch-ab,v 1.3 2008/05/27 21:22:03 tonnerre Exp $ ---- configure.orig 2006-04-19 12:52:19.000000000 +0900 +--- configure.orig 2007-12-13 23:42:38.000000000 +0100 +++ configure -@@ -24395,7 +24395,7 @@ _ACEOF +@@ -1058,7 +1058,7 @@ dvidir='${docdir}' + pdfdir='${docdir}' + psdir='${docdir}' + libdir='${exec_prefix}/lib' +-localedir='${datarootdir}/locale' ++localedir='${datarootdir}/nagios/locale' + mandir='${datarootdir}/man' + + ac_prev= +@@ -21137,7 +21137,7 @@ _ACEOF fi @@ -11,7 +20,7 @@ $NetBSD: patch-ab,v 1.2 2006/08/17 14:20:14 taca Exp $ if test -n "$PGSQL"; then LDFLAGS="$LDFLAGS -L$PGSQL/lib" CPPFLAGS="$CPPFLAGS -I$PGSQL/include" -@@ -25040,7 +25040,7 @@ _ACEOF +@@ -21746,7 +21746,7 @@ _ACEOF fi @@ -20,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2006/08/17 14:20:14 taca Exp $ EXTRAS="$EXTRAS check_radius" RADIUSLIBS="-lradiusclient" -@@ -25121,7 +25121,7 @@ _ACEOF +@@ -21901,7 +21901,7 @@ _ACEOF fi @@ -29,70 +38,77 @@ $NetBSD: patch-ab,v 1.2 2006/08/17 14:20:14 taca Exp $ LDAPLIBS="-lldap -llber"\ LDAPINCLUDE="-I/usr/include/ldap" -@@ -30212,7 +30212,7 @@ fi +@@ -25688,7 +25688,7 @@ fi then - echo "$as_me:$LINENO: checking for nslookup syntax" >&5 - echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for nslookup syntax" >&5 + echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&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 | fgrep "Invalid option: sil" >/dev/null then ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" - echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5 -@@ -30530,7 +30530,7 @@ else - echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5 +@@ -25911,7 +25911,7 @@ echo "${ECHO_T}no" >&6; } fi + -if test -x "$PATH_TO_LMSTAT" +if false then cat >>confdefs.h <<_ACEOF -@@ -30698,7 +30698,7 @@ if test "${with_snmpget_command+set}" = - withval="$with_snmpget_command" - PATH_TO_SNMPGET=$withval - fi; +@@ -26082,7 +26082,7 @@ if test "${with_snmpget_command+set}" = + withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval + fi + -if test -n "$PATH_TO_SNMPGET" +if test -n "$PATH_TO_SNMPGET" -a "$PATH_TO_SNMPGET" != "no" then cat >>confdefs.h <<_ACEOF -@@ -30765,7 +30765,7 @@ _ACEOF +@@ -26141,7 +26141,7 @@ if test "${with_snmpgetnext_command+set} + withval=$with_snmpgetnext_command; PATH_TO_SNMPGETNEXT=$withval + fi + +-if test -n "$PATH_TO_SNMPGETNEXT" ++if test -n "$PATH_TO_SNMPGETNEXT" -a "$PATH_TO_SNMPGETNEXT" != "no" + then + + cat >>confdefs.h <<_ACEOF +@@ -26150,7 +26150,7 @@ _ACEOF fi -if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null ) +if false then - echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5 - echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6 -@@ -30929,7 +30929,7 @@ if test "${with_fping_command+set}" = se - withval="$with_fping_command" - PATH_TO_FPING=$withval - fi; + { echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5 + echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6; } +@@ -26317,7 +26317,7 @@ if test "${with_fping_command+set}" = se + withval=$with_fping_command; PATH_TO_FPING=$withval + fi + -if test -n "$PATH_TO_FPING" +if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no" then cat >>confdefs.h <<_ACEOF -@@ -32115,7 +32115,7 @@ _ACEOF - +@@ -27533,7 +27533,7 @@ if test -n "$PATH_TO_APTGET" ; then fi + -if test -f plugins/check_nt.c ; then +if false ; then EXTRAS="$EXTRAS check_nt" elif test -f ../plugins/check_nt.c ; then EXTRAS="$EXTRAS check_nt" -@@ -41104,6 +41104,12 @@ do - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF +@@ -45418,6 +45418,10 @@ do + case $ac_option in + # Handling of the options. -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + : Avoid regenerating within pkgsrc + exit 0 + : Avoid regenerating within pkgsrc + exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; diff --git a/net/nagios-plugins/patches/patch-ad b/net/nagios-plugins/patches/patch-ad index 15126b27380..da7ff080cc0 100644 --- a/net/nagios-plugins/patches/patch-ad +++ b/net/nagios-plugins/patches/patch-ad @@ -1,25 +1,25 @@ -$NetBSD: patch-ad,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $ +$NetBSD: patch-ad,v 1.2 2008/05/27 21:22:03 tonnerre Exp $ ---- plugins-scripts/Makefile.in.orig 2005-08-01 14:34:40.000000000 -0700 -+++ plugins-scripts/Makefile.in 2005-08-04 11:02:01.000000000 -0700 -@@ -238,14 +238,14 @@ - with_nagios_user = @with_nagios_user@ +--- plugins-scripts/Makefile.in.orig 2007-12-13 23:42:35.000000000 +0100 ++++ plugins-scripts/Makefile.in +@@ -330,15 +330,11 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ with_trusted_path = @with_trusted_path@ SUFFIXES = .pl .sh -libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \ -- check_log check_ntp check_oracle check_rpc check_sensors check_wave \ +- check_log check_oracle check_rpc check_sensors check_wave \ - check_ifstatus check_ifoperstatus check_mailq check_file_age \ -+libexec_SCRIPTS = check_ircd \ -+ check_log check_ntp check_rpc \ -+ check_mailq check_file_age \ - utils.sh utils.pm - +- utils.sh utils.pm +- -EXTRA_DIST = check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \ - check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \ - check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \ -+EXTRA_DIST = check_ircd.pl \ -+ check_log.sh check_ntp.pl check_rpc.pl \ -+ check_mailq.pl check_file_age.pl \ - utils.sh.in utils.pm.in t +- utils.sh.in utils.pm.in t ++libexec_SCRIPTS = check_ircd check_log check_ntp check_rpc check_mailq \ ++ check_file_age utils.sh utils.pm ++ ++EXTRA_DIST = check_ircd.pl check_log.sh check_ntp.pl check_rpc.pl \ ++ check_mailq.pl check_file_age.pl utils.sh.in utils.pm.in t TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir) + TESTS = @SCRIPT_TEST@ diff --git a/net/nagios-plugins/patches/patch-ae b/net/nagios-plugins/patches/patch-ae index 3fb10bc7073..3bf889914e8 100644 --- a/net/nagios-plugins/patches/patch-ae +++ b/net/nagios-plugins/patches/patch-ae @@ -1,17 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2006/08/17 14:20:14 taca Exp $ +$NetBSD: patch-ae,v 1.3 2008/05/27 21:22:03 tonnerre Exp $ ---- plugins/Makefile.am.orig 2006-03-21 20:42:59.000000000 +0900 +--- plugins/Makefile.am.orig 2007-12-12 02:27:48.000000000 +0100 +++ plugins/Makefile.am -@@ -46,7 +46,7 @@ test: - cd tests && make test - perl -I $(top_builddir) -I $(top_srcdir) ../test.pl - --AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@ -+#AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@ - - ############################################################################## - # the actual targets -@@ -155,7 +155,7 @@ install-exec-hook: +@@ -162,7 +162,7 @@ install-exec-hook: cd $(DESTDIR)$(libexecdir) && \ for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\ if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi diff --git a/net/nagios-plugins/patches/patch-af b/net/nagios-plugins/patches/patch-af index 22432cdf3e2..74343954641 100644 --- a/net/nagios-plugins/patches/patch-af +++ b/net/nagios-plugins/patches/patch-af @@ -1,17 +1,17 @@ -$NetBSD: patch-af,v 1.2 2006/08/17 14:20:14 taca Exp $ +$NetBSD: patch-af,v 1.3 2008/05/27 21:22:03 tonnerre Exp $ ---- plugins/Makefile.in.orig 2006-04-19 12:52:11.000000000 +0900 +--- plugins/Makefile.in.orig 2007-12-13 23:42:36.000000000 +0100 +++ plugins/Makefile.in -@@ -407,7 +407,7 @@ SSLOBJS = sslutils.o - NETLIBS = $(NETOBJS) $(SOCKETLIBS) - TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir) - TESTS = @PLUGIN_TEST@ --AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@ -+#AM_INSTALL_PROGRAM_FLAGS = @INSTALL_OPTS@ - - ############################################################################## - # the actual targets -@@ -1129,7 +1129,7 @@ $(check_tcp_programs): check_tcp +@@ -34,7 +34,7 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \ ++libexec_PROGRAMS = \ + check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \ + check_load$(EXEEXT) check_mrtg$(EXEEXT) \ + check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \ +@@ -1131,7 +1131,7 @@ $(check_tcp_programs): check_tcp install-exec-hook: cd $(DESTDIR)$(libexecdir) && \ for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\ diff --git a/net/nagios-plugins/patches/patch-ak b/net/nagios-plugins/patches/patch-ak index e3e76bc81d9..6f30cf339ed 100644 --- a/net/nagios-plugins/patches/patch-ak +++ b/net/nagios-plugins/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $ +$NetBSD: patch-ak,v 1.2 2008/05/27 21:22:03 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:19:20 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:19:20 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:19:20 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:19:20 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:19:20 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-plugins/patches/patch-al b/net/nagios-plugins/patches/patch-al index ef11283469b..a8fc97d2c20 100644 --- a/net/nagios-plugins/patches/patch-al +++ b/net/nagios-plugins/patches/patch-al @@ -1,6 +1,6 @@ -$NetBSD: patch-al,v 1.1 2006/10/16 05:29:40 seb Exp $ +$NetBSD: patch-al,v 1.2 2008/05/27 21:22:03 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 05:29:40 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 diff --git a/net/nagios-plugins/patches/patch-an b/net/nagios-plugins/patches/patch-an index 16033d75844..7395db12b39 100644 --- a/net/nagios-plugins/patches/patch-an +++ b/net/nagios-plugins/patches/patch-an @@ -1,13 +1,13 @@ -$NetBSD: patch-an,v 1.1 2007/03/30 05:52:37 grant Exp $ +$NetBSD: patch-an,v 1.2 2008/05/27 21:22:03 tonnerre Exp $ ---- lib/Makefile.in.orig 2006-04-19 13:52:06.000000000 +1000 +--- lib/Makefile.in.orig 2007-12-13 23:42:34.000000000 +0100 +++ lib/Makefile.in -@@ -82,7 +82,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(t - depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -109,7 +109,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(t + depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS_LFS) - LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ + LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) |