summaryrefslogtreecommitdiffstats
path: root/web/attachments/354011-41_check_ping_detect_args_2.dpatch
diff options
context:
space:
mode:
Diffstat (limited to 'web/attachments/354011-41_check_ping_detect_args_2.dpatch')
-rw-r--r--web/attachments/354011-41_check_ping_detect_args_2.dpatch293
1 files changed, 293 insertions, 0 deletions
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 @@
1diff -uNr nagios-plugins-1.4.14-56-g4b226/configure nagios-plugins-1.4.14-59-g96a2/configure
2--- nagios-plugins-1.4.14-56-g4b226/configure 2009-11-23 13:00:57.000000000 +0000
3+++ nagios-plugins-1.4.14-59-g96a2/configure 2009-12-05 20:02:24.000000000 +0000
4@@ -26914,17 +26914,24 @@
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 $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
24 egrep -i "^round-trip|^rtt" >/dev/null
25 then
26- with_ping_command="$PATH_TO_PING -n -U -c %d %s"
27+ with_ping_command="$PATH_TO_PING -n -U -c %d %s"
28 ac_cv_ping_packets_first=yes
29 { echo "$as_me:$LINENO: result: $with_ping_command" >&5
30 echo "${ECHO_T}$with_ping_command" >&6; }
31@@ -26932,7 +26939,7 @@
32 elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
33 egrep -i "^round-trip|^rtt" >/dev/null
34 then
35- with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
36+ with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
37 ac_cv_ping_packets_first=yes
38 ac_cv_ping_has_timeout=yes
39 { echo "$as_me:$LINENO: result: $with_ping_command" >&5
40@@ -26941,7 +26948,7 @@
41 elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
42 egrep -i "^round-trip|^rtt" >/dev/null
43 then
44- with_ping_command="$PATH_TO_PING -n -U -c %d %s"
45+ with_ping_command="$PATH_TO_PING -n -U -c %d %s"
46 ac_cv_ping_packets_first=yes
47 { echo "$as_me:$LINENO: result: $with_ping_command" >&5
48 echo "${ECHO_T}$with_ping_command" >&6; }
49@@ -27042,7 +27049,15 @@
50 then
51 { echo "$as_me:$LINENO: result: (command-line) $with_ping6_command" >&5
52 echo "${ECHO_T}(command-line) $with_ping6_command" >&6; }
53- if test -n "$ac_cv_ping6_packets_first"
54+ if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
55+ then
56+ ac_cv_ping6_packets_first=yes
57+ elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
58+ echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
59+ then
60+ # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
61+ true
62+ elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
63 then
64 ac_cv_ping6_packets_first=yes
65 fi
66@@ -27052,7 +27067,7 @@
67 $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
68 egrep -i "^round-trip|^rtt" >/dev/null
69 then
70- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
71+ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
72 ac_cv_ping6_packets_first=yes
73 { echo "$as_me:$LINENO: result: $with_ping6_command" >&5
74 echo "${ECHO_T}$with_ping6_command" >&6; }
75@@ -27069,7 +27084,7 @@
76 elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
77 egrep -i "^round-trip|^rtt" >/dev/null
78 then
79- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
80+ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
81 ac_cv_ping6_packets_first=yes
82 { echo "$as_me:$LINENO: result: $with_ping6_command" >&5
83 echo "${ECHO_T}$with_ping6_command" >&6; }
84@@ -27133,7 +27148,7 @@
85 $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
86 egrep -i "^round-trip|^rtt" >/dev/null
87 then
88- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
89+ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
90 ac_cv_ping6_packets_first=yes
91 { echo "$as_me:$LINENO: result: $with_ping6_command" >&5
92 echo "${ECHO_T}$with_ping6_command" >&6; }
93@@ -27141,7 +27156,7 @@
94 elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \
95 egrep -i "^round-trip|^rtt" >/dev/null
96 then
97- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
98+ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
99 ac_cv_ping6_packets_first=yes
100 { echo "$as_me:$LINENO: result: $with_ping6_command" >&5
101 echo "${ECHO_T}$with_ping6_command" >&6; }
102@@ -28500,7 +28515,7 @@
103
104 #include <unistd.h>
105 #include <sys/types.h>
106- #include <sys/param.h>
107+ #include <sys/param.h>
108 #include <sys/stat.h>
109 #include <sys/swap.h>
110
111@@ -28574,7 +28589,7 @@
112 /* end confdefs.h. */
113
114 #include <sys/types.h>
115- #include <sys/param.h>
116+ #include <sys/param.h>
117 #include <sys/stat.h>
118 #include <sys/swap.h>
119
120@@ -28641,7 +28656,7 @@
121 /* end confdefs.h. */
122
123 #include <sys/types.h>
124- #include <sys/param.h>
125+ #include <sys/param.h>
126 #include <sys/stat.h>
127 #include <sys/swap.h>
128
129@@ -28708,11 +28723,11 @@
130 cat >>conftest.$ac_ext <<_ACEOF
131 /* end confdefs.h. */
132
133- #include <unistd.h>
134- #include <sys/types.h>
135- #include <sys/param.h>
136- #include <sys/stat.h>
137- #include <sys/swap.h>
138+ #include <unistd.h>
139+ #include <sys/types.h>
140+ #include <sys/param.h>
141+ #include <sys/stat.h>
142+ #include <sys/swap.h>
143
144
145 int
146@@ -28754,11 +28769,11 @@
147 cat >>conftest.$ac_ext <<_ACEOF
148 /* end confdefs.h. */
149
150- #include <unistd.h>
151- #include <sys/types.h>
152- #include <sys/param.h>
153- #include <sys/stat.h>
154- #include <sys/swap.h>
155+ #include <unistd.h>
156+ #include <sys/types.h>
157+ #include <sys/param.h>
158+ #include <sys/stat.h>
159+ #include <sys/swap.h>
160
161
162 int
163diff -uNr nagios-plugins-1.4.14-56-g4b226/configure.in nagios-plugins-1.4.14-59-g96a2/configure.in
164--- nagios-plugins-1.4.14-56-g4b226/configure.in 2009-11-23 12:00:03.000000000 +0000
165+++ nagios-plugins-1.4.14-59-g96a2/configure.in 2009-12-05 20:01:44.000000000 +0000
166@@ -877,24 +877,31 @@
167 if test -n "$with_ping_command"
168 then
169 AC_MSG_RESULT([(command-line) $with_ping_command])
170- if test -n "$ac_cv_ping_packets_first"
171+ if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
172 then
173 ac_cv_ping_packets_first=yes
174 ac_cv_ping_has_timeout=yes
175+ elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
176+ echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
177+ then
178+ ac_cv_ping_has_timeout=yes
179+ elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
180+ then
181+ ac_cv_ping_packets_first=yes
182 fi
183
184 elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
185 $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
186 egrep -i "^round-trip|^rtt" >/dev/null
187 then
188- with_ping_command="$PATH_TO_PING -n -U -c %d %s"
189+ with_ping_command="$PATH_TO_PING -n -U -c %d %s"
190 ac_cv_ping_packets_first=yes
191 AC_MSG_RESULT([$with_ping_command])
192
193 elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
194 egrep -i "^round-trip|^rtt" >/dev/null
195 then
196- with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
197+ with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
198 ac_cv_ping_packets_first=yes
199 ac_cv_ping_has_timeout=yes
200 AC_MSG_RESULT([$with_ping_command])
201@@ -902,7 +909,7 @@
202 elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
203 egrep -i "^round-trip|^rtt" >/dev/null
204 then
205- with_ping_command="$PATH_TO_PING -n -U -c %d %s"
206+ with_ping_command="$PATH_TO_PING -n -U -c %d %s"
207 ac_cv_ping_packets_first=yes
208 AC_MSG_RESULT([$with_ping_command])
209
210@@ -981,7 +988,15 @@
211 if test -n "$with_ping6_command"
212 then
213 AC_MSG_RESULT([(command-line) $with_ping6_command])
214- if test -n "$ac_cv_ping6_packets_first"
215+ if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
216+ then
217+ ac_cv_ping6_packets_first=yes
218+ elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
219+ echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
220+ then
221+ # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
222+ true
223+ elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
224 then
225 ac_cv_ping6_packets_first=yes
226 fi
227@@ -991,7 +1006,7 @@
228 $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
229 egrep -i "^round-trip|^rtt" >/dev/null
230 then
231- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
232+ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
233 ac_cv_ping6_packets_first=yes
234 AC_MSG_RESULT([$with_ping6_command])
235
236@@ -1006,7 +1021,7 @@
237 elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
238 egrep -i "^round-trip|^rtt" >/dev/null
239 then
240- with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
241+ with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
242 ac_cv_ping6_packets_first=yes
243 AC_MSG_RESULT([$with_ping6_command])
244
245@@ -1062,14 +1077,14 @@
246 $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
247 egrep -i "^round-trip|^rtt" >/dev/null
248 then
249- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
250+ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
251 ac_cv_ping6_packets_first=yes
252 AC_MSG_RESULT([$with_ping6_command])
253
254 elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \
255 egrep -i "^round-trip|^rtt" >/dev/null
256 then
257- with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
258+ with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
259 ac_cv_ping6_packets_first=yes
260 AC_MSG_RESULT([$with_ping6_command])
261
262@@ -1411,23 +1426,23 @@
263 AC_CHECK_DECLS([swapctl],,,[
264 #include <unistd.h>
265 #include <sys/types.h>
266- #include <sys/param.h>
267+ #include <sys/param.h>
268 #include <sys/stat.h>
269 #include <sys/swap.h>
270 ])
271 AC_CHECK_TYPES([swaptbl_t, swapent_t],,,[
272 #include <sys/types.h>
273- #include <sys/param.h>
274+ #include <sys/param.h>
275 #include <sys/stat.h>
276 #include <sys/swap.h>
277 ])
278 AC_CHECK_MEMBERS([struct swapent.se_nblks],,,[
279- #include <unistd.h>
280- #include <sys/types.h>
281- #include <sys/param.h>
282- #include <sys/stat.h>
283- #include <sys/swap.h>
284- ])
285+ #include <unistd.h>
286+ #include <sys/types.h>
287+ #include <sys/param.h>
288+ #include <sys/stat.h>
289+ #include <sys/swap.h>
290+ ])
291
292 if test "$ac_cv_have_decl_swapctl" = "yes";
293 then