From 0b6423f9c99d9edf8c96fefd0f6c453859395aa1 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Mon, 30 Sep 2013 00:03:24 +0200 Subject: Import Nagios Plugins site Import the Nagios Plugins web site, Cronjobs, infrastructure scripts, and configuration files. --- .../354010-41_check_ping_detect_args.dpatch | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 web/attachments/354010-41_check_ping_detect_args.dpatch (limited to 'web/attachments/354010-41_check_ping_detect_args.dpatch') diff --git a/web/attachments/354010-41_check_ping_detect_args.dpatch b/web/attachments/354010-41_check_ping_detect_args.dpatch new file mode 100644 index 0000000..98e1d36 --- /dev/null +++ b/web/attachments/354010-41_check_ping_detect_args.dpatch @@ -0,0 +1,78 @@ +diff -uNr nagios-plugins-1.4.14-58-g96f2/configure nagios-plugins-1.4.14-59-g96a2/configure +--- nagios-plugins-1.4.14-58-g96f2/configure 2009-12-04 21:00:51.000000000 +0000 ++++ nagios-plugins-1.4.14-59-g96a2/configure 2009-12-05 20:02:24.000000000 +0000 +@@ -26914,10 +26914,17 @@ + then + { echo "$as_me:$LINENO: result: (command-line) $with_ping_command" >&5 + echo "${ECHO_T}(command-line) $with_ping_command" >&6; } +- if test -n "$ac_cv_ping_packets_first" ++ if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null + then + ac_cv_ping_packets_first=yes + ac_cv_ping_has_timeout=yes ++ elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \ ++ echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null ++ then ++ ac_cv_ping_has_timeout=yes ++ elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null ++ then ++ ac_cv_ping_packets_first=yes + fi + + elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ +@@ -27042,7 +27049,15 @@ + then + { echo "$as_me:$LINENO: result: (command-line) $with_ping6_command" >&5 + echo "${ECHO_T}(command-line) $with_ping6_command" >&6; } +- if test -n "$ac_cv_ping6_packets_first" ++ if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null ++ then ++ ac_cv_ping6_packets_first=yes ++ elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \ ++ echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null ++ then ++ # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout ++ true ++ elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null + then + ac_cv_ping6_packets_first=yes + fi +diff -uNr nagios-plugins-1.4.14-58-g96f2/configure.in nagios-plugins-1.4.14-59-g96a2/configure.in +--- nagios-plugins-1.4.14-58-g96f2/configure.in 2009-12-04 21:00:08.000000000 +0000 ++++ nagios-plugins-1.4.14-59-g96a2/configure.in 2009-12-05 20:01:44.000000000 +0000 +@@ -877,10 +877,17 @@ + if test -n "$with_ping_command" + then + AC_MSG_RESULT([(command-line) $with_ping_command]) +- if test -n "$ac_cv_ping_packets_first" ++ if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null + then + ac_cv_ping_packets_first=yes + ac_cv_ping_has_timeout=yes ++ elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \ ++ echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null ++ then ++ ac_cv_ping_has_timeout=yes ++ elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null ++ then ++ ac_cv_ping_packets_first=yes + fi + + elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ +@@ -981,7 +988,15 @@ + if test -n "$with_ping6_command" + then + AC_MSG_RESULT([(command-line) $with_ping6_command]) +- if test -n "$ac_cv_ping6_packets_first" ++ if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null ++ then ++ ac_cv_ping6_packets_first=yes ++ elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \ ++ echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null ++ then ++ # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout ++ true ++ elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null + then + ac_cv_ping6_packets_first=yes + fi -- cgit v1.2.3-74-g34f1