From 45aed90fa01da1a431fbdd29e6c2917bab5b69cc1fdeaf0fcb9b4441258143ac Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 14 Aug 2013 12:25:16 +0000
Subject: [PATCH] Accepting request 187005 from home:Andreas_Schwab:Factory

- strace-linux-ptrace-h.patch: handle conflict with struct
  ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>

OBS-URL: https://build.opensuse.org/request/show/187005
OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=31
---
 strace-linux-ptrace-h.patch | 64 +++++++++++++++++++++++++++++++++++++
 strace.changes              |  6 ++++
 strace.spec                 |  2 ++
 3 files changed, 72 insertions(+)
 create mode 100644 strace-linux-ptrace-h.patch

diff --git a/strace-linux-ptrace-h.patch b/strace-linux-ptrace-h.patch
new file mode 100644
index 0000000..a2ca4bc
--- /dev/null
+++ b/strace-linux-ptrace-h.patch
@@ -0,0 +1,64 @@
+Index: strace-4.8/process.c
+===================================================================
+--- strace-4.8.orig/process.c
++++ strace-4.8/process.c
+@@ -63,9 +63,11 @@
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ #  define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+ # include <linux/ptrace.h>
+ # undef ia64_fpreg
+ # undef pt_all_user_regs
++# undef ptrace_peeksiginfo_args
+ #endif
+ 
+ #if defined(SPARC64)
+Index: strace-4.8/signal.c
+===================================================================
+--- strace-4.8.orig/signal.c
++++ strace-4.8/signal.c
+@@ -51,9 +51,11 @@
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ #  define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+ # include <linux/ptrace.h>
+ # undef ia64_fpreg
+ # undef pt_all_user_regs
++# undef ptrace_peeksiginfo_args
+ #endif
+ 
+ #ifdef IA64
+Index: strace-4.8/syscall.c
+===================================================================
+--- strace-4.8.orig/syscall.c
++++ strace-4.8/syscall.c
+@@ -48,9 +48,11 @@
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ #  define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+ # include <linux/ptrace.h>
+ # undef ia64_fpreg
+ # undef pt_all_user_regs
++# undef ptrace_peeksiginfo_args
+ #endif
+ 
+ #if defined(SPARC64)
+Index: strace-4.8/util.c
+===================================================================
+--- strace-4.8.orig/util.c
++++ strace-4.8/util.c
+@@ -55,9 +55,11 @@
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ #  define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
++# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+ # include <linux/ptrace.h>
+ # undef ia64_fpreg
+ # undef pt_all_user_regs
++# undef ptrace_peeksiginfo_args
+ #endif
+ 
+ int
diff --git a/strace.changes b/strace.changes
index f5d4cfa..5034c54 100644
--- a/strace.changes
+++ b/strace.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 14 09:11:17 UTC 2013 - schwab@suse.de
+
+- strace-linux-ptrace-h.patch: handle conflict with struct
+  ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
+
 -------------------------------------------------------------------
 Thu Jun 13 15:49:29 UTC 2013 - jengelh@inai.de
 
diff --git a/strace.spec b/strace.spec
index 21f33e6..2ec51af 100644
--- a/strace.spec
+++ b/strace.spec
@@ -31,6 +31,7 @@ Source2:        http://downloads.sourceforge.net/strace/%name-%version.tar.xz.as
 Source3:        %name.keyring
 Source4:        baselibs.conf
 Patch1:         strace-4.7.diff
+Patch2:         strace-linux-ptrace-h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libacl-devel
 BuildRequires:  libaio-devel
@@ -61,6 +62,7 @@ Authors:
 %{?gpg_verify: %gpg_verify %{S:2}}
 %setup -q
 %patch -P 1 -p1
+%patch2 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"