From 1e2387474a449452b78520b9ad96a8b4b5e99722 Mon Sep 17 00:00:00 2001 From: Harald Pfeiffer Date: Wed, 17 Apr 2019 19:07:19 +0200 Subject: initial commit of source fetch --- .../debian/patches/check_printer/debian_bts | 17 ++++++++++ .../debian/patches/check_printer/epn | 8 +++++ .../check_printer/use_data_dumper_if_needed | 18 ++++++++++ .../debian/patches/check_printer/use_nagios_plugin | 38 ++++++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/debian_bts create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/epn create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/use_data_dumper_if_needed create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/use_nagios_plugin (limited to 'nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer') diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/debian_bts b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/debian_bts new file mode 100644 index 0000000..73ff81a --- /dev/null +++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/debian_bts @@ -0,0 +1,17 @@ +--- a/check_printer/check_printer ++++ b/check_printer/check_printer +@@ -267,10 +267,10 @@ + if ($debug){ + print Dumper(\%status); + print "\n\n############ ATTENTION ############\n"; +- print "You have debug enabled. If asked to enable debug by the developer,\n"; +- 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 '$Id: check_printer 363 2014-07-23 14:37:59Z ecrist $'."\n\n"; + } + if ($is_crit){ diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/epn b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/epn new file mode 100644 index 0000000..ea584db --- /dev/null +++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/epn @@ -0,0 +1,8 @@ +--- a/check_printer/check_printer ++++ b/check_printer/check_printer +@@ -1,4 +1,5 @@ + #!/usr/bin/perl ++# nagios: -epn + # + # Copyright (c) 2007,2011 Eric F Crist + # diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/use_data_dumper_if_needed b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/use_data_dumper_if_needed new file mode 100644 index 0000000..977338e --- /dev/null +++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/use_data_dumper_if_needed @@ -0,0 +1,18 @@ +--- a/check_printer/check_printer ++++ b/check_printer/check_printer +@@ -40,7 +40,6 @@ if ($OS =~ m/^\wBSD/){ + use lib "/usr/local/nagios/libexec"; + } + +-use Data::Dumper; + use Getopt::Long; + use Pod::Usage; + +@@ -109,6 +108,7 @@ foreach(@vars){ + } + + if ($debug){ ++ use Data::Dumper; + print Dumper(\@values); + } + my %finvalues; diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/use_nagios_plugin b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/use_nagios_plugin new file mode 100644 index 0000000..36e7880 --- /dev/null +++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_printer/use_nagios_plugin @@ -0,0 +1,38 @@ +diff --git a/check_printer/check_printer b/check_printer/check_printer +index 6d801de..da8e099 100644 +--- a/check_printer/check_printer ++++ b/check_printer/check_printer +@@ -33,11 +33,27 @@ + use strict; + use warnings; + +-my $OS = `uname`; +-if ($OS =~ m/^\wBSD/){ +- use lib "/usr/local/libexec/nagios"; +-} elsif ($OS =~ m/Linux/){ +- use lib "/usr/local/nagios/libexec"; ++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(qw(%ERRORS)); ++ $module = $name; ++ }; ++ last if $module; ++ } ++ return $module; ++} ++ ++my $plugin_module; ++BEGIN { ++ $plugin_module = load_module( 'Monitoring::Plugin', 'Nagios::Plugin' ); + } + + use Getopt::Long; + use Pod::Usage; -- cgit v1.2.3