diff options
author | seb <seb@pkgsrc.org> | 2006-10-16 05:29:40 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2006-10-16 05:29:40 +0000 |
commit | ab3cb42775a16bdc694a51d54ea68732f9d3bb20 (patch) | |
tree | d02c01d44428d7163460164255cd89d65db4a13c /net | |
parent | 5f20abb30def86aab72cef7a7e1f04bb9784002c (diff) | |
download | pkgsrc-ab3cb42775a16bdc694a51d54ea68732f9d3bb20.tar.gz |
Fixed "test ==".
While here remove obsolete patch files which had not been cvs removed
until now.
Diffstat (limited to 'net')
-rw-r--r-- | net/nagios-plugins/distinfo | 4 | ||||
-rw-r--r-- | net/nagios-plugins/patches/patch-ag | 17 | ||||
-rw-r--r-- | net/nagios-plugins/patches/patch-aj | 13 | ||||
-rw-r--r-- | net/nagios-plugins/patches/patch-al | 92 | ||||
-rw-r--r-- | net/nagios-plugins/patches/patch-am | 56 |
5 files changed, 151 insertions, 31 deletions
diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo index 2c20501f3e0..0a7d0b461b2 100644 --- a/net/nagios-plugins/distinfo +++ b/net/nagios-plugins/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2006/08/17 14:20:14 taca Exp $ +$NetBSD: distinfo,v 1.3 2006/10/16 05:29:40 seb Exp $ SHA1 (nagios-plugins-1.4.3.tar.gz) = c26fc2f31d7579c3a8174dcd1965046c4b1c8d37 RMD160 (nagios-plugins-1.4.3.tar.gz) = bc1d4f8cddd481775c514758a462fe533e01e846 @@ -10,3 +10,5 @@ SHA1 (patch-af) = 626810863f909652202ead6bcf4b00494d1d758f SHA1 (patch-ah) = b9f9f36d2c77ac08213dfea4df443872230f8099 SHA1 (patch-ai) = 383f5b19466c82454e198e1b9cdbec2dcfd04047 SHA1 (patch-ak) = c3d9f6ea9a971c45ec4159f800c2a975a3013c82 +SHA1 (patch-al) = cfeef69928795681f17e1faa1639fb3e57a31c32 +SHA1 (patch-am) = ed7e108505679e739449b5eed6101f307e23f436 diff --git a/net/nagios-plugins/patches/patch-ag b/net/nagios-plugins/patches/patch-ag deleted file mode 100644 index 3377f2ec404..00000000000 --- a/net/nagios-plugins/patches/patch-ag +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $ - ---- plugins-scripts/utils.sh.in.orig 2002-06-05 21:16:56.000000000 -0700 -+++ plugins-scripts/utils.sh.in 2005-08-04 10:58:12.000000000 -0700 -@@ -14,10 +14,10 @@ - - print_revision() { - echo "$1 (@PACKAGE@ @VERSION@) $2" -- $ECHO "@WARRANTY@" | /bin/sed -e 's/\n/ /g' -+ $ECHO "@WARRANTY@" | /usr/bin/sed -e 's/\n/ /g' - } - - support() { -- $ECHO "@SUPPORT@" | /bin/sed -e 's/\n/ /g' -+ $ECHO "@SUPPORT@" | /usr/bin/sed -e 's/\n/ /g' - } - diff --git a/net/nagios-plugins/patches/patch-aj b/net/nagios-plugins/patches/patch-aj deleted file mode 100644 index a393513fc20..00000000000 --- a/net/nagios-plugins/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2006/02/18 17:19:20 bouyer Exp $ - ---- plugins-scripts/check_log.sh.orig 2005-08-04 10:29:25.000000000 -0700 -+++ plugins-scripts/check_log.sh 2005-08-04 10:29:54.000000000 -0700 -@@ -201,7 +201,7 @@ - count=`$GREP -c "$query" $tempdiff` - - # Get the last matching entry in the diff file --lastentry=`$GREP "$query" $tempdiff | $TAIL --lines=1` -+lastentry=`$GREP "$query" $tempdiff | $TAIL -n 1` - - $RM -f $tempdiff - $CAT $logfile > $oldlog diff --git a/net/nagios-plugins/patches/patch-al b/net/nagios-plugins/patches/patch-al new file mode 100644 index 00000000000..ef11283469b --- /dev/null +++ b/net/nagios-plugins/patches/patch-al @@ -0,0 +1,92 @@ +$NetBSD: patch-al,v 1.1 2006/10/16 05:29:40 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-plugins/patches/patch-am b/net/nagios-plugins/patches/patch-am new file mode 100644 index 00000000000..83ca5e86cd0 --- /dev/null +++ b/net/nagios-plugins/patches/patch-am @@ -0,0 +1,56 @@ +$NetBSD: patch-am,v 1.1 2006/10/16 05:29:40 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; |