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 adf7f0f9f3d1f0b534f709a082786c15aaad6b9a
Author: Evgeni Golov <evgeni at golov.de>
Date: Sat Sep 24 15:42:21 2016 +0200
update patches
---
debian/patches/check_printer/debian_bts | 2 +-
debian/patches/check_rbl/disable_dul.ru | 4 +-
debian/patches/check_rbl/disable_solid.net | 11 ------
debian/patches/check_rbl/nagios-plugins | 59 ------------------------------
debian/patches/series | 4 +-
5 files changed, 4 insertions(+), 76 deletions(-)
diff --git a/debian/patches/check_printer/debian_bts b/debian/patches/check_printer/debian_bts
index 53a8ef3..147d0d2 100644
--- a/debian/patches/check_printer/debian_bts
+++ b/debian/patches/check_printer/debian_bts
@@ -12,6 +12,6 @@
+ 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";
+ print '$Id: check_printer 363 2014-07-23 14:37:59Z ecrist $'."\n\n";
}
if ($is_crit){
diff --git a/debian/patches/check_rbl/disable_dul.ru b/debian/patches/check_rbl/disable_dul.ru
index 0b77e94..8efb0ca 100644
--- a/debian/patches/check_rbl/disable_dul.ru
+++ b/debian/patches/check_rbl/disable_dul.ru
@@ -1,9 +1,9 @@
--- a/check_rbl/src/check_rbl.ini
+++ b/check_rbl/src/check_rbl.ini
-@@ -33,7 +33,7 @@
+@@ -32,7 +32,7 @@
+ server=blacklist.sci.kun.nl
server=bl.technovision.dk
server=dnsbl.kempt.net
- ;server=dnsbl.solid.net ; domain offline
-server=dul.ru
+;server=dul.ru ; domain seems abandoned
server=forbidden.icm.edu.pl
diff --git a/debian/patches/check_rbl/disable_solid.net b/debian/patches/check_rbl/disable_solid.net
deleted file mode 100644
index eafb7b2..0000000
--- a/debian/patches/check_rbl/disable_solid.net
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/check_rbl/src/check_rbl.ini
-+++ b/check_rbl/src/check_rbl.ini
-@@ -36,7 +36,7 @@ server=access.redhawk.org
- server=blacklist.sci.kun.nl
- server=bl.technovision.dk
- server=dnsbl.kempt.net
--server=dnsbl.solid.net
-+;server=dnsbl.solid.net ; domain offline
- server=dul.ru
- server=forbidden.icm.edu.pl
- server=hil.habeas.com
diff --git a/debian/patches/check_rbl/nagios-plugins b/debian/patches/check_rbl/nagios-plugins
deleted file mode 100644
index c69d109..0000000
--- a/debian/patches/check_rbl/nagios-plugins
+++ /dev/null
@@ -1,59 +0,0 @@
-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 5a3a355..7d97df0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,13 +21,11 @@ check_nfsmounts/nfs_write_location
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_raid/prefer_cciss_vol_status_over_hpacucli
check_rbl/interpreter
check_rbl/spelling_errors
-check_rbl/disable_solid.net
check_rbl/disable_dul.ru
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