1.1 --- a/config/debug/strace.in Tue Nov 19 14:44:02 2013 +0800
1.2 +++ b/config/debug/strace.in Mon Nov 25 08:56:55 2013 +0100
1.3 @@ -8,6 +8,16 @@
1.4 # Don't remove next line
1.5 # CT_INSERT_VERSION_BELOW
1.6
1.7 +config STRACE_V_4_8
1.8 + bool
1.9 + prompt "4.8"
1.10 + depends on CONFIGURE_has_xz
1.11 +
1.12 +config STRACE_V_4_7
1.13 + bool
1.14 + prompt "4.7"
1.15 + depends on CONFIGURE_has_xz
1.16 +
1.17 config STRACE_V_4_6
1.18 bool
1.19 prompt "4.6"
1.20 @@ -31,6 +41,8 @@
1.21 string
1.22 # Don't remove next line
1.23 # CT_INSERT_VERSION_STRING_BELOW
1.24 + default "4.8" if STRACE_V_4_8
1.25 + default "4.7" if STRACE_V_4_7
1.26 default "4.6" if STRACE_V_4_6
1.27 default "4.5.20" if STRACE_V_4_5_20
1.28 default "4.5.19" if STRACE_V_4_5_19
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch Mon Nov 25 08:56:55 2013 +0100
2.3 @@ -0,0 +1,78 @@
2.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
2.5 +Date: 2013-08-26
2.6 +Initial Package Version: 4.8
2.7 +Upstream Status: Unknown
2.8 +Origin: Unknown
2.9 +Description: Fixes compilation with glibc-2.18.
2.10 +From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net.
2.11 +http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm
2.12 +Their changelog reports:
2.13 + * Wed Aug 14 2013 schwab@suse.de
2.14 + - strace-linux-ptrace-h.patch: handle conflict with struct
2.15 + ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
2.16 +
2.17 +
2.18 +Index: strace-4.8/process.c
2.19 +===================================================================
2.20 +--- strace-4.8.orig/process.c
2.21 ++++ strace-4.8/process.c
2.22 +@@ -63,9 +63,11 @@
2.23 + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
2.24 + # define pt_all_user_regs XXX_pt_all_user_regs
2.25 + # endif
2.26 ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
2.27 + # include <linux/ptrace.h>
2.28 + # undef ia64_fpreg
2.29 + # undef pt_all_user_regs
2.30 ++# undef ptrace_peeksiginfo_args
2.31 + #endif
2.32 +
2.33 + #if defined(SPARC64)
2.34 +Index: strace-4.8/signal.c
2.35 +===================================================================
2.36 +--- strace-4.8.orig/signal.c
2.37 ++++ strace-4.8/signal.c
2.38 +@@ -51,9 +51,11 @@
2.39 + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
2.40 + # define pt_all_user_regs XXX_pt_all_user_regs
2.41 + # endif
2.42 ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
2.43 + # include <linux/ptrace.h>
2.44 + # undef ia64_fpreg
2.45 + # undef pt_all_user_regs
2.46 ++# undef ptrace_peeksiginfo_args
2.47 + #endif
2.48 +
2.49 + #ifdef IA64
2.50 +Index: strace-4.8/syscall.c
2.51 +===================================================================
2.52 +--- strace-4.8.orig/syscall.c
2.53 ++++ strace-4.8/syscall.c
2.54 +@@ -48,9 +48,11 @@
2.55 + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
2.56 + # define pt_all_user_regs XXX_pt_all_user_regs
2.57 + # endif
2.58 ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
2.59 + # include <linux/ptrace.h>
2.60 + # undef ia64_fpreg
2.61 + # undef pt_all_user_regs
2.62 ++# undef ptrace_peeksiginfo_args
2.63 + #endif
2.64 +
2.65 + #if defined(SPARC64)
2.66 +Index: strace-4.8/util.c
2.67 +===================================================================
2.68 +--- strace-4.8.orig/util.c
2.69 ++++ strace-4.8/util.c
2.70 +@@ -55,9 +55,11 @@
2.71 + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
2.72 + # define pt_all_user_regs XXX_pt_all_user_regs
2.73 + # endif
2.74 ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
2.75 + # include <linux/ptrace.h>
2.76 + # undef ia64_fpreg
2.77 + # undef pt_all_user_regs
2.78 ++# undef ptrace_peeksiginfo_args
2.79 + #endif
2.80 +
2.81 + int