1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
3 Initial Package Version: 4.8
4 Upstream Status: Unknown
6 Description: Fixes compilation with glibc-2.18.
7 From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net.
8 http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm
9 Their changelog reports:
10 * Wed Aug 14 2013 schwab@suse.de
11 - strace-linux-ptrace-h.patch: handle conflict with struct
12 ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
15 Index: strace-4.8/process.c
16 ===================================================================
17 --- strace-4.8.orig/process.c
18 +++ strace-4.8/process.c
20 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
21 # define pt_all_user_regs XXX_pt_all_user_regs
23 +# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
24 # include <linux/ptrace.h>
26 # undef pt_all_user_regs
27 +# undef ptrace_peeksiginfo_args
31 Index: strace-4.8/signal.c
32 ===================================================================
33 --- strace-4.8.orig/signal.c
34 +++ strace-4.8/signal.c
36 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
37 # define pt_all_user_regs XXX_pt_all_user_regs
39 +# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
40 # include <linux/ptrace.h>
42 # undef pt_all_user_regs
43 +# undef ptrace_peeksiginfo_args
47 Index: strace-4.8/syscall.c
48 ===================================================================
49 --- strace-4.8.orig/syscall.c
50 +++ strace-4.8/syscall.c
52 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
53 # define pt_all_user_regs XXX_pt_all_user_regs
55 +# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
56 # include <linux/ptrace.h>
58 # undef pt_all_user_regs
59 +# undef ptrace_peeksiginfo_args
63 Index: strace-4.8/util.c
64 ===================================================================
65 --- strace-4.8.orig/util.c
68 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
69 # define pt_all_user_regs XXX_pt_all_user_regs
71 +# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
72 # include <linux/ptrace.h>
74 # undef pt_all_user_regs
75 +# undef ptrace_peeksiginfo_args