[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 08/13: check_rbl: Updating to 1.3.7
Jan Wagner
waja at moszumanska.debian.org
Fri Mar 6 09:57:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
waja pushed a commit to branch master
in repository pkg-nagios-plugins-contrib.
commit 99c5b8432166b9b95f0b4784002439ecfa494aed
Author: Jan Wagner <waja at cyconet.org>
Date: Wed Mar 4 23:20:14 2015 +0100
check_rbl: Updating to 1.3.7
---
check_rbl/check_rbl-1.3.5/README | 19 --------
check_rbl/check_rbl-1.3.5/VERSION | 2 -
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/AUTHORS | 0
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/COPYING | 0
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/COPYRIGHT | 0
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/Changes | 17 ++++++--
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/INSTALL | 12 +++---
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/MANIFEST | 0
.../MANIFEST.SKIP | 0
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/META.yml | 10 ++---
.../Makefile.PL | 22 +++++-----
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/NEWS | 9 ++--
check_rbl/check_rbl-1.3.7/README | 19 ++++++++
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/TODO | 0
check_rbl/check_rbl-1.3.7/VERSION | 2 +
.../{check_rbl-1.3.5 => check_rbl-1.3.7}/check_rbl | 21 +++++----
.../check_rbl.ini | 4 --
.../check_rbl.pod | 12 +++---
.../check_rbl.spec | 14 ++++--
.../inc/Module/Install.pm | 6 ++-
.../inc/Module/Install/Base.pm | 2 +-
.../inc/Module/Install/Include.pm | 2 +-
.../inc/Module/Install/MakeMaker.pm | 2 +-
.../inc/Module/Install/Makefile.pm | 2 +-
.../inc/Module/Install/Metadata.pm | 2 +-
.../inc/Module/Install/Scripts.pm | 2 +-
.../inc/version.pm | 50 +++++++++++++++++++++-
.../t/00_modules.t | 32 +++++++-------
check_rbl/control | 2 +-
check_rbl/src | 2 +-
debian/control | 2 +-
31 files changed, 168 insertions(+), 101 deletions(-)
diff --git a/check_rbl/check_rbl-1.3.5/README b/check_rbl/check_rbl-1.3.5/README
deleted file mode 100644
index c59d7e6..0000000
--- a/check_rbl/check_rbl-1.3.5/README
+++ /dev/null
@@ -1,19 +0,0 @@
-check_rbl is a Nagios plugin to check if an SMTP server is blacklisted
-
-Note: some blacklister as Spamhaus ban DNS queries from public DNS resolvers as Google resulting in no host being listed. If you are experiencing problems with the plugin just try the DNS query with a tool as nslookup to check your DNS configuration.
-
-Example:
-
-check_rbl -H example.org -t 60 -c 1 -w 1 -s dnsbl.ahbl.org -s cbl.anti-spam.org.cn -s cblplus.anti-spam.org.cn -s cblless.anti-spam.org.cn -s cdl.anti-spam.org.cn -s cbl.abuseat.org -s dnsbl.cyberlogic.net -s bl.deadbeef.com -s t1.dnsbl.net.au -s spamtrap.drbl.drand.net -s spamsources.fabel.dk -s 0spam.fusionzero.com -s dnsbl.isoc.bg -s mail-abuse.blacklist.jippg.org -s korea.services.net -s spamguard.leadmon.net -s ix.dnsbl.manitu.net -s relays.nether.net -s dnsbl.njabl.org -s bhnc.njab [...]
-
-
-Please report any bugs or feature requests to matteo.corti at id.ethz.ch, or through the
-web interface at
-https://trac.id.ethz.ch/projects/nagios_plugins/newticket?component=check_rbl
-
-
-# File version information:
-# $Id: README 1310 2012-08-17 05:09:32Z corti $
-# $Revision: 1310 $
-# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_rbl/README $
-# $Date: 2012-08-17 07:09:32 +0200 (Fri, 17 Aug 2012) $
diff --git a/check_rbl/check_rbl-1.3.5/VERSION b/check_rbl/check_rbl-1.3.5/VERSION
deleted file mode 100644
index 19ba008..0000000
--- a/check_rbl/check_rbl-1.3.5/VERSION
+++ /dev/null
@@ -1,2 +0,0 @@
-1.3.5
-
diff --git a/check_rbl/check_rbl-1.3.5/AUTHORS b/check_rbl/check_rbl-1.3.7/AUTHORS
similarity index 100%
rename from check_rbl/check_rbl-1.3.5/AUTHORS
rename to check_rbl/check_rbl-1.3.7/AUTHORS
diff --git a/check_rbl/check_rbl-1.3.5/COPYING b/check_rbl/check_rbl-1.3.7/COPYING
similarity index 100%
rename from check_rbl/check_rbl-1.3.5/COPYING
rename to check_rbl/check_rbl-1.3.7/COPYING
diff --git a/check_rbl/check_rbl-1.3.5/COPYRIGHT b/check_rbl/check_rbl-1.3.7/COPYRIGHT
similarity index 100%
rename from check_rbl/check_rbl-1.3.5/COPYRIGHT
rename to check_rbl/check_rbl-1.3.7/COPYRIGHT
diff --git a/check_rbl/check_rbl-1.3.5/Changes b/check_rbl/check_rbl-1.3.7/Changes
similarity index 84%
rename from check_rbl/check_rbl-1.3.5/Changes
rename to check_rbl/check_rbl-1.3.7/Changes
index aa69ef2..261133b 100644
--- a/check_rbl/check_rbl-1.3.5/Changes
+++ b/check_rbl/check_rbl-1.3.7/Changes
@@ -1,3 +1,14 @@
+2015-02-01 Matteo Corti <matteo at corti.li>
+
+ * Version 1.3.7
+ * check_rbl: switching to Monitoring::Plugin
+ (as Nagios::Plugin is deprecated)
+
+2014-12-05 Matteo Corti <matteo at corti.li>
+
+ * Version 1.3.6
+ * example.pl: removed unnecessary dependency on Data::Dumper
+
2014-09-20 Matteo Corti <matteo at corti.li>
* Version 1.3.5
@@ -78,7 +89,7 @@
* check_rbl: Initial release
# File version information:
-# $Id: Changes 1369 2014-09-20 17:40:12Z corti $
-# $Revision: 1369 $
+# $Id: Changes 1428 2015-02-01 12:22:40Z corti $
+# $Revision: 1428 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_rbl/Changes $
-# $Date: 2014-09-20 19:40:12 +0200 (Sat, 20 Sep 2014) $
+# $Date: 2015-02-01 13:22:40 +0100 (Sun, 01 Feb 2015) $
diff --git a/check_rbl/check_rbl-1.3.5/INSTALL b/check_rbl/check_rbl-1.3.7/INSTALL
similarity index 89%
rename from check_rbl/check_rbl-1.3.5/INSTALL
rename to check_rbl/check_rbl-1.3.7/INSTALL
index a689588..b62993c 100644
--- a/check_rbl/check_rbl-1.3.5/INSTALL
+++ b/check_rbl/check_rbl-1.3.7/INSTALL
@@ -6,9 +6,9 @@ Dependences
check_rbl depends on several Perl modules:
* IO::Select
- * Nagios::Plugin
- * Nagios::Plugin::Getopt
- * Nagios::Plugin::Threshold
+ * Monitoring::Plugin
+ * Monitoring::Plugin::Getopt
+ * Monitoring::Plugin::Threshold
* Net::DNS
* Readonly
@@ -67,7 +67,7 @@ open a ticket at
https://trac.id.ethz.ch/projects/nagios_plugins/newticket
# File version information:
-# $Id: INSTALL 1349 2014-01-30 11:18:43Z corti $
-# $Revision: 1349 $
+# $Id: INSTALL 1404 2015-01-09 16:56:58Z corti $
+# $Revision: 1404 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_rbl/INSTALL $
-# $Date: 2014-01-30 12:18:43 +0100 (Thu, 30 Jan 2014) $
+# $Date: 2015-01-09 17:56:58 +0100 (Fri, 09 Jan 2015) $
diff --git a/check_rbl/check_rbl-1.3.5/MANIFEST b/check_rbl/check_rbl-1.3.7/MANIFEST
similarity index 100%
rename from check_rbl/check_rbl-1.3.5/MANIFEST
rename to check_rbl/check_rbl-1.3.7/MANIFEST
diff --git a/check_rbl/check_rbl-1.3.5/MANIFEST.SKIP b/check_rbl/check_rbl-1.3.7/MANIFEST.SKIP
similarity index 100%
rename from check_rbl/check_rbl-1.3.5/MANIFEST.SKIP
rename to check_rbl/check_rbl-1.3.7/MANIFEST.SKIP
diff --git a/check_rbl/check_rbl-1.3.5/META.yml b/check_rbl/check_rbl-1.3.7/META.yml
similarity index 78%
rename from check_rbl/check_rbl-1.3.5/META.yml
rename to check_rbl/check_rbl-1.3.7/META.yml
index a7aa3f5..55621a8 100644
--- a/check_rbl/check_rbl-1.3.5/META.yml
+++ b/check_rbl/check_rbl-1.3.7/META.yml
@@ -8,7 +8,7 @@ configure_requires:
ExtUtils::MakeMaker: 6.59
distribution_type: module
dynamic_config: 1
-generated_by: 'Module::Install version 1.12'
+generated_by: 'Module::Install version 1.14'
license: gpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -22,12 +22,12 @@ requires:
Data::Validate::Domain: 0
Data::Validate::IP: 0
IO::Select: 0
- Nagios::Plugin: 0.31
- Nagios::Plugin::Getopt: 0
- Nagios::Plugin::Threshold: 0
+ Monitoring::Plugin: 0
+ Monitoring::Plugin::Getopt: 0
+ Monitoring::Plugin::Threshold: 0
Net::DNS: 0
Readonly: 0
perl: 5.8.0
resources:
license: http://opensource.org/licenses/gpl-license.php
-version: 1.3.5
+version: 1.3.7
diff --git a/check_rbl/check_rbl-1.3.5/Makefile.PL b/check_rbl/check_rbl-1.3.7/Makefile.PL
similarity index 62%
rename from check_rbl/check_rbl-1.3.5/Makefile.PL
rename to check_rbl/check_rbl-1.3.7/Makefile.PL
index 44097e9..8a30c37 100644
--- a/check_rbl/check_rbl-1.3.5/Makefile.PL
+++ b/check_rbl/check_rbl-1.3.7/Makefile.PL
@@ -2,10 +2,10 @@
use inc::Module::Install;
# File version information:
-# $Id: Makefile.PL 1361 2014-08-09 09:41:30Z corti $
-# $Revision: 1361 $
+# $Id: Makefile.PL 1404 2015-01-09 16:56:58Z corti $
+# $Revision: 1404 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_rbl/Makefile.PL $
-# $Date: 2014-08-09 11:41:30 +0200 (Sat, 09 Aug 2014) $
+# $Date: 2015-01-09 17:56:58 +0100 (Fri, 09 Jan 2015) $
##############################################################################
# Define metadata (we read it from the binary)
@@ -20,14 +20,14 @@ all_from 'check_rbl.pod';
include 'version';
-requires 'Data::Validate::Domain' => 0;
-requires 'Data::Validate::IP' => 0;
-requires 'Nagios::Plugin' => 0.31;
-requires 'Nagios::Plugin::Getopt' => 0;
-requires 'Nagios::Plugin::Threshold' => 0;
-requires 'Net::DNS' => 0;
-requires 'Readonly' => 0;
-requires 'IO::Select' => 0;
+requires 'Data::Validate::Domain' => 0;
+requires 'Data::Validate::IP' => 0;
+requires 'Monitoring::Plugin' => 0;
+requires 'Monitoring::Plugin::Getopt' => 0;
+requires 'Monitoring::Plugin::Threshold' => 0;
+requires 'Net::DNS' => 0;
+requires 'Readonly' => 0;
+requires 'IO::Select' => 0;
install_script 'check_rbl';
diff --git a/check_rbl/check_rbl-1.3.5/NEWS b/check_rbl/check_rbl-1.3.7/NEWS
similarity index 72%
rename from check_rbl/check_rbl-1.3.5/NEWS
rename to check_rbl/check_rbl-1.3.7/NEWS
index 96e3759..42e4baf 100644
--- a/check_rbl/check_rbl-1.3.5/NEWS
+++ b/check_rbl/check_rbl-1.3.7/NEWS
@@ -1,3 +1,6 @@
+2015-02-01: 1.3.7 - now depends on Monitoring::Plugins (Nagios::Plugins
+ is deprecated)
+2014-12-05: 1.3.6 - removed dependency on Data::Dumper
2014-09-21: 1.3.5 - fixed the default critical and warning range
2014-09-20: 1.3.4 - parameter validation fix
2014-08-09: 1.3.3 - parameter validation
@@ -13,7 +16,7 @@
2008-12-29: 1.0.0 - Initial release
# File version information:
-# $Id: NEWS 1369 2014-09-20 17:40:12Z corti $
-# $Revision: 1369 $
+# $Id: NEWS 1428 2015-02-01 12:22:40Z corti $
+# $Revision: 1428 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_rbl/NEWS $
-# $Date: 2014-09-20 19:40:12 +0200 (Sat, 20 Sep 2014) $
+# $Date: 2015-02-01 13:22:40 +0100 (Sun, 01 Feb 2015) $
diff --git a/check_rbl/check_rbl-1.3.7/README b/check_rbl/check_rbl-1.3.7/README
new file mode 100644
index 0000000..b3dacbd
--- /dev/null
+++ b/check_rbl/check_rbl-1.3.7/README
@@ -0,0 +1,19 @@
+check_rbl is a Nagios plugin to check if an SMTP server is blacklisted
+
+Note: some blacklister as Spamhaus ban DNS queries from public DNS resolvers as Google resulting in no host being listed. If you are experiencing problems with the plugin just try the DNS query with a tool as nslookup to check your DNS configuration.
+
+Example:
+
+check_rbl -H example.org -t 60 -c 1 -w 1 -s cbl.anti-spam.org.cn -s cblplus.anti-spam.org.cn -s cblless.anti-spam.org.cn -s cdl.anti-spam.org.cn -s cbl.abuseat.org -s dnsbl.cyberlogic.net -s bl.deadbeef.com -s t1.dnsbl.net.au -s spamtrap.drbl.drand.net -s spamsources.fabel.dk -s 0spam.fusionzero.com -s mail-abuse.blacklist.jippg.org -s korea.services.net -s spamguard.leadmon.net -s ix.dnsbl.manitu.net -s relays.nether.net -s no-more-funn.moensted.dk -s psbl.surriel.com -s dyna.spamrats.c [...]
+
+
+Please report any bugs or feature requests to matteo.corti at id.ethz.ch, or through the
+web interface at
+https://trac.id.ethz.ch/projects/nagios_plugins/newticket?component=check_rbl
+
+
+# File version information:
+# $Id: README 1426 2015-01-12 09:06:32Z corti $
+# $Revision: 1426 $
+# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_rbl/README $
+# $Date: 2015-01-12 10:06:32 +0100 (Mon, 12 Jan 2015) $
diff --git a/check_rbl/check_rbl-1.3.5/TODO b/check_rbl/check_rbl-1.3.7/TODO
similarity index 100%
rename from check_rbl/check_rbl-1.3.5/TODO
rename to check_rbl/check_rbl-1.3.7/TODO
diff --git a/check_rbl/check_rbl-1.3.7/VERSION b/check_rbl/check_rbl-1.3.7/VERSION
new file mode 100644
index 0000000..7e030f6
--- /dev/null
+++ b/check_rbl/check_rbl-1.3.7/VERSION
@@ -0,0 +1,2 @@
+1.3.7
+
diff --git a/check_rbl/check_rbl-1.3.5/check_rbl b/check_rbl/check_rbl-1.3.7/check_rbl
similarity index 97%
rename from check_rbl/check_rbl-1.3.5/check_rbl
rename to check_rbl/check_rbl-1.3.7/check_rbl
index a992c39..43f5f29 100644
--- a/check_rbl/check_rbl-1.3.5/check_rbl
+++ b/check_rbl/check_rbl-1.3.7/check_rbl
@@ -21,27 +21,26 @@ package main;
# enable substitution with:
# $ svn propset svn:keywords "Id Revision HeadURL Source Date"
#
-# $Id: check_rbl 1369 2014-09-20 17:40:12Z corti $
-# $Revision: 1369 $
+# $Id: check_rbl 1428 2015-02-01 12:22:40Z corti $
+# $Revision: 1428 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_rbl/check_rbl $
-# $Date: 2014-09-20 19:40:12 +0200 (Sat, 20 Sep 2014) $
+# $Date: 2015-02-01 13:22:40 +0100 (Sun, 01 Feb 2015) $
use strict;
use warnings;
use 5.00800;
-use Data::Dumper;
use Data::Validate::Domain qw(is_hostname);
use Data::Validate::IP qw(is_ipv4 is_ipv6);
use IO::Select;
-use Nagios::Plugin 0.31;
-use Nagios::Plugin::Getopt;
-use Nagios::Plugin::Threshold;
+use Monitoring::Plugin;
+use Monitoring::Plugin::Getopt;
+use Monitoring::Plugin::Threshold;
use Net::DNS;
use Readonly;
-our $VERSION = '1.3.5';
+our $VERSION = '1.3.7';
Readonly our $DEFAULT_TIMEOUT => 15;
Readonly our $DEFAULT_RETRIES => 4;
@@ -353,14 +352,14 @@ sub run {
################################################################################
# Initialization
- $plugin = Nagios::Plugin->new( shortname => 'CHECK_RBL' );
+ $plugin = Monitoring::Plugin->new( shortname => 'CHECK_RBL' );
my $time = time;
########################
# Command line arguments
- $options = Nagios::Plugin::Getopt->new(
+ $options = Monitoring::Plugin::Getopt->new(
usage => 'Usage: %s [OPTIONS]',
version => $VERSION,
url => 'https://trac.id.ethz.ch/projects/nagios_plugins',
@@ -449,7 +448,7 @@ sub run {
# Set the limits
# see https://nagios-plugins.org/doc/guidelines.html#THRESHOLDFORMAT
- $threshold = Nagios::Plugin::Threshold->set_thresholds(
+ $threshold = Monitoring::Plugin::Threshold->set_thresholds(
warning => $options->warning - 1,
critical => $options->critical - 1,
);
diff --git a/check_rbl/check_rbl-1.3.5/check_rbl.ini b/check_rbl/check_rbl-1.3.7/check_rbl.ini
similarity index 92%
rename from check_rbl/check_rbl-1.3.5/check_rbl.ini
rename to check_rbl/check_rbl-1.3.7/check_rbl.ini
index aeebf6d..e2b28cc 100644
--- a/check_rbl/check_rbl-1.3.5/check_rbl.ini
+++ b/check_rbl/check_rbl-1.3.7/check_rbl.ini
@@ -1,5 +1,4 @@
[rbl]
-server=dnsbl.ahbl.org
server=cbl.abuseat.org
server=dnsbl.cyberlogic.net
server=bl.deadbeef.com
@@ -11,10 +10,7 @@ server=korea.services.net
server=spamguard.leadmon.net
server=ix.dnsbl.manitu.net
server=relays.nether.net
-server=dnsbl.njabl.org
-server=bhnc.njabl.org
server=no-more-funn.moensted.dk
-server=rbl.orbitrbl.com
server=psbl.surriel.com
server=dyna.spamrats.com
server=noptr.spamrats.com
diff --git a/check_rbl/check_rbl-1.3.5/check_rbl.pod b/check_rbl/check_rbl-1.3.7/check_rbl.pod
similarity index 95%
rename from check_rbl/check_rbl-1.3.5/check_rbl.pod
rename to check_rbl/check_rbl-1.3.7/check_rbl.pod
index 2413c33..c9c5735 100644
--- a/check_rbl/check_rbl-1.3.5/check_rbl.pod
+++ b/check_rbl/check_rbl-1.3.7/check_rbl.pod
@@ -1,8 +1,8 @@
# File version information:
-# $Id: check_rbl.pod 1369 2014-09-20 17:40:12Z corti $
-# $Revision: 1369 $
+# $Id: check_rbl.pod 1428 2015-02-01 12:22:40Z corti $
+# $Revision: 1428 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_rbl/check_rbl.pod $
-# $Date: 2014-09-20 19:40:12 +0200 (Sat, 20 Sep 2014) $
+# $Date: 2015-02-01 13:22:40 +0100 (Sun, 01 Feb 2015) $
=pod
@@ -16,7 +16,7 @@ check_rbl is a Nagios plugin to check if an SMTP server is blacklisted
=head1 VERSION
-Version 1.3.5
+Version 1.3.7
=head1 SYNOPSIS
@@ -74,9 +74,9 @@ check_updates depends on
=item * IO::Select
-=item * Nagios::Plugin
+=item * Monitoring::Plugin
-=item * Nagios::Plugin::Threshold
+=item * Monitoring::Plugin::Threshold
=item * Number::Format
diff --git a/check_rbl/check_rbl-1.3.5/check_rbl.spec b/check_rbl/check_rbl-1.3.7/check_rbl.spec
similarity index 88%
rename from check_rbl/check_rbl-1.3.5/check_rbl.spec
rename to check_rbl/check_rbl-1.3.7/check_rbl.spec
index fe70eee..e70360a 100644
--- a/check_rbl/check_rbl-1.3.5/check_rbl.spec
+++ b/check_rbl/check_rbl-1.3.7/check_rbl.spec
@@ -1,12 +1,12 @@
################################################################################
# File version information:
-# $Id: check_rbl.spec 1369 2014-09-20 17:40:12Z corti $
-# $Revision: 1369 $
+# $Id: check_rbl.spec 1428 2015-02-01 12:22:40Z corti $
+# $Revision: 1428 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_rbl/check_rbl.spec $
-# $Date: 2014-09-20 19:40:12 +0200 (Sat, 20 Sep 2014) $
+# $Date: 2015-02-01 13:22:40 +0100 (Sun, 01 Feb 2015) $
################################################################################
-%define version 1.3.5
+%define version 1.3.7
%define release 0
%define sourcename check_rbl
%define packagename nagios-plugins-check-rbl
@@ -62,6 +62,12 @@ rm -rf %{buildroot}
%{_mandir}/man1/%{sourcename}.1*
%changelog
+* Sun Feb 1 2015 Matteo Corti <matteo at corti.li> - 1.3.7-0
+- Update to 1.3.7 (using Monitoring::Plugins)
+
+* Fri Dec 5 2014 Matteo Corti <matteo at corti.li> - 1.3.6-0
+- Updated to 1.3.6 (removed dependency on Data::Dumper)
+
* Sat Sep 20 2014 Matteo Corti <matteo at corti.li> - 1.3.5-0
- Updated to 1.3.5
diff --git a/check_rbl/check_rbl-1.3.5/inc/Module/Install.pm b/check_rbl/check_rbl-1.3.7/inc/Module/Install.pm
similarity index 99%
rename from check_rbl/check_rbl-1.3.5/inc/Module/Install.pm
rename to check_rbl/check_rbl-1.3.7/inc/Module/Install.pm
index 5460dd5..ff767fa 100644
--- a/check_rbl/check_rbl-1.3.5/inc/Module/Install.pm
+++ b/check_rbl/check_rbl-1.3.7/inc/Module/Install.pm
@@ -31,7 +31,7 @@ BEGIN {
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '1.12';
+ $VERSION = '1.14';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -378,6 +378,7 @@ eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _read {
local *FH;
open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+ binmode FH;
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
@@ -386,6 +387,7 @@ END_NEW
sub _read {
local *FH;
open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ binmode FH;
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
@@ -416,6 +418,7 @@ eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _write {
local *FH;
open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+ binmode FH;
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
@@ -425,6 +428,7 @@ END_NEW
sub _write {
local *FH;
open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ binmode FH;
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
diff --git a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Base.pm b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Base.pm
similarity index 98%
rename from check_rbl/check_rbl-1.3.5/inc/Module/Install/Base.pm
rename to check_rbl/check_rbl-1.3.7/inc/Module/Install/Base.pm
index f9bf5de..4206347 100644
--- a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Base.pm
+++ b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Base.pm
@@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
}
# Suspend handler for "redefined" warnings
diff --git a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Include.pm b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Include.pm
similarity index 96%
rename from check_rbl/check_rbl-1.3.5/inc/Module/Install/Include.pm
rename to check_rbl/check_rbl-1.3.7/inc/Module/Install/Include.pm
index 7224cff..f274f87 100644
--- a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Include.pm
+++ b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Include.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/check_rbl/check_rbl-1.3.5/inc/Module/Install/MakeMaker.pm b/check_rbl/check_rbl-1.3.7/inc/Module/Install/MakeMaker.pm
similarity index 98%
rename from check_rbl/check_rbl-1.3.5/inc/Module/Install/MakeMaker.pm
rename to check_rbl/check_rbl-1.3.7/inc/Module/Install/MakeMaker.pm
index 4e3bf26..2dfccde 100644
--- a/check_rbl/check_rbl-1.3.5/inc/Module/Install/MakeMaker.pm
+++ b/check_rbl/check_rbl-1.3.7/inc/Module/Install/MakeMaker.pm
@@ -7,7 +7,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Makefile.pm b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Makefile.pm
similarity index 99%
rename from check_rbl/check_rbl-1.3.5/inc/Module/Install/Makefile.pm
rename to check_rbl/check_rbl-1.3.7/inc/Module/Install/Makefile.pm
index 81cddd5..66993af 100644
--- a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Makefile.pm
+++ b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Makefile.pm
@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Metadata.pm b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Metadata.pm
similarity index 99%
rename from check_rbl/check_rbl-1.3.5/inc/Module/Install/Metadata.pm
rename to check_rbl/check_rbl-1.3.7/inc/Module/Install/Metadata.pm
index 2c66b1e..e547fa0 100644
--- a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Metadata.pm
+++ b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Scripts.pm b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Scripts.pm
similarity index 96%
rename from check_rbl/check_rbl-1.3.5/inc/Module/Install/Scripts.pm
rename to check_rbl/check_rbl-1.3.7/inc/Module/Install/Scripts.pm
index 66a3350..fba56ae 100644
--- a/check_rbl/check_rbl-1.3.5/inc/Module/Install/Scripts.pm
+++ b/check_rbl/check_rbl-1.3.7/inc/Module/Install/Scripts.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.12';
+ $VERSION = '1.14';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/check_rbl/check_rbl-1.3.5/inc/version.pm b/check_rbl/check_rbl-1.3.7/inc/version.pm
similarity index 50%
rename from check_rbl/check_rbl-1.3.5/inc/version.pm
rename to check_rbl/check_rbl-1.3.7/inc/version.pm
index a3d38e3..5114914 100644
--- a/check_rbl/check_rbl-1.3.5/inc/version.pm
+++ b/check_rbl/check_rbl-1.3.7/inc/version.pm
@@ -4,12 +4,60 @@ package version;
use 5.006002;
use strict;
+use warnings::register;
+if ($] >= 5.015) {
+ warnings::register_categories(qw/version/);
+}
use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);
-$VERSION = 0.9909;
+$VERSION = 0.9912;
$CLASS = 'version';
+# !!!!Delete this next block completely when adding to Perl core!!!!
+{
+ local $SIG{'__DIE__'};
+ eval "use version::vxs $VERSION";
+ if ( $@ ) { # don't have the XS version installed
+ eval "use version::vpp $VERSION"; # don't tempt fate
+ die "$@" if ( $@ );
+ push @ISA, "version::vpp";
+ local $^W;
+ *version::qv = \&version::vpp::qv;
+ *version::declare = \&version::vpp::declare;
+ *version::_VERSION = \&version::vpp::_VERSION;
+ *version::vcmp = \&version::vpp::vcmp;
+ *version::new = \&version::vpp::new;
+ *version::numify = \&version::vpp::numify;
+ *version::normal = \&version::vpp::normal;
+ if ($] >= 5.009000) {
+ no strict 'refs';
+ *version::stringify = \&version::vpp::stringify;
+ *{'version::(""'} = \&version::vpp::stringify;
+ *{'version::(<=>'} = \&version::vpp::vcmp;
+ *version::parse = \&version::vpp::parse;
+ }
+ }
+ else { # use XS module
+ push @ISA, "version::vxs";
+ local $^W;
+ *version::declare = \&version::vxs::declare;
+ *version::qv = \&version::vxs::qv;
+ *version::_VERSION = \&version::vxs::_VERSION;
+ *version::vcmp = \&version::vxs::VCMP;
+ *version::new = \&version::vxs::new;
+ *version::numify = \&version::vxs::numify;
+ *version::normal = \&version::vxs::normal;
+ if ($] >= 5.009000) {
+ no strict 'refs';
+ *version::stringify = \&version::vxs::stringify;
+ *{'version::(""'} = \&version::vxs::stringify;
+ *{'version::(<=>'} = \&version::vxs::VCMP;
+ *version::parse = \&version::vxs::parse;
+ }
+ }
+}
+
# avoid using Exporter
require version::regex;
*version::is_lax = \&version::regex::is_lax;
diff --git a/check_rbl/check_rbl-1.3.5/t/00_modules.t b/check_rbl/check_rbl-1.3.7/t/00_modules.t
similarity index 53%
rename from check_rbl/check_rbl-1.3.5/t/00_modules.t
rename to check_rbl/check_rbl-1.3.7/t/00_modules.t
index 791ff3e..c0b8ecd 100644
--- a/check_rbl/check_rbl-1.3.5/t/00_modules.t
+++ b/check_rbl/check_rbl-1.3.7/t/00_modules.t
@@ -12,22 +12,22 @@ use warnings;
use Test::More tests => 23;
-our $VERSION = '1.3.3';
-
-use_ok('Nagios::Plugin');
-can_ok( 'Nagios::Plugin', 'new' );
-can_ok( 'Nagios::Plugin', 'nagios_exit' );
-can_ok( 'Nagios::Plugin', 'add_perfdata' );
-
-use_ok('Nagios::Plugin::Getopt');
-can_ok( 'Nagios::Plugin::Getopt', 'new' );
-can_ok( 'Nagios::Plugin::Getopt', 'arg' );
-can_ok( 'Nagios::Plugin::Getopt', 'getopts' );
-can_ok( 'Nagios::Plugin::Getopt', 'get' );
-
-use_ok('Nagios::Plugin::Threshold');
-can_ok( 'Nagios::Plugin::Threshold', 'new' );
-can_ok( 'Nagios::Plugin::Threshold', 'set_thresholds' );
+our $VERSION = '1.3.7';
+
+use_ok('Monitoring::Plugin');
+can_ok( 'Monitoring::Plugin', 'new' );
+can_ok( 'Monitoring::Plugin', 'nagios_exit' );
+can_ok( 'Monitoring::Plugin', 'add_perfdata' );
+
+use_ok('Monitoring::Plugin::Getopt');
+can_ok( 'Monitoring::Plugin::Getopt', 'new' );
+can_ok( 'Monitoring::Plugin::Getopt', 'arg' );
+can_ok( 'Monitoring::Plugin::Getopt', 'getopts' );
+can_ok( 'Monitoring::Plugin::Getopt', 'get' );
+
+use_ok('Monitoring::Plugin::Threshold');
+can_ok( 'Monitoring::Plugin::Threshold', 'new' );
+can_ok( 'Monitoring::Plugin::Threshold', 'set_thresholds' );
use_ok('IO::Select');
can_ok( 'IO::Select', 'new' );
diff --git a/check_rbl/control b/check_rbl/control
index 9eb1187..6cb62be 100644
--- a/check_rbl/control
+++ b/check_rbl/control
@@ -1,6 +1,6 @@
Uploaders: Bernd Zeimetz <bzed at debian.org>
Recommends: libnagios-plugin-perl (>= 0.31), libreadonly-perl, libnet-dns-perl, libdata-validate-domain-perl, libdata-validate-ip-perl
-Version: 1.3.5
+Version: 1.3.7
Homepage: https://svn.id.ethz.ch/projects/nagios_plugins/wiki/check_rbl
Watch: https://svn.id.ethz.ch/projects/nagios_plugins/wiki/check_rbl check_rbl-([0-9.]+)\.tar\.gz
Description: plugin to check if a server is blacklisted
diff --git a/check_rbl/src b/check_rbl/src
index 5da1ce3..32dad55 120000
--- a/check_rbl/src
+++ b/check_rbl/src
@@ -1 +1 @@
-check_rbl-1.3.5
\ No newline at end of file
+check_rbl-1.3.7
\ No newline at end of file
diff --git a/debian/control b/debian/control
index ea33e84..d1405df 100644
--- a/debian/control
+++ b/debian/control
@@ -132,7 +132,7 @@ Description: Plugins for nagios compatible monitoring systems
- Serveraid IPS via ipssend
- Solaris software RAID via metastat
- Areca SATA RAID Support via cli64/cli32
- * check_rbl (1.3.5): plugin to check if a server is blacklisted
+ * check_rbl (1.3.7): plugin to check if a server is blacklisted
* check_redis (0.73): Redis Server check plugin
This plugin checks Redis NoSQL database status variables,
measures its response time and if specified allows to set thresholds
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins-contrib.git
More information about the Pkg-nagios-changes
mailing list