Hello community,
here is the log from the commit of package strace for openSUSE:Factory checked
in at 2013-08-15 09:16:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/strace (Old)
and /work/SRC/openSUSE:Factory/.strace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "strace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/strace/strace.changes 2013-06-18
15:35:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.strace.new/strace.changes 2013-08-15
09:16:43.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 14 09:11:17 UTC 2013 - sch...@suse.de
+
+- strace-linux-ptrace-h.patch: handle conflict with struct
+ ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
+
+-------------------------------------------------------------------
New:
----
strace-linux-ptrace-h.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ strace.spec ++++++
--- /var/tmp/diff_new_pack.zGINdk/_old 2013-08-15 09:16:44.000000000 +0200
+++ /var/tmp/diff_new_pack.zGINdk/_new 2013-08-15 09:16:44.000000000 +0200
@@ -31,6 +31,7 @@
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 @@
%{?gpg_verify: %gpg_verify %{S:2}}
%setup -q
%patch -P 1 -p1
+%patch2 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
++++++ strace-linux-ptrace-h.patch ++++++
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
