[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 23/24: Refreshing patches against new upstreams

Jan Wagner waja at moszumanska.debian.org
Wed Dec 13 22:07:36 UTC 2017 

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 d3c7d4707e8b2d5af5592585da510da21e95fd5f
Author: Jan Wagner <waja at cyconet.org>
Date:   Wed Dec 13 22:32:04 2017 +0100

    Refreshing patches against new upstreams
---
 debian/patches/check_cups/monitoring-plugin         |  6 ++----
 debian/patches/check_haproxy/monitoring-plugin      |  8 +++-----
 debian/patches/check_httpd_status/monitoring-plugin | 11 +++++------
 debian/patches/check_httpd_status/numeric-uptime    |  4 +---
 debian/patches/check_libvirt/fix_uom                |  4 +---
 debian/patches/check_nfsmounts/nfs_write_location   |  4 ++--
 debian/patches/check_printer/debian_bts             |  2 +-
 debian/patches/check_rbl/additional_rbls            |  4 +---
 debian/patches/check_smstools/operator_siglvl       |  6 ++----
 9 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/debian/patches/check_cups/monitoring-plugin b/debian/patches/check_cups/monitoring-plugin
index a55baee..ec3439e 100644
--- a/debian/patches/check_cups/monitoring-plugin
+++ b/debian/patches/check_cups/monitoring-plugin
@@ -1,8 +1,6 @@
-diff --git a/check_cups/check_cups b/check_cups/check_cups
-index b202fbc..c376b1d 100644
 --- a/check_cups/check_cups
 +++ b/check_cups/check_cups
-@@ -38,13 +38,33 @@ use warnings;
+@@ -39,13 +39,33 @@
  # http://search.cpan.org/~rgarcia/perl-5.6.2/pod/perllexwarn.pod
  no warnings qw( redefine prototype );
  
@@ -37,7 +35,7 @@ index b202fbc..c376b1d 100644
  
      use Data::Dumper;
  
-@@ -94,7 +114,7 @@ General Public Licence (see http://www.fsf.org/licensing/licenses/gpl.txt).
+@@ -95,7 +115,7 @@
  This plugin was written at The Harvard-MIT Data Center
  (http://www.hmdc.harvard.edu) by Steve Huff (<shuff\@hmdc.harvard.edu>).
  LICENSE
diff --git a/debian/patches/check_haproxy/monitoring-plugin b/debian/patches/check_haproxy/monitoring-plugin
index 79ab552..8e47f4a 100644
--- a/debian/patches/check_haproxy/monitoring-plugin
+++ b/debian/patches/check_haproxy/monitoring-plugin
@@ -1,8 +1,6 @@
-diff --git a/check_haproxy/check_haproxy b/check_haproxy/check_haproxy
-index 1da4240..875ab1f 100644
 --- a/check_haproxy/check_haproxy
 +++ b/check_haproxy/check_haproxy
-@@ -30,7 +30,28 @@ use POSIX qw(setlocale);
+@@ -31,7 +31,28 @@
  use Time::HiRes qw(time);			# get microtime
  use POSIX qw(mktime);
  
@@ -32,7 +30,7 @@ index 1da4240..875ab1f 100644
  
  use LWP::UserAgent;			# http client
  use HTTP::Request;			# used by LWP::UserAgent
-@@ -52,7 +73,7 @@ setlocale(LC_MESSAGES, '');
+@@ -53,7 +74,7 @@
  textdomain('nagios-plugins-perl');
  
  
@@ -41,7 +39,7 @@ index 1da4240..875ab1f 100644
  	version => $VERSION,
  	blurb => _gt('Plugin to check HAProxy stats url'),
  	usage => "Usage: %s [ -v|--verbose ]  -u <url> [-t <timeout>] [-U <username>] [-P <password>] [ -c|--critical=<threshold> ] [ -w|--warning=<threshold> ]",
-@@ -318,4 +339,4 @@ In F<services.cfg> you just have to add something like :
+@@ -319,4 +340,4 @@
  
  Stéphane Urbanovski <stephane.urbanovski at ac-nancy-metz.fr>
  
diff --git a/debian/patches/check_httpd_status/monitoring-plugin b/debian/patches/check_httpd_status/monitoring-plugin
index 1ec9fd4..dd8451a 100644
--- a/debian/patches/check_httpd_status/monitoring-plugin
+++ b/debian/patches/check_httpd_status/monitoring-plugin
@@ -1,12 +1,11 @@
-diff --git a/check_httpd_status/check_httpd_status b/check_httpd_status/check_httpd_status
-index bc5e809..f8a1350 100644
 --- a/check_httpd_status/check_httpd_status
 +++ b/check_httpd_status/check_httpd_status
-@@ -32,8 +32,28 @@ use File::Basename;			# get basename()
+@@ -34,8 +34,28 @@
  use POSIX qw(setlocale);
  use Locale::gettext;
  
 -use Nagios::Plugin ;
+-
 +sub load_module {
 +    my @names = @_;
 +    my $module;
@@ -24,7 +23,7 @@ index bc5e809..f8a1350 100644
 +    }
 +    return $module;
 +}
- 
++
 +my $plugin_module;
 +BEGIN {
 +	$plugin_module = load_module( 'Monitoring::Plugin', 'Nagios::Plugin' );
@@ -32,7 +31,7 @@ index bc5e809..f8a1350 100644
  use LWP::UserAgent;
  use HTTP::Status; # get status_message()
  use Time::HiRes qw(gettimeofday tv_interval);
-@@ -90,7 +110,7 @@ my %TranslationTable = (
+@@ -92,7 +112,7 @@
  );
  
  
@@ -41,7 +40,7 @@ index bc5e809..f8a1350 100644
  	version => $VERSION,
  	blurb => _gt('Apache / Lighthttpd server status monitor for Nagios'),
  	usage => "Usage: %s [ -H <host> [-p <port>] [-t <timeout>] [-w <warn_level> -c <crit_level>] [-V] [-u <url>] [-U user -P pass -r realm]",
-@@ -436,4 +456,4 @@ Note :
+@@ -438,4 +458,4 @@
          Warn if less than 100 workers are available
          Crit if less than 10 workers are available
  EOT
diff --git a/debian/patches/check_httpd_status/numeric-uptime b/debian/patches/check_httpd_status/numeric-uptime
index ac88736..bc6b290 100644
--- a/debian/patches/check_httpd_status/numeric-uptime
+++ b/debian/patches/check_httpd_status/numeric-uptime
@@ -1,8 +1,6 @@
-diff --git a/check_httpd_status/check_httpd_status b/check_httpd_status/check_httpd_status
-index bc5e809..687870a 100644
 --- a/check_httpd_status/check_httpd_status
 +++ b/check_httpd_status/check_httpd_status
-@@ -235,7 +235,7 @@ logD("Web content :\n----------------------------\n".$webcontent."\n------------
+@@ -257,7 +257,7 @@
  my $patternFound = 0;
  
  my $Uptime = 0;
diff --git a/debian/patches/check_libvirt/fix_uom b/debian/patches/check_libvirt/fix_uom
index a188d21..c192353 100644
--- a/debian/patches/check_libvirt/fix_uom
+++ b/debian/patches/check_libvirt/fix_uom
@@ -13,11 +13,9 @@ Subject: [PATCH] fix uom of check_libvirt
  check_libvirt/check_libvirt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/check_libvirt/check_libvirt b/check_libvirt/check_libvirt
-index 2029c9e..437c3fa 100755
 --- a/check_libvirt/check_libvirt
 +++ b/check_libvirt/check_libvirt
-@@ -224,7 +224,7 @@ eval
+@@ -246,7 +246,7 @@
  			chop($output);
  			chop($output);
  			$output = $up . "/" . $cnt . " VMs up: " . $output;
diff --git a/debian/patches/check_nfsmounts/nfs_write_location b/debian/patches/check_nfsmounts/nfs_write_location
index 462883d..feb3e23 100644
--- a/debian/patches/check_nfsmounts/nfs_write_location
+++ b/debian/patches/check_nfsmounts/nfs_write_location
@@ -1,6 +1,6 @@
 --- a/check_nfsmounts/check_nfsmounts
 +++ b/check_nfsmounts/check_nfsmounts
-@@ -23,6 +23,7 @@
+@@ -45,6 +45,7 @@
  }
  
  use Time::HiRes qw{time alarm};
@@ -8,7 +8,7 @@
  use Getopt::Long;
  use strict;
  
-@@ -107,7 +108,8 @@ foreach $dir (@dirs) {
+@@ -129,7 +130,8 @@
    if($pid==0) {
      chdir $dir or &bad_mount($dir,$!);
      if($writemode and exists($mountmodes{$dir}->{"rw"})) {
diff --git a/debian/patches/check_printer/debian_bts b/debian/patches/check_printer/debian_bts
index 147d0d2..73ff81a 100644
--- a/debian/patches/check_printer/debian_bts
+++ b/debian/patches/check_printer/debian_bts
@@ -1,6 +1,6 @@
 --- a/check_printer/check_printer
 +++ b/check_printer/check_printer
-@@ -246,10 +246,10 @@ while (my($key, $value) = each(%status))
+@@ -267,10 +267,10 @@
  if ($debug){
  	print Dumper(\%status);
  	print "\n\n############ ATTENTION ############\n";
diff --git a/debian/patches/check_rbl/additional_rbls b/debian/patches/check_rbl/additional_rbls
index 7db21f8..0ad0159 100644
--- a/debian/patches/check_rbl/additional_rbls
+++ b/debian/patches/check_rbl/additional_rbls
@@ -1,8 +1,6 @@
-diff --git a/check_rbl/src/check_rbl.ini b/check_rbl/src/check_rbl.ini
-index aeebf6d..4db4edd 100644
 --- a/check_rbl/src/check_rbl.ini
 +++ b/check_rbl/src/check_rbl.ini
-@@ -42,6 +42,46 @@ server=forbidden.icm.edu.pl
+@@ -36,6 +36,46 @@
  server=hil.habeas.com
  server=rbl.schulte.org
  server=sbl-xbl.spamhaus.org
diff --git a/debian/patches/check_smstools/operator_siglvl b/debian/patches/check_smstools/operator_siglvl
index a78d115..7c18cbd 100644
--- a/debian/patches/check_smstools/operator_siglvl
+++ b/debian/patches/check_smstools/operator_siglvl
@@ -9,11 +9,9 @@ siglvl at our modem is 31.99 - but still works
  check_smstools/bin/check_smstools | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/check_smstools/bin/check_smstools b/check_smstools/bin/check_smstools
-index a7a0336..a0adcf6 100755
 --- a/check_smstools/bin/check_smstools
 +++ b/check_smstools/bin/check_smstools
-@@ -169,6 +169,7 @@ sub process_statusfile {
+@@ -191,6 +191,7 @@
  			if ($result{'cmd'} =~ /$operator_command/) {
  				$operator = $result{'answer'};
  				$operator =~ s/0,0,"//g;
@@ -21,7 +19,7 @@ index a7a0336..a0adcf6 100755
  			}
  		}
  		# No need to parse the rest of the file, if signal
-@@ -196,7 +197,7 @@ sub check_signal {
+@@ -218,7 +219,7 @@
  		$np->nagios_die("Unable to determine the modem signal strength.");
  	}
  

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