diff --git a/debian/patches/10_fix_net_snmp_version b/debian/patches/10_fix_net_snmp_version old mode 100755 new mode 100644 index c8cb20c..757d055 --- a/debian/patches/10_fix_net_snmp_version +++ b/debian/patches/10_fix_net_snmp_version @@ -3,9 +3,8 @@ ## DP: Fixing Net::SNMP version ## DP: (see https://wiki.icinga.org/display/howtos/check_snmp#checksnmp-Argumentv601isntnumericinnumericlt) -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_boostedge.pl nagios-snmp-plugins-1.1.1/check_snmp_boostedge.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_boostedge.pl 2007-01-16 23:57:14.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_boostedge.pl 2013-01-31 08:38:55.000000000 +0100 +--- a/check_snmp_boostedge.pl ++++ b/check_snmp_boostedge.pl @@ -249,7 +249,7 @@ # Get global status @@ -24,9 +23,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_table($be_service_table) : $session->get_table(Baseoid => $be_service_table); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_css.pl nagios-snmp-plugins-1.1.1/check_snmp_css.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_css.pl 2007-01-11 17:06:08.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_css.pl 2013-01-31 08:38:55.000000000 +0100 +--- a/check_snmp_css.pl ++++ b/check_snmp_css.pl @@ -356,7 +356,7 @@ } close (FILE); @@ -54,9 +52,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_request(@oid_list2) : $session->get_request(-varbindlist => \@oid_list2); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_css_main.pl nagios-snmp-plugins-1.1.1/check_snmp_css_main.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_css_main.pl 2006-10-05 23:40:55.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_css_main.pl 2013-01-31 08:38:55.000000000 +0100 +--- a/check_snmp_css_main.pl ++++ b/check_snmp_css_main.pl @@ -219,7 +219,7 @@ ########### Cisco CSS checks ############## @@ -66,9 +63,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_table($css_svc_name) : $session->get_table(Baseoid => $css_svc_name); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_env.pl nagios-snmp-plugins-1.1.1/check_snmp_env.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_env.pl 2013-01-31 08:37:55.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_env.pl 2013-01-31 08:38:55.000000000 +0100 +--- a/check_snmp_env.pl ++++ b/check_snmp_env.pl @@ -390,7 +390,7 @@ verb("Checking cisco env"); @@ -159,9 +155,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_table($foundry_ps_table) : $session->get_table(Baseoid => $foundry_ps_table); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_linkproof_nhr.pl nagios-snmp-plugins-1.1.1/check_snmp_linkproof_nhr.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_linkproof_nhr.pl 2006-08-26 14:37:12.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_linkproof_nhr.pl 2013-01-31 08:38:56.000000000 +0100 +--- a/check_snmp_linkproof_nhr.pl ++++ b/check_snmp_linkproof_nhr.pl @@ -232,7 +232,7 @@ my $global_status=0; @@ -180,9 +175,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $result = $session->get_request(@oids); } else { if ($session->version == 0) { -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_load.pl nagios-snmp-plugins-1.1.1/check_snmp_load.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_load.pl 2013-01-31 08:37:55.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_load.pl 2013-01-31 08:38:56.000000000 +0100 +--- a/check_snmp_load.pl ++++ b/check_snmp_load.pl @@ -346,7 +346,7 @@ verb("Checking linux load"); @@ -246,10 +240,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_table($base_proc) : $session->get_table(Baseoid => $base_proc); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_mem.pl nagios-snmp-plugins-1.1.1/check_snmp_mem.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_mem.pl 2006-07-09 22:52:37.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_mem.pl 2013-01-31 08:38:56.000000000 +0100 -@@ -316,7 +316,7 @@ +--- a/check_snmp_mem.pl ++++ b/check_snmp_mem.pl +@@ -320,7 +320,7 @@ if (defined ($o_cisco)) { # Get Cisco memory table @@ -258,7 +251,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_table($cisco_mem_pool) :$session->get_table(Baseoid => $cisco_mem_pool); -@@ -393,7 +393,7 @@ +@@ -397,7 +397,7 @@ if (defined ($o_hp)) { # Get hp memory table @@ -267,7 +260,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_table($hp_mem_pool) :$session->get_table(Baseoid => $hp_mem_pool); -@@ -462,7 +462,7 @@ +@@ -466,7 +466,7 @@ if (defined ($o_netsnmp)) { # Get NetSNMP memory values @@ -276,9 +269,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_request(@nets_oids) :$session->get_request(-varbindlist => \@nets_oids); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_nsbox.pl nagios-snmp-plugins-1.1.1/check_snmp_nsbox.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_nsbox.pl 2007-01-16 23:55:21.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_nsbox.pl 2013-01-31 08:38:56.000000000 +0100 +--- a/check_snmp_nsbox.pl ++++ b/check_snmp_nsbox.pl @@ -265,7 +265,7 @@ ########### check global status ############## @@ -297,9 +289,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_table($ns_service_table) : $session->get_table(Baseoid => $ns_service_table); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_process.pl nagios-snmp-plugins-1.1.1/check_snmp_process.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_process.pl 2013-01-31 08:37:55.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_process.pl 2013-01-31 08:38:56.000000000 +0100 +--- a/check_snmp_process.pl ++++ b/check_snmp_process.pl @@ -407,11 +407,11 @@ my %result_cons=(); my ($getall_run,$getall_cpu,$getall_mem)=(undef,undef,undef); @@ -368,9 +359,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $session->get_request(@oids) : $session->get_request(Varbindlist => \@oids); if (!defined($result)) { printf("ERROR: running table : %s.\n", $session->error); $session->close; -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_storage.pl nagios-snmp-plugins-1.1.1/check_snmp_storage.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_storage.pl 2013-01-31 08:37:55.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_storage.pl 2013-01-31 08:38:56.000000000 +0100 +--- a/check_snmp_storage.pl ++++ b/check_snmp_storage.pl @@ -411,13 +411,13 @@ # Get rid of UTF8 translation in case of accentuated caracters (thanks to Dimo Velev). $session->translate(Net::SNMP->TRANSLATE_NONE); @@ -405,10 +395,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $result = $session->get_request(@oids); } else { if ($session->version == 0) { -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_vrrp.pl nagios-snmp-plugins-1.1.1/check_snmp_vrrp.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_vrrp.pl 2006-08-23 23:39:48.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_vrrp.pl 2013-01-31 08:38:56.000000000 +0100 -@@ -306,7 +306,7 @@ +--- a/check_snmp_vrrp.pl ++++ b/check_snmp_vrrp.pl +@@ -318,7 +318,7 @@ if ($o_type eq "ipso") { # Get cluster table my $resultat; @@ -417,7 +406,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $resultat = $session->get_table( $nokia_clust_table ); } else { $resultat = $session->get_table( Baseoid => $nokia_clust_table ); -@@ -364,7 +364,7 @@ +@@ -376,7 +376,7 @@ # Get vrrp table my $resultat; @@ -426,9 +415,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' $resultat = $session->get_table( $base_vrrp{$o_type} ); } else { $resultat = $session->get_table( Baseoid => $base_vrrp{$o_type} ); -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-snmp-plugins-1.1.1~/check_snmp_win.pl nagios-snmp-plugins-1.1.1/check_snmp_win.pl ---- nagios-snmp-plugins-1.1.1~/check_snmp_win.pl 2013-01-31 08:37:55.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_win.pl 2013-01-31 08:38:56.000000000 +0100 +--- a/check_snmp_win.pl ++++ b/check_snmp_win.pl @@ -256,7 +256,7 @@ # Look for process in name or path name table my $resultat=undef; diff --git a/debian/patches/50_disable_epn b/debian/patches/50_disable_epn index 5cec8b8..8b51cd6 100644 --- a/debian/patches/50_disable_epn +++ b/debian/patches/50_disable_epn @@ -2,126 +2,112 @@ ## ## DP: leave marks to disable epn -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_boostedge.pl nagios-snmp-plugins-1.1.1/check_snmp_boostedge.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_boostedge.pl 2007-01-16 23:57:14.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_boostedge.pl 2008-05-23 14:09:04.000000000 +0200 +--- a/check_snmp_boostedge.pl ++++ b/check_snmp_boostedge.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_boostedge.pl ################# # Version : 1.0 # Date : Jan 16 2007 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_cpfw.pl nagios-snmp-plugins-1.1.1/check_snmp_cpfw.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_cpfw.pl 2007-04-20 00:03:30.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_cpfw.pl 2008-05-23 14:09:09.000000000 +0200 +--- a/check_snmp_cpfw.pl ++++ b/check_snmp_cpfw.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_cpfw ############## - # Version : 1.2.1 - # Date : April 19 2007 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_css_main.pl nagios-snmp-plugins-1.1.1/check_snmp_css_main.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_css_main.pl 2006-10-05 23:40:55.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_css_main.pl 2008-05-23 14:09:25.000000000 +0200 + my $Version='1.8'; + # Date : Oct 20 2007 +--- a/check_snmp_css_main.pl ++++ b/check_snmp_css_main.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_css_main.pl ################# # Version : 1.0 # Date : 27 Sept 2006 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_css.pl nagios-snmp-plugins-1.1.1/check_snmp_css.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_css.pl 2007-01-11 17:06:08.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_css.pl 2008-05-23 14:09:18.000000000 +0200 +--- a/check_snmp_css.pl ++++ b/check_snmp_css.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_css.pl ################# # Version : 1.0.1 # Date : 27 Sept 2006 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_env.pl nagios-snmp-plugins-1.1.1/check_snmp_env.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_env.pl 2008-05-23 14:05:14.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_env.pl 2008-05-23 14:09:32.000000000 +0200 +--- a/check_snmp_env.pl ++++ b/check_snmp_env.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_env ################# # Version : 1.3 # Date : May 24 2007 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_int.pl nagios-snmp-plugins-1.1.1/check_snmp_int.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_int.pl 2008-05-23 14:05:14.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_int.pl 2008-05-23 14:09:39.000000000 +0200 +--- a/check_snmp_int.pl ++++ b/check_snmp_int.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_int ############## my $Version='1.24'; # Date : Oct 10 2007 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_linkproof_nhr.pl nagios-snmp-plugins-1.1.1/check_snmp_linkproof_nhr.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_linkproof_nhr.pl 2006-08-26 14:37:12.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_linkproof_nhr.pl 2008-05-23 14:09:46.000000000 +0200 +--- a/check_snmp_linkproof_nhr.pl ++++ b/check_snmp_linkproof_nhr.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_linkproof_nhr ################# # Version : 1.0 # Date : Aug 24 2006 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_load.pl nagios-snmp-plugins-1.1.1/check_snmp_load.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_load.pl 2008-05-23 14:05:14.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_load.pl 2008-05-23 14:09:52.000000000 +0200 +--- a/check_snmp_load.pl ++++ b/check_snmp_load.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_load ################# my $Version='1.12'; # Date : Oct 12 2007 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_mem.pl nagios-snmp-plugins-1.1.1/check_snmp_mem.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_mem.pl 2006-07-09 22:52:37.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_mem.pl 2008-05-23 14:09:58.000000000 +0200 +--- a/check_snmp_mem.pl ++++ b/check_snmp_mem.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_mem ############## - # Version : 1.1 - # Date : Jul 09 2006 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_nsbox.pl nagios-snmp-plugins-1.1.1/check_snmp_nsbox.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_nsbox.pl 2007-01-16 23:55:21.000000000 +0100 -+++ nagios-snmp-plugins-1.1.1/check_snmp_nsbox.pl 2008-05-23 14:10:04.000000000 +0200 + my $Version='1.5'; + # Date : 17 October 2007 +--- a/check_snmp_nsbox.pl ++++ b/check_snmp_nsbox.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_nsbox ################# # Version : 1.0 # Date : Jan 16 2007 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_process.pl nagios-snmp-plugins-1.1.1/check_snmp_process.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_process.pl 2008-05-23 14:05:14.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_process.pl 2008-05-23 14:10:10.000000000 +0200 +--- a/check_snmp_process.pl ++++ b/check_snmp_process.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_process ############## my $Version='1.10'; # Date : Oct 12 2007 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_storage.pl nagios-snmp-plugins-1.1.1/check_snmp_storage.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_storage.pl 2008-05-23 14:05:14.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_storage.pl 2008-05-23 14:10:15.000000000 +0200 +--- a/check_snmp_storage.pl ++++ b/check_snmp_storage.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_storage ############## # Version : 1.3.3 # Date : Jun 1 2007 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_vrrp.pl nagios-snmp-plugins-1.1.1/check_snmp_vrrp.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_vrrp.pl 2006-08-23 23:39:48.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_vrrp.pl 2008-05-23 14:10:21.000000000 +0200 +--- a/check_snmp_vrrp.pl ++++ b/check_snmp_vrrp.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn ############################## check_snmp_vrrp ############## - # Version : 1.3 - # Date : Aug 23 2006 -diff -Nur nagios-snmp-plugins-1.1.1.orig/check_snmp_win.pl nagios-snmp-plugins-1.1.1/check_snmp_win.pl ---- nagios-snmp-plugins-1.1.1.orig/check_snmp_win.pl 2008-05-23 14:05:14.000000000 +0200 -+++ nagios-snmp-plugins-1.1.1/check_snmp_win.pl 2008-05-23 14:10:26.000000000 +0200 + my $Version='1.4'; + # Date : Oct 17 2007 +--- a/check_snmp_win.pl ++++ b/check_snmp_win.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +# nagios: -epn