diff options
author | morr <morr> | 2011-04-08 22:48:40 +0000 |
---|---|---|
committer | morr <morr> | 2011-04-08 22:48:40 +0000 |
commit | 856e3bd550f838d046a232bfd087b8530f1ac7ea (patch) | |
tree | 61c9adf79f2fa9ebc5376f21f45e4ddabdf32c2b /net | |
parent | b61b2f2d7e84c8d6b43b0b218aa9f3d11dad66c4 (diff) | |
download | pkgsrc-856e3bd550f838d046a232bfd087b8530f1ac7ea.tar.gz |
Add DESTDIR support and LICENSE
Diffstat (limited to 'net')
-rw-r--r-- | net/nagios-plugin-mysql/Makefile | 6 | ||||
-rw-r--r-- | net/nagios-plugin-mysql/distinfo | 14 | ||||
-rw-r--r-- | net/nagios-plugin-mysql/patches/patch-ak | 45 | ||||
-rw-r--r-- | net/nagios-plugin-mysql/patches/patch-al | 4 | ||||
-rw-r--r-- | net/nagios-plugin-mysql/patches/patch-am | 4 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/Makefile | 6 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/distinfo | 14 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/patches/patch-ak | 45 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/patches/patch-al | 4 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/patches/patch-am | 4 | ||||
-rw-r--r-- | net/nagios-plugin-radius/Makefile | 6 | ||||
-rw-r--r-- | net/nagios-plugin-radius/distinfo | 14 | ||||
-rw-r--r-- | net/nagios-plugin-radius/patches/patch-ak | 45 | ||||
-rw-r--r-- | net/nagios-plugin-radius/patches/patch-al | 4 | ||||
-rw-r--r-- | net/nagios-plugin-radius/patches/patch-am | 4 | ||||
-rw-r--r-- | net/nagios-plugin-snmp/Makefile | 6 | ||||
-rw-r--r-- | net/nagios-plugin-snmp/distinfo | 14 | ||||
-rw-r--r-- | net/nagios-plugin-snmp/patches/patch-ak | 45 | ||||
-rw-r--r-- | net/nagios-plugin-snmp/patches/patch-al | 4 | ||||
-rw-r--r-- | net/nagios-plugin-snmp/patches/patch-am | 4 |
20 files changed, 88 insertions, 204 deletions
diff --git a/net/nagios-plugin-mysql/Makefile b/net/nagios-plugin-mysql/Makefile index 4c6033d1ddd..2bca90904cf 100644 --- a/net/nagios-plugin-mysql/Makefile +++ b/net/nagios-plugin-mysql/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.8 2010/09/30 10:49:11 obache Exp $ +# $NetBSD: Makefile,v 1.9 2011/04/08 22:48:40 morr Exp $ # PKGNAME= nagios-plugin-mysql-${PLUGINSVERSION} -PKGREVISION= 2 CATEGORIES= net sysutils databases MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Nagios mysql plugin +LICENSE= gnu-gpl-v3 + +PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins diff --git a/net/nagios-plugin-mysql/distinfo b/net/nagios-plugin-mysql/distinfo index 30d2cd362ff..f6dfbe2d936 100644 --- a/net/nagios-plugin-mysql/distinfo +++ b/net/nagios-plugin-mysql/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2009/12/15 18:59:54 bouyer Exp $ +$NetBSD: distinfo,v 1.7 2011/04/08 22:48:40 morr Exp $ -SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c -RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a -Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes -SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac -SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01 -SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 +SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610 +RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736 +Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes +SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b +SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594 +SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62 diff --git a/net/nagios-plugin-mysql/patches/patch-ak b/net/nagios-plugin-mysql/patches/patch-ak index c3b74c269cd..3d1509c55ba 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.2 2008/05/27 21:22:02 tonnerre Exp $ +$NetBSD: patch-ak,v 1.3 2011/04/08 22:48:41 morr Exp $ ---- gl/mountlist.c.orig 2007-01-24 23:47:25.000000000 +0100 +--- gl/mountlist.c.orig 2010-07-27 20:47:15.000000000 +0000 +++ gl/mountlist.c -@@ -57,7 +57,11 @@ char *strstr (); +@@ -52,7 +52,11 @@ # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME # define FS_TYPE(Ent) ((Ent).f_fstypename) # else @@ -15,7 +15,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ # endif #endif /* MOUNTED_GETFSSTAT */ -@@ -104,6 +108,10 @@ char *strstr (); +@@ -99,6 +103,10 @@ # include <sys/statfs.h> #endif @@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ #ifdef MOUNTED_LISTMNTENT # include <mntent.h> #endif -@@ -178,7 +186,7 @@ char *strstr (); +@@ -169,7 +177,7 @@ #if MOUNTED_GETMNTINFO @@ -35,7 +35,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ static char * fstype_to_string (short int t) { -@@ -275,9 +283,13 @@ fstype_to_string (short int t) +@@ -266,9 +274,13 @@ fstype_to_string (short int t) # endif static char * @@ -50,19 +50,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ return (char *) (fsp->f_fstypename); # else return fstype_to_string (fsp->f_type); -@@ -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 +@@ -592,9 +604,17 @@ read_file_system_list (bool need_fs_type { int numsys, counter; size_t bufsize; @@ -80,22 +68,3 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ if (numsys < 0) return (NULL); if (SIZE_MAX / sizeof *stats <= numsys) -@@ -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); diff --git a/net/nagios-plugin-mysql/patches/patch-al b/net/nagios-plugin-mysql/patches/patch-al index a88fb89ef0b..c673daf1ce5 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.2 2008/05/27 21:22:02 tonnerre Exp $ +$NetBSD: patch-al,v 1.3 2011/04/08 22:48:41 morr Exp $ ---- contrib/check_axis.sh.orig 2003-05-26 12:09:23.000000000 +0200 +--- contrib/check_axis.sh.orig 2010-07-27 20:47:15.000000000 +0000 +++ contrib/check_axis.sh @@ -5,7 +5,7 @@ port=$2 usr=$3 diff --git a/net/nagios-plugin-mysql/patches/patch-am b/net/nagios-plugin-mysql/patches/patch-am index 495de47227e..440b6569158 100644 --- a/net/nagios-plugin-mysql/patches/patch-am +++ b/net/nagios-plugin-mysql/patches/patch-am @@ -1,6 +1,6 @@ -$NetBSD: patch-am,v 1.1 2006/10/16 08:40:45 seb Exp $ +$NetBSD: patch-am,v 1.2 2011/04/08 22:48:41 morr Exp $ ---- contrib/check_mssql.sh.orig 2003-08-05 09:56:13.000000000 +0000 +--- contrib/check_mssql.sh.orig 2010-07-27 20:47:15.000000000 +0000 +++ contrib/check_mssql.sh @@ -35,10 +35,10 @@ pswd=$3 srv=$4 diff --git a/net/nagios-plugin-pgsql/Makefile b/net/nagios-plugin-pgsql/Makefile index e0776a48b63..1d65e8fd6c8 100644 --- a/net/nagios-plugin-pgsql/Makefile +++ b/net/nagios-plugin-pgsql/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.10 2010/02/10 19:34:07 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2011/04/08 22:49:19 morr Exp $ # PKGNAME= nagios-plugin-pgsql-${PLUGINSVERSION} -PKGREVISION= 2 CATEGORIES= net sysutils databases MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Nagios pgsql plugin +LICENSE= gnu-gpl-v3 + +PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins diff --git a/net/nagios-plugin-pgsql/distinfo b/net/nagios-plugin-pgsql/distinfo index 2a4146bc7a4..f8c4bb2fcf0 100644 --- a/net/nagios-plugin-pgsql/distinfo +++ b/net/nagios-plugin-pgsql/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2009/12/15 18:59:54 bouyer Exp $ +$NetBSD: distinfo,v 1.8 2011/04/08 22:49:19 morr Exp $ -SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c -RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a -Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes -SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac -SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01 -SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 +SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610 +RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736 +Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes +SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b +SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594 +SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62 diff --git a/net/nagios-plugin-pgsql/patches/patch-ak b/net/nagios-plugin-pgsql/patches/patch-ak index c3b74c269cd..8d09c895285 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.2 2008/05/27 21:22:02 tonnerre Exp $ +$NetBSD: patch-ak,v 1.3 2011/04/08 22:49:19 morr Exp $ ---- gl/mountlist.c.orig 2007-01-24 23:47:25.000000000 +0100 +--- gl/mountlist.c.orig 2010-07-27 20:47:15.000000000 +0000 +++ gl/mountlist.c -@@ -57,7 +57,11 @@ char *strstr (); +@@ -52,7 +52,11 @@ # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME # define FS_TYPE(Ent) ((Ent).f_fstypename) # else @@ -15,7 +15,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ # endif #endif /* MOUNTED_GETFSSTAT */ -@@ -104,6 +108,10 @@ char *strstr (); +@@ -99,6 +103,10 @@ # include <sys/statfs.h> #endif @@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ #ifdef MOUNTED_LISTMNTENT # include <mntent.h> #endif -@@ -178,7 +186,7 @@ char *strstr (); +@@ -169,7 +177,7 @@ #if MOUNTED_GETMNTINFO @@ -35,7 +35,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ static char * fstype_to_string (short int t) { -@@ -275,9 +283,13 @@ fstype_to_string (short int t) +@@ -266,9 +274,13 @@ fstype_to_string (short int t) # endif static char * @@ -50,19 +50,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ return (char *) (fsp->f_fstypename); # else return fstype_to_string (fsp->f_type); -@@ -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 +@@ -592,9 +604,17 @@ read_file_system_list (bool need_fs_type { int numsys, counter; size_t bufsize; @@ -80,22 +68,3 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ if (numsys < 0) return (NULL); if (SIZE_MAX / sizeof *stats <= numsys) -@@ -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); diff --git a/net/nagios-plugin-pgsql/patches/patch-al b/net/nagios-plugin-pgsql/patches/patch-al index a88fb89ef0b..2b548c7c476 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.2 2008/05/27 21:22:02 tonnerre Exp $ +$NetBSD: patch-al,v 1.3 2011/04/08 22:49:19 morr Exp $ ---- contrib/check_axis.sh.orig 2003-05-26 12:09:23.000000000 +0200 +--- contrib/check_axis.sh.orig 2010-07-27 20:47:15.000000000 +0000 +++ contrib/check_axis.sh @@ -5,7 +5,7 @@ port=$2 usr=$3 diff --git a/net/nagios-plugin-pgsql/patches/patch-am b/net/nagios-plugin-pgsql/patches/patch-am index 495de47227e..975cbbf40e5 100644 --- a/net/nagios-plugin-pgsql/patches/patch-am +++ b/net/nagios-plugin-pgsql/patches/patch-am @@ -1,6 +1,6 @@ -$NetBSD: patch-am,v 1.1 2006/10/16 08:40:45 seb Exp $ +$NetBSD: patch-am,v 1.2 2011/04/08 22:49:19 morr Exp $ ---- contrib/check_mssql.sh.orig 2003-08-05 09:56:13.000000000 +0000 +--- contrib/check_mssql.sh.orig 2010-07-27 20:47:15.000000000 +0000 +++ contrib/check_mssql.sh @@ -35,10 +35,10 @@ pswd=$3 srv=$4 diff --git a/net/nagios-plugin-radius/Makefile b/net/nagios-plugin-radius/Makefile index 8478a2a8040..421bfa16dc4 100644 --- a/net/nagios-plugin-radius/Makefile +++ b/net/nagios-plugin-radius/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2010/01/17 12:02:33 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2011/04/08 22:49:49 morr Exp $ # PKGNAME= nagios-plugin-radius-${PLUGINSVERSION} -PKGREVISION= 1 CATEGORIES= net sysutils MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Nagios radius plugin +LICENSE= gnu-gpl-v3 + +PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins DEPENDS+= p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP diff --git a/net/nagios-plugin-radius/distinfo b/net/nagios-plugin-radius/distinfo index 68017bf284d..a514df050d1 100644 --- a/net/nagios-plugin-radius/distinfo +++ b/net/nagios-plugin-radius/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2009/12/15 18:59:54 bouyer Exp $ +$NetBSD: distinfo,v 1.5 2011/04/08 22:49:49 morr Exp $ -SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c -RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a -Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes +SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610 +RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736 +Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes SHA1 (patch-aa) = eb39ca2fcbe857b48ec6a5a15a097a2e7fd635a2 -SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac -SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01 -SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 +SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b +SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594 +SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62 diff --git a/net/nagios-plugin-radius/patches/patch-ak b/net/nagios-plugin-radius/patches/patch-ak index c3b74c269cd..d5fb538c3e4 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.2 2008/05/27 21:22:02 tonnerre Exp $ +$NetBSD: patch-ak,v 1.3 2011/04/08 22:49:49 morr Exp $ ---- gl/mountlist.c.orig 2007-01-24 23:47:25.000000000 +0100 +--- gl/mountlist.c.orig 2010-07-27 20:47:15.000000000 +0000 +++ gl/mountlist.c -@@ -57,7 +57,11 @@ char *strstr (); +@@ -52,7 +52,11 @@ # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME # define FS_TYPE(Ent) ((Ent).f_fstypename) # else @@ -15,7 +15,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ # endif #endif /* MOUNTED_GETFSSTAT */ -@@ -104,6 +108,10 @@ char *strstr (); +@@ -99,6 +103,10 @@ # include <sys/statfs.h> #endif @@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ #ifdef MOUNTED_LISTMNTENT # include <mntent.h> #endif -@@ -178,7 +186,7 @@ char *strstr (); +@@ -169,7 +177,7 @@ #if MOUNTED_GETMNTINFO @@ -35,7 +35,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ static char * fstype_to_string (short int t) { -@@ -275,9 +283,13 @@ fstype_to_string (short int t) +@@ -266,9 +274,13 @@ fstype_to_string (short int t) # endif static char * @@ -50,19 +50,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ return (char *) (fsp->f_fstypename); # else return fstype_to_string (fsp->f_type); -@@ -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 +@@ -592,9 +604,17 @@ read_file_system_list (bool need_fs_type { int numsys, counter; size_t bufsize; @@ -80,22 +68,3 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ if (numsys < 0) return (NULL); if (SIZE_MAX / sizeof *stats <= numsys) -@@ -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); diff --git a/net/nagios-plugin-radius/patches/patch-al b/net/nagios-plugin-radius/patches/patch-al index a88fb89ef0b..2b977e331ff 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.2 2008/05/27 21:22:02 tonnerre Exp $ +$NetBSD: patch-al,v 1.3 2011/04/08 22:49:49 morr Exp $ ---- contrib/check_axis.sh.orig 2003-05-26 12:09:23.000000000 +0200 +--- contrib/check_axis.sh.orig 2010-07-27 20:47:15.000000000 +0000 +++ contrib/check_axis.sh @@ -5,7 +5,7 @@ port=$2 usr=$3 diff --git a/net/nagios-plugin-radius/patches/patch-am b/net/nagios-plugin-radius/patches/patch-am index c6eb6ca49c9..aca64f53ed0 100644 --- a/net/nagios-plugin-radius/patches/patch-am +++ b/net/nagios-plugin-radius/patches/patch-am @@ -1,6 +1,6 @@ -$NetBSD: patch-am,v 1.1.1.1 2007/04/13 20:06:21 bouyer Exp $ +$NetBSD: patch-am,v 1.2 2011/04/08 22:49:49 morr Exp $ ---- contrib/check_mssql.sh.orig 2003-08-05 09:56:13.000000000 +0000 +--- contrib/check_mssql.sh.orig 2010-07-27 20:47:15.000000000 +0000 +++ contrib/check_mssql.sh @@ -35,10 +35,10 @@ pswd=$3 srv=$4 diff --git a/net/nagios-plugin-snmp/Makefile b/net/nagios-plugin-snmp/Makefile index 8faea72f298..c9443a4f228 100644 --- a/net/nagios-plugin-snmp/Makefile +++ b/net/nagios-plugin-snmp/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.11 2010/01/17 12:02:33 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2011/04/08 22:50:17 morr Exp $ # PKGNAME= nagios-plugin-snmp-${PLUGINSVERSION} -PKGREVISION= 1 CATEGORIES= net sysutils MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Nagios snmp plugins +LICENSE= gnu-gpl-v3 + +PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins DEPENDS+= p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP diff --git a/net/nagios-plugin-snmp/distinfo b/net/nagios-plugin-snmp/distinfo index 99696d05d25..2ac86cc64d4 100644 --- a/net/nagios-plugin-snmp/distinfo +++ b/net/nagios-plugin-snmp/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2010/03/09 02:07:38 taca Exp $ +$NetBSD: distinfo,v 1.9 2011/04/08 22:50:17 morr Exp $ -SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c -RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a -Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes +SHA1 (nagios-plugins-1.4.15.tar.gz) = 1faab309c06d37e559490fd852ecb0dc8a8ab610 +RMD160 (nagios-plugins-1.4.15.tar.gz) = c2780a3523cf4eaaed34a94c07f5f6bd6fb1f736 +Size (nagios-plugins-1.4.15.tar.gz) = 2095419 bytes SHA1 (patch-ad) = 75bb44093f1fe0d18668cb9aec787d760fe16ad4 SHA1 (patch-ae) = 42a2767b290e4a10c93f170e85138e8c639906dc -SHA1 (patch-ak) = 801eaa64d88db20880c8b7e61922f198fc5791ac -SHA1 (patch-al) = 658079cb3669ffcf2b0d158816b048c412f78d01 -SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 +SHA1 (patch-ak) = dd9aba7a0930a6448e372b581ba04d62018a973b +SHA1 (patch-al) = 63e28ae36d671e773acfe6aeb45ab7603c112594 +SHA1 (patch-am) = adc95ba1037a7d7caab6dde6ca1e27e47754db62 diff --git a/net/nagios-plugin-snmp/patches/patch-ak b/net/nagios-plugin-snmp/patches/patch-ak index c3b74c269cd..f873d9b23ea 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.2 2008/05/27 21:22:02 tonnerre Exp $ +$NetBSD: patch-ak,v 1.3 2011/04/08 22:50:17 morr Exp $ ---- gl/mountlist.c.orig 2007-01-24 23:47:25.000000000 +0100 +--- gl/mountlist.c.orig 2010-07-27 20:47:15.000000000 +0000 +++ gl/mountlist.c -@@ -57,7 +57,11 @@ char *strstr (); +@@ -52,7 +52,11 @@ # if HAVE_STRUCT_FSSTAT_F_FSTYPENAME # define FS_TYPE(Ent) ((Ent).f_fstypename) # else @@ -15,7 +15,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ # endif #endif /* MOUNTED_GETFSSTAT */ -@@ -104,6 +108,10 @@ char *strstr (); +@@ -99,6 +103,10 @@ # include <sys/statfs.h> #endif @@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ #ifdef MOUNTED_LISTMNTENT # include <mntent.h> #endif -@@ -178,7 +186,7 @@ char *strstr (); +@@ -169,7 +177,7 @@ #if MOUNTED_GETMNTINFO @@ -35,7 +35,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ static char * fstype_to_string (short int t) { -@@ -275,9 +283,13 @@ fstype_to_string (short int t) +@@ -266,9 +274,13 @@ fstype_to_string (short int t) # endif static char * @@ -50,19 +50,7 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ return (char *) (fsp->f_fstypename); # else return fstype_to_string (fsp->f_type); -@@ -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 +@@ -592,9 +604,17 @@ read_file_system_list (bool need_fs_type { int numsys, counter; size_t bufsize; @@ -80,22 +68,3 @@ $NetBSD: patch-ak,v 1.2 2008/05/27 21:22:02 tonnerre Exp $ if (numsys < 0) return (NULL); if (SIZE_MAX / sizeof *stats <= numsys) -@@ -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); diff --git a/net/nagios-plugin-snmp/patches/patch-al b/net/nagios-plugin-snmp/patches/patch-al index a88fb89ef0b..fba98f4d902 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.2 2008/05/27 21:22:02 tonnerre Exp $ +$NetBSD: patch-al,v 1.3 2011/04/08 22:50:17 morr Exp $ ---- contrib/check_axis.sh.orig 2003-05-26 12:09:23.000000000 +0200 +--- contrib/check_axis.sh.orig 2010-07-27 20:47:15.000000000 +0000 +++ contrib/check_axis.sh @@ -5,7 +5,7 @@ port=$2 usr=$3 diff --git a/net/nagios-plugin-snmp/patches/patch-am b/net/nagios-plugin-snmp/patches/patch-am index 495de47227e..aab635bf6f9 100644 --- a/net/nagios-plugin-snmp/patches/patch-am +++ b/net/nagios-plugin-snmp/patches/patch-am @@ -1,6 +1,6 @@ -$NetBSD: patch-am,v 1.1 2006/10/16 08:40:45 seb Exp $ +$NetBSD: patch-am,v 1.2 2011/04/08 22:50:17 morr Exp $ ---- contrib/check_mssql.sh.orig 2003-08-05 09:56:13.000000000 +0000 +--- contrib/check_mssql.sh.orig 2010-07-27 20:47:15.000000000 +0000 +++ contrib/check_mssql.sh @@ -35,10 +35,10 @@ pswd=$3 srv=$4 |