[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 09/13: check_rbl: Move back to Nagios::Plugin again by adding patches/check_rbl/nagios-plugins

Jan Wagner waja at moszumanska.debian.org
Fri Mar 6 09:57:10 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 160e8d3f372806d1dcf01f2967ab548083e5c77f
Author: Jan Wagner <waja at cyconet.org>
Date:   Thu Mar 5 12:52:53 2015 +0100

    check_rbl: Move back to Nagios::Plugin again by adding patches/check_rbl/nagios-plugins
---
 debian/patches/check_rbl/nagios-plugins | 59 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 60 insertions(+)

diff --git a/debian/patches/check_rbl/nagios-plugins b/debian/patches/check_rbl/nagios-plugins
new file mode 100644
index 0000000..c69d109
--- /dev/null
+++ b/debian/patches/check_rbl/nagios-plugins
@@ -0,0 +1,59 @@
+diff --git a/check_rbl/src/check_rbl b/check_rbl/src/check_rbl
+index 43f5f29..fa3ece8 100644
+--- a/check_rbl/src/check_rbl
++++ b/check_rbl/src/check_rbl
+@@ -34,9 +34,9 @@ use 5.00800;
+ use Data::Validate::Domain qw(is_hostname);
+ use Data::Validate::IP qw(is_ipv4 is_ipv6);
+ use IO::Select;
+-use Monitoring::Plugin;
+-use Monitoring::Plugin::Getopt;
+-use Monitoring::Plugin::Threshold;
++use Nagios::Plugin 0.31;
++use Nagios::Plugin::Getopt;
++use Nagios::Plugin::Threshold;
+ use Net::DNS;
+ use Readonly;
+ 
+@@ -352,14 +352,14 @@ sub run {
+     ################################################################################
+     # Initialization
+ 
+-    $plugin = Monitoring::Plugin->new( shortname => 'CHECK_RBL' );
++    $plugin = Nagios::Plugin->new( shortname => 'CHECK_RBL' );
+ 
+     my $time = time;
+ 
+     ########################
+     # Command line arguments
+ 
+-    $options = Monitoring::Plugin::Getopt->new(
++    $options = Nagios::Plugin::Getopt->new(
+         usage   => 'Usage: %s [OPTIONS]',
+         version => $VERSION,
+         url     => 'https://trac.id.ethz.ch/projects/nagios_plugins',
+@@ -448,7 +448,7 @@ sub run {
+     # Set the limits
+ 
+     # see https://nagios-plugins.org/doc/guidelines.html#THRESHOLDFORMAT
+-    $threshold = Monitoring::Plugin::Threshold->set_thresholds(
++    $threshold = Nagios::Plugin::Threshold->set_thresholds(
+         warning  => $options->warning - 1,
+         critical => $options->critical - 1,
+     );
+diff --git a/check_rbl/src/check_rbl.pod b/check_rbl/src/check_rbl.pod
+index c9c5735..9267980 100644
+--- a/check_rbl/src/check_rbl.pod
++++ b/check_rbl/src/check_rbl.pod
+@@ -74,9 +74,9 @@ check_updates depends on
+ 
+ =item * IO::Select
+ 
+-=item * Monitoring::Plugin
++=item * Nagios::Plugin
+ 
+-=item * Monitoring::Plugin::Threshold
++=item * Nagios::Plugin::Threshold
+ 
+ =item * Number::Format
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1e0ff8f..403ce90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,6 +28,7 @@ check_rbl/disable_ahbl.org
 check_rbl/disable_orbitrbl.com
 check_rbl/disable_solid.net
 check_rbl/additional_rbls
+check_rbl/nagios-plugins
 check_snmp_time/epn
 check_varnish/automake_foreign
 check_varnish/support-for-varnish-4

-- 
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