diff --git a/strace-4.7.diff b/strace-4.7.diff deleted file mode 100644 index 6a037b0..0000000 --- a/strace-4.7.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- strace-4.5.20/util.c.orig 2010-02-04 23:40:57.000000000 +0100 -+++ strace-4.5.20/util.c 2010-04-15 14:26:42.697554000 +0200 -@@ -1292,9 +1292,8 @@ arg_setup(struct tcb *tcp, arg_setup_sta - - sof = (cfm >> 0) & 0x7f; - sol = (cfm >> 7) & 0x7f; -- bsp = (long) ia64_rse_skip_regs((unsigned long *) bsp, -sof + sol); -+ *state = ia64_rse_skip_regs((unsigned long *) bsp, -sof + sol); - -- *state = (unsigned long *) bsp; - return 0; - } - diff --git a/strace-4.8.tar.xz b/strace-4.8.tar.xz deleted file mode 100644 index 80e9364..0000000 --- a/strace-4.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8 -size 441712 diff --git a/strace-4.8.tar.xz.asc b/strace-4.8.tar.xz.asc deleted file mode 100644 index c04984e..0000000 --- a/strace-4.8.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.13 (GNU/Linux) - -iEYEABECAAYFAlGugDUACgkQ2XqGi/fduzqUBQCfTdbLZ9zANPPV1QuE+ZfEX8kc -PZAAn0Zp4DuW2hrXG+PTiaeZxOqJPrFm -=45lF ------END PGP SIGNATURE----- diff --git a/strace-4.9.tar.xz b/strace-4.9.tar.xz new file mode 100644 index 0000000..8e7de78 --- /dev/null +++ b/strace-4.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65 +size 521728 diff --git a/strace-4.9.tar.xz.asc b/strace-4.9.tar.xz.asc new file mode 100644 index 0000000..c7c6dd8 --- /dev/null +++ b/strace-4.9.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlPuB6cACgkQ2XqGi/fduzobCACePKABdfDGleG5f79h3T5FmgJb ++9MAniO5c4kqQXQIp6fugVL0AahWiYUZ +=Xx/G +-----END PGP SIGNATURE----- diff --git a/strace-linux-ptrace-h.patch b/strace-linux-ptrace-h.patch deleted file mode 100644 index a2ca4bc..0000000 --- a/strace-linux-ptrace-h.patch +++ /dev/null @@ -1,64 +0,0 @@ -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 - # 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 - # 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 - # 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 - # undef ia64_fpreg - # undef pt_all_user_regs -+# undef ptrace_peeksiginfo_args - #endif - - int diff --git a/strace-ppc64le.patch b/strace-ppc64le.patch deleted file mode 100644 index 8a207b3..0000000 --- a/strace-ppc64le.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: strace-4.8/configure -=================================================================== ---- strace-4.8.orig/configure -+++ strace-4.8/configure -@@ -4660,7 +4660,7 @@ powerpc*) - - $as_echo "#define POWERPC 1" >>confdefs.h - -- if test $host_cpu = powerpc64; then -+ if test $host_cpu = powerpc64 || test $host_cpu = powerpc64le ; then - - $as_echo "#define POWERPC64 1" >>confdefs.h - -Index: strace-4.8/configure.ac -=================================================================== ---- strace-4.8.orig/configure.ac -+++ strace-4.8/configure.ac -@@ -54,7 +54,7 @@ alpha*) - powerpc*) - arch=powerpc - AC_DEFINE([POWERPC], 1, [Define for the PowerPC architecture.]) -- if test $host_cpu = powerpc64; then -+ if test $host_cpu = powerpc64 || test $host_cpu = powerpc64le; then - AC_DEFINE([POWERPC64], 1, [Define for the PowerPC64 architecture.]) - fi - ;; diff --git a/strace.changes b/strace.changes index f08612c..ab963ab 100644 --- a/strace.changes +++ b/strace.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Wed Nov 26 15:20:42 UTC 2014 - schwab@linux-m68k.org + +- Update to strace 4.9: + * Changes in behavior + * Disabled OABI support on ARM EABI systems by default, + added --enable-arm-oabi option to enable it at configure time. + + * Improvements + * Added experimental -k option to print stack trace after each traced syscall. + * Added -w option to produce stats on syscall latency. + (addresses Debian bug #457497). + * Added ARC architecture support. + * Added PTRACE_GETREGS API support on PowerPC. + * Enhanced Bionic libc and musl libc support. + * Enhanced tracing of x86 personality processes on x86_64 and x32. + * Enhanced tracing of ARM personality processes on AArch64. + * Enhanced 32/64bit personality detection on PowerPC. + * Implemented decoding of add_key, ioprio_get, ioprio_set, kexec_load, keyctl, + renameat2, and request_key syscalls. + * Robustified decoding of select, pselect, and io_submit syscalls. + * Enhanced decoding of delete_module, fanotify_init, fanotify_mark, fcntl, + setdomainname, sethostname, setns, and sync_file_range syscalls. + * Enhanced decoding of signal bitmasks. + * Enhanced decoding of file descriptors. + * Enhanced siginfo_t decoding. + * Enhanced PF_NETLINK decoding. + * Updated CLOCK_* constants + (addresses Fedora bug #1088455). + * Added new syscall entries to match Linux 3.16. + + * Bug fixes + * Added shmat and shmdt to the set of memory mapping related syscalls. + * Fixed detaching from stopped processes. + * Fixed fanotify_mark decoding on 32bit architectures. + * Fixed offset decoding in preadv and pwritev syscalls. + * Fixed select decoding for glibc in _FORTIFY_SOURCE mode. + * Fixed decoding of epoll_ctl syscall with EPOLL_CTL_DEL argument. + * Fixed build when and conflict + (addresses Fedora bug #993384). + * Miscellaneous corrections in the manual page. + (Addresses Debian bug #725987). +- Remove obsolete patches: + * strace-4.7.diff + * strace-linux-ptrace-h.patch + * strace-ppc64le.patch + * strace_cid_03ef0b2.patch + ------------------------------------------------------------------- Fri Nov 14 09:19:16 UTC 2014 - dimstar@opensuse.org diff --git a/strace.spec b/strace.spec index 4fb68c2..e9bb756 100644 --- a/strace.spec +++ b/strace.spec @@ -17,7 +17,7 @@ Name: strace -Version: 4.8 +Version: 4.9 Release: 0 Summary: A utility to trace the system calls of a program License: BSD-3-Clause @@ -30,10 +30,6 @@ Source: http://downloads.sourceforge.net/strace/%name-%version.tar.xz Source2: http://downloads.sourceforge.net/strace/%name-%version.tar.xz.asc Source3: %name.keyring 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 @@ -59,10 +55,6 @@ Authors: %prep %setup -q -%patch -P 1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -71,9 +63,9 @@ CFLAGS="$CFLAGS -ffixed-8" %endif %configure \ %ifarch %sparc - --host=%_target_platform + --host=%_target_platform \ %endif - + %{nil} make %{?_smp_mflags} # Have to exclude make check for qemu builds, which apparently don't support PTRACE. diff --git a/strace_cid_03ef0b2.patch b/strace_cid_03ef0b2.patch deleted file mode 100644 index dffe79d..0000000 --- a/strace_cid_03ef0b2.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: "Dmitry V. Levin" -Date: Wed, 13 Nov 2013 18:09:04 +0000 -Subject: [PATCH] Assume that provides a valid ptrace prototype - -We used to explicitly list architectures where 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 - 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 - ---- - 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 --#else --/* Work around awkward prototype in ptrace.h. */ -+#ifdef NEED_PTRACE_PROTOTYPE_WORKAROUND - # define ptrace xptrace - # include - # undef ptrace --# ifdef POWERPC --# define __KERNEL__ --# include --# undef __KERNEL__ --# endif - extern long ptrace(int, int, char *, long); -+#else -+# include -+#endif -+ -+#if defined(POWERPC) -+# include - #endif - - #if defined(TILE)