packages: nagios-plugin-check_bacula_log/nagios-plugin-check_bacula_log.spe...

[glen]

Author: glen                         Date: Thu Jan 14 15:57:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use srtftime instead of shell call, fix spelling and version

---- Files affected:
packages/nagios-plugin-check_bacula_log:
   nagios-plugin-check_bacula_log.spec (1.4 -> 1.5) , fixes.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_bacula_log/nagios-plugin-check_bacula_log.spec
diff -u packages/nagios-plugin-check_bacula_log/nagios-plugin-check_bacula_log.spec:1.4 packages/nagios-plugin-check_bacula_log/nagios-plugin-check_bacula_log.spec:1.5
--- packages/nagios-plugin-check_bacula_log/nagios-plugin-check_bacula_log.spec:1.4	Thu Jan 14 16:41:29 2010
+++ packages/nagios-plugin-check_bacula_log/nagios-plugin-check_bacula_log.spec	Thu Jan 14 16:57:35 2010
@@ -4,13 +4,14 @@
 Summary:	Nagios plugin to check bacula status via bacula log
 Name:		nagios-plugin-%{plugin}
 Version:	0.3
-Release:	1
+Release:	0.11
 License:	GPL v2
 Group:		Networking
 # Source0Download: http://exchange.nagios.org/components/com_mtree/attachment.php?link_id=1327&cf_id=24
 Source0:	nocturnal_nagios_plugins-1.0.tar.gz
 # Source0-md5:	3a50cd7abee1801e578ef0374cf2a072
 URL:		http://exchange.nagios.org/directory/Plugins/Backup-and-Recovery/Bacula/nagios%252Dcheck_bacula/details
+Patch0:		fixes.patch
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
 Requires:	nagios-common
@@ -32,9 +33,11 @@
 
 %prep
 %setup -qc
+%patch0 -p1
+
 cat > nagios.cfg <<'EOF'
 # Usage:
-# %{plugin}
+# %{plugin} -F /var/log/bacula/log
 define command {
 	command_name    %{plugin}
 	command_line    %{plugindir}/%{plugin} $ARG1$
@@ -74,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/01/14 15:57:35  glen
+- use srtftime instead of shell call, fix spelling and version
+
 Revision 1.4  2010/01/14 15:41:29  glen
 - md5
 

================================================================
Index: packages/nagios-plugin-check_bacula_log/fixes.patch
diff -u /dev/null packages/nagios-plugin-check_bacula_log/fixes.patch:1.1
--- /dev/null	Thu Jan 14 16:57:40 2010
+++ packages/nagios-plugin-check_bacula_log/fixes.patch	Thu Jan 14 16:57:35 2010
@@ -0,0 +1,51 @@
+--- nagios-plugin-check_bacula_log-0.3/check_bacula	2010-01-14 17:55:52.776266774 +0200
++++ nagios-plugin-check_bacula_log-0.3/check_bacula	2010-01-14 17:48:22.206310890 +0200
+@@ -16,19 +16,19 @@
+ #    GNU General Public License for more details.
+ #
+ # USAGE:
+-# check_internet 
++# check_bacula_log
+ #
+ ############################################################################
+ 
+ use strict;
+ use warnings;
+ use Getopt::Long;
++use POSIX qw(strftime);
+ use vars qw($opt_V $opt_h $opt_t $opt_F $opt_m $PROGNAME);
+-use lib '/usr/lib/nagios/plugins/';
++use lib '/usr/lib/nagios/plugins';
+ use utils qw(%ERRORS &print_revision &support);
+-use Net::Ping;
+ 
+-$PROGNAME="check_bacula";
++$PROGNAME="check_bacula_log";
+ 
+ sub print_help ();
+ sub print_usage ();
+@@ -113,13 +113,13 @@
+ 
+ if($failedbackups > 0){
+ 	$state = $ERRORS{'WARNING'};
+-	$msg = "Backups: $failedbackups Failed, $okbackups completed successfull ";
++	$msg = "Backups: $failedbackups failed, $okbackups completed successfully ";
+ } elsif ($totalbackups < $minbackups) {
+ 	$state = $ERRORS{'WARNING'};
+         $msg = "Backups: Only $totalbackups ran ($minbackups expected)";
+ } else {
+ 	$state = $ERRORS{'OK'};
+-	$msg = "Backups: $okbackups Backups completed successfull";
++	$msg = "Backups: $okbackups backups completed successfully";
+ }
+ 
+ 
+@@ -136,7 +136,7 @@
+ }
+ 
+ sub print_help () {
+-        print_revision($PROGNAME,'$Revision$');
++        print_revision($PROGNAME,'$Revision$');
+         print "Copyright (c) 2005 Guy Van Sanden\n";
+         print "\n";
+         print_usage();
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_bacula_log/nagios-plugin-check_bacula_log.spec?r1=1.4&r2=1.5&f=u