From 23787a9deeb9845c3e0b61fb3f7d8b7a00b1870bf5295b2dbed411cdc35a25ff Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 15 Apr 2010 15:06:57 +0000 Subject: [PATCH] Accepting request 37991 from home:jnweiger:branches:devel:tools Copy from home:jnweiger:branches:devel:tools/strace via accept of submit request 37991 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/37991 OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=7 --- strace-4.5.19.diff | 70 ------------------------------------------- strace-4.5.19.tar.bz2 | 3 -- strace-4.5.20.diff | 13 ++++++++ strace-4.5.20.tar.bz2 | 3 ++ strace.changes | 36 ++++++++++++++++++++++ strace.spec | 4 +-- 6 files changed, 54 insertions(+), 75 deletions(-) delete mode 100644 strace-4.5.19.diff delete mode 100644 strace-4.5.19.tar.bz2 create mode 100644 strace-4.5.20.diff create mode 100644 strace-4.5.20.tar.bz2 diff --git a/strace-4.5.19.diff b/strace-4.5.19.diff deleted file mode 100644 index 40f0bf1..0000000 --- a/strace-4.5.19.diff +++ /dev/null @@ -1,70 +0,0 @@ -Index: resource.c -=================================================================== ---- resource.c.orig 2009-04-14 14:51:00.000000000 +0200 -+++ resource.c 2010-02-13 21:24:23.000000000 +0100 -@@ -373,10 +373,10 @@ sys_sysinfo(struct tcb *tcp) - si.loads[2]); - tprintf("totalram=%lu, freeram=%lu, ", - si.totalram, si.freeram); -- tprintf("sharedram=%lu, bufferram=%lu} ", -+ tprintf("sharedram=%lu, bufferram=%lu, ", - si.sharedram, si.bufferram); -- tprintf("totalswap=%lu, freeswap=%lu, procs=%hu}", -- si.totalswap, si.freeswap, si.procs); -+ tprintf("totalswap=%lu, freeswap=%lu, procs=%hu, mem_unit=%u}", -+ si.totalswap, si.freeswap, si.procs, si.mem_unit); - } - } - return 0; -Index: strace-graph -=================================================================== ---- strace-graph.orig 2009-07-08 16:57:27.000000000 +0200 -+++ strace-graph 2010-02-13 21:24:23.000000000 +0100 -@@ -229,7 +229,7 @@ sub handle_trace { - push @$seq, ['EXEC', $filename, $argv]; - - $pr{$pid}{seq} = $seq; -- } elsif ($call eq 'fork' || $call eq 'clone' || $call eq 'vfork') { -+ } elsif ($call eq 'fork' || $call eq 'clone' || $call eq 'clone2' || $call eq 'vfork') { - return if $result == 0; - - my $seq = $pr{$pid}{seq}; -Index: util.c -=================================================================== ---- util.c.orig 2009-10-12 21:54:21.000000000 +0200 -+++ util.c 2010-02-13 21:24:23.000000000 +0100 -@@ -1407,9 +1407,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; - } - -Index: configure -=================================================================== ---- configure.orig 2009-10-21 19:41:11.000000000 +0200 -+++ configure 2010-02-13 21:25:46.000000000 +0100 -@@ -5880,6 +5880,7 @@ for ac_header in linux/icmp.h linux/in6. - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include -+#include - #include - " - eval as_val=\$$as_ac_Header -Index: configure.ac -=================================================================== ---- configure.ac.orig 2009-10-12 21:54:43.000000000 +0200 -+++ configure.ac 2010-02-13 21:25:22.000000000 +0100 -@@ -258,6 +258,7 @@ AC_CHECK_HEADERS([ \ - ], [], []) - AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], - [], [], [#include -+#include - #include ]) - AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include ]) - AC_CHECK_TYPES([struct sigcontext_struct, diff --git a/strace-4.5.19.tar.bz2 b/strace-4.5.19.tar.bz2 deleted file mode 100644 index ee50f99..0000000 --- a/strace-4.5.19.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8997ce919e971b0ec45cd7006c6e1f9c7c0bce68ab59e3a629e1ddeda5013d08 -size 499565 diff --git a/strace-4.5.20.diff b/strace-4.5.20.diff new file mode 100644 index 0000000..6a037b0 --- /dev/null +++ b/strace-4.5.20.diff @@ -0,0 +1,13 @@ +--- 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.5.20.tar.bz2 b/strace-4.5.20.tar.bz2 new file mode 100644 index 0000000..2c11fe6 --- /dev/null +++ b/strace-4.5.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea8c059369eaa5ad90b246f34eab247d0ee48bfdee2670c7196320a4669ccabd +size 504078 diff --git a/strace.changes b/strace.changes index 6dc37ce..cd630fd 100644 --- a/strace.changes +++ b/strace.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Thu Apr 15 12:35:15 UTC 2010 - jw@novell.com + +- Update to version 4.5.20 + * Implemented decoding of new linux syscalls: inotify_init1, recvmmsg. + * Implemented basic decoding of new linux syscalls: preadv, pwritev, + rt_tgsigqueueinfo, perf_event_open. + * Enhanced decoding of recently added syscalls on non-x86 architectures + by replacing a bare decoder with elaborate parsers enabled earlier + for x86/x86-64. + * Implemented -C option to combine regular and -c output. + (Addresses Debian bug #466196) + * Enhanced decoding of mbind and mremap syscalls. + * Enhanced SOL_PACKET socket options decoding. + * Regenerated list of ioctl names from linux 2.6.33. + * Added TILE architecture support. + + * Fixed build with Linux kernel headers 2.6.32-rc5+. + (Addresses Debian bug #560516 and Fedora bug #539044) + * Fixed build on mips. + * Fixed handling of Linux systems without struct statfs64. + * Fixed reporting signal mask by sigreturn on powerpc. + * Fixed potential stack buffer overflow in select decoder. + (Addresses Fedora bug #556678) + * Corrected msgsnd indirect ipccall decoding. + * Corrected decoding of 64bit syscalls. + (Addresses Debian bug #570603) + * Corrected getsockopt decoding on architectures where + sizeof(long) > sizeof(int). + (Addresses Debian bug #494844) + * Corrected decoding of epoll_pwait. + (Addresses Debian bug #513014) + * Corrected handling of killed threads. +- strace-4.5.19.diff almost fully upstreamed. shortening to one minor hunk. + + ------------------------------------------------------------------- Sat Feb 13 21:27:50 CET 2010 - rguenther@suse.de diff --git a/strace.spec b/strace.spec index 51dcc21..acb498d 100644 --- a/strace.spec +++ b/strace.spec @@ -27,7 +27,7 @@ AutoReqProv: on Obsoletes: strace-64bit %endif # -Version: 4.5.19 +Version: 4.5.20 Release: 1 Summary: A utility to trace the system calls of a program Source: http://dl.sourceforge.net/strace/strace-%{version}.tar.bz2 @@ -51,7 +51,7 @@ Authors: %prep %setup -q -%patch +%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS"