packages: nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec, nagios-plug...

[glen]

Author: glen                         Date: Mon Feb  1 16:40:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- report hostname being checked in check result

---- Files affected:
packages/nagios-plugin-check_rbl:
   nagios-plugin-check_rbl.spec (1.2 -> 1.3) , verbose-reporting.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec
diff -u packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec:1.2 packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec:1.3
--- packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec:1.2	Mon Feb  1 17:24:51 2010
+++ packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec	Mon Feb  1 17:40:25 2010
@@ -8,13 +8,14 @@
 Summary:	check_rbl is a Nagios plugin to check if an SMTP server is blacklisted
 Name:		nagios-plugin-%{plugin}
 Version:	1.1.0
-Release:	0.4
+Release:	0.7
 License:	GPL
 Group:		Networking
-Source0:	http://www.id.ethz.ch/people/allid_list/corti/%{plugin}-%{version}.tar.gz
+Source0:	https://trac.id.ethz.ch/projects/nagios_plugins/downloads/%{plugin}-%{version}.tar.gz
 # Source0-md5:	724cd353d48df3f4e9a98743146cfd0f
 Source1:	%{plugin}.cfg
 Source2:	%{plugin}.ini
+Patch0:		verbose-reporting.patch
 URL:		https://trac.id.ethz.ch/projects/nagios_plugins/wiki/check_rbl
 BuildRequires:	sed >= 4.0
 Requires:	nagios-common
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q -n %{plugin}-%{version}
+%patch0 -p1
 
 %{__sed} -i -e '
 # no need for debug dependency
@@ -85,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/02/01 16:40:25  glen
+- report hostname being checked in check result
+
 Revision 1.2  2010/02/01 16:24:51  glen
 - install plugin config
 

================================================================
Index: packages/nagios-plugin-check_rbl/verbose-reporting.patch
diff -u /dev/null packages/nagios-plugin-check_rbl/verbose-reporting.patch:1.1
--- /dev/null	Mon Feb  1 17:40:30 2010
+++ packages/nagios-plugin-check_rbl/verbose-reporting.patch	Mon Feb  1 17:40:25 2010
@@ -0,0 +1,11 @@
+--- check_rbl-1.1.0/check_rbl~	2010-02-01 18:27:44.918315737 +0200
++++ check_rbl-1.1.0/check_rbl	2010-02-01 18:28:07.075134119 +0200
+@@ -272,7 +275,7 @@
+ my $total = scalar @BLACKLISTED;
+ 
+ my $status =
+-  "BLACKLISTED on $total " . ( ( $total == 1 ) ? 'server' : 'servers' );
++  $OPTIONS->host. " BLACKLISTED on $total " . ( ( $total == 1 ) ? 'server' : 'servers' );
+ 
+ if ( $total > 0 ) {
+     $status .= " (@BLACKLISTED)";
================================================================

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