| author | Daniel Zimmermann <netzimme@gmail.com> |
| Mon Nov 25 08:56:55 2013 +0100 (2013-11-25) | |
| changeset 3255 | 4f3536b12be5 |
| permissions | -rw-r--r-- |
| netzimme@3255 | 1 |
Submitted By: Ken Moffat <ken at linuxfromscratch dot org> |
| netzimme@3255 | 2 |
Date: 2013-08-26 |
| netzimme@3255 | 3 |
Initial Package Version: 4.8 |
| netzimme@3255 | 4 |
Upstream Status: Unknown |
| netzimme@3255 | 5 |
Origin: Unknown |
| netzimme@3255 | 6 |
Description: Fixes compilation with glibc-2.18. |
| netzimme@3255 | 7 |
From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net. |
| netzimme@3255 | 8 |
http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm |
| netzimme@3255 | 9 |
Their changelog reports: |
| netzimme@3255 | 10 |
* Wed Aug 14 2013 schwab@suse.de |
| netzimme@3255 | 11 |
- strace-linux-ptrace-h.patch: handle conflict with struct |
| netzimme@3255 | 12 |
ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h> |
| netzimme@3255 | 13 |
|
| netzimme@3255 | 14 |
|
| netzimme@3255 | 15 |
Index: strace-4.8/process.c |
| netzimme@3255 | 16 |
=================================================================== |
| netzimme@3255 | 17 |
--- strace-4.8.orig/process.c |
| netzimme@3255 | 18 |
+++ strace-4.8/process.c |
| netzimme@3255 | 19 |
@@ -63,9 +63,11 @@ |
| netzimme@3255 | 20 |
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS |
| netzimme@3255 | 21 |
# define pt_all_user_regs XXX_pt_all_user_regs |
| netzimme@3255 | 22 |
# endif |
| netzimme@3255 | 23 |
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args |
| netzimme@3255 | 24 |
# include <linux/ptrace.h> |
| netzimme@3255 | 25 |
# undef ia64_fpreg |
| netzimme@3255 | 26 |
# undef pt_all_user_regs |
| netzimme@3255 | 27 |
+# undef ptrace_peeksiginfo_args |
| netzimme@3255 | 28 |
#endif |
| netzimme@3255 | 29 |
|
| netzimme@3255 | 30 |
#if defined(SPARC64) |
| netzimme@3255 | 31 |
Index: strace-4.8/signal.c |
| netzimme@3255 | 32 |
=================================================================== |
| netzimme@3255 | 33 |
--- strace-4.8.orig/signal.c |
| netzimme@3255 | 34 |
+++ strace-4.8/signal.c |
| netzimme@3255 | 35 |
@@ -51,9 +51,11 @@ |
| netzimme@3255 | 36 |
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS |
| netzimme@3255 | 37 |
# define pt_all_user_regs XXX_pt_all_user_regs |
| netzimme@3255 | 38 |
# endif |
| netzimme@3255 | 39 |
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args |
| netzimme@3255 | 40 |
# include <linux/ptrace.h> |
| netzimme@3255 | 41 |
# undef ia64_fpreg |
| netzimme@3255 | 42 |
# undef pt_all_user_regs |
| netzimme@3255 | 43 |
+# undef ptrace_peeksiginfo_args |
| netzimme@3255 | 44 |
#endif |
| netzimme@3255 | 45 |
|
| netzimme@3255 | 46 |
#ifdef IA64 |
| netzimme@3255 | 47 |
Index: strace-4.8/syscall.c |
| netzimme@3255 | 48 |
=================================================================== |
| netzimme@3255 | 49 |
--- strace-4.8.orig/syscall.c |
| netzimme@3255 | 50 |
+++ strace-4.8/syscall.c |
| netzimme@3255 | 51 |
@@ -48,9 +48,11 @@ |
| netzimme@3255 | 52 |
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS |
| netzimme@3255 | 53 |
# define pt_all_user_regs XXX_pt_all_user_regs |
| netzimme@3255 | 54 |
# endif |
| netzimme@3255 | 55 |
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args |
| netzimme@3255 | 56 |
# include <linux/ptrace.h> |
| netzimme@3255 | 57 |
# undef ia64_fpreg |
| netzimme@3255 | 58 |
# undef pt_all_user_regs |
| netzimme@3255 | 59 |
+# undef ptrace_peeksiginfo_args |
| netzimme@3255 | 60 |
#endif |
| netzimme@3255 | 61 |
|
| netzimme@3255 | 62 |
#if defined(SPARC64) |
| netzimme@3255 | 63 |
Index: strace-4.8/util.c |
| netzimme@3255 | 64 |
=================================================================== |
| netzimme@3255 | 65 |
--- strace-4.8.orig/util.c |
| netzimme@3255 | 66 |
+++ strace-4.8/util.c |
| netzimme@3255 | 67 |
@@ -55,9 +55,11 @@ |
| netzimme@3255 | 68 |
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS |
| netzimme@3255 | 69 |
# define pt_all_user_regs XXX_pt_all_user_regs |
| netzimme@3255 | 70 |
# endif |
| netzimme@3255 | 71 |
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args |
| netzimme@3255 | 72 |
# include <linux/ptrace.h> |
| netzimme@3255 | 73 |
# undef ia64_fpreg |
| netzimme@3255 | 74 |
# undef pt_all_user_regs |
| netzimme@3255 | 75 |
+# undef ptrace_peeksiginfo_args |
| netzimme@3255 | 76 |
#endif |
| netzimme@3255 | 77 |
|
| netzimme@3255 | 78 |
int |