diff options
Diffstat (limited to 'nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_smstools')
2 files changed, 76 insertions, 0 deletions
diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_smstools/monitoring-plugin b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_smstools/monitoring-plugin new file mode 100644 index 0000000..1715f96 --- /dev/null +++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_smstools/monitoring-plugin @@ -0,0 +1,46 @@ +diff --git a/check_smstools/bin/check_smstools b/check_smstools/bin/check_smstools +index a7a0336..707d289 100755 +--- a/check_smstools/bin/check_smstools ++++ b/check_smstools/bin/check_smstools +@@ -13,9 +13,31 @@ + + use strict; + use warnings; +-use Nagios::Plugin; + use POSIX; + ++sub load_module { ++ my @names = @_; ++ my $module; ++ for my $name (@names) { ++ my $file = $name; ++ # requires need either a bare word or a file name ++ $file =~ s{::}{/}gsxm; ++ $file .= '.pm'; ++ eval { ++ require $file; ++ $name->import(); ++ $module = $name; ++ }; ++ last if $module; ++ } ++ return $module; ++} ++ ++my $plugin_module; ++BEGIN { ++ $plugin_module = load_module( 'Monitoring::Plugin', 'Nagios::Plugin' ); ++} ++ + # Define regular expressions used to find the correct lines from + # the status file + my $signal_command = 'AT\+CSQ'; +@@ -45,7 +67,7 @@ my $timestamp; + my $np; + + sub init_plugin { +- $np = Nagios::Plugin->new(usage => "usage: %s"); ++ $np = $plugin_module->new(usage => "usage: %s"); + + $np->add_arg( + spec => 'warning|w=f', diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_smstools/operator_siglvl b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_smstools/operator_siglvl new file mode 100644 index 0000000..7c18cbd --- /dev/null +++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_smstools/operator_siglvl @@ -0,0 +1,30 @@ +From 75a6f801a18961b1abd169046a105813da6c3424 Mon Sep 17 00:00:00 2001 +From: ZyanKLee <zyanklee@gmail.com> +Date: Thu, 28 Apr 2016 12:51:42 +0200 +Subject: [PATCH] operator string, siglvl + +operator string has a " at the end, too - removing it +siglvl at our modem is 31.99 - but still works +--- + check_smstools/bin/check_smstools | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/check_smstools/bin/check_smstools ++++ b/check_smstools/bin/check_smstools +@@ -191,6 +191,7 @@ + if ($result{'cmd'} =~ /$operator_command/) { + $operator = $result{'answer'}; + $operator =~ s/0,0,"//g; ++ $operator =~ s/"$//g; + } + } + # No need to parse the rest of the file, if signal +@@ -218,7 +219,7 @@ + $np->nagios_die("Unable to determine the modem signal strength."); + } + +- if (($siglvl < 0) or ($siglvl > 31)) { ++ if (($siglvl < 0) or ($siglvl > 32)) { + $np->nagios_die("Unable to determine the modem signal strength."); + } + |