diff options
author | cvs <cvs@pkgsrc.org> | 2007-03-23 19:00:19 +0000 |
---|---|---|
committer | cvs <cvs@pkgsrc.org> | 2007-03-23 19:00:19 +0000 |
commit | da1b24d6fdfe442753c8272da5432c8fcaa1f43c (patch) | |
tree | 8c7c348db30abadfdc6b77822405d9ffe7b79103 /net/nagios-plugin-pgsql | |
parent | da5bb3f20f33565c1db65018aabd8cf59023cfef (diff) | |
download | pkgsrc-jlam-pkgviews.tar.gz |
Creating branch jlam-pkgviewsjlam-pkgviews
Diffstat (limited to 'net/nagios-plugin-pgsql')
-rw-r--r-- | net/nagios-plugin-pgsql/DESCR | 2 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/Makefile | 24 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/PLIST | 2 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/distinfo | 8 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/patches/patch-ak | 105 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/patches/patch-al | 92 | ||||
-rw-r--r-- | net/nagios-plugin-pgsql/patches/patch-am | 56 |
7 files changed, 0 insertions, 289 deletions
diff --git a/net/nagios-plugin-pgsql/DESCR b/net/nagios-plugin-pgsql/DESCR deleted file mode 100644 index 3b31cbf7021..00000000000 --- a/net/nagios-plugin-pgsql/DESCR +++ /dev/null @@ -1,2 +0,0 @@ - This is a package for a pgsql monitoring plug-in for nagios. For -more information about nagios, see the 'nagios-base' package. diff --git a/net/nagios-plugin-pgsql/Makefile b/net/nagios-plugin-pgsql/Makefile deleted file mode 100644 index 69ed08b37c0..00000000000 --- a/net/nagios-plugin-pgsql/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.5 2007/02/22 19:26:56 wiz Exp $ -# - -PKGNAME= nagios-plugin-pgsql-${PLUGINSVERSION} -PKGREVISION= 1 -CATEGORIES= net sysutils databases - -MAINTAINER= pkgsrc-users@NetBSD.org -COMMENT= Nagios pgsql plugin - -DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins - -CONFIGURE_ARGS+= --with-pgsql=${BUILDLINK_PREFIX.pgsql-lib} -#CPPFLAGS+= -I${PGSQL_PREFIX}/include/pgsql - -.include "../../net/nagios-plugins/Makefile.common" - -BINARY_TARGET= check_pgsql - -.include "../../net/nagios-plugins/Makefile.plugin" -.include "../../mk/pgsql.buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/nagios-plugin-pgsql/PLIST b/net/nagios-plugin-pgsql/PLIST deleted file mode 100644 index bff84343d17..00000000000 --- a/net/nagios-plugin-pgsql/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/18 17:22:57 bouyer Exp $ -libexec/nagios/check_pgsql diff --git a/net/nagios-plugin-pgsql/distinfo b/net/nagios-plugin-pgsql/distinfo deleted file mode 100644 index 956afc0ad1d..00000000000 --- a/net/nagios-plugin-pgsql/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.3 2006/10/16 08:40:45 seb 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 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 diff --git a/net/nagios-plugin-pgsql/patches/patch-ak b/net/nagios-plugin-pgsql/patches/patch-ak deleted file mode 100644 index fcf8b069a00..00000000000 --- a/net/nagios-plugin-pgsql/patches/patch-ak +++ /dev/null @@ -1,105 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2006/02/18 17:22:57 bouyer 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 @@ - # 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 */ - -@@ -109,6 +113,10 @@ - # include <sys/statfs.h> - #endif - -+#ifdef HAVE_SYS_STATVFS_H -+#include <sys/statvfs.h> -+#endif -+ - #ifdef MOUNTED_LISTMNTENT - # include <mntent.h> - #endif -@@ -173,7 +181,7 @@ - - #if MOUNTED_GETMNTINFO - --# if ! HAVE_F_FSTYPENAME_IN_STATFS -+# if ! HAVE_F_FSTYPENAME_IN_STATFS && ! STAT_STATVFS - static char * - fstype_to_string (short t) - { -@@ -271,12 +279,16 @@ - - /* __NetBSD__ || BSD_NET2 || __OpenBSD__ */ - static char * -+#ifdef STAT_STATVFS -+fsp_to_string (const struct statvfs *fsp) -+#else - 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 - 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 @@ - - #ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */ - { -+#ifdef STAT_STATVFS -+ struct statvfs *fsp; -+#else - struct statfs *fsp; -+#endif - int entries; - - entries = getmntinfo (&fsp, MNT_NOWAIT); -@@ -543,9 +559,17 @@ - { - int numsys, counter; - size_t bufsize; -+#ifdef STAT_STATVFS -+ struct statvfs *stats; -+#else - struct statfs *stats; -+#endif - -+#ifdef STAT_STATVFS -+ numsys = getfsstat ((struct statvfs *)0, 0L, MNT_NOWAIT); -+#else - numsys = getfsstat ((struct statfs *)0, 0L, MNT_NOWAIT); -+#endif - if (numsys < 0) - return (NULL); - if (SIZE_MAX / sizeof *stats <= numsys) -@@ -608,10 +632,18 @@ - # 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 deleted file mode 100644 index b3f944d580c..00000000000 --- a/net/nagios-plugin-pgsql/patches/patch-al +++ /dev/null @@ -1,92 +0,0 @@ -$NetBSD: patch-al,v 1.1 2006/10/16 08:40:45 seb Exp $ - ---- contrib/check_axis.sh.orig 2003-05-26 10:09:23.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) 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 }'`; - else -@@ -40,48 +40,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 --git a/net/nagios-plugin-pgsql/patches/patch-am b/net/nagios-plugin-pgsql/patches/patch-am deleted file mode 100644 index 495de47227e..00000000000 --- a/net/nagios-plugin-pgsql/patches/patch-am +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-am,v 1.1 2006/10/16 08:40:45 seb Exp $ - ---- contrib/check_mssql.sh.orig 2003-08-05 09:56:13.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) 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; |