1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.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
     1.3 @@ -0,0 +1,78 @@
     1.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
     1.5 +Date: 2013-08-26
     1.6 +Initial Package Version: 4.8
     1.7 +Upstream Status: Unknown
     1.8 +Origin: Unknown
     1.9 +Description: Fixes compilation with glibc-2.18.
    1.10 +From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net.
    1.11 +http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm
    1.12 +Their changelog reports:
    1.13 + * Wed Aug 14 2013 schwab@suse.de
    1.14 + - strace-linux-ptrace-h.patch: handle conflict with struct
    1.15 +   ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
    1.16 +
    1.17 +
    1.18 +Index: strace-4.8/process.c
    1.19 +===================================================================
    1.20 +--- strace-4.8.orig/process.c
    1.21 ++++ strace-4.8/process.c
    1.22 +@@ -63,9 +63,11 @@
    1.23 + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
    1.24 + #  define pt_all_user_regs XXX_pt_all_user_regs
    1.25 + # endif
    1.26 ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
    1.27 + # include <linux/ptrace.h>
    1.28 + # undef ia64_fpreg
    1.29 + # undef pt_all_user_regs
    1.30 ++# undef ptrace_peeksiginfo_args
    1.31 + #endif
    1.32 + 
    1.33 + #if defined(SPARC64)
    1.34 +Index: strace-4.8/signal.c
    1.35 +===================================================================
    1.36 +--- strace-4.8.orig/signal.c
    1.37 ++++ strace-4.8/signal.c
    1.38 +@@ -51,9 +51,11 @@
    1.39 + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
    1.40 + #  define pt_all_user_regs XXX_pt_all_user_regs
    1.41 + # endif
    1.42 ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
    1.43 + # include <linux/ptrace.h>
    1.44 + # undef ia64_fpreg
    1.45 + # undef pt_all_user_regs
    1.46 ++# undef ptrace_peeksiginfo_args
    1.47 + #endif
    1.48 + 
    1.49 + #ifdef IA64
    1.50 +Index: strace-4.8/syscall.c
    1.51 +===================================================================
    1.52 +--- strace-4.8.orig/syscall.c
    1.53 ++++ strace-4.8/syscall.c
    1.54 +@@ -48,9 +48,11 @@
    1.55 + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
    1.56 + #  define pt_all_user_regs XXX_pt_all_user_regs
    1.57 + # endif
    1.58 ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
    1.59 + # include <linux/ptrace.h>
    1.60 + # undef ia64_fpreg
    1.61 + # undef pt_all_user_regs
    1.62 ++# undef ptrace_peeksiginfo_args
    1.63 + #endif
    1.64 + 
    1.65 + #if defined(SPARC64)
    1.66 +Index: strace-4.8/util.c
    1.67 +===================================================================
    1.68 +--- strace-4.8.orig/util.c
    1.69 ++++ strace-4.8/util.c
    1.70 +@@ -55,9 +55,11 @@
    1.71 + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
    1.72 + #  define pt_all_user_regs XXX_pt_all_user_regs
    1.73 + # endif
    1.74 ++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
    1.75 + # include <linux/ptrace.h>
    1.76 + # undef ia64_fpreg
    1.77 + # undef pt_all_user_regs
    1.78 ++# undef ptrace_peeksiginfo_args
    1.79 + #endif
    1.80 + 
    1.81 + int