- report hostname being checked in check result

Changed files:
    nagios-plugin-check_rbl.spec -> 1.3
    verbose-reporting.patch -> 1.1

diff --git a/nagios-plugin-check_rbl.spec b/nagios-plugin-check_rbl.spec
index 4f8bb7530b35500ec5f219f1426e886b5a62b2b0..0bc60bc903c80c4212eaea70037e9b202c5262d8 100644 (file)
--- a/nagios-plugin-check_rbl.spec
+++ b/nagios-plugin-check_rbl.spec
@@ -7,13 +7,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
@@ -37,6 +38,7 @@ check_rbl is a Nagios plugin to check if an SMTP server is blacklisted
 
 %prep
 %setup -q -n %{plugin}-%{version}
+%patch0 -p1
 
 %{__sed} -i -e '
 # no need for debug dependency

diff --git a/verbose-reporting.patch b/verbose-reporting.patch
new file mode 100644 (file)
index 0000000..93227a0
--- /dev/null
+++ b/verbose-reporting.patch
@@ -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)";