summaryrefslogtreecommitdiffstats
path: root/web/attachments/354010-41_check_ping_detect_args.dpatch
diff options
context:
space:
mode:
Diffstat (limited to 'web/attachments/354010-41_check_ping_detect_args.dpatch')
-rw-r--r--web/attachments/354010-41_check_ping_detect_args.dpatch78
1 files changed, 78 insertions, 0 deletions
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 @@
1diff -uNr nagios-plugins-1.4.14-58-g96f2/configure nagios-plugins-1.4.14-59-g96a2/configure
2--- nagios-plugins-1.4.14-58-g96f2/configure 2009-12-04 21:00:51.000000000 +0000
3+++ nagios-plugins-1.4.14-59-g96a2/configure 2009-12-05 20:02:24.000000000 +0000
4@@ -26914,10 +26914,17 @@
5 then
6 { echo "$as_me:$LINENO: result: (command-line) $with_ping_command" >&5
7 echo "${ECHO_T}(command-line) $with_ping_command" >&6; }
8- if test -n "$ac_cv_ping_packets_first"
9+ if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
10 then
11 ac_cv_ping_packets_first=yes
12 ac_cv_ping_has_timeout=yes
13+ elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
14+ echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
15+ then
16+ ac_cv_ping_has_timeout=yes
17+ elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
18+ then
19+ ac_cv_ping_packets_first=yes
20 fi
21
22 elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \
23@@ -27042,7 +27049,15 @@
24 then
25 { echo "$as_me:$LINENO: result: (command-line) $with_ping6_command" >&5
26 echo "${ECHO_T}(command-line) $with_ping6_command" >&6; }
27- if test -n "$ac_cv_ping6_packets_first"
28+ if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
29+ then
30+ ac_cv_ping6_packets_first=yes
31+ elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
32+ echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
33+ then
34+ # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
35+ true
36+ elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
37 then
38 ac_cv_ping6_packets_first=yes
39 fi
40diff -uNr nagios-plugins-1.4.14-58-g96f2/configure.in nagios-plugins-1.4.14-59-g96a2/configure.in
41--- nagios-plugins-1.4.14-58-g96f2/configure.in 2009-12-04 21:00:08.000000000 +0000
42+++ nagios-plugins-1.4.14-59-g96a2/configure.in 2009-12-05 20:01:44.000000000 +0000
43@@ -877,10 +877,17 @@
44 if test -n "$with_ping_command"
45 then
46 AC_MSG_RESULT([(command-line) $with_ping_command])
47- if test -n "$ac_cv_ping_packets_first"
48+ if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
49 then
50 ac_cv_ping_packets_first=yes
51 ac_cv_ping_has_timeout=yes
52+ elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
53+ echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
54+ then
55+ ac_cv_ping_has_timeout=yes
56+ elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
57+ then
58+ ac_cv_ping_packets_first=yes
59 fi
60
61 elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
62@@ -981,7 +988,15 @@
63 if test -n "$with_ping6_command"
64 then
65 AC_MSG_RESULT([(command-line) $with_ping6_command])
66- if test -n "$ac_cv_ping6_packets_first"
67+ if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
68+ then
69+ ac_cv_ping6_packets_first=yes
70+ elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
71+ echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
72+ then
73+ # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
74+ true
75+ elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
76 then
77 ac_cv_ping6_packets_first=yes
78 fi