[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 14/18: Refreshing patches.

Bernd Zeimetz bernd at bzed.de
Wed Oct 1 11:13:16 UTC 2014 

This is an automated email from the git hooks/post-receive script.

bzed pushed a commit to branch master
in repository pkg-nagios-plugins-contrib.

commit d6d96ff5ef27378decda5a1560cd923bf95005d5
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Wed Oct 1 12:37:11 2014 +0200

    Refreshing patches.
---
 debian/patches/check_printer/debian_bts            | 30 +++++-----------------
 .../check_printer/use_data_dumper_if_needed        | 20 +++++++--------
 debian/patches/check_printer/use_nagios_plugin     |  8 +++---
 .../prefer_cciss_vol_status_over_hpacucli          |  2 +-
 debian/patches/check_rbl/additional_rbls           |  6 ++---
 debian/patches/check_rbl/pod_encoding_fix          | 11 --------
 debian/patches/series                              |  1 -
 7 files changed, 23 insertions(+), 55 deletions(-)

diff --git a/debian/patches/check_printer/debian_bts b/debian/patches/check_printer/debian_bts
index ebaafb9..53a8ef3 100644
--- a/debian/patches/check_printer/debian_bts
+++ b/debian/patches/check_printer/debian_bts
@@ -1,25 +1,6 @@
 --- a/check_printer/check_printer
 +++ b/check_printer/check_printer
-@@ -35,10 +35,6 @@ use warnings;
- 
- use Nagios::Plugin qw(%ERRORS);
- 
--'$Revision$' =~ m/Revision: (\d+)/;
--my $revision = $1;
--'$HeadURL$' =~ m/HeadURL: ([\w\:\/\-\.\_]+) /;
--my $src_url = $1;
- my $usage = "
- Usage: $0 host_addr community warn% crit%
- 
-@@ -52,7 +48,6 @@ my $debug = 0;
- if ($ARGV[4]){
-         use Data::Dumper;
- 	$debug = 1;
--	print "check_printer Revision $revision\n$src_url\n\n";
- }
- die $usage unless ($#ARGV >= 3);
- my $base_oid = ".1.3.6.1.2.1.43.11.1.1";
-@@ -235,10 +230,9 @@ while (my($key, $value) = each(%status))
+@@ -246,10 +246,10 @@ while (my($key, $value) = each(%status))
  if ($debug){
  	print Dumper(\%status);
  	print "\n\n############ ATTENTION ############\n";
@@ -27,9 +8,10 @@
 -	print "please send all of the output, including your command line to\n";
 -	print "ecrist\@secure-computing.net with the subject line 'check_printer DEBUG' along\n";
 -	print "with a description of the problem you're experiencing.\n###################################\n";
-+	print "You have debug enabled.  If asked to enable debug by the Debian Maintainer,\n";
-+	print "please send all of the output to the Debian Bug Tracking System, either by \n";
-+	print "replying to an existing bug or by opening a new bug.\n";
++        print "You have debug enabled.  If asked to enable debug by the Debian Maintainer,\n";
++        print "please send all of the output to the Debian Bug Tracking System, either by \n";
++        print "replying to an existing bug or by opening a new bug.\n";
++
+ 	print '$Id$'."\n\n";
  }
  if ($is_crit){
- 	print "$err_str CRITICAL.  See http://$ARGV[0] | $perf_str";
diff --git a/debian/patches/check_printer/use_data_dumper_if_needed b/debian/patches/check_printer/use_data_dumper_if_needed
index 374d10f..977338e 100644
--- a/debian/patches/check_printer/use_data_dumper_if_needed
+++ b/debian/patches/check_printer/use_data_dumper_if_needed
@@ -1,18 +1,18 @@
 --- a/check_printer/check_printer
 +++ b/check_printer/check_printer
-@@ -41,7 +41,6 @@ if ($OS =~ m/^\wBSD/){
+@@ -40,7 +40,6 @@ if ($OS =~ m/^\wBSD/){
+ 	use lib "/usr/local/nagios/libexec";
  }
  
- use utils qw(%ERRORS);
 -use Data::Dumper;
+ use Getopt::Long;
+ use Pod::Usage;
  
- '$Revision$' =~ m/Revision: (\d+)/;
- my $revision = $1;
-@@ -58,6 +57,7 @@ found for toner and drum.
- ## set to 1 if you want debug output for development
- my $debug = 0;
- if ($ARGV[4]){
+@@ -109,6 +108,7 @@ foreach(@vars){
+ }
+ 
+ if ($debug){
 +        use Data::Dumper;
- 	$debug = 1;
- 	print "check_printer Revision $revision\n$src_url\n\n";
+ 	print Dumper(\@values);
  }
+ my %finvalues;
diff --git a/debian/patches/check_printer/use_nagios_plugin b/debian/patches/check_printer/use_nagios_plugin
index f12bfee..b1a2c52 100644
--- a/debian/patches/check_printer/use_nagios_plugin
+++ b/debian/patches/check_printer/use_nagios_plugin
@@ -1,6 +1,6 @@
 --- a/check_printer/check_printer
 +++ b/check_printer/check_printer
-@@ -33,14 +33,7 @@
+@@ -33,12 +33,7 @@
  use strict;
  use warnings;
  
@@ -10,9 +10,7 @@
 -} elsif ($OS =~ m/Linux/){
 -	use lib "/usr/local/nagios/libexec";
 -}
--
--use utils qw(%ERRORS);
 +use Nagios::Plugin qw(%ERRORS);
  
- '$Revision$' =~ m/Revision: (\d+)/;
- my $revision = $1;
+ use Getopt::Long;
+ use Pod::Usage;
diff --git a/debian/patches/check_raid/prefer_cciss_vol_status_over_hpacucli b/debian/patches/check_raid/prefer_cciss_vol_status_over_hpacucli
index 1733c15..c8def56 100644
--- a/debian/patches/check_raid/prefer_cciss_vol_status_over_hpacucli
+++ b/debian/patches/check_raid/prefer_cciss_vol_status_over_hpacucli
@@ -1,6 +1,6 @@
 --- a/check_raid/check_raid
 +++ b/check_raid/check_raid
-@@ -3251,8 +3251,10 @@ sub check {
+@@ -3975,8 +3975,10 @@ sub check {
  package hpacucli;
  use base 'plugin';
  
diff --git a/debian/patches/check_rbl/additional_rbls b/debian/patches/check_rbl/additional_rbls
index 4f8e19b..7db21f8 100644
--- a/debian/patches/check_rbl/additional_rbls
+++ b/debian/patches/check_rbl/additional_rbls
@@ -1,7 +1,7 @@
-diff --git a/check_rbl/check_rbl-1.3.2/check_rbl.ini b/check_rbl/check_rbl-1.3.2/check_rbl.ini
+diff --git a/check_rbl/src/check_rbl.ini b/check_rbl/src/check_rbl.ini
 index aeebf6d..4db4edd 100644
---- a/check_rbl/check_rbl-1.3.2/check_rbl.ini
-+++ b/check_rbl/check_rbl-1.3.2/check_rbl.ini
+--- a/check_rbl/src/check_rbl.ini
++++ b/check_rbl/src/check_rbl.ini
 @@ -42,6 +42,46 @@ server=forbidden.icm.edu.pl
  server=hil.habeas.com
  server=rbl.schulte.org
diff --git a/debian/patches/check_rbl/pod_encoding_fix b/debian/patches/check_rbl/pod_encoding_fix
deleted file mode 100644
index a367312..0000000
--- a/debian/patches/check_rbl/pod_encoding_fix
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/check_rbl/src/check_rbl.pod
-+++ b/check_rbl/src/check_rbl.pod
-@@ -6,6 +6,8 @@
- 
- =pod
- 
-+=encoding utf8
-+
- =head1 NAME
- 
- C<check_rbl> - a Nagios plugin to check if an SMTP server is blacklisted
diff --git a/debian/patches/series b/debian/patches/series
index fb649cc..1c7a1e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,7 +22,6 @@ check_printer/use_data_dumper_if_needed
 check_printer/use_nagios_plugin
 check_printer/debian_bts
 check_raid/prefer_cciss_vol_status_over_hpacucli
-check_rbl/pod_encoding_fix
 check_rbl/interpreter
 check_rbl/spelling_errors
 check_rbl/disable_solid.net

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