Hello community,
here is the log from the commit of package strace for openSUSE:Factory checked
in at 2014-02-28 17:46:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-06
14:45:53.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.strace.new/strace.changes 2014-02-28
17:46:29.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Feb 25 17:20:43 UTC 2014 - norm...@linux.vnet.ibm.com
+
+- strace -p 99999 segfault for ppc64le archi disapear if
+ upstream patch 03ef0b2 is applied to this strace 4.8 version
+
+- added patches:
+ * strace_cid_03ef0b2.patch
+-------------------------------------------------------------------
New:
----
strace_cid_03ef0b2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ strace.spec ++++++
--- /var/tmp/diff_new_pack.XErjqf/_old 2014-02-28 17:46:29.000000000 +0100
+++ /var/tmp/diff_new_pack.XErjqf/_new 2014-02-28 17:46:29.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package strace
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -33,6 +33,7 @@
Patch1: strace-4.7.diff
Patch2: strace-linux-ptrace-h.patch
Patch3: strace-ppc64le.patch
+Patch4: strace_cid_03ef0b2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libacl-devel
BuildRequires: libaio-devel
@@ -65,6 +66,7 @@
%patch -P 1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
++++++ strace_cid_03ef0b2.patch ++++++
From: "Dmitry V. Levin" <l...@altlinux.org>
Date: Wed, 13 Nov 2013 18:09:04 +0000
Subject: [PATCH] Assume that <sys/ptrace.h> provides a valid ptrace prototype
We used to explicitly list architectures where <sys/ptrace.h> from glibc
is known to provide a valid prototype for ptrace, and use a homegrown
replacement for all the rest. Situation seems to be better nowadays,
glibc is not the only libc available, so let's use ptrace prototype from
<sys/ptrace.h> by default, leaving the replacement for rare broken cases
if any.
* defs.h: Use ptrace prototype workaround iff
NEED_PTRACE_PROTOTYPE_WORKAROUND is defined.
This patch is adapted to Suse strace 4.8 version
Signed-off-by: Michel Normand <norm...@linux.vnet.ibm.com>
---
defs.h | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
Index: strace-4.8/defs.h
===================================================================
--- strace-4.8.orig/defs.h
+++ strace-4.8/defs.h
@@ -147,27 +147,17 @@ extern char *stpcpy(char *dst, const cha
/* To force NOMMU build, set to 1 */
#define NOMMU_SYSTEM 0
-#if (defined(SPARC) || defined(SPARC64) \
- || defined(I386) || defined(X32) || defined(X86_64) \
- || defined(ARM) || defined(AARCH64) \
- || defined(AVR32) \
- || defined(OR1K) \
- || defined(METAG) \
- || defined(TILE) \
- || defined(XTENSA) \
- ) && defined(__GLIBC__)
-# include <sys/ptrace.h>
-#else
-/* Work around awkward prototype in ptrace.h. */
+#ifdef NEED_PTRACE_PROTOTYPE_WORKAROUND
# define ptrace xptrace
# include <sys/ptrace.h>
# undef ptrace
-# ifdef POWERPC
-# define __KERNEL__
-# include <asm/ptrace.h>
-# undef __KERNEL__
-# endif
extern long ptrace(int, int, char *, long);
+#else
+# include <sys/ptrace.h>
+#endif
+
+#if defined(POWERPC)
+# include <asm/ptrace.h>
#endif
#if defined(TILE)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
