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. --- .../354011-41_check_ping_detect_args_2.dpatch | 293 +++++++++++++++++++++ 1 file changed, 293 insertions(+) create mode 100644 web/attachments/354011-41_check_ping_detect_args_2.dpatch (limited to 'web/attachments/354011-41_check_ping_detect_args_2.dpatch') diff --git a/web/attachments/354011-41_check_ping_detect_args_2.dpatch b/web/attachments/354011-41_check_ping_detect_args_2.dpatch new file mode 100644 index 0000000..351b506 --- /dev/null +++ b/web/attachments/354011-41_check_ping_detect_args_2.dpatch @@ -0,0 +1,293 @@ +diff -uNr nagios-plugins-1.4.14-56-g4b226/configure nagios-plugins-1.4.14-59-g96a2/configure +--- nagios-plugins-1.4.14-56-g4b226/configure 2009-11-23 13:00:57.000000000 +0000 ++++ nagios-plugins-1.4.14-59-g96a2/configure 2009-12-05 20:02:24.000000000 +0000 +@@ -26914,17 +26914,24 @@ + 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" ] && \ + $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping_command="$PATH_TO_PING -n -U -c %d %s" ++ with_ping_command="$PATH_TO_PING -n -U -c %d %s" + ac_cv_ping_packets_first=yes + { echo "$as_me:$LINENO: result: $with_ping_command" >&5 + echo "${ECHO_T}$with_ping_command" >&6; } +@@ -26932,7 +26939,7 @@ + elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" ++ with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" + ac_cv_ping_packets_first=yes + ac_cv_ping_has_timeout=yes + { echo "$as_me:$LINENO: result: $with_ping_command" >&5 +@@ -26941,7 +26948,7 @@ + elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping_command="$PATH_TO_PING -n -U -c %d %s" ++ with_ping_command="$PATH_TO_PING -n -U -c %d %s" + ac_cv_ping_packets_first=yes + { echo "$as_me:$LINENO: result: $with_ping_command" >&5 + echo "${ECHO_T}$with_ping_command" >&6; } +@@ -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 +@@ -27052,7 +27067,7 @@ + $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ++ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" + ac_cv_ping6_packets_first=yes + { echo "$as_me:$LINENO: result: $with_ping6_command" >&5 + echo "${ECHO_T}$with_ping6_command" >&6; } +@@ -27069,7 +27084,7 @@ + elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ++ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" + ac_cv_ping6_packets_first=yes + { echo "$as_me:$LINENO: result: $with_ping6_command" >&5 + echo "${ECHO_T}$with_ping6_command" >&6; } +@@ -27133,7 +27148,7 @@ + $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ++ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" + ac_cv_ping6_packets_first=yes + { echo "$as_me:$LINENO: result: $with_ping6_command" >&5 + echo "${ECHO_T}$with_ping6_command" >&6; } +@@ -27141,7 +27156,7 @@ + elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ++ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" + ac_cv_ping6_packets_first=yes + { echo "$as_me:$LINENO: result: $with_ping6_command" >&5 + echo "${ECHO_T}$with_ping6_command" >&6; } +@@ -28500,7 +28515,7 @@ + + #include + #include +- #include ++ #include + #include + #include + +@@ -28574,7 +28589,7 @@ + /* end confdefs.h. */ + + #include +- #include ++ #include + #include + #include + +@@ -28641,7 +28656,7 @@ + /* end confdefs.h. */ + + #include +- #include ++ #include + #include + #include + +@@ -28708,11 +28723,11 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +- #include +- #include +- #include +- #include +- #include ++ #include ++ #include ++ #include ++ #include ++ #include + + + int +@@ -28754,11 +28769,11 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +- #include +- #include +- #include +- #include +- #include ++ #include ++ #include ++ #include ++ #include ++ #include + + + int +diff -uNr nagios-plugins-1.4.14-56-g4b226/configure.in nagios-plugins-1.4.14-59-g96a2/configure.in +--- nagios-plugins-1.4.14-56-g4b226/configure.in 2009-11-23 12:00:03.000000000 +0000 ++++ nagios-plugins-1.4.14-59-g96a2/configure.in 2009-12-05 20:01:44.000000000 +0000 +@@ -877,24 +877,31 @@ + 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" ]] && \ + $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping_command="$PATH_TO_PING -n -U -c %d %s" ++ with_ping_command="$PATH_TO_PING -n -U -c %d %s" + ac_cv_ping_packets_first=yes + AC_MSG_RESULT([$with_ping_command]) + + elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" ++ with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" + ac_cv_ping_packets_first=yes + ac_cv_ping_has_timeout=yes + AC_MSG_RESULT([$with_ping_command]) +@@ -902,7 +909,7 @@ + elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping_command="$PATH_TO_PING -n -U -c %d %s" ++ with_ping_command="$PATH_TO_PING -n -U -c %d %s" + ac_cv_ping_packets_first=yes + AC_MSG_RESULT([$with_ping_command]) + +@@ -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 +@@ -991,7 +1006,7 @@ + $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ++ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" + ac_cv_ping6_packets_first=yes + AC_MSG_RESULT([$with_ping6_command]) + +@@ -1006,7 +1021,7 @@ + elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ++ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" + ac_cv_ping6_packets_first=yes + AC_MSG_RESULT([$with_ping6_command]) + +@@ -1062,14 +1077,14 @@ + $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ++ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" + ac_cv_ping6_packets_first=yes + AC_MSG_RESULT([$with_ping6_command]) + + elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \ + egrep -i "^round-trip|^rtt" >/dev/null + then +- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ++ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" + ac_cv_ping6_packets_first=yes + AC_MSG_RESULT([$with_ping6_command]) + +@@ -1411,23 +1426,23 @@ + AC_CHECK_DECLS([swapctl],,,[ + #include + #include +- #include ++ #include + #include + #include + ]) + AC_CHECK_TYPES([swaptbl_t, swapent_t],,,[ + #include +- #include ++ #include + #include + #include + ]) + AC_CHECK_MEMBERS([struct swapent.se_nblks],,,[ +- #include +- #include +- #include +- #include +- #include +- ]) ++ #include ++ #include ++ #include ++ #include ++ #include ++ ]) + + if test "$ac_cv_have_decl_swapctl" = "yes"; + then -- cgit v1.2.3-74-g34f1