Re-diff strace patches against current version.
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/strace/4.5.15/100-strace-autoreconf.patch Sat Jul 14 17:34:54 2007 +0000
1.3 @@ -0,0 +1,761 @@
1.4 +diff -dur strace-4.5.15.orig/configure strace-4.5.15/configure
1.5 +--- strace-4.5.15.orig/configure 2007-01-11 23:23:33.000000000 +0100
1.6 ++++ strace-4.5.15/configure 2007-07-14 19:18:43.000000000 +0200
1.7 +@@ -956,7 +956,7 @@
1.8 + else
1.9 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1.10 + fi
1.11 +- cd $ac_popdir
1.12 ++ cd "$ac_popdir"
1.13 + done
1.14 + fi
1.15 +
1.16 +@@ -2660,8 +2660,7 @@
1.17 + cat conftest.err >&5
1.18 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.19 + (exit $ac_status); } &&
1.20 +- { ac_try='test -z "$ac_c_werror_flag"
1.21 +- || test ! -s conftest.err'
1.22 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.23 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.24 + (eval $ac_try) 2>&5
1.25 + ac_status=$?
1.26 +@@ -2719,8 +2718,7 @@
1.27 + cat conftest.err >&5
1.28 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.29 + (exit $ac_status); } &&
1.30 +- { ac_try='test -z "$ac_c_werror_flag"
1.31 +- || test ! -s conftest.err'
1.32 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.33 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.34 + (eval $ac_try) 2>&5
1.35 + ac_status=$?
1.36 +@@ -2836,8 +2834,7 @@
1.37 + cat conftest.err >&5
1.38 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.39 + (exit $ac_status); } &&
1.40 +- { ac_try='test -z "$ac_c_werror_flag"
1.41 +- || test ! -s conftest.err'
1.42 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.43 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.44 + (eval $ac_try) 2>&5
1.45 + ac_status=$?
1.46 +@@ -2891,8 +2888,7 @@
1.47 + cat conftest.err >&5
1.48 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.49 + (exit $ac_status); } &&
1.50 +- { ac_try='test -z "$ac_c_werror_flag"
1.51 +- || test ! -s conftest.err'
1.52 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.53 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.54 + (eval $ac_try) 2>&5
1.55 + ac_status=$?
1.56 +@@ -2937,8 +2933,7 @@
1.57 + cat conftest.err >&5
1.58 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.59 + (exit $ac_status); } &&
1.60 +- { ac_try='test -z "$ac_c_werror_flag"
1.61 +- || test ! -s conftest.err'
1.62 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.63 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.64 + (eval $ac_try) 2>&5
1.65 + ac_status=$?
1.66 +@@ -2982,8 +2977,7 @@
1.67 + cat conftest.err >&5
1.68 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.69 + (exit $ac_status); } &&
1.70 +- { ac_try='test -z "$ac_c_werror_flag"
1.71 +- || test ! -s conftest.err'
1.72 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.73 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.74 + (eval $ac_try) 2>&5
1.75 + ac_status=$?
1.76 +@@ -3721,8 +3715,7 @@
1.77 + cat conftest.err >&5
1.78 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.79 + (exit $ac_status); } &&
1.80 +- { ac_try='test -z "$ac_c_werror_flag"
1.81 +- || test ! -s conftest.err'
1.82 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.83 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.84 + (eval $ac_try) 2>&5
1.85 + ac_status=$?
1.86 +@@ -3786,8 +3779,7 @@
1.87 + cat conftest.err >&5
1.88 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.89 + (exit $ac_status); } &&
1.90 +- { ac_try='test -z "$ac_c_werror_flag"
1.91 +- || test ! -s conftest.err'
1.92 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.93 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.94 + (eval $ac_try) 2>&5
1.95 + ac_status=$?
1.96 +@@ -3959,8 +3951,7 @@
1.97 + cat conftest.err >&5
1.98 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.99 + (exit $ac_status); } &&
1.100 +- { ac_try='test -z "$ac_c_werror_flag"
1.101 +- || test ! -s conftest.err'
1.102 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.103 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.104 + (eval $ac_try) 2>&5
1.105 + ac_status=$?
1.106 +@@ -4032,8 +4023,7 @@
1.107 + cat conftest.err >&5
1.108 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.109 + (exit $ac_status); } &&
1.110 +- { ac_try='test -z "$ac_c_werror_flag"
1.111 +- || test ! -s conftest.err'
1.112 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.113 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.114 + (eval $ac_try) 2>&5
1.115 + ac_status=$?
1.116 +@@ -4087,8 +4077,7 @@
1.117 + cat conftest.err >&5
1.118 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.119 + (exit $ac_status); } &&
1.120 +- { ac_try='test -z "$ac_c_werror_flag"
1.121 +- || test ! -s conftest.err'
1.122 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.123 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.124 + (eval $ac_try) 2>&5
1.125 + ac_status=$?
1.126 +@@ -4159,8 +4148,7 @@
1.127 + cat conftest.err >&5
1.128 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.129 + (exit $ac_status); } &&
1.130 +- { ac_try='test -z "$ac_c_werror_flag"
1.131 +- || test ! -s conftest.err'
1.132 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.133 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.134 + (eval $ac_try) 2>&5
1.135 + ac_status=$?
1.136 +@@ -4214,8 +4202,7 @@
1.137 + cat conftest.err >&5
1.138 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.139 + (exit $ac_status); } &&
1.140 +- { ac_try='test -z "$ac_c_werror_flag"
1.141 +- || test ! -s conftest.err'
1.142 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.143 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.144 + (eval $ac_try) 2>&5
1.145 + ac_status=$?
1.146 +@@ -4345,8 +4332,7 @@
1.147 + cat conftest.err >&5
1.148 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.149 + (exit $ac_status); } &&
1.150 +- { ac_try='test -z "$ac_c_werror_flag"
1.151 +- || test ! -s conftest.err'
1.152 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.153 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.154 + (eval $ac_try) 2>&5
1.155 + ac_status=$?
1.156 +@@ -4410,8 +4396,7 @@
1.157 + cat conftest.err >&5
1.158 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.159 + (exit $ac_status); } &&
1.160 +- { ac_try='test -z "$ac_c_werror_flag"
1.161 +- || test ! -s conftest.err'
1.162 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.163 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.164 + (eval $ac_try) 2>&5
1.165 + ac_status=$?
1.166 +@@ -4454,8 +4439,7 @@
1.167 + cat conftest.err >&5
1.168 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.169 + (exit $ac_status); } &&
1.170 +- { ac_try='test -z "$ac_c_werror_flag"
1.171 +- || test ! -s conftest.err'
1.172 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.173 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.174 + (eval $ac_try) 2>&5
1.175 + ac_status=$?
1.176 +@@ -4519,8 +4503,7 @@
1.177 + cat conftest.err >&5
1.178 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.179 + (exit $ac_status); } &&
1.180 +- { ac_try='test -z "$ac_c_werror_flag"
1.181 +- || test ! -s conftest.err'
1.182 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.183 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.184 + (eval $ac_try) 2>&5
1.185 + ac_status=$?
1.186 +@@ -4563,8 +4546,7 @@
1.187 + cat conftest.err >&5
1.188 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.189 + (exit $ac_status); } &&
1.190 +- { ac_try='test -z "$ac_c_werror_flag"
1.191 +- || test ! -s conftest.err'
1.192 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.193 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.194 + (eval $ac_try) 2>&5
1.195 + ac_status=$?
1.196 +@@ -4628,8 +4610,7 @@
1.197 + cat conftest.err >&5
1.198 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.199 + (exit $ac_status); } &&
1.200 +- { ac_try='test -z "$ac_c_werror_flag"
1.201 +- || test ! -s conftest.err'
1.202 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.203 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.204 + (eval $ac_try) 2>&5
1.205 + ac_status=$?
1.206 +@@ -4672,8 +4653,7 @@
1.207 + cat conftest.err >&5
1.208 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.209 + (exit $ac_status); } &&
1.210 +- { ac_try='test -z "$ac_c_werror_flag"
1.211 +- || test ! -s conftest.err'
1.212 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.213 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.214 + (eval $ac_try) 2>&5
1.215 + ac_status=$?
1.216 +@@ -4737,8 +4717,7 @@
1.217 + cat conftest.err >&5
1.218 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.219 + (exit $ac_status); } &&
1.220 +- { ac_try='test -z "$ac_c_werror_flag"
1.221 +- || test ! -s conftest.err'
1.222 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.223 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.224 + (eval $ac_try) 2>&5
1.225 + ac_status=$?
1.226 +@@ -4781,8 +4760,7 @@
1.227 + cat conftest.err >&5
1.228 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.229 + (exit $ac_status); } &&
1.230 +- { ac_try='test -z "$ac_c_werror_flag"
1.231 +- || test ! -s conftest.err'
1.232 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.233 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.234 + (eval $ac_try) 2>&5
1.235 + ac_status=$?
1.236 +@@ -4846,8 +4824,7 @@
1.237 + cat conftest.err >&5
1.238 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.239 + (exit $ac_status); } &&
1.240 +- { ac_try='test -z "$ac_c_werror_flag"
1.241 +- || test ! -s conftest.err'
1.242 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.243 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.244 + (eval $ac_try) 2>&5
1.245 + ac_status=$?
1.246 +@@ -4890,8 +4867,7 @@
1.247 + cat conftest.err >&5
1.248 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.249 + (exit $ac_status); } &&
1.250 +- { ac_try='test -z "$ac_c_werror_flag"
1.251 +- || test ! -s conftest.err'
1.252 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.253 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.254 + (eval $ac_try) 2>&5
1.255 + ac_status=$?
1.256 +@@ -4955,8 +4931,7 @@
1.257 + cat conftest.err >&5
1.258 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.259 + (exit $ac_status); } &&
1.260 +- { ac_try='test -z "$ac_c_werror_flag"
1.261 +- || test ! -s conftest.err'
1.262 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.263 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.264 + (eval $ac_try) 2>&5
1.265 + ac_status=$?
1.266 +@@ -4999,8 +4974,7 @@
1.267 + cat conftest.err >&5
1.268 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.269 + (exit $ac_status); } &&
1.270 +- { ac_try='test -z "$ac_c_werror_flag"
1.271 +- || test ! -s conftest.err'
1.272 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.273 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.274 + (eval $ac_try) 2>&5
1.275 + ac_status=$?
1.276 +@@ -5064,8 +5038,7 @@
1.277 + cat conftest.err >&5
1.278 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.279 + (exit $ac_status); } &&
1.280 +- { ac_try='test -z "$ac_c_werror_flag"
1.281 +- || test ! -s conftest.err'
1.282 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.283 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.284 + (eval $ac_try) 2>&5
1.285 + ac_status=$?
1.286 +@@ -5108,8 +5081,7 @@
1.287 + cat conftest.err >&5
1.288 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.289 + (exit $ac_status); } &&
1.290 +- { ac_try='test -z "$ac_c_werror_flag"
1.291 +- || test ! -s conftest.err'
1.292 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.293 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.294 + (eval $ac_try) 2>&5
1.295 + ac_status=$?
1.296 +@@ -5173,8 +5145,7 @@
1.297 + cat conftest.err >&5
1.298 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.299 + (exit $ac_status); } &&
1.300 +- { ac_try='test -z "$ac_c_werror_flag"
1.301 +- || test ! -s conftest.err'
1.302 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.303 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.304 + (eval $ac_try) 2>&5
1.305 + ac_status=$?
1.306 +@@ -5217,8 +5188,7 @@
1.307 + cat conftest.err >&5
1.308 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.309 + (exit $ac_status); } &&
1.310 +- { ac_try='test -z "$ac_c_werror_flag"
1.311 +- || test ! -s conftest.err'
1.312 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.313 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.314 + (eval $ac_try) 2>&5
1.315 + ac_status=$?
1.316 +@@ -5286,8 +5256,7 @@
1.317 + cat conftest.err >&5
1.318 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.319 + (exit $ac_status); } &&
1.320 +- { ac_try='test -z "$ac_c_werror_flag"
1.321 +- || test ! -s conftest.err'
1.322 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.323 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.324 + (eval $ac_try) 2>&5
1.325 + ac_status=$?
1.326 +@@ -5320,6 +5289,73 @@
1.327 +
1.328 + fi
1.329 +
1.330 ++echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
1.331 ++echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
1.332 ++if test "${ac_cv_type_statfs64+set}" = set; then
1.333 ++ echo $ECHO_N "(cached) $ECHO_C" >&6
1.334 ++else
1.335 ++ cat >conftest.$ac_ext <<_ACEOF
1.336 ++/* confdefs.h. */
1.337 ++_ACEOF
1.338 ++cat confdefs.h >>conftest.$ac_ext
1.339 ++cat >>conftest.$ac_ext <<_ACEOF
1.340 ++/* end confdefs.h. */
1.341 ++#ifdef LINUX
1.342 ++#include <linux/types.h>
1.343 ++#include <sys/statfs.h>
1.344 ++#else
1.345 ++#include <sys/vfs.h>
1.346 ++#endif
1.347 ++int
1.348 ++main ()
1.349 ++{
1.350 ++struct statfs64 st;
1.351 ++ ;
1.352 ++ return 0;
1.353 ++}
1.354 ++_ACEOF
1.355 ++rm -f conftest.$ac_objext
1.356 ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1.357 ++ (eval $ac_compile) 2>conftest.er1
1.358 ++ ac_status=$?
1.359 ++ grep -v '^ *+' conftest.er1 >conftest.err
1.360 ++ rm -f conftest.er1
1.361 ++ cat conftest.err >&5
1.362 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.363 ++ (exit $ac_status); } &&
1.364 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.365 ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.366 ++ (eval $ac_try) 2>&5
1.367 ++ ac_status=$?
1.368 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.369 ++ (exit $ac_status); }; } &&
1.370 ++ { ac_try='test -s conftest.$ac_objext'
1.371 ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.372 ++ (eval $ac_try) 2>&5
1.373 ++ ac_status=$?
1.374 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.375 ++ (exit $ac_status); }; }; then
1.376 ++ ac_cv_type_statfs64=yes
1.377 ++else
1.378 ++ echo "$as_me: failed program was:" >&5
1.379 ++sed 's/^/| /' conftest.$ac_ext >&5
1.380 ++
1.381 ++ac_cv_type_statfs64=no
1.382 ++fi
1.383 ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
1.384 ++fi
1.385 ++
1.386 ++echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
1.387 ++echo "${ECHO_T}$ac_cv_type_statfs64" >&6
1.388 ++if test "$ac_cv_type_statfs64" = yes
1.389 ++then
1.390 ++
1.391 ++cat >>confdefs.h <<\_ACEOF
1.392 ++#define HAVE_STATFS64 1
1.393 ++_ACEOF
1.394 ++
1.395 ++fi
1.396 ++
1.397 +
1.398 + echo "$as_me:$LINENO: checking return type of signal handlers" >&5
1.399 + echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
1.400 +@@ -5360,8 +5396,7 @@
1.401 + cat conftest.err >&5
1.402 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.403 + (exit $ac_status); } &&
1.404 +- { ac_try='test -z "$ac_c_werror_flag"
1.405 +- || test ! -s conftest.err'
1.406 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.407 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.408 + (eval $ac_try) 2>&5
1.409 + ac_status=$?
1.410 +@@ -5460,8 +5495,7 @@
1.411 + cat conftest.err >&5
1.412 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.413 + (exit $ac_status); } &&
1.414 +- { ac_try='test -z "$ac_c_werror_flag"
1.415 +- || test ! -s conftest.err'
1.416 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.417 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.418 + (eval $ac_try) 2>&5
1.419 + ac_status=$?
1.420 +@@ -5610,8 +5644,7 @@
1.421 + cat conftest.err >&5
1.422 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.423 + (exit $ac_status); } &&
1.424 +- { ac_try='test -z "$ac_c_werror_flag"
1.425 +- || test ! -s conftest.err'
1.426 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.427 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.428 + (eval $ac_try) 2>&5
1.429 + ac_status=$?
1.430 +@@ -5668,8 +5701,7 @@
1.431 + cat conftest.err >&5
1.432 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.433 + (exit $ac_status); } &&
1.434 +- { ac_try='test -z "$ac_c_werror_flag"
1.435 +- || test ! -s conftest.err'
1.436 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.437 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.438 + (eval $ac_try) 2>&5
1.439 + ac_status=$?
1.440 +@@ -5816,8 +5848,7 @@
1.441 + cat conftest.err >&5
1.442 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.443 + (exit $ac_status); } &&
1.444 +- { ac_try='test -z "$ac_c_werror_flag"
1.445 +- || test ! -s conftest.err'
1.446 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.447 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.448 + (eval $ac_try) 2>&5
1.449 + ac_status=$?
1.450 +@@ -5968,8 +5999,7 @@
1.451 + cat conftest.err >&5
1.452 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.453 + (exit $ac_status); } &&
1.454 +- { ac_try='test -z "$ac_c_werror_flag"
1.455 +- || test ! -s conftest.err'
1.456 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.457 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.458 + (eval $ac_try) 2>&5
1.459 + ac_status=$?
1.460 +@@ -6033,8 +6063,7 @@
1.461 + cat conftest.err >&5
1.462 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.463 + (exit $ac_status); } &&
1.464 +- { ac_try='test -z "$ac_c_werror_flag"
1.465 +- || test ! -s conftest.err'
1.466 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.467 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.468 + (eval $ac_try) 2>&5
1.469 + ac_status=$?
1.470 +@@ -6100,8 +6129,7 @@
1.471 + cat conftest.err >&5
1.472 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.473 + (exit $ac_status); } &&
1.474 +- { ac_try='test -z "$ac_c_werror_flag"
1.475 +- || test ! -s conftest.err'
1.476 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.477 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.478 + (eval $ac_try) 2>&5
1.479 + ac_status=$?
1.480 +@@ -6147,8 +6175,7 @@
1.481 + cat conftest.err >&5
1.482 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.483 + (exit $ac_status); } &&
1.484 +- { ac_try='test -z "$ac_c_werror_flag"
1.485 +- || test ! -s conftest.err'
1.486 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.487 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.488 + (eval $ac_try) 2>&5
1.489 + ac_status=$?
1.490 +@@ -6214,8 +6241,7 @@
1.491 + cat conftest.err >&5
1.492 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.493 + (exit $ac_status); } &&
1.494 +- { ac_try='test -z "$ac_c_werror_flag"
1.495 +- || test ! -s conftest.err'
1.496 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.497 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.498 + (eval $ac_try) 2>&5
1.499 + ac_status=$?
1.500 +@@ -6466,8 +6492,7 @@
1.501 + cat conftest.err >&5
1.502 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.503 + (exit $ac_status); } &&
1.504 +- { ac_try='test -z "$ac_c_werror_flag"
1.505 +- || test ! -s conftest.err'
1.506 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.507 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.508 + (eval $ac_try) 2>&5
1.509 + ac_status=$?
1.510 +@@ -6532,8 +6557,7 @@
1.511 + cat conftest.err >&5
1.512 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.513 + (exit $ac_status); } &&
1.514 +- { ac_try='test -z "$ac_c_werror_flag"
1.515 +- || test ! -s conftest.err'
1.516 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.517 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.518 + (eval $ac_try) 2>&5
1.519 + ac_status=$?
1.520 +@@ -6600,8 +6624,7 @@
1.521 + cat conftest.err >&5
1.522 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.523 + (exit $ac_status); } &&
1.524 +- { ac_try='test -z "$ac_c_werror_flag"
1.525 +- || test ! -s conftest.err'
1.526 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.527 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.528 + (eval $ac_try) 2>&5
1.529 + ac_status=$?
1.530 +@@ -6717,8 +6740,7 @@
1.531 + cat conftest.err >&5
1.532 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.533 + (exit $ac_status); } &&
1.534 +- { ac_try='test -z "$ac_c_werror_flag"
1.535 +- || test ! -s conftest.err'
1.536 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.537 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.538 + (eval $ac_try) 2>&5
1.539 + ac_status=$?
1.540 +@@ -6812,8 +6834,7 @@
1.541 + cat conftest.err >&5
1.542 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.543 + (exit $ac_status); } &&
1.544 +- { ac_try='test -z "$ac_c_werror_flag"
1.545 +- || test ! -s conftest.err'
1.546 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.547 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.548 + (eval $ac_try) 2>&5
1.549 + ac_status=$?
1.550 +@@ -6959,8 +6980,7 @@
1.551 + cat conftest.err >&5
1.552 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.553 + (exit $ac_status); } &&
1.554 +- { ac_try='test -z "$ac_c_werror_flag"
1.555 +- || test ! -s conftest.err'
1.556 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.557 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.558 + (eval $ac_try) 2>&5
1.559 + ac_status=$?
1.560 +@@ -7020,8 +7040,7 @@
1.561 + cat conftest.err >&5
1.562 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.563 + (exit $ac_status); } &&
1.564 +- { ac_try='test -z "$ac_c_werror_flag"
1.565 +- || test ! -s conftest.err'
1.566 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.567 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.568 + (eval $ac_try) 2>&5
1.569 + ac_status=$?
1.570 +@@ -7082,8 +7101,7 @@
1.571 + cat conftest.err >&5
1.572 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.573 + (exit $ac_status); } &&
1.574 +- { ac_try='test -z "$ac_c_werror_flag"
1.575 +- || test ! -s conftest.err'
1.576 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.577 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.578 + (eval $ac_try) 2>&5
1.579 + ac_status=$?
1.580 +@@ -7356,8 +7374,7 @@
1.581 + cat conftest.err >&5
1.582 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.583 + (exit $ac_status); } &&
1.584 +- { ac_try='test -z "$ac_c_werror_flag"
1.585 +- || test ! -s conftest.err'
1.586 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.587 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.588 + (eval $ac_try) 2>&5
1.589 + ac_status=$?
1.590 +@@ -7401,8 +7418,7 @@
1.591 + cat conftest.err >&5
1.592 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.593 + (exit $ac_status); } &&
1.594 +- { ac_try='test -z "$ac_c_werror_flag"
1.595 +- || test ! -s conftest.err'
1.596 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.597 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.598 + (eval $ac_try) 2>&5
1.599 + ac_status=$?
1.600 +@@ -7471,8 +7487,7 @@
1.601 + cat conftest.err >&5
1.602 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.603 + (exit $ac_status); } &&
1.604 +- { ac_try='test -z "$ac_c_werror_flag"
1.605 +- || test ! -s conftest.err'
1.606 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.607 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.608 + (eval $ac_try) 2>&5
1.609 + ac_status=$?
1.610 +@@ -7539,8 +7554,7 @@
1.611 + cat conftest.err >&5
1.612 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.613 + (exit $ac_status); } &&
1.614 +- { ac_try='test -z "$ac_c_werror_flag"
1.615 +- || test ! -s conftest.err'
1.616 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.617 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.618 + (eval $ac_try) 2>&5
1.619 + ac_status=$?
1.620 +@@ -7585,8 +7599,7 @@
1.621 + cat conftest.err >&5
1.622 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.623 + (exit $ac_status); } &&
1.624 +- { ac_try='test -z "$ac_c_werror_flag"
1.625 +- || test ! -s conftest.err'
1.626 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.627 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.628 + (eval $ac_try) 2>&5
1.629 + ac_status=$?
1.630 +@@ -7652,8 +7665,7 @@
1.631 + cat conftest.err >&5
1.632 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.633 + (exit $ac_status); } &&
1.634 +- { ac_try='test -z "$ac_c_werror_flag"
1.635 +- || test ! -s conftest.err'
1.636 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.637 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.638 + (eval $ac_try) 2>&5
1.639 + ac_status=$?
1.640 +@@ -7698,8 +7710,7 @@
1.641 + cat conftest.err >&5
1.642 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.643 + (exit $ac_status); } &&
1.644 +- { ac_try='test -z "$ac_c_werror_flag"
1.645 +- || test ! -s conftest.err'
1.646 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.647 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.648 + (eval $ac_try) 2>&5
1.649 + ac_status=$?
1.650 +@@ -7767,8 +7778,7 @@
1.651 + cat conftest.err >&5
1.652 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.653 + (exit $ac_status); } &&
1.654 +- { ac_try='test -z "$ac_c_werror_flag"
1.655 +- || test ! -s conftest.err'
1.656 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.657 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.658 + (eval $ac_try) 2>&5
1.659 + ac_status=$?
1.660 +@@ -7834,8 +7844,7 @@
1.661 + cat conftest.err >&5
1.662 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.663 + (exit $ac_status); } &&
1.664 +- { ac_try='test -z "$ac_c_werror_flag"
1.665 +- || test ! -s conftest.err'
1.666 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.667 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.668 + (eval $ac_try) 2>&5
1.669 + ac_status=$?
1.670 +@@ -7899,8 +7908,7 @@
1.671 + cat conftest.err >&5
1.672 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.673 + (exit $ac_status); } &&
1.674 +- { ac_try='test -z "$ac_c_werror_flag"
1.675 +- || test ! -s conftest.err'
1.676 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.677 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.678 + (eval $ac_try) 2>&5
1.679 + ac_status=$?
1.680 +@@ -7966,8 +7974,7 @@
1.681 + cat conftest.err >&5
1.682 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.683 + (exit $ac_status); } &&
1.684 +- { ac_try='test -z "$ac_c_werror_flag"
1.685 +- || test ! -s conftest.err'
1.686 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.687 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.688 + (eval $ac_try) 2>&5
1.689 + ac_status=$?
1.690 +@@ -8032,8 +8039,7 @@
1.691 + cat conftest.err >&5
1.692 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.693 + (exit $ac_status); } &&
1.694 +- { ac_try='test -z "$ac_c_werror_flag"
1.695 +- || test ! -s conftest.err'
1.696 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.697 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.698 + (eval $ac_try) 2>&5
1.699 + ac_status=$?
1.700 +@@ -8077,8 +8083,7 @@
1.701 + cat conftest.err >&5
1.702 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.703 + (exit $ac_status); } &&
1.704 +- { ac_try='test -z "$ac_c_werror_flag"
1.705 +- || test ! -s conftest.err'
1.706 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.707 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.708 + (eval $ac_try) 2>&5
1.709 + ac_status=$?
1.710 +@@ -8145,8 +8150,7 @@
1.711 + cat conftest.err >&5
1.712 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.713 + (exit $ac_status); } &&
1.714 +- { ac_try='test -z "$ac_c_werror_flag"
1.715 +- || test ! -s conftest.err'
1.716 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.717 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.718 + (eval $ac_try) 2>&5
1.719 + ac_status=$?
1.720 +@@ -8218,8 +8222,7 @@
1.721 + cat conftest.err >&5
1.722 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.723 + (exit $ac_status); } &&
1.724 +- { ac_try='test -z "$ac_c_werror_flag"
1.725 +- || test ! -s conftest.err'
1.726 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.727 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.728 + (eval $ac_try) 2>&5
1.729 + ac_status=$?
1.730 +@@ -8289,8 +8292,7 @@
1.731 + cat conftest.err >&5
1.732 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.733 + (exit $ac_status); } &&
1.734 +- { ac_try='test -z "$ac_c_werror_flag"
1.735 +- || test ! -s conftest.err'
1.736 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.737 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.738 + (eval $ac_try) 2>&5
1.739 + ac_status=$?
1.740 +@@ -9293,11 +9295,6 @@
1.741 + *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
1.742 + esac
1.743 +
1.744 +- if test x"$ac_file" != x-; then
1.745 +- { echo "$as_me:$LINENO: creating $ac_file" >&5
1.746 +-echo "$as_me: creating $ac_file" >&6;}
1.747 +- rm -f "$ac_file"
1.748 +- fi
1.749 + # Let's still pretend it is `configure' which instantiates (i.e., don't
1.750 + # use $as_me), people would be surprised to read:
1.751 + # /* config.h. Generated by config.status. */
1.752 +@@ -9336,6 +9333,12 @@
1.753 + fi;;
1.754 + esac
1.755 + done` || { (exit 1); exit 1; }
1.756 ++
1.757 ++ if test x"$ac_file" != x-; then
1.758 ++ { echo "$as_me:$LINENO: creating $ac_file" >&5
1.759 ++echo "$as_me: creating $ac_file" >&6;}
1.760 ++ rm -f "$ac_file"
1.761 ++ fi
1.762 + _ACEOF
1.763 + cat >>$CONFIG_STATUS <<_ACEOF
1.764 + sed "$ac_vpsub
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/strace/4.5.15/150-strace-dont-use-REG_SYSCALL-for-sh.patch Sat Jul 14 17:34:54 2007 +0000
2.3 @@ -0,0 +1,11 @@
2.4 +diff -dur strace-4.5.15.orig/process.c strace-4.5.15/process.c
2.5 +--- strace-4.5.15.orig/process.c 2007-01-11 23:08:38.000000000 +0100
2.6 ++++ strace-4.5.15/process.c 2007-07-14 19:19:58.000000000 +0200
2.7 +@@ -2679,7 +2679,6 @@
2.8 + { 4*REG_GBR, "4*REG_GBR" },
2.9 + { 4*REG_MACH, "4*REG_MACH" },
2.10 + { 4*REG_MACL, "4*REG_MACL" },
2.11 +- { 4*REG_SYSCALL, "4*REG_SYSCALL" },
2.12 + { 4*REG_FPUL, "4*REG_FPUL" },
2.13 + { 4*REG_FPREG0, "4*REG_FPREG0" },
2.14 + { 4*(REG_FPREG0+1), "4*REG_FPREG1" },
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/strace/4.5.15/200-strace-fix-arm-bad-syscall.patch Sat Jul 14 17:34:54 2007 +0000
3.3 @@ -0,0 +1,19 @@
3.4 +diff -dur strace-4.5.15.orig/syscall.c strace-4.5.15/syscall.c
3.5 +--- strace-4.5.15.orig/syscall.c 2006-12-21 23:13:33.000000000 +0100
3.6 ++++ strace-4.5.15/syscall.c 2007-07-14 19:21:44.000000000 +0200
3.7 +@@ -1045,6 +1045,15 @@
3.8 + /*
3.9 + * Note: we only deal with only 32-bit CPUs here.
3.10 + */
3.11 ++
3.12 ++ if (!(tcp->flags & TCB_INSYSCALL) &&
3.13 ++ (tcp->flags & TCB_WAITEXECVE)) {
3.14 ++ /* caught a fake syscall from the execve's exit */
3.15 ++ tcp->flags &= ~TCB_WAITEXECVE;
3.16 ++ return 0;
3.17 ++ }
3.18 ++
3.19 ++
3.20 + if (regs.ARM_cpsr & 0x20) {
3.21 + /*
3.22 + * Get the Thumb-mode system call number
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/patches/strace/4.5.15/250-strace-fix-disabled-largefile-syscalls.patch Sat Jul 14 17:34:54 2007 +0000
4.3 @@ -0,0 +1,22 @@
4.4 +diff -dur strace-4.5.15.orig/syscall.c strace-4.5.15/syscall.c
4.5 +--- strace-4.5.15.orig/syscall.c 2007-07-14 19:21:44.000000000 +0200
4.6 ++++ strace-4.5.15/syscall.c 2007-07-14 19:22:49.000000000 +0200
4.7 +@@ -125,6 +125,18 @@
4.8 + #define TP TRACE_PROCESS
4.9 + #define TS TRACE_SIGNAL
4.10 +
4.11 ++#ifndef HAVE_STATFS64
4.12 ++/*
4.13 ++ * Ugly hacks for systems that do not have LFS
4.14 ++ */
4.15 ++
4.16 ++#define sys_truncate64 sys_truncate
4.17 ++#define sys_ftruncate64 sys_ftruncate
4.18 ++#define sys_getdents64 sys_getdents
4.19 ++#define sys_statfs64 sys_statfs
4.20 ++#define sys_fstatfs64 sys_fstatfs
4.21 ++#endif
4.22 ++
4.23 + static const struct sysent sysent0[] = {
4.24 + #include "syscallent.h"
4.25 + };
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/patches/strace/4.5.15/300-strace-mips-sprintsigmask-fix.patch Sat Jul 14 17:34:54 2007 +0000
5.3 @@ -0,0 +1,12 @@
5.4 +diff -dur strace-4.5.15.orig/signal.c strace-4.5.15/signal.c
5.5 +--- strace-4.5.15.orig/signal.c 2007-01-11 23:08:38.000000000 +0100
5.6 ++++ strace-4.5.15/signal.c 2007-07-14 19:24:43.000000000 +0200
5.7 +@@ -1440,7 +1440,7 @@
5.8 + tcp->u_rval = tcp->u_error = 0;
5.9 + if(tcp->u_arg[0] == 0)
5.10 + return 0;
5.11 +- tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1]);
5.12 ++ tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1], 0);
5.13 + return RVAL_NONE | RVAL_STR;
5.14 + }
5.15 + return 0;
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/patches/strace/4.5.15/350-strace-statfs64-check.patch Sat Jul 14 17:34:54 2007 +0000
6.3 @@ -0,0 +1,53 @@
6.4 +diff -dur strace-4.5.15.orig/acinclude.m4 strace-4.5.15/acinclude.m4
6.5 +--- strace-4.5.15.orig/acinclude.m4 2004-04-14 04:21:01.000000000 +0200
6.6 ++++ strace-4.5.15/acinclude.m4 2007-07-14 19:25:25.000000000 +0200
6.7 +@@ -210,6 +210,26 @@
6.8 + fi
6.9 + ])
6.10 +
6.11 ++dnl ### A macro to determine whether statfs64 is defined.
6.12 ++AC_DEFUN([AC_STATFS64],
6.13 ++[AC_MSG_CHECKING(for statfs64 in sys/(statfs|vfs).h)
6.14 ++AC_CACHE_VAL(ac_cv_type_statfs64,
6.15 ++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX
6.16 ++#include <linux/types.h>
6.17 ++#include <sys/statfs.h>
6.18 ++#else
6.19 ++#include <sys/vfs.h>
6.20 ++#endif]], [[struct statfs64 st;]])],[ac_cv_type_statfs64=yes],[ac_cv_type_statfs64=no])])
6.21 ++AC_MSG_RESULT($ac_cv_type_statfs64)
6.22 ++if test "$ac_cv_type_statfs64" = yes
6.23 ++then
6.24 ++ AC_DEFINE([HAVE_STATFS64], 1,
6.25 ++[Define if statfs64 is available in sys/statfs.h or sys/vfs.h.])
6.26 ++fi
6.27 ++])
6.28 ++
6.29 ++
6.30 ++
6.31 + dnl ### A macro to determine if off_t is a long long
6.32 + AC_DEFUN([AC_OFF_T_IS_LONG_LONG],
6.33 + [AC_MSG_CHECKING(for long long off_t)
6.34 +diff -dur strace-4.5.15.orig/configure.ac strace-4.5.15/configure.ac
6.35 +--- strace-4.5.15.orig/configure.ac 2007-01-11 12:37:55.000000000 +0100
6.36 ++++ strace-4.5.15/configure.ac 2007-07-14 19:25:25.000000000 +0200
6.37 +@@ -169,6 +169,7 @@
6.38 + struct stat.st_level,
6.39 + struct stat.st_rdev])
6.40 + AC_STAT64
6.41 ++AC_STATFS64
6.42 +
6.43 + AC_TYPE_SIGNAL
6.44 + AC_TYPE_UID_T
6.45 +diff -dur strace-4.5.15.orig/file.c strace-4.5.15/file.c
6.46 +--- strace-4.5.15.orig/file.c 2007-01-15 21:25:52.000000000 +0100
6.47 ++++ strace-4.5.15/file.c 2007-07-14 19:25:25.000000000 +0200
6.48 +@@ -1635,7 +1635,7 @@
6.49 + return 0;
6.50 + }
6.51 +
6.52 +-#ifdef LINUX
6.53 ++#ifdef HAVE_STATFS64
6.54 + static void
6.55 + printstatfs64(tcp, addr)
6.56 + struct tcb *tcp;
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/patches/strace/4.5.15/400-strace-superh-update.ac.patch Sat Jul 14 17:34:54 2007 +0000
7.3 @@ -0,0 +1,22 @@
7.4 +diff -dur strace-4.5.15.orig/configure.ac strace-4.5.15/configure.ac
7.5 +--- strace-4.5.15.orig/configure.ac 2007-07-14 19:25:25.000000000 +0200
7.6 ++++ strace-4.5.15/configure.ac 2007-07-14 19:27:35.000000000 +0200
7.7 +@@ -91,14 +91,14 @@
7.8 + arch=hppa
7.9 + AC_DEFINE([HPPA], 1, [Define for the HPPA architecture.])
7.10 + ;;
7.11 +-sh)
7.12 +- arch=sh
7.13 +- AC_DEFINE([SH], 1, [Define for the SH architecture.])
7.14 +- ;;
7.15 + sh64)
7.16 + arch=sh64
7.17 + AC_DEFINE([SH64], 1, [Define for the SH64 architecture.])
7.18 + ;;
7.19 ++sh*)
7.20 ++ arch=sh
7.21 ++ AC_DEFINE([SH], 1, [Define for the SH architecture.])
7.22 ++ ;;
7.23 + x86?64*)
7.24 + arch=x86_64
7.25 + AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.])
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/patches/strace/4.5.15/450-strace-undef-CTL_PROC.patch Sat Jul 14 17:34:54 2007 +0000
8.3 @@ -0,0 +1,13 @@
8.4 +diff -dur strace-4.5.15.orig/system.c strace-4.5.15/system.c
8.5 +--- strace-4.5.15.orig/system.c 2007-01-17 00:22:36.000000000 +0100
8.6 ++++ strace-4.5.15/system.c 2007-07-14 19:28:41.000000000 +0200
8.7 +@@ -1612,7 +1612,9 @@
8.8 + { CTL_KERN, "CTL_KERN" },
8.9 + { CTL_VM, "CTL_VM" },
8.10 + { CTL_NET, "CTL_NET" },
8.11 ++#ifdef CTL_PROC
8.12 + { CTL_PROC, "CTL_PROC" },
8.13 ++#endif
8.14 + { CTL_FS, "CTL_FS" },
8.15 + { CTL_DEBUG, "CTL_DEBUG" },
8.16 + { CTL_DEV, "CTL_DEV" },
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/patches/strace/4.5.15/500-strace-undef-PACKET_MEMBERSHIP.patch Sat Jul 14 17:34:54 2007 +0000
9.3 @@ -0,0 +1,16 @@
9.4 +diff -dur strace-4.5.15.orig/net.c strace-4.5.15/net.c
9.5 +--- strace-4.5.15.orig/net.c 2006-12-13 20:57:23.000000000 +0100
9.6 ++++ strace-4.5.15/net.c 2007-07-14 19:29:36.000000000 +0200
9.7 +@@ -800,8 +800,12 @@
9.8 +
9.9 + #ifdef SOL_PACKET
9.10 + static const struct xlat sockpacketoptions[] = {
9.11 ++#if defined(PACKET_ADD_MEMBERSHIP)
9.12 + { PACKET_ADD_MEMBERSHIP, "PACKET_ADD_MEMBERSHIP" },
9.13 ++#endif
9.14 ++#if defined(PACKET_DROP_MEMBERSHIP)
9.15 + { PACKET_DROP_MEMBERSHIP, "PACKET_DROP_MEMBERSHIP"},
9.16 ++#endif
9.17 + #if defined(PACKET_RECV_OUTPUT)
9.18 + { PACKET_RECV_OUTPUT, "PACKET_RECV_OUTPUT" },
9.19 + #endif
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
10.2 +++ b/patches/strace/4.5.15/550-strace-undef-syscall.patch Sat Jul 14 17:34:54 2007 +0000
10.3 @@ -0,0 +1,62 @@
10.4 +diff -dur strace-4.5.15.orig/linux/syscallent.h strace-4.5.15/linux/syscallent.h
10.5 +--- strace-4.5.15.orig/linux/syscallent.h 2006-10-16 03:17:52.000000000 +0200
10.6 ++++ strace-4.5.15/linux/syscallent.h 2007-07-14 19:30:16.000000000 +0200
10.7 +@@ -130,7 +130,10 @@
10.8 + { 2, TF, sys_statfs, "statfs" }, /* 99 */
10.9 + { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */
10.10 + { 3, 0, sys_ioperm, "ioperm" }, /* 101 */
10.11 +- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */
10.12 ++ { 2, TD, sys_socketcall, "socketcall",
10.13 ++#ifdef __NR_socketcall
10.14 ++ SYS_socketcall }, /* 102 */
10.15 ++#endif
10.16 + { 3, 0, sys_syslog, "syslog" }, /* 103 */
10.17 + { 3, 0, sys_setitimer, "setitimer" }, /* 104 */
10.18 + { 2, 0, sys_getitimer, "getitimer" }, /* 105 */
10.19 +@@ -145,7 +148,10 @@
10.20 + { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */
10.21 + { 1, 0, sys_swapoff, "swapoff" }, /* 115 */
10.22 + { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */
10.23 +- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */
10.24 ++ { 6, 0, sys_ipc, "ipc",
10.25 ++#ifdef __NR_ipc
10.26 ++ SYS_ipc }, /* 117 */
10.27 ++#endif
10.28 + { 1, TD, sys_fsync, "fsync" }, /* 118 */
10.29 + { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */
10.30 + { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */
10.31 +@@ -282,7 +288,11 @@
10.32 + { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */
10.33 + { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */
10.34 + { 5, 0, printargs, "SYS_251" }, /* 251 */
10.35 +- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */
10.36 ++ { 1, TP, sys_exit, "exit_group"
10.37 ++#ifdef __NR_exit_group
10.38 ++ , __NR_exit_group
10.39 ++#endif
10.40 ++ }, /* 252 */
10.41 + { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
10.42 + { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */
10.43 + { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */
10.44 +diff -dur strace-4.5.15.orig/syscall.c strace-4.5.15/syscall.c
10.45 +--- strace-4.5.15.orig/syscall.c 2007-07-14 19:22:49.000000000 +0200
10.46 ++++ strace-4.5.15/syscall.c 2007-07-14 19:30:16.000000000 +0200
10.47 +@@ -2404,14 +2404,18 @@
10.48 + switch (known_scno(tcp)) {
10.49 + #ifdef LINUX
10.50 + #if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA)
10.51 ++#ifdef __NR_socketcall
10.52 + case SYS_socketcall:
10.53 + decode_subcall(tcp, SYS_socket_subcall,
10.54 + SYS_socket_nsubcalls, deref_style);
10.55 + break;
10.56 ++#endif
10.57 ++#ifdef __NR_ipc
10.58 + case SYS_ipc:
10.59 + decode_subcall(tcp, SYS_ipc_subcall,
10.60 + SYS_ipc_nsubcalls, shift_style);
10.61 + break;
10.62 ++#endif
10.63 + #endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */
10.64 + #if defined (SPARC) || defined (SPARC64)
10.65 + case SYS_socketcall:
11.1 --- a/patches/strace/4.5.15/strace-autoreconf.patch Sat Jul 14 17:02:05 2007 +0000
11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
11.3 @@ -1,760 +0,0 @@
11.4 ---- strace-4.5.15.orig/configure 2007-01-29 17:23:38.000000000 +0100
11.5 -+++ strace-4.5.15/configure 2007-01-29 17:46:54.000000000 +0100
11.6 -@@ -956,7 +956,7 @@ esac
11.7 - else
11.8 - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
11.9 - fi
11.10 -- cd $ac_popdir
11.11 -+ cd "$ac_popdir"
11.12 - done
11.13 - fi
11.14 -
11.15 -@@ -2660,8 +2660,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.16 - cat conftest.err >&5
11.17 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.18 - (exit $ac_status); } &&
11.19 -- { ac_try='test -z "$ac_c_werror_flag"
11.20 -- || test ! -s conftest.err'
11.21 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.22 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.23 - (eval $ac_try) 2>&5
11.24 - ac_status=$?
11.25 -@@ -2719,8 +2718,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.26 - cat conftest.err >&5
11.27 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.28 - (exit $ac_status); } &&
11.29 -- { ac_try='test -z "$ac_c_werror_flag"
11.30 -- || test ! -s conftest.err'
11.31 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.32 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.33 - (eval $ac_try) 2>&5
11.34 - ac_status=$?
11.35 -@@ -2836,8 +2834,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.36 - cat conftest.err >&5
11.37 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.38 - (exit $ac_status); } &&
11.39 -- { ac_try='test -z "$ac_c_werror_flag"
11.40 -- || test ! -s conftest.err'
11.41 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.42 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.43 - (eval $ac_try) 2>&5
11.44 - ac_status=$?
11.45 -@@ -2891,8 +2888,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.46 - cat conftest.err >&5
11.47 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.48 - (exit $ac_status); } &&
11.49 -- { ac_try='test -z "$ac_c_werror_flag"
11.50 -- || test ! -s conftest.err'
11.51 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.52 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.53 - (eval $ac_try) 2>&5
11.54 - ac_status=$?
11.55 -@@ -2937,8 +2933,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.56 - cat conftest.err >&5
11.57 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.58 - (exit $ac_status); } &&
11.59 -- { ac_try='test -z "$ac_c_werror_flag"
11.60 -- || test ! -s conftest.err'
11.61 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.62 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.63 - (eval $ac_try) 2>&5
11.64 - ac_status=$?
11.65 -@@ -2982,8 +2977,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.66 - cat conftest.err >&5
11.67 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.68 - (exit $ac_status); } &&
11.69 -- { ac_try='test -z "$ac_c_werror_flag"
11.70 -- || test ! -s conftest.err'
11.71 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.72 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.73 - (eval $ac_try) 2>&5
11.74 - ac_status=$?
11.75 -@@ -3721,8 +3715,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.76 - cat conftest.err >&5
11.77 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.78 - (exit $ac_status); } &&
11.79 -- { ac_try='test -z "$ac_c_werror_flag"
11.80 -- || test ! -s conftest.err'
11.81 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.82 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.83 - (eval $ac_try) 2>&5
11.84 - ac_status=$?
11.85 -@@ -3786,8 +3779,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.86 - cat conftest.err >&5
11.87 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.88 - (exit $ac_status); } &&
11.89 -- { ac_try='test -z "$ac_c_werror_flag"
11.90 -- || test ! -s conftest.err'
11.91 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.92 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.93 - (eval $ac_try) 2>&5
11.94 - ac_status=$?
11.95 -@@ -3959,8 +3951,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.96 - cat conftest.err >&5
11.97 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.98 - (exit $ac_status); } &&
11.99 -- { ac_try='test -z "$ac_c_werror_flag"
11.100 -- || test ! -s conftest.err'
11.101 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.102 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.103 - (eval $ac_try) 2>&5
11.104 - ac_status=$?
11.105 -@@ -4032,8 +4023,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
11.106 - cat conftest.err >&5
11.107 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.108 - (exit $ac_status); } &&
11.109 -- { ac_try='test -z "$ac_c_werror_flag"
11.110 -- || test ! -s conftest.err'
11.111 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.112 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.113 - (eval $ac_try) 2>&5
11.114 - ac_status=$?
11.115 -@@ -4087,8 +4077,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
11.116 - cat conftest.err >&5
11.117 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.118 - (exit $ac_status); } &&
11.119 -- { ac_try='test -z "$ac_c_werror_flag"
11.120 -- || test ! -s conftest.err'
11.121 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.122 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.123 - (eval $ac_try) 2>&5
11.124 - ac_status=$?
11.125 -@@ -4159,8 +4148,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
11.126 - cat conftest.err >&5
11.127 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.128 - (exit $ac_status); } &&
11.129 -- { ac_try='test -z "$ac_c_werror_flag"
11.130 -- || test ! -s conftest.err'
11.131 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.132 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.133 - (eval $ac_try) 2>&5
11.134 - ac_status=$?
11.135 -@@ -4214,8 +4202,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
11.136 - cat conftest.err >&5
11.137 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.138 - (exit $ac_status); } &&
11.139 -- { ac_try='test -z "$ac_c_werror_flag"
11.140 -- || test ! -s conftest.err'
11.141 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.142 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.143 - (eval $ac_try) 2>&5
11.144 - ac_status=$?
11.145 -@@ -4345,8 +4332,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.146 - cat conftest.err >&5
11.147 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.148 - (exit $ac_status); } &&
11.149 -- { ac_try='test -z "$ac_c_werror_flag"
11.150 -- || test ! -s conftest.err'
11.151 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.152 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.153 - (eval $ac_try) 2>&5
11.154 - ac_status=$?
11.155 -@@ -4410,8 +4396,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.156 - cat conftest.err >&5
11.157 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.158 - (exit $ac_status); } &&
11.159 -- { ac_try='test -z "$ac_c_werror_flag"
11.160 -- || test ! -s conftest.err'
11.161 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.162 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.163 - (eval $ac_try) 2>&5
11.164 - ac_status=$?
11.165 -@@ -4454,8 +4439,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.166 - cat conftest.err >&5
11.167 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.168 - (exit $ac_status); } &&
11.169 -- { ac_try='test -z "$ac_c_werror_flag"
11.170 -- || test ! -s conftest.err'
11.171 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.172 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.173 - (eval $ac_try) 2>&5
11.174 - ac_status=$?
11.175 -@@ -4519,8 +4503,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.176 - cat conftest.err >&5
11.177 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.178 - (exit $ac_status); } &&
11.179 -- { ac_try='test -z "$ac_c_werror_flag"
11.180 -- || test ! -s conftest.err'
11.181 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.182 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.183 - (eval $ac_try) 2>&5
11.184 - ac_status=$?
11.185 -@@ -4563,8 +4546,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.186 - cat conftest.err >&5
11.187 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.188 - (exit $ac_status); } &&
11.189 -- { ac_try='test -z "$ac_c_werror_flag"
11.190 -- || test ! -s conftest.err'
11.191 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.192 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.193 - (eval $ac_try) 2>&5
11.194 - ac_status=$?
11.195 -@@ -4628,8 +4610,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.196 - cat conftest.err >&5
11.197 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.198 - (exit $ac_status); } &&
11.199 -- { ac_try='test -z "$ac_c_werror_flag"
11.200 -- || test ! -s conftest.err'
11.201 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.202 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.203 - (eval $ac_try) 2>&5
11.204 - ac_status=$?
11.205 -@@ -4672,8 +4653,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.206 - cat conftest.err >&5
11.207 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.208 - (exit $ac_status); } &&
11.209 -- { ac_try='test -z "$ac_c_werror_flag"
11.210 -- || test ! -s conftest.err'
11.211 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.212 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.213 - (eval $ac_try) 2>&5
11.214 - ac_status=$?
11.215 -@@ -4737,8 +4717,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.216 - cat conftest.err >&5
11.217 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.218 - (exit $ac_status); } &&
11.219 -- { ac_try='test -z "$ac_c_werror_flag"
11.220 -- || test ! -s conftest.err'
11.221 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.222 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.223 - (eval $ac_try) 2>&5
11.224 - ac_status=$?
11.225 -@@ -4781,8 +4760,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.226 - cat conftest.err >&5
11.227 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.228 - (exit $ac_status); } &&
11.229 -- { ac_try='test -z "$ac_c_werror_flag"
11.230 -- || test ! -s conftest.err'
11.231 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.232 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.233 - (eval $ac_try) 2>&5
11.234 - ac_status=$?
11.235 -@@ -4846,8 +4824,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.236 - cat conftest.err >&5
11.237 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.238 - (exit $ac_status); } &&
11.239 -- { ac_try='test -z "$ac_c_werror_flag"
11.240 -- || test ! -s conftest.err'
11.241 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.242 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.243 - (eval $ac_try) 2>&5
11.244 - ac_status=$?
11.245 -@@ -4890,8 +4867,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.246 - cat conftest.err >&5
11.247 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.248 - (exit $ac_status); } &&
11.249 -- { ac_try='test -z "$ac_c_werror_flag"
11.250 -- || test ! -s conftest.err'
11.251 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.252 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.253 - (eval $ac_try) 2>&5
11.254 - ac_status=$?
11.255 -@@ -4955,8 +4931,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.256 - cat conftest.err >&5
11.257 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.258 - (exit $ac_status); } &&
11.259 -- { ac_try='test -z "$ac_c_werror_flag"
11.260 -- || test ! -s conftest.err'
11.261 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.262 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.263 - (eval $ac_try) 2>&5
11.264 - ac_status=$?
11.265 -@@ -4999,8 +4974,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.266 - cat conftest.err >&5
11.267 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.268 - (exit $ac_status); } &&
11.269 -- { ac_try='test -z "$ac_c_werror_flag"
11.270 -- || test ! -s conftest.err'
11.271 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.272 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.273 - (eval $ac_try) 2>&5
11.274 - ac_status=$?
11.275 -@@ -5064,8 +5038,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.276 - cat conftest.err >&5
11.277 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.278 - (exit $ac_status); } &&
11.279 -- { ac_try='test -z "$ac_c_werror_flag"
11.280 -- || test ! -s conftest.err'
11.281 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.282 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.283 - (eval $ac_try) 2>&5
11.284 - ac_status=$?
11.285 -@@ -5108,8 +5081,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.286 - cat conftest.err >&5
11.287 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.288 - (exit $ac_status); } &&
11.289 -- { ac_try='test -z "$ac_c_werror_flag"
11.290 -- || test ! -s conftest.err'
11.291 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.292 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.293 - (eval $ac_try) 2>&5
11.294 - ac_status=$?
11.295 -@@ -5173,8 +5145,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.296 - cat conftest.err >&5
11.297 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.298 - (exit $ac_status); } &&
11.299 -- { ac_try='test -z "$ac_c_werror_flag"
11.300 -- || test ! -s conftest.err'
11.301 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.302 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.303 - (eval $ac_try) 2>&5
11.304 - ac_status=$?
11.305 -@@ -5217,8 +5188,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.306 - cat conftest.err >&5
11.307 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.308 - (exit $ac_status); } &&
11.309 -- { ac_try='test -z "$ac_c_werror_flag"
11.310 -- || test ! -s conftest.err'
11.311 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.312 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.313 - (eval $ac_try) 2>&5
11.314 - ac_status=$?
11.315 -@@ -5286,8 +5256,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.316 - cat conftest.err >&5
11.317 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.318 - (exit $ac_status); } &&
11.319 -- { ac_try='test -z "$ac_c_werror_flag"
11.320 -- || test ! -s conftest.err'
11.321 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.322 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.323 - (eval $ac_try) 2>&5
11.324 - ac_status=$?
11.325 -@@ -5320,6 +5289,73 @@ _ACEOF
11.326 -
11.327 - fi
11.328 -
11.329 -+echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
11.330 -+echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
11.331 -+if test "${ac_cv_type_statfs64+set}" = set; then
11.332 -+ echo $ECHO_N "(cached) $ECHO_C" >&6
11.333 -+else
11.334 -+ cat >conftest.$ac_ext <<_ACEOF
11.335 -+/* confdefs.h. */
11.336 -+_ACEOF
11.337 -+cat confdefs.h >>conftest.$ac_ext
11.338 -+cat >>conftest.$ac_ext <<_ACEOF
11.339 -+/* end confdefs.h. */
11.340 -+#ifdef LINUX
11.341 -+#include <linux/types.h>
11.342 -+#include <sys/statfs.h>
11.343 -+#else
11.344 -+#include <sys/vfs.h>
11.345 -+#endif
11.346 -+int
11.347 -+main ()
11.348 -+{
11.349 -+struct statfs64 st;
11.350 -+ ;
11.351 -+ return 0;
11.352 -+}
11.353 -+_ACEOF
11.354 -+rm -f conftest.$ac_objext
11.355 -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
11.356 -+ (eval $ac_compile) 2>conftest.er1
11.357 -+ ac_status=$?
11.358 -+ grep -v '^ *+' conftest.er1 >conftest.err
11.359 -+ rm -f conftest.er1
11.360 -+ cat conftest.err >&5
11.361 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.362 -+ (exit $ac_status); } &&
11.363 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.364 -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.365 -+ (eval $ac_try) 2>&5
11.366 -+ ac_status=$?
11.367 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.368 -+ (exit $ac_status); }; } &&
11.369 -+ { ac_try='test -s conftest.$ac_objext'
11.370 -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.371 -+ (eval $ac_try) 2>&5
11.372 -+ ac_status=$?
11.373 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.374 -+ (exit $ac_status); }; }; then
11.375 -+ ac_cv_type_statfs64=yes
11.376 -+else
11.377 -+ echo "$as_me: failed program was:" >&5
11.378 -+sed 's/^/| /' conftest.$ac_ext >&5
11.379 -+
11.380 -+ac_cv_type_statfs64=no
11.381 -+fi
11.382 -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
11.383 -+fi
11.384 -+
11.385 -+echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
11.386 -+echo "${ECHO_T}$ac_cv_type_statfs64" >&6
11.387 -+if test "$ac_cv_type_statfs64" = yes
11.388 -+then
11.389 -+
11.390 -+cat >>confdefs.h <<\_ACEOF
11.391 -+#define HAVE_STATFS64 1
11.392 -+_ACEOF
11.393 -+
11.394 -+fi
11.395 -+
11.396 -
11.397 - echo "$as_me:$LINENO: checking return type of signal handlers" >&5
11.398 - echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
11.399 -@@ -5360,8 +5396,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.400 - cat conftest.err >&5
11.401 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.402 - (exit $ac_status); } &&
11.403 -- { ac_try='test -z "$ac_c_werror_flag"
11.404 -- || test ! -s conftest.err'
11.405 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.406 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.407 - (eval $ac_try) 2>&5
11.408 - ac_status=$?
11.409 -@@ -5460,8 +5495,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.410 - cat conftest.err >&5
11.411 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.412 - (exit $ac_status); } &&
11.413 -- { ac_try='test -z "$ac_c_werror_flag"
11.414 -- || test ! -s conftest.err'
11.415 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.416 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.417 - (eval $ac_try) 2>&5
11.418 - ac_status=$?
11.419 -@@ -5610,8 +5644,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
11.420 - cat conftest.err >&5
11.421 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.422 - (exit $ac_status); } &&
11.423 -- { ac_try='test -z "$ac_c_werror_flag"
11.424 -- || test ! -s conftest.err'
11.425 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.426 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.427 - (eval $ac_try) 2>&5
11.428 - ac_status=$?
11.429 -@@ -5668,8 +5701,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.430 - cat conftest.err >&5
11.431 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.432 - (exit $ac_status); } &&
11.433 -- { ac_try='test -z "$ac_c_werror_flag"
11.434 -- || test ! -s conftest.err'
11.435 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.436 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.437 - (eval $ac_try) 2>&5
11.438 - ac_status=$?
11.439 -@@ -5816,8 +5848,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.440 - cat conftest.err >&5
11.441 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.442 - (exit $ac_status); } &&
11.443 -- { ac_try='test -z "$ac_c_werror_flag"
11.444 -- || test ! -s conftest.err'
11.445 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.446 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.447 - (eval $ac_try) 2>&5
11.448 - ac_status=$?
11.449 -@@ -5968,8 +5999,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.450 - cat conftest.err >&5
11.451 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.452 - (exit $ac_status); } &&
11.453 -- { ac_try='test -z "$ac_c_werror_flag"
11.454 -- || test ! -s conftest.err'
11.455 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.456 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.457 - (eval $ac_try) 2>&5
11.458 - ac_status=$?
11.459 -@@ -6033,8 +6063,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.460 - cat conftest.err >&5
11.461 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.462 - (exit $ac_status); } &&
11.463 -- { ac_try='test -z "$ac_c_werror_flag"
11.464 -- || test ! -s conftest.err'
11.465 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.466 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.467 - (eval $ac_try) 2>&5
11.468 - ac_status=$?
11.469 -@@ -6100,8 +6129,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.470 - cat conftest.err >&5
11.471 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.472 - (exit $ac_status); } &&
11.473 -- { ac_try='test -z "$ac_c_werror_flag"
11.474 -- || test ! -s conftest.err'
11.475 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.476 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.477 - (eval $ac_try) 2>&5
11.478 - ac_status=$?
11.479 -@@ -6147,8 +6175,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.480 - cat conftest.err >&5
11.481 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.482 - (exit $ac_status); } &&
11.483 -- { ac_try='test -z "$ac_c_werror_flag"
11.484 -- || test ! -s conftest.err'
11.485 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.486 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.487 - (eval $ac_try) 2>&5
11.488 - ac_status=$?
11.489 -@@ -6214,8 +6241,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.490 - cat conftest.err >&5
11.491 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.492 - (exit $ac_status); } &&
11.493 -- { ac_try='test -z "$ac_c_werror_flag"
11.494 -- || test ! -s conftest.err'
11.495 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.496 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.497 - (eval $ac_try) 2>&5
11.498 - ac_status=$?
11.499 -@@ -6466,8 +6492,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.500 - cat conftest.err >&5
11.501 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.502 - (exit $ac_status); } &&
11.503 -- { ac_try='test -z "$ac_c_werror_flag"
11.504 -- || test ! -s conftest.err'
11.505 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.506 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.507 - (eval $ac_try) 2>&5
11.508 - ac_status=$?
11.509 -@@ -6532,8 +6557,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.510 - cat conftest.err >&5
11.511 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.512 - (exit $ac_status); } &&
11.513 -- { ac_try='test -z "$ac_c_werror_flag"
11.514 -- || test ! -s conftest.err'
11.515 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.516 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.517 - (eval $ac_try) 2>&5
11.518 - ac_status=$?
11.519 -@@ -6600,8 +6624,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
11.520 - cat conftest.err >&5
11.521 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.522 - (exit $ac_status); } &&
11.523 -- { ac_try='test -z "$ac_c_werror_flag"
11.524 -- || test ! -s conftest.err'
11.525 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.526 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.527 - (eval $ac_try) 2>&5
11.528 - ac_status=$?
11.529 -@@ -6717,8 +6740,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
11.530 - cat conftest.err >&5
11.531 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.532 - (exit $ac_status); } &&
11.533 -- { ac_try='test -z "$ac_c_werror_flag"
11.534 -- || test ! -s conftest.err'
11.535 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.536 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.537 - (eval $ac_try) 2>&5
11.538 - ac_status=$?
11.539 -@@ -6812,8 +6834,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.540 - cat conftest.err >&5
11.541 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.542 - (exit $ac_status); } &&
11.543 -- { ac_try='test -z "$ac_c_werror_flag"
11.544 -- || test ! -s conftest.err'
11.545 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.546 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.547 - (eval $ac_try) 2>&5
11.548 - ac_status=$?
11.549 -@@ -6959,8 +6980,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.550 - cat conftest.err >&5
11.551 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.552 - (exit $ac_status); } &&
11.553 -- { ac_try='test -z "$ac_c_werror_flag"
11.554 -- || test ! -s conftest.err'
11.555 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.556 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.557 - (eval $ac_try) 2>&5
11.558 - ac_status=$?
11.559 -@@ -7020,8 +7040,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.560 - cat conftest.err >&5
11.561 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.562 - (exit $ac_status); } &&
11.563 -- { ac_try='test -z "$ac_c_werror_flag"
11.564 -- || test ! -s conftest.err'
11.565 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.566 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.567 - (eval $ac_try) 2>&5
11.568 - ac_status=$?
11.569 -@@ -7082,8 +7101,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.570 - cat conftest.err >&5
11.571 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.572 - (exit $ac_status); } &&
11.573 -- { ac_try='test -z "$ac_c_werror_flag"
11.574 -- || test ! -s conftest.err'
11.575 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.576 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.577 - (eval $ac_try) 2>&5
11.578 - ac_status=$?
11.579 -@@ -7356,8 +7374,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.580 - cat conftest.err >&5
11.581 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.582 - (exit $ac_status); } &&
11.583 -- { ac_try='test -z "$ac_c_werror_flag"
11.584 -- || test ! -s conftest.err'
11.585 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.586 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.587 - (eval $ac_try) 2>&5
11.588 - ac_status=$?
11.589 -@@ -7401,8 +7418,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.590 - cat conftest.err >&5
11.591 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.592 - (exit $ac_status); } &&
11.593 -- { ac_try='test -z "$ac_c_werror_flag"
11.594 -- || test ! -s conftest.err'
11.595 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.596 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.597 - (eval $ac_try) 2>&5
11.598 - ac_status=$?
11.599 -@@ -7471,8 +7487,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.600 - cat conftest.err >&5
11.601 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.602 - (exit $ac_status); } &&
11.603 -- { ac_try='test -z "$ac_c_werror_flag"
11.604 -- || test ! -s conftest.err'
11.605 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.606 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.607 - (eval $ac_try) 2>&5
11.608 - ac_status=$?
11.609 -@@ -7539,8 +7554,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.610 - cat conftest.err >&5
11.611 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.612 - (exit $ac_status); } &&
11.613 -- { ac_try='test -z "$ac_c_werror_flag"
11.614 -- || test ! -s conftest.err'
11.615 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.616 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.617 - (eval $ac_try) 2>&5
11.618 - ac_status=$?
11.619 -@@ -7585,8 +7599,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.620 - cat conftest.err >&5
11.621 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.622 - (exit $ac_status); } &&
11.623 -- { ac_try='test -z "$ac_c_werror_flag"
11.624 -- || test ! -s conftest.err'
11.625 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.626 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.627 - (eval $ac_try) 2>&5
11.628 - ac_status=$?
11.629 -@@ -7652,8 +7665,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.630 - cat conftest.err >&5
11.631 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.632 - (exit $ac_status); } &&
11.633 -- { ac_try='test -z "$ac_c_werror_flag"
11.634 -- || test ! -s conftest.err'
11.635 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.636 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.637 - (eval $ac_try) 2>&5
11.638 - ac_status=$?
11.639 -@@ -7698,8 +7710,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.640 - cat conftest.err >&5
11.641 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.642 - (exit $ac_status); } &&
11.643 -- { ac_try='test -z "$ac_c_werror_flag"
11.644 -- || test ! -s conftest.err'
11.645 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.646 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.647 - (eval $ac_try) 2>&5
11.648 - ac_status=$?
11.649 -@@ -7767,8 +7778,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.650 - cat conftest.err >&5
11.651 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.652 - (exit $ac_status); } &&
11.653 -- { ac_try='test -z "$ac_c_werror_flag"
11.654 -- || test ! -s conftest.err'
11.655 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.656 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.657 - (eval $ac_try) 2>&5
11.658 - ac_status=$?
11.659 -@@ -7834,8 +7844,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.660 - cat conftest.err >&5
11.661 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.662 - (exit $ac_status); } &&
11.663 -- { ac_try='test -z "$ac_c_werror_flag"
11.664 -- || test ! -s conftest.err'
11.665 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.666 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.667 - (eval $ac_try) 2>&5
11.668 - ac_status=$?
11.669 -@@ -7899,8 +7908,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.670 - cat conftest.err >&5
11.671 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.672 - (exit $ac_status); } &&
11.673 -- { ac_try='test -z "$ac_c_werror_flag"
11.674 -- || test ! -s conftest.err'
11.675 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.676 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.677 - (eval $ac_try) 2>&5
11.678 - ac_status=$?
11.679 -@@ -7966,8 +7974,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.680 - cat conftest.err >&5
11.681 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.682 - (exit $ac_status); } &&
11.683 -- { ac_try='test -z "$ac_c_werror_flag"
11.684 -- || test ! -s conftest.err'
11.685 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.686 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.687 - (eval $ac_try) 2>&5
11.688 - ac_status=$?
11.689 -@@ -8032,8 +8039,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.690 - cat conftest.err >&5
11.691 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.692 - (exit $ac_status); } &&
11.693 -- { ac_try='test -z "$ac_c_werror_flag"
11.694 -- || test ! -s conftest.err'
11.695 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.696 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.697 - (eval $ac_try) 2>&5
11.698 - ac_status=$?
11.699 -@@ -8077,8 +8083,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.700 - cat conftest.err >&5
11.701 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.702 - (exit $ac_status); } &&
11.703 -- { ac_try='test -z "$ac_c_werror_flag"
11.704 -- || test ! -s conftest.err'
11.705 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.706 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.707 - (eval $ac_try) 2>&5
11.708 - ac_status=$?
11.709 -@@ -8145,8 +8150,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.710 - cat conftest.err >&5
11.711 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.712 - (exit $ac_status); } &&
11.713 -- { ac_try='test -z "$ac_c_werror_flag"
11.714 -- || test ! -s conftest.err'
11.715 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.716 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.717 - (eval $ac_try) 2>&5
11.718 - ac_status=$?
11.719 -@@ -8218,8 +8222,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.720 - cat conftest.err >&5
11.721 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.722 - (exit $ac_status); } &&
11.723 -- { ac_try='test -z "$ac_c_werror_flag"
11.724 -- || test ! -s conftest.err'
11.725 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.726 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.727 - (eval $ac_try) 2>&5
11.728 - ac_status=$?
11.729 -@@ -8289,8 +8292,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
11.730 - cat conftest.err >&5
11.731 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
11.732 - (exit $ac_status); } &&
11.733 -- { ac_try='test -z "$ac_c_werror_flag"
11.734 -- || test ! -s conftest.err'
11.735 -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
11.736 - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11.737 - (eval $ac_try) 2>&5
11.738 - ac_status=$?
11.739 -@@ -9293,11 +9295,6 @@ esac
11.740 - *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
11.741 - esac
11.742 -
11.743 -- if test x"$ac_file" != x-; then
11.744 -- { echo "$as_me:$LINENO: creating $ac_file" >&5
11.745 --echo "$as_me: creating $ac_file" >&6;}
11.746 -- rm -f "$ac_file"
11.747 -- fi
11.748 - # Let's still pretend it is `configure' which instantiates (i.e., don't
11.749 - # use $as_me), people would be surprised to read:
11.750 - # /* config.h. Generated by config.status. */
11.751 -@@ -9336,6 +9333,12 @@ echo "$as_me: error: cannot find input f
11.752 - fi;;
11.753 - esac
11.754 - done` || { (exit 1); exit 1; }
11.755 -+
11.756 -+ if test x"$ac_file" != x-; then
11.757 -+ { echo "$as_me:$LINENO: creating $ac_file" >&5
11.758 -+echo "$as_me: creating $ac_file" >&6;}
11.759 -+ rm -f "$ac_file"
11.760 -+ fi
11.761 - _ACEOF
11.762 - cat >>$CONFIG_STATUS <<_ACEOF
11.763 - sed "$ac_vpsub
12.1 --- a/patches/strace/4.5.15/strace-dont-use-REG_SYSCALL-for-sh.patch Sat Jul 14 17:02:05 2007 +0000
12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
12.3 @@ -1,10 +0,0 @@
12.4 ---- strace/process.c
12.5 -+++ strace/process.c
12.6 -@@ -2663,7 +2663,6 @@ const struct xlat struct_user_offsets[]
12.7 - { 4*REG_GBR, "4*REG_GBR" },
12.8 - { 4*REG_MACH, "4*REG_MACH" },
12.9 - { 4*REG_MACL, "4*REG_MACL" },
12.10 -- { 4*REG_SYSCALL, "4*REG_SYSCALL" },
12.11 - { 4*REG_FPUL, "4*REG_FPUL" },
12.12 - { 4*REG_FPREG0, "4*REG_FPREG0" },
12.13 - { 4*(REG_FPREG0+1), "4*REG_FPREG1" },
13.1 --- a/patches/strace/4.5.15/strace-fix-arm-bad-syscall.patch Sat Jul 14 17:02:05 2007 +0000
13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
13.3 @@ -1,18 +0,0 @@
13.4 ---- strace-4.5.12-orig/syscall.c 2005-06-08 21:45:28.000000000 +0100
13.5 -+++ strace-4.5.12/syscall.c 2005-10-25 19:26:39.000000000 +0100
13.6 -@@ -1013,6 +1013,15 @@ struct tcb *tcp;
13.7 - /*
13.8 - * Note: we only deal with only 32-bit CPUs here.
13.9 - */
13.10 -+
13.11 -+ if (!(tcp->flags & TCB_INSYSCALL) &&
13.12 -+ (tcp->flags & TCB_WAITEXECVE)) {
13.13 -+ /* caught a fake syscall from the execve's exit */
13.14 -+ tcp->flags &= ~TCB_WAITEXECVE;
13.15 -+ return 0;
13.16 -+ }
13.17 -+
13.18 -+
13.19 - if (regs.ARM_cpsr & 0x20) {
13.20 - /*
13.21 - * Get the Thumb-mode system call number
14.1 --- a/patches/strace/4.5.15/strace-fix-disabled-largefile-syscalls.patch Sat Jul 14 17:02:05 2007 +0000
14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
14.3 @@ -1,21 +0,0 @@
14.4 ---- strace-4.5.15.orig/syscall.c 2007-01-29 17:23:38.000000000 +0100
14.5 -+++ strace-4.5.15/syscall.c 2007-01-29 18:02:17.000000000 +0100
14.6 -@@ -125,6 +125,18 @@
14.7 - #define TP TRACE_PROCESS
14.8 - #define TS TRACE_SIGNAL
14.9 -
14.10 -+#ifndef HAVE_STATFS64
14.11 -+/*
14.12 -+ * Ugly hacks for systems that do not have LFS
14.13 -+ */
14.14 -+
14.15 -+#define sys_truncate64 sys_truncate
14.16 -+#define sys_ftruncate64 sys_ftruncate
14.17 -+#define sys_getdents64 sys_getdents
14.18 -+#define sys_statfs64 sys_statfs
14.19 -+#define sys_fstatfs64 sys_fstatfs
14.20 -+#endif
14.21 -+
14.22 - static const struct sysent sysent0[] = {
14.23 - #include "syscallent.h"
14.24 - };
15.1 --- a/patches/strace/4.5.15/strace-mips-sprintsigmask-fix.patch Sat Jul 14 17:02:05 2007 +0000
15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
15.3 @@ -1,12 +0,0 @@
15.4 -diff -ur strace-4.5.15/signal.c strace-4.5.15-patched/signal.c
15.5 ---- strace-4.5.15/signal.c 2007-01-11 16:08:38.000000000 -0600
15.6 -+++ strace-4.5.15-patched/signal.c 2007-02-06 20:49:34.714320249 -0600
15.7 -@@ -1440,7 +1440,7 @@
15.8 - tcp->u_rval = tcp->u_error = 0;
15.9 - if(tcp->u_arg[0] == 0)
15.10 - return 0;
15.11 -- tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1]);
15.12 -+ tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1], 0);
15.13 - return RVAL_NONE | RVAL_STR;
15.14 - }
15.15 - return 0;
16.1 --- a/patches/strace/4.5.15/strace-statfs64-check.patch Sat Jul 14 17:02:05 2007 +0000
16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
16.3 @@ -1,53 +0,0 @@
16.4 -diff -dup strace-4.5.15.orig/acinclude.m4 strace-4.5.15/acinclude.m4
16.5 ---- strace-4.5.15.orig/acinclude.m4 2004-04-14 04:21:01.000000000 +0200
16.6 -+++ strace-4.5.15/acinclude.m4 2007-01-29 17:31:37.000000000 +0100
16.7 -@@ -210,6 +210,26 @@ then
16.8 - fi
16.9 - ])
16.10 -
16.11 -+dnl ### A macro to determine whether statfs64 is defined.
16.12 -+AC_DEFUN([AC_STATFS64],
16.13 -+[AC_MSG_CHECKING(for statfs64 in sys/(statfs|vfs).h)
16.14 -+AC_CACHE_VAL(ac_cv_type_statfs64,
16.15 -+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX
16.16 -+#include <linux/types.h>
16.17 -+#include <sys/statfs.h>
16.18 -+#else
16.19 -+#include <sys/vfs.h>
16.20 -+#endif]], [[struct statfs64 st;]])],[ac_cv_type_statfs64=yes],[ac_cv_type_statfs64=no])])
16.21 -+AC_MSG_RESULT($ac_cv_type_statfs64)
16.22 -+if test "$ac_cv_type_statfs64" = yes
16.23 -+then
16.24 -+ AC_DEFINE([HAVE_STATFS64], 1,
16.25 -+[Define if statfs64 is available in sys/statfs.h or sys/vfs.h.])
16.26 -+fi
16.27 -+])
16.28 -+
16.29 -+
16.30 -+
16.31 - dnl ### A macro to determine if off_t is a long long
16.32 - AC_DEFUN([AC_OFF_T_IS_LONG_LONG],
16.33 - [AC_MSG_CHECKING(for long long off_t)
16.34 -diff -dup strace-4.5.15.orig/configure.ac strace-4.5.15/configure.ac
16.35 ---- strace-4.5.15.orig/configure.ac 2007-01-11 12:37:55.000000000 +0100
16.36 -+++ strace-4.5.15/configure.ac 2007-01-29 17:32:02.000000000 +0100
16.37 -@@ -169,6 +169,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize
16.38 - struct stat.st_level,
16.39 - struct stat.st_rdev])
16.40 - AC_STAT64
16.41 -+AC_STATFS64
16.42 -
16.43 - AC_TYPE_SIGNAL
16.44 - AC_TYPE_UID_T
16.45 -diff -dup strace-4.5.15.orig/file.c strace-4.5.15/file.c
16.46 ---- strace-4.5.15.orig/file.c 2007-01-15 21:25:52.000000000 +0100
16.47 -+++ strace-4.5.15/file.c 2007-01-29 17:33:15.000000000 +0100
16.48 -@@ -1635,7 +1635,7 @@ struct tcb *tcp;
16.49 - return 0;
16.50 - }
16.51 -
16.52 --#ifdef LINUX
16.53 -+#ifdef HAVE_STATFS64
16.54 - static void
16.55 - printstatfs64(tcp, addr)
16.56 - struct tcb *tcp;
17.1 --- a/patches/strace/4.5.15/strace-superh-update.ac.patch Sat Jul 14 17:02:05 2007 +0000
17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
17.3 @@ -1,22 +0,0 @@
17.4 ---- strace-4.5.15.orig/configure.ac 2007-01-11 12:37:55.000000000 +0100
17.5 -+++ strace-4.5.15/configure.ac 2007-01-29 17:38:26.000000000 +0100
17.6 -@@ -91,14 +91,14 @@ hppa*|parisc*)
17.7 - arch=hppa
17.8 - AC_DEFINE([HPPA], 1, [Define for the HPPA architecture.])
17.9 - ;;
17.10 --sh)
17.11 -- arch=sh
17.12 -- AC_DEFINE([SH], 1, [Define for the SH architecture.])
17.13 -- ;;
17.14 - sh64)
17.15 - arch=sh64
17.16 - AC_DEFINE([SH64], 1, [Define for the SH64 architecture.])
17.17 - ;;
17.18 -+sh*)
17.19 -+ arch=sh
17.20 -+ AC_DEFINE([SH], 1, [Define for the SH architecture.])
17.21 -+ ;;
17.22 - x86?64*)
17.23 - arch=x86_64
17.24 - AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.])
17.25 -
18.1 --- a/patches/strace/4.5.15/strace-undef-CTL_PROC.patch Sat Jul 14 17:02:05 2007 +0000
18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
18.3 @@ -1,12 +0,0 @@
18.4 ---- strace-4.5.12/system.c.oorig 2005-06-01 21:22:06.000000000 +0200
18.5 -+++ strace-4.5.12/system.c 2006-09-28 18:18:31.000000000 +0200
18.6 -@@ -1572,7 +1572,9 @@
18.7 - { CTL_KERN, "CTL_KERN" },
18.8 - { CTL_VM, "CTL_VM" },
18.9 - { CTL_NET, "CTL_NET" },
18.10 -+#ifdef CTL_PROC
18.11 - { CTL_PROC, "CTL_PROC" },
18.12 -+#endif
18.13 - { CTL_FS, "CTL_FS" },
18.14 - { CTL_DEBUG, "CTL_DEBUG" },
18.15 - { CTL_DEV, "CTL_DEV" },
19.1 --- a/patches/strace/4.5.15/strace-undef-PACKET_MEMBERSHIP.patch Sat Jul 14 17:02:05 2007 +0000
19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
19.3 @@ -1,15 +0,0 @@
19.4 ---- strace-4.5.14/net.c.oorig 2005-07-05 01:33:38.000000000 +0200
19.5 -+++ strace-4.5.14/net.c 2006-10-09 16:35:02.000000000 +0200
19.6 -@@ -800,8 +800,12 @@
19.7 -
19.8 - #ifdef SOL_PACKET
19.9 - static const struct xlat sockpacketoptions[] = {
19.10 -+#if defined(PACKET_ADD_MEMBERSHIP)
19.11 - { PACKET_ADD_MEMBERSHIP, "PACKET_ADD_MEMBERSHIP" },
19.12 -+#endif
19.13 -+#if defined(PACKET_DROP_MEMBERSHIP)
19.14 - { PACKET_DROP_MEMBERSHIP, "PACKET_DROP_MEMBERSHIP"},
19.15 -+#endif
19.16 - #if defined(PACKET_RECV_OUTPUT)
19.17 - { PACKET_RECV_OUTPUT, "PACKET_RECV_OUTPUT" },
19.18 - #endif
20.1 --- a/patches/strace/4.5.15/strace-undef-syscall.patch Sat Jul 14 17:02:05 2007 +0000
20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
20.3 @@ -1,62 +0,0 @@
20.4 ---- strace-4.5.12/linux/syscallent.h.orig 2005-08-09 01:48:54.000000000 -0600
20.5 -+++ strace-4.5.12/linux/syscallent.h 2005-08-09 01:50:23.000000000 -0600
20.6 -@@ -298,7 +298,11 @@
20.7 - { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */
20.8 - { 5, TF, sys_fadvise64, "fadvise64" }, /* 250 */
20.9 - { 5, 0, printargs, "SYS_251" }, /* 251 */
20.10 -- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */
20.11 -+ { 1, TP, sys_exit, "exit_group"
20.12 -+#ifdef __NR_exit_group
20.13 -+ , __NR_exit_group
20.14 -+#endif
20.15 -+ }, /* 252 */
20.16 - { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
20.17 - { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */
20.18 - { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 255 */
20.19 ---- strace-4.5.15.orig/linux/syscallent.h 2007-02-04 19:03:48.000000000 +0100
20.20 -+++ strace-4.5.15/linux/syscallent.h 2007-02-04 19:11:04.000000000 +0100
20.21 -@@ -130,7 +130,10 @@
20.22 - { 2, TF, sys_statfs, "statfs" }, /* 99 */
20.23 - { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */
20.24 - { 3, 0, sys_ioperm, "ioperm" }, /* 101 */
20.25 -- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */
20.26 -+ { 2, TD, sys_socketcall, "socketcall",
20.27 -+#ifdef __NR_socketcall
20.28 -+ SYS_socketcall }, /* 102 */
20.29 -+#endif
20.30 - { 3, 0, sys_syslog, "syslog" }, /* 103 */
20.31 - { 3, 0, sys_setitimer, "setitimer" }, /* 104 */
20.32 - { 2, 0, sys_getitimer, "getitimer" }, /* 105 */
20.33 -@@ -145,7 +148,10 @@
20.34 - { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */
20.35 - { 1, 0, sys_swapoff, "swapoff" }, /* 115 */
20.36 - { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */
20.37 -- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */
20.38 -+ { 6, 0, sys_ipc, "ipc",
20.39 -+#ifdef __NR_ipc
20.40 -+ SYS_ipc }, /* 117 */
20.41 -+#endif
20.42 - { 1, TD, sys_fsync, "fsync" }, /* 118 */
20.43 - { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */
20.44 - { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */
20.45 ---- strace-4.5.15.orig/syscall.c 2007-02-04 19:03:48.000000000 +0100
20.46 -+++ strace-4.5.15/syscall.c 2007-02-04 19:07:26.000000000 +0100
20.47 -@@ -2404,14 +2404,18 @@
20.48 - switch (known_scno(tcp)) {
20.49 - #ifdef LINUX
20.50 - #if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA)
20.51 -+#ifdef __NR_socketcall
20.52 - case SYS_socketcall:
20.53 - decode_subcall(tcp, SYS_socket_subcall,
20.54 - SYS_socket_nsubcalls, deref_style);
20.55 - break;
20.56 -+#endif
20.57 -+#ifdef __NR_ipc
20.58 - case SYS_ipc:
20.59 - decode_subcall(tcp, SYS_ipc_subcall,
20.60 - SYS_ipc_nsubcalls, shift_style);
20.61 - break;
20.62 -+#endif
20.63 - #endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */
20.64 - #if defined (SPARC) || defined (SPARC64)
20.65 - case SYS_socketcall: