pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net Sync with net/nagios-plugins.
details: https://anonhg.NetBSD.org/pkgsrc/rev/512da8dd6fdd
branches: trunk
changeset: 649488:512da8dd6fdd
user: rodent <rodent%pkgsrc.org@localhost>
date: Fri Apr 03 18:34:16 2015 +0000
description:
Sync with net/nagios-plugins.
diffstat:
net/nagios-plugin-pgsql/Makefile | 3 +-
net/nagios-plugin-pgsql/distinfo | 15 +-
net/nagios-plugin-pgsql/patches/patch-ak | 24 ++-
net/nagios-plugin-pgsql/patches/patch-al | 92 -------------
net/nagios-plugin-pgsql/patches/patch-am | 56 --------
net/nagios-plugin-pgsql/patches/patch-configure | 112 ++++++++++++++-
net/nagios-plugin-pgsql/patches/patch-lib_utils_base.c | 14 --
net/nagios-plugin-radius/Makefile | 3 +-
net/nagios-plugin-radius/distinfo | 15 +-
net/nagios-plugin-radius/patches/patch-ak | 24 ++-
net/nagios-plugin-radius/patches/patch-al | 92 -------------
net/nagios-plugin-radius/patches/patch-am | 56 --------
net/nagios-plugin-radius/patches/patch-configure | 94 ++++++++++++-
net/nagios-plugin-radius/patches/patch-lib_utils_base.c | 14 --
14 files changed, 234 insertions(+), 380 deletions(-)
diffs (truncated from 763 to 300 lines):
diff -r 239bedb6b3bd -r 512da8dd6fdd net/nagios-plugin-pgsql/Makefile
--- a/net/nagios-plugin-pgsql/Makefile Fri Apr 03 18:34:14 2015 +0000
+++ b/net/nagios-plugin-pgsql/Makefile Fri Apr 03 18:34:16 2015 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/06/10 14:21:37 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/03 18:34:16 rodent Exp $
#
PKGNAME= nagios-plugin-pgsql-${PLUGINSVERSION}
-PKGREVISION= 5
CATEGORIES= net sysutils databases
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
diff -r 239bedb6b3bd -r 512da8dd6fdd net/nagios-plugin-pgsql/distinfo
--- a/net/nagios-plugin-pgsql/distinfo Fri Apr 03 18:34:14 2015 +0000
+++ b/net/nagios-plugin-pgsql/distinfo Fri Apr 03 18:34:16 2015 +0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.10 2012/07/25 12:07:30 fhajny Exp $
+$NetBSD: distinfo,v 1.11 2015/04/03 18:34:16 rodent Exp $
-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
-SHA1 (patch-configure) = 1b9f7c4014c0425cda5f93e9fa123a236728f003
-SHA1 (patch-lib_utils_base.c) = 7e315711f8ca9ec033841c8f0eb9e037625c84ca
+SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
+RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
+Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes
+SHA1 (patch-ak) = cd052cfbe669cd64038ae23c624761dd3a7da188
+SHA1 (patch-configure) = 8aa67c3eb339d57d225df7dc106b888dd2d37da3
diff -r 239bedb6b3bd -r 512da8dd6fdd net/nagios-plugin-pgsql/patches/patch-ak
--- a/net/nagios-plugin-pgsql/patches/patch-ak Fri Apr 03 18:34:14 2015 +0000
+++ b/net/nagios-plugin-pgsql/patches/patch-ak Fri Apr 03 18:34:16 2015 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.3 2011/04/08 22:49:19 morr Exp $
+$NetBSD: patch-ak,v 1.4 2015/04/03 18:34:16 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 @@
#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 @@
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 @@
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 @@
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 -r 239bedb6b3bd -r 512da8dd6fdd net/nagios-plugin-pgsql/patches/patch-al
--- a/net/nagios-plugin-pgsql/patches/patch-al Fri Apr 03 18:34:14 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-$NetBSD: patch-al,v 1.3 2011/04/08 22:49:19 morr Exp $
-
---- 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
- pass=$4
-
--if [ ! "$#" == "4" ]; then
-+if [ ! "$#" = "4" ]; then
- echo -e "\nYou did not supply enough command line arguments. \nUsage: ./check_axis.sh <host> <port> <username> <password> \n \nCheck_axis.sh checks the status of LPT ports on Axis print
servers. \nIt was written by Tom De Blende (tom.deblende%village.uunet.be@localhost) in 2002. \n" && exit "3"
- fi
-
-@@ -27,7 +27,7 @@ fi
-
- lines=`cat $tempfile | grep -i $port`
- status=`echo $lines | awk '{ print $3 }'`
--if [ "$status" == "Printing" ]; then
-+if [ "$status" = "Printing" ]; then
- bytes=`echo $lines | awk '{ print $4 }'`;
- comments=`echo $lines | tr -d "
- " | awk '{ print $5 " " $6 }'`;
-@@ -42,48 +42,48 @@ if [ "$comma" -eq "1" ]; then
- fi
-
-
--if [ "$status" == "Available" ]; then
-- if [ "$comments" == "Paper out" ]; then
-+if [ "$status" = "Available" ]; then
-+ if [ "$comments" = "Paper out" ]; then
- exit="1" && stdio="WARNING - Out of paper.";
-- elif [ "$comments" == " " ]; then
-+ elif [ "$comments" = " " ]; then
- exit="0" && stdio="OK - Printer is available but returns no comments.";
-- elif [ "$comments" == "No error" ]; then
-+ elif [ "$comments" = "No error" ]; then
- exit="0" && stdio="OK - No error.";
-- elif [ "$comments" == "Ready " ]; then
-+ elif [ "$comments" = "Ready " ]; then
- exit="0" && stdio="OK - Ready.";
-- elif [ "$comments" == "Off line" ]; then
-+ elif [ "$comments" = "Off line" ]; then
- exit="1" && stdio="WARNING - Printer is off line.";
-- elif [ "$comments" == "Out of" ]; then
-+ elif [ "$comments" = "Out of" ]; then
- exit="1" && stdio="WARNING - Out of paper.";
-- elif [ "$comments" == "Busy Out" ]; then
-+ elif [ "$comments" = "Busy Out" ]; then
- exit="1" && stdio="WARNING - Busy, out of paper.";
-- elif [ "$comments" == "Printer off-line" ]; then
-+ elif [ "$comments" = "Printer off-line" ]; then
- exit="1" && stdio="WARNING - Printer is off line.";
-- elif [ "$comments" == "Printer fault" ]; then
-+ elif [ "$comments" = "Printer fault" ]; then
- exit="2" && stdio="CRITICAL - Printer fault.";
- else
- exit="3" && stdio="Comments: $comments";
- fi
--elif [ "$status" == "Printing" ]; then
-- if [ "$comments" == "Printer busy" ]; then
-+elif [ "$status" = "Printing" ]; then
-+ if [ "$comments" = "Printer busy" ]; then
- exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";
-- elif [ "$comments" == "No error" ]; then
-+ elif [ "$comments" = "No error" ]; then
- exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";
-- elif [ "$comments" == "Paper out" ]; then
-+ elif [ "$comments" = "Paper out" ]; then
- exit="1" && stdio="WARNING - PRINTING. Out of paper.";
-- elif [ "$comments" == "Out of" ]; then
-+ elif [ "$comments" = "Out of" ]; then
- exit="1" && stdio="WARNING - PRINTING. Out of paper. Bytes printed: $bytes.";
-- elif [ "$comments" == "Busy Out" ]; then
-+ elif [ "$comments" = "Busy Out" ]; then
- exit="1" && stdio="WARNING - Busy, out of paper.";
-- elif [ "$comments" == "Ready " ]; then
-+ elif [ "$comments" = "Ready " ]; then
- exit="0" && stdio="OK - PRINTING. Bytes printed: $bytes.";
-- elif [ "$comments" == "Printer off-line" ]; then
-+ elif [ "$comments" = "Printer off-line" ]; then
- exit="1" && stdio="WARNING - PRINTING. Printer is off line.";
-- elif [ "$comments" == "Busy " ]; then
-+ elif [ "$comments" = "Busy " ]; then
- exit="0" && stdio="OK - PRINTING. Busy. Bytes printed: $bytes.";
-- elif [ "$comments" == "Off line" ]; then
-+ elif [ "$comments" = "Off line" ]; then
- exit="1" && stdio="WARNING - PRINTING. Printer is off line.";
-- elif [ "$comments" == "Printer fault" ]; then
-+ elif [ "$comments" = "Printer fault" ]; then
- exit="2" && stdio="CRITICAL - PRINTING. Printer fault. Bytes printed: $bytes.";
- else
- exit="3" && stdio="Comments: $comments.";
diff -r 239bedb6b3bd -r 512da8dd6fdd net/nagios-plugin-pgsql/patches/patch-am
--- a/net/nagios-plugin-pgsql/patches/patch-am Fri Apr 03 18:34:14 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-$NetBSD: patch-am,v 1.2 2011/04/08 22:49:19 morr Exp $
-
---- 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
-
-
--if [ ! "$#" == "4" ]; then
-+if [ ! "$#" = "4" ]; then
- echo -e "\nYou did not supply enough arguments. \nUsage: $0 <host> <username> <password> <version> \n \n$0 checks Microsoft SQL Server connectivity. It works with versions 7 and
2000.\n\nYou need a working version of FreeTDS (http://www.freetds.org/) and tsql (included in FreeTDS 6.0+) to connect to the SQL server. \nIt was written by Tom De Blende
(tom.deblende%village.uunet.be@localhost) in 2003. \n\nExample:\n $0 dbserver sa f00bar 2000\n" && exit "3"
-
--elif [ $tsqlcmd == "" ]; then
-+elif [ $tsqlcmd = "" ]; then
- echo -e "tsql not found! Please verify you have a working version of tsql (included in the FreeTDS version 6.0+) and enter the full path in the script." && exit "3"
-
- fi
-@@ -50,9 +50,9 @@ exit="3"
-
- tmpfile=`$mktempcmd /tmp/$hostname.XXXXXX`
-
--if [ $srv == "7" ]; then
-+if [ $srv = "7" ]; then
- spid=7
--elif [ $srv == "2000" ]; then
-+elif [ $srv = "2000" ]; then
- spid=50
- else
- echo -e "$srv is not a supported MS SQL Server version!" && exit "3"
-@@ -69,7 +69,7 @@ $tsqlcmd -S $hostname -U $usr -P $pswd <
-
- $grepcmd -q "Login failed for user" $errorfile
-
--if [ "$?" == "0" ]; then
-+if [ "$?" = "0" ]; then
- $rmcmd -f $tmpfile $resultfile $errorfile;
- echo CRITICAL - Could not make connection to SQL server. Login failed.;
- exit 2;
-@@ -77,7 +77,7 @@ fi
-
- $grepcmd -q "There was a problem connecting to the server" $errorfile
-
--if [ "$?" == "0" ]; then
-+if [ "$?" = "0" ]; then
- $rmcmd -f $tmpfile $resultfile $errorfile;
- echo CRITICAL - Could not make connection to SQL server. Incorrect server name or SQL service not running.;
- exit 2;
-@@ -85,7 +85,7 @@ fi
-
- resultfileln=`$catcmd $resultfile | $wccmd -l | $sedcmd 's/ //g'`
-
--if [ "$resultfileln" == "2" ]; then
-+if [ "$resultfileln" = "2" ]; then
- $rmcmd -f $tmpfile $resultfile $errorfile;
- echo CRITICAL - Could not make connection to SQL server. No data received from host.;
- exit 2;
diff -r 239bedb6b3bd -r 512da8dd6fdd net/nagios-plugin-pgsql/patches/patch-configure
--- a/net/nagios-plugin-pgsql/patches/patch-configure Fri Apr 03 18:34:14 2015 +0000
+++ b/net/nagios-plugin-pgsql/patches/patch-configure Fri Apr 03 18:34:16 2015 +0000
@@ -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:34:16 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
Home |
Main Index |
Thread Index |
Old Index