rpm/strace
SHA256
1
0
Fork 0
forked from pool/strace
Code Pull Requests Activity

Accepting request 223856 from home:michel_mno:branches:devel:tools

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/223856
OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=35
This commit is contained in:
Marcus Meissner 2014-02-26 08:55:39 +00:00 committed by Git OBS Bridge
parent c70ba976df
commit aec348d425
3 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
strace.changes
View File

@ -1,4 +1,12 @@
-------------------------------------------------------------------
Tue Feb 25 17:20:43 UTC 2014 - normand@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
-------------------------------------------------------------------
Wed Dec 4 16:27:29 UTC 2013 - dvaleev@suse.com
- Make ppc64le architecture known

4
strace.spec
View File

@ -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 @@ Source4: baselibs.conf
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 @@ Authors:
%patch -P 1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"

61
strace_cid_03ef0b2.patch Normal file
View File

@ -0,0 +1,61 @@
From: "Dmitry V. Levin" <ldv@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 <normand@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)