From a128e6fb54d8bb1329532999223829ebe474a31b Mon Sep 17 00:00:00 2001
From: Daniel Zimmermann <netzimme@gmail.com>
Date: Mon, 25 Nov 2013 08:56:55 +0100
Subject: debug/strace: pump version to 4.7 and 4.8

Pump version for strace to 4.7 and 4.8.
Add patch from strace mainline.


 Work around conflict between <sys/ptrace.h> and <linux/ptrace.h>

  Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args
  which collides with <linux/ptrace.h>.

   * configure.ac: Check for `struct ptrace_peeksiginfo_args' in
   <sys/ptrace.h>.
   * process.c: Work around potential conflict between <sys/ptrace.h>
   and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args.
   * signal.c: Likewise.
   * syscall.c: Likewise.
   * util.c: Likewise.
   http://sourceforge.net/p/strace/code/ci/0b4060f61f1bb101b5d8d084714b7d2feacdb199/

Signed-off-by: "Daniel Zimmermann" <netzimme@gmail.com>
Message-Id: <67b082cf1cdc8276eb4a.1385366288@haus-VirtualBox>
Patchwork-Id: 293842

diff --git a/config/debug/strace.in b/config/debug/strace.in
index 5cdef7e..19563a9 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -8,6 +8,16 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config STRACE_V_4_8
+    bool
+    prompt "4.8"
+    depends on CONFIGURE_has_xz
+
+config STRACE_V_4_7
+    bool
+    prompt "4.7"
+    depends on CONFIGURE_has_xz
+
 config STRACE_V_4_6
     bool
     prompt "4.6"
@@ -31,6 +41,8 @@ config STRACE_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "4.8" if STRACE_V_4_8
+    default "4.7" if STRACE_V_4_7
     default "4.6" if STRACE_V_4_6
     default "4.5.20" if STRACE_V_4_5_20
     default "4.5.19" if STRACE_V_4_5_19
diff --git a/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch b/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
new file mode 100644
index 0000000..49a71e1
--- /dev/null
+++ b/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
@@ -0,0 +1,78 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2013-08-26
+Initial Package Version: 4.8
+Upstream Status: Unknown
+Origin: Unknown
+Description: Fixes compilation with glibc-2.18.
+From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net.
+http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm
+Their changelog reports:
+ * Wed Aug 14 2013 schwab@suse.de
+ - strace-linux-ptrace-h.patch: handle conflict with struct
+   ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
+
+
+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
-- 
cgit v0.10.2-6-g49f6