diff options
Diffstat (limited to 'net-mgmt/nagios-plugins/files')
8 files changed, 25 insertions, 54 deletions
diff --git a/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff b/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff index 21a8df54c690..3f568a49445f 100644 --- a/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff +++ b/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff @@ -1,11 +1,11 @@ ---- plugins/check_dig.c.orig 2014-03-04 21:41:57 UTC +--- plugins/check_dig.c.orig 2015-07-30 21:40:06 UTC +++ plugins/check_dig.c @@ -94,8 +94,8 @@ main (int argc, char **argv) timeout_interval_dig = ceil((double) timeout_interval / (double) number_tries); /* get the command to run */ -- xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d", -- PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport, number_tries, timeout_interval_dig); +- xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +tries=%d +time=%d", +- PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type, number_tries, timeout_interval_dig); + xasprintf (&command_line, "%s %s @%s -z -p %d %s %s %s", + PATH_TO_DIG, dig_args, dns_server, server_port, query_transport, query_address, record_type); diff --git a/net-mgmt/nagios-plugins/files/patch-configure b/net-mgmt/nagios-plugins/files/patch-configure index b995fb7f62f4..d096efb5232c 100644 --- a/net-mgmt/nagios-plugins/files/patch-configure +++ b/net-mgmt/nagios-plugins/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-06-26 16:17:37 UTC +--- configure.orig 2015-07-31 17:47:20 UTC +++ configure -@@ -21787,7 +21787,7 @@ then +@@ -22224,7 +22224,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ diff --git a/net-mgmt/nagios-plugins/files/patch-plugins-root_check__dhcp.c b/net-mgmt/nagios-plugins/files/patch-plugins-root_check__dhcp.c index 450dcf69d90e..926d3b7eddff 100644 --- a/net-mgmt/nagios-plugins/files/patch-plugins-root_check__dhcp.c +++ b/net-mgmt/nagios-plugins/files/patch-plugins-root_check__dhcp.c @@ -1,4 +1,4 @@ ---- plugins-root/check_dhcp.c.orig 2014-06-26 16:17:12 UTC +--- plugins-root/check_dhcp.c.orig 2015-07-30 21:40:06 UTC +++ plugins-root/check_dhcp.c @@ -326,7 +326,8 @@ int get_hardware_address(int sock,char * #elif defined(__bsd__) @@ -10,7 +10,7 @@ char *buf; unsigned char *ptr; struct if_msghdr *ifm; -@@ -1185,7 +1186,7 @@ int call_getopt(int argc, char **argv){ +@@ -1194,7 +1195,7 @@ int call_getopt(int argc, char **argv){ } } diff --git a/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl b/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl index 57da722743be..5b09476f279d 100644 --- a/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl +++ b/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl @@ -1,14 +1,14 @@ ---- plugins-scripts/check_ircd.pl.orig 2014-03-04 21:41:57 UTC +--- plugins-scripts/check_ircd.pl.orig 2015-07-30 21:40:06 UTC +++ plugins-scripts/check_ircd.pl -@@ -66,6 +66,7 @@ - $ENV{PATH} = ""; - $ENV{ENV} = ""; - $ENV{BASH_ENV} = ""; -+$ENV{CDPATH} = ""; +@@ -67,6 +67,7 @@ sub bindRemote ($$); + $ENV{'PATH'}='@TRUSTED_PATH@'; + $ENV{'BASH_ENV'}=''; + $ENV{'ENV'}=''; ++$ENV{'CDPATH'} = ""; # -----------------------------------------------------------------[ Global ]-- -@@ -153,7 +154,7 @@ +@@ -154,7 +155,7 @@ sub bindRemote ($$) print "IRCD UNKNOWN: Could not start socket ($!)\n"; exit $ERRORS{"UNKNOWN"}; } diff --git a/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl b/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl index 92612d35bfe2..40e8668f427b 100644 --- a/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl +++ b/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl @@ -1,6 +1,6 @@ ---- plugins-scripts/check_ntp.pl.orig 2014-03-04 21:41:57 UTC +--- plugins-scripts/check_ntp.pl.orig 2015-07-30 21:40:06 UTC +++ plugins-scripts/check_ntp.pl -@@ -313,7 +313,6 @@ +@@ -313,7 +313,6 @@ if ($have_ntpq) { } } else { print "No match!\n" if $verbose; @@ -8,7 +8,7 @@ } } -@@ -427,7 +426,7 @@ +@@ -427,7 +426,7 @@ if ($ntpdate_error != $ERRORS{'OK'}) { foreach my $key (keys %ERRORS) { if ($state==$ERRORS{$key}) { # print ("NTP $key: $answer"); diff --git a/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in b/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in deleted file mode 100644 index d4a9c6a34f3e..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-plugins-scripts__subst.in +++ /dev/null @@ -1,29 +0,0 @@ ---- plugins-scripts/subst.in.orig 2014-03-04 21:41:57 UTC -+++ plugins-scripts/subst.in -@@ -1,7 +1,7 @@ - #!/usr/bin/awk - - function which(c,path) { -- cmd = "test -x " c; -+ cmd = "[ " c " = @libexecdir@ ] || test -x " c; - - if (system(cmd)==0) { - return c; -@@ -53,7 +53,7 @@ - # FIXME: Prepend executables with a substitution keyword instead. - # - /^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// { -- match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/); -+ match($0,/(\/[^ ]*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/); - c=substr($0,RSTART,RLENGTH); - sub(c,which(c,path)); - } -@@ -65,7 +65,7 @@ - # Trusted path mechanism (deprecated) - - /^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ { -- sub(/\=[ \t]*['"][^"']+["']/,"='@with_trusted_path@' # autoconf-derived"); -+ sub(/\=[ \t]*['"][^"']+["'];/,"='@with_trusted_path@'; # autoconf-derived"); - } - - /^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ { diff --git a/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c b/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c index b6f6acf7d78d..3da67fb48a92 100644 --- a/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c +++ b/net-mgmt/nagios-plugins/files/patch-plugins__check_pgsql.c @@ -1,6 +1,6 @@ ---- plugins/check_pgsql.c.orig 2014-04-15 22:19:03 UTC +--- plugins/check_pgsql.c.orig 2015-07-30 21:40:06 UTC +++ plugins/check_pgsql.c -@@ -36,6 +36,7 @@ +@@ -36,6 +36,7 @@ const char *email = "devel@nagios-plugin #include "utils.h" #include "netutils.h" diff --git a/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c b/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c index eb5e038642c5..22862e326e3a 100644 --- a/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c +++ b/net-mgmt/nagios-plugins/files/patch-plugins__check_ssh.c @@ -1,17 +1,17 @@ ---- plugins/check_ssh.c.orig 2014-03-04 21:41:57 UTC +--- plugins/check_ssh.c.orig 2015-07-30 21:40:06 UTC +++ plugins/check_ssh.c -@@ -255,6 +255,7 @@ +@@ -252,6 +252,7 @@ ssh_connect (char *haddr, int hport, cha printf - (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"), + (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"), ssh_server, ssh_proto, remote_version); + recv (sd, output, BUFF_SZ, 0); close(sd); - exit (STATE_WARNING); + exit (STATE_CRITICAL); } -@@ -273,6 +274,7 @@ +@@ -270,6 +271,7 @@ ssh_connect (char *haddr, int hport, cha (_("SSH OK - %s (protocol %s) | %s\n"), ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s", - FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout)); + FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)timeout_interval)); + recv (sd, output, BUFF_SZ, 0); close(sd); exit (STATE_OK); |