1.1 --- a/config/debug/strace.in Fri Oct 24 15:40:58 2008 +0000
1.2 +++ b/config/debug/strace.in Sat Oct 25 15:44:05 2008 +0000
1.3 @@ -24,6 +24,10 @@
1.4 bool
1.5 prompt "4.5.16"
1.6
1.7 +config STRACE_V_4_5_17
1.8 + bool
1.9 + prompt "4.5.17"
1.10 +
1.11 config STRACE_V_4_5_18
1.12 bool
1.13 prompt "4.5.18 (EXPERIMENTAL)"
1.14 @@ -39,6 +43,7 @@
1.15 default "4.5.14" if STRACE_V_4_5_14
1.16 default "4.5.15" if STRACE_V_4_5_15
1.17 default "4.5.16" if STRACE_V_4_5_16
1.18 + default "4.5.17" if STRACE_V_4_5_17
1.19 default "4.5.18" if STRACE_V_4_5_18
1.20 # CT_INSERT_VERSION_STRING_ABOVE
1.21 # # Don't remove above line!
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/strace/4.5.17/100-autoreconf.patch Sat Oct 25 15:44:05 2008 +0000
2.3 @@ -0,0 +1,81 @@
2.4 +Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/100-autoreconf.patch
2.5 +-= BEGIN original header =-
2.6 +diff -dur strace-4.5.16.orig/configure strace-4.5.16/configure
2.7 +-= END original header =-
2.8 +diff -durN strace-4.5.17.orig/configure strace-4.5.17/configure
2.9 +--- strace-4.5.17.orig/configure 2008-07-22 02:43:21.000000000 +0200
2.10 ++++ strace-4.5.17/configure 2008-10-24 21:30:13.000000000 +0200
2.11 +@@ -5808,6 +5808,73 @@
2.12 +
2.13 + fi
2.14 +
2.15 ++echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
2.16 ++echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
2.17 ++if test "${ac_cv_type_statfs64+set}" = set; then
2.18 ++ echo $ECHO_N "(cached) $ECHO_C" >&6
2.19 ++else
2.20 ++ cat >conftest.$ac_ext <<_ACEOF
2.21 ++/* confdefs.h. */
2.22 ++_ACEOF
2.23 ++cat confdefs.h >>conftest.$ac_ext
2.24 ++cat >>conftest.$ac_ext <<_ACEOF
2.25 ++/* end confdefs.h. */
2.26 ++#ifdef LINUX
2.27 ++#include <linux/types.h>
2.28 ++#include <sys/statfs.h>
2.29 ++#else
2.30 ++#include <sys/vfs.h>
2.31 ++#endif
2.32 ++int
2.33 ++main ()
2.34 ++{
2.35 ++struct statfs64 st;
2.36 ++ ;
2.37 ++ return 0;
2.38 ++}
2.39 ++_ACEOF
2.40 ++rm -f conftest.$ac_objext
2.41 ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2.42 ++ (eval $ac_compile) 2>conftest.er1
2.43 ++ ac_status=$?
2.44 ++ grep -v '^ *+' conftest.er1 >conftest.err
2.45 ++ rm -f conftest.er1
2.46 ++ cat conftest.err >&5
2.47 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
2.48 ++ (exit $ac_status); } &&
2.49 ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
2.50 ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2.51 ++ (eval $ac_try) 2>&5
2.52 ++ ac_status=$?
2.53 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
2.54 ++ (exit $ac_status); }; } &&
2.55 ++ { ac_try='test -s conftest.$ac_objext'
2.56 ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2.57 ++ (eval $ac_try) 2>&5
2.58 ++ ac_status=$?
2.59 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
2.60 ++ (exit $ac_status); }; }; then
2.61 ++ ac_cv_type_statfs64=yes
2.62 ++else
2.63 ++ echo "$as_me: failed program was:" >&5
2.64 ++sed 's/^/| /' conftest.$ac_ext >&5
2.65 ++
2.66 ++ac_cv_type_statfs64=no
2.67 ++fi
2.68 ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2.69 ++fi
2.70 ++
2.71 ++echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
2.72 ++echo "${ECHO_T}$ac_cv_type_statfs64" >&6
2.73 ++if test "$ac_cv_type_statfs64" = yes
2.74 ++then
2.75 ++
2.76 ++cat >>confdefs.h <<\_ACEOF
2.77 ++#define HAVE_STATFS64 1
2.78 ++_ACEOF
2.79 ++
2.80 ++fi
2.81 ++
2.82 +
2.83 + { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
2.84 + echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/strace/4.5.17/110-dont-use-REG_SYSCALL-for-sh.patch Sat Oct 25 15:44:05 2008 +0000
3.3 @@ -0,0 +1,15 @@
3.4 +Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/110-dont-use-REG_SYSCALL-for-sh.patch
3.5 +-= BEGIN original header =-
3.6 +diff -dur strace-4.5.16.orig/process.c strace-4.5.16/process.c
3.7 +-= END original header =-
3.8 +diff -durN strace-4.5.17.orig/process.c strace-4.5.17/process.c
3.9 +--- strace-4.5.17.orig/process.c 2008-07-18 04:16:47.000000000 +0200
3.10 ++++ strace-4.5.17/process.c 2008-10-24 21:30:13.000000000 +0200
3.11 +@@ -2726,7 +2726,6 @@
3.12 + { 4*REG_GBR, "4*REG_GBR" },
3.13 + { 4*REG_MACH, "4*REG_MACH" },
3.14 + { 4*REG_MACL, "4*REG_MACL" },
3.15 +- { 4*REG_SYSCALL, "4*REG_SYSCALL" },
3.16 + { 4*REG_FPUL, "4*REG_FPUL" },
3.17 + { 4*REG_FPREG0, "4*REG_FPREG0" },
3.18 + { 4*(REG_FPREG0+1), "4*REG_FPREG1" },
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/patches/strace/4.5.17/120-fix-arm-bad-syscall.patch Sat Oct 25 15:44:05 2008 +0000
4.3 @@ -0,0 +1,23 @@
4.4 +Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/120-fix-arm-bad-syscall.patch
4.5 +-= BEGIN original header =-
4.6 +diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
4.7 +-= END original header =-
4.8 +diff -durN strace-4.5.17.orig/syscall.c strace-4.5.17/syscall.c
4.9 +--- strace-4.5.17.orig/syscall.c 2008-05-28 01:18:29.000000000 +0200
4.10 ++++ strace-4.5.17/syscall.c 2008-10-24 21:30:13.000000000 +0200
4.11 +@@ -1016,6 +1016,15 @@
4.12 + /*
4.13 + * Note: we only deal with only 32-bit CPUs here.
4.14 + */
4.15 ++
4.16 ++ if (!(tcp->flags & TCB_INSYSCALL) &&
4.17 ++ (tcp->flags & TCB_WAITEXECVE)) {
4.18 ++ /* caught a fake syscall from the execve's exit */
4.19 ++ tcp->flags &= ~TCB_WAITEXECVE;
4.20 ++ return 0;
4.21 ++ }
4.22 ++
4.23 ++
4.24 + if (regs.ARM_cpsr & 0x20) {
4.25 + /*
4.26 + * Get the Thumb-mode system call number
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/patches/strace/4.5.17/130-fix-disabled-largefile-syscalls.patch Sat Oct 25 15:44:05 2008 +0000
5.3 @@ -0,0 +1,26 @@
5.4 +Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/130-fix-disabled-largefile-syscalls.patch
5.5 +-= BEGIN original header =-
5.6 +diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
5.7 +-= END original header =-
5.8 +diff -durN strace-4.5.17.orig/syscall.c strace-4.5.17/syscall.c
5.9 +--- strace-4.5.17.orig/syscall.c 2008-10-24 21:30:13.000000000 +0200
5.10 ++++ strace-4.5.17/syscall.c 2008-10-24 21:30:13.000000000 +0200
5.11 +@@ -125,6 +125,18 @@
5.12 + #define TP TRACE_PROCESS
5.13 + #define TS TRACE_SIGNAL
5.14 +
5.15 ++#ifndef HAVE_STATFS64
5.16 ++/*
5.17 ++ * Ugly hacks for systems that do not have LFS
5.18 ++ */
5.19 ++
5.20 ++#define sys_truncate64 sys_truncate
5.21 ++#define sys_ftruncate64 sys_ftruncate
5.22 ++#define sys_getdents64 sys_getdents
5.23 ++#define sys_statfs64 sys_statfs
5.24 ++#define sys_fstatfs64 sys_fstatfs
5.25 ++#endif
5.26 ++
5.27 + static const struct sysent sysent0[] = {
5.28 + #include "syscallent.h"
5.29 + };
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/patches/strace/4.5.17/140-statfs64-check.patch Sat Oct 25 15:44:05 2008 +0000
6.3 @@ -0,0 +1,57 @@
6.4 +Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/140-statfs64-check.patch
6.5 +-= BEGIN original header =-
6.6 +diff -dur strace-4.5.16.orig/acinclude.m4 strace-4.5.16/acinclude.m4
6.7 +-= END original header =-
6.8 +diff -durN strace-4.5.17.orig/acinclude.m4 strace-4.5.17/acinclude.m4
6.9 +--- strace-4.5.17.orig/acinclude.m4 2004-04-14 04:21:01.000000000 +0200
6.10 ++++ strace-4.5.17/acinclude.m4 2008-10-24 21:30:13.000000000 +0200
6.11 +@@ -210,6 +210,26 @@
6.12 + fi
6.13 + ])
6.14 +
6.15 ++dnl ### A macro to determine whether statfs64 is defined.
6.16 ++AC_DEFUN([AC_STATFS64],
6.17 ++[AC_MSG_CHECKING(for statfs64 in sys/(statfs|vfs).h)
6.18 ++AC_CACHE_VAL(ac_cv_type_statfs64,
6.19 ++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX
6.20 ++#include <linux/types.h>
6.21 ++#include <sys/statfs.h>
6.22 ++#else
6.23 ++#include <sys/vfs.h>
6.24 ++#endif]], [[struct statfs64 st;]])],[ac_cv_type_statfs64=yes],[ac_cv_type_statfs64=no])])
6.25 ++AC_MSG_RESULT($ac_cv_type_statfs64)
6.26 ++if test "$ac_cv_type_statfs64" = yes
6.27 ++then
6.28 ++ AC_DEFINE([HAVE_STATFS64], 1,
6.29 ++[Define if statfs64 is available in sys/statfs.h or sys/vfs.h.])
6.30 ++fi
6.31 ++])
6.32 ++
6.33 ++
6.34 ++
6.35 + dnl ### A macro to determine if off_t is a long long
6.36 + AC_DEFUN([AC_OFF_T_IS_LONG_LONG],
6.37 + [AC_MSG_CHECKING(for long long off_t)
6.38 +diff -durN strace-4.5.17.orig/configure.ac strace-4.5.17/configure.ac
6.39 +--- strace-4.5.17.orig/configure.ac 2008-07-22 02:42:29.000000000 +0200
6.40 ++++ strace-4.5.17/configure.ac 2008-10-24 21:30:13.000000000 +0200
6.41 +@@ -169,6 +169,7 @@
6.42 + struct stat.st_level,
6.43 + struct stat.st_rdev])
6.44 + AC_STAT64
6.45 ++AC_STATFS64
6.46 +
6.47 + AC_TYPE_SIGNAL
6.48 + AC_TYPE_UID_T
6.49 +diff -durN strace-4.5.17.orig/file.c strace-4.5.17/file.c
6.50 +--- strace-4.5.17.orig/file.c 2008-05-20 06:56:18.000000000 +0200
6.51 ++++ strace-4.5.17/file.c 2008-10-24 21:30:13.000000000 +0200
6.52 +@@ -1703,7 +1703,7 @@
6.53 + return 0;
6.54 + }
6.55 +
6.56 +-#ifdef LINUX
6.57 ++#ifdef HAVE_STATFS64
6.58 + static void
6.59 + printstatfs64(tcp, addr)
6.60 + struct tcb *tcp;
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/patches/strace/4.5.17/150-undef-CTL_PROC.patch Sat Oct 25 15:44:05 2008 +0000
7.3 @@ -0,0 +1,17 @@
7.4 +Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/150-undef-CTL_PROC.patch
7.5 +-= BEGIN original header =-
7.6 +diff -dur strace-4.5.16.orig/system.c strace-4.5.16/system.c
7.7 +-= END original header =-
7.8 +diff -durN strace-4.5.17.orig/system.c strace-4.5.17/system.c
7.9 +--- strace-4.5.17.orig/system.c 2007-01-17 00:22:36.000000000 +0100
7.10 ++++ strace-4.5.17/system.c 2008-10-24 21:30:13.000000000 +0200
7.11 +@@ -1612,7 +1612,9 @@
7.12 + { CTL_KERN, "CTL_KERN" },
7.13 + { CTL_VM, "CTL_VM" },
7.14 + { CTL_NET, "CTL_NET" },
7.15 ++#ifdef CTL_PROC
7.16 + { CTL_PROC, "CTL_PROC" },
7.17 ++#endif
7.18 + { CTL_FS, "CTL_FS" },
7.19 + { CTL_DEBUG, "CTL_DEBUG" },
7.20 + { CTL_DEV, "CTL_DEV" },
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/patches/strace/4.5.17/160-undef-syscall.patch Sat Oct 25 15:44:05 2008 +0000
8.3 @@ -0,0 +1,68 @@
8.4 +Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/160-undef-syscall.patch
8.5 +-= BEGIN original header =-
8.6 +diff -dur strace-4.5.16.orig/linux/syscallent.h strace-4.5.16/linux/syscallent.h
8.7 +-= END original header =-
8.8 +diff -durN strace-4.5.17.orig/linux/syscallent.h strace-4.5.17/linux/syscallent.h
8.9 +--- strace-4.5.17.orig/linux/syscallent.h 2008-07-18 03:23:49.000000000 +0200
8.10 ++++ strace-4.5.17/linux/syscallent.h 2008-10-24 21:30:13.000000000 +0200
8.11 +@@ -130,7 +130,11 @@
8.12 + { 2, TF, sys_statfs, "statfs" }, /* 99 */
8.13 + { 2, TD, sys_fstatfs, "fstatfs" }, /* 100 */
8.14 + { 3, 0, sys_ioperm, "ioperm" }, /* 101 */
8.15 +- { 2, TD, sys_socketcall, "socketcall", SYS_socketcall }, /* 102 */
8.16 ++ { 2, TD, sys_socketcall, "socketcall"
8.17 ++#ifdef __NR_socketcall
8.18 ++ , SYS_socketcall
8.19 ++#endif
8.20 ++ }, /* 102 */
8.21 + { 3, 0, sys_syslog, "syslog" }, /* 103 */
8.22 + { 3, 0, sys_setitimer, "setitimer" }, /* 104 */
8.23 + { 2, 0, sys_getitimer, "getitimer" }, /* 105 */
8.24 +@@ -145,7 +149,11 @@
8.25 + { 4, TP, sys_wait4, "wait4", SYS_wait4 }, /* 114 */
8.26 + { 1, 0, sys_swapoff, "swapoff" }, /* 115 */
8.27 + { 1, 0, sys_sysinfo, "sysinfo" }, /* 116 */
8.28 +- { 6, 0, sys_ipc, "ipc", SYS_ipc }, /* 117 */
8.29 ++ { 6, 0, sys_ipc, "ipc"
8.30 ++#ifdef __NR_ipc
8.31 ++ , SYS_ipc
8.32 ++#endif
8.33 ++ }, /* 117 */
8.34 + { 1, TD, sys_fsync, "fsync" }, /* 118 */
8.35 + { 1, TS, sys_sigreturn, "sigreturn" }, /* 119 */
8.36 + { 5, TP, sys_clone, "clone", SYS_clone }, /* 120 */
8.37 +@@ -282,7 +290,11 @@
8.38 + { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */
8.39 + { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */
8.40 + { 5, 0, printargs, "SYS_251" }, /* 251 */
8.41 +- { 1, TP, sys_exit, "exit_group", __NR_exit_group }, /* 252 */
8.42 ++ { 1, TP, sys_exit, "exit_group"
8.43 ++#ifdef __NR_exit_group
8.44 ++ , __NR_exit_group
8.45 ++#endif
8.46 ++ }, /* 252 */
8.47 + { 4, 0, printargs, "lookup_dcookie"}, /* 253 */
8.48 + { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */
8.49 + { 4, TD, sys_epoll_ctl, "epoll_ctl" }, /* 255 */
8.50 +diff -durN strace-4.5.17.orig/syscall.c strace-4.5.17/syscall.c
8.51 +--- strace-4.5.17.orig/syscall.c 2008-10-24 21:30:13.000000000 +0200
8.52 ++++ strace-4.5.17/syscall.c 2008-10-24 21:30:13.000000000 +0200
8.53 +@@ -2452,14 +2452,18 @@
8.54 + switch (known_scno(tcp)) {
8.55 + #ifdef LINUX
8.56 + #if !defined (ALPHA) && !defined(MIPS) && !defined(HPPA)
8.57 ++#ifdef __NR_socketcall
8.58 + case SYS_socketcall:
8.59 + decode_subcall(tcp, SYS_socket_subcall,
8.60 + SYS_socket_nsubcalls, deref_style);
8.61 + break;
8.62 ++#endif
8.63 ++#ifdef __NR_ipc
8.64 + case SYS_ipc:
8.65 + decode_subcall(tcp, SYS_ipc_subcall,
8.66 + SYS_ipc_nsubcalls, shift_style);
8.67 + break;
8.68 ++#endif
8.69 + #endif /* !(ALPHA || MIPS || HPPA) */
8.70 + #endif /* LINUX */
8.71 + #ifdef SVR4
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/patches/strace/4.5.17/170-arm-syscalls.patch Sat Oct 25 15:44:05 2008 +0000
9.3 @@ -0,0 +1,42 @@
9.4 +Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/170-arm-syscalls.patch
9.5 +-= BEGIN original header =-
9.6 +Author: Michael Abbott <michael.abbott@diamond.ac.uk>
9.7 +Date: Wed Oct 22 08:53:42 2008 +0100
9.8 +
9.9 + Syscall patch for ARM
9.10 + Patch mailed to strace mailing list by Anderson Lizardo, work by
9.11 + Bruna Moreira, dated 2008-01-25. Patch cleaned up against 4.5.17 release.
9.12 +
9.13 +diff --git a/linux/arm/errnoent1.h b/linux/arm/errnoent1.h
9.14 +new file mode 100644
9.15 +index 0000000..a894827
9.16 +-= END original header =-
9.17 +diff -durN b/linux/arm/errnoent1.h b/linux/arm/errnoent1.h
9.18 +--- b/linux/arm/errnoent1.h 1970-01-01 01:00:00.000000000 +0100
9.19 ++++ b/linux/arm/errnoent1.h 2008-10-24 21:30:13.000000000 +0200
9.20 +@@ -0,0 +1,2 @@
9.21 ++/* Our second set comes from the i386 files. */
9.22 ++#include "../errnoent.h"
9.23 +diff -durN b/linux/arm/ioctlent1.h b/linux/arm/ioctlent1.h
9.24 +--- b/linux/arm/ioctlent1.h 1970-01-01 01:00:00.000000000 +0100
9.25 ++++ b/linux/arm/ioctlent1.h 2008-10-24 21:30:13.000000000 +0200
9.26 +@@ -0,0 +1,2 @@
9.27 ++/* Our second set comes from the i386 files. */
9.28 ++#include "../ioctlent.h"
9.29 +diff -durN b/linux/arm/signalent1.h b/linux/arm/signalent1.h
9.30 +--- b/linux/arm/signalent1.h 1970-01-01 01:00:00.000000000 +0100
9.31 ++++ b/linux/arm/signalent1.h 2008-10-24 21:30:13.000000000 +0200
9.32 +@@ -0,0 +1,2 @@
9.33 ++/* Our second set comes from the i386 files. */
9.34 ++#include "../signalent.h"
9.35 +diff -durN b/linux/arm/syscallent1.h b/linux/arm/syscallent1.h
9.36 +--- b/linux/arm/syscallent1.h 1970-01-01 01:00:00.000000000 +0100
9.37 ++++ b/linux/arm/syscallent1.h 2008-10-24 21:30:13.000000000 +0200
9.38 +@@ -0,0 +1,7 @@
9.39 ++/* ARM specific syscalls */
9.40 ++ { 5, 0, printargs, "SYS_0" }, /* 0 */
9.41 ++ { 5, 0, printargs, "breakpoint" }, /* 1 */
9.42 ++ { 5, 0, printargs, "cacheflush" }, /* 2 */
9.43 ++ { 5, 0, printargs, "usr26" }, /* 3 */
9.44 ++ { 5, 0, printargs, "usr32" }, /* 4 */
9.45 ++ { 5, 0, printargs, "set_tls" }, /* 5 */