Accepting request 576863 from home:AndreasSchwab

- Update to strace 4.21 * Changes in behaviour * Warning is now issued when -F option is used. * Warning is now issued when a tracee with unsupported personality is attached. * Unknown syscall numbers are now printed in hexadecimal form. * Improvements * Implemented decoding of netlink descriptor attributes as file descriptors. * Implemented decoding of hugetlb page size selection flags. * Implemented decoding of BPF_PROG_TEST_RUN, BPF_PROG_GET_NEXT_ID, BPF_MAP_GET_NEXT_ID, BPF_PROG_GET_FD_BY_ID, BPF_MAP_GET_FD_BY_ID, and BPF_OBJ_GET_INFO_BY_FD commands of bpf syscall. * Enhanced decoding of get_thread_area, memfd_create, modify_ldt, perf_event_open, reboot, s390_guarded_storage, s390_pcio_mmio_read, s390_pci_mmio_write, s390_runtime_instr, s390_sthyi, set_thread_area, and shmget syscalls. * Implemented decoding of KVM_* and DM_LIST_DEVICES ioctl commands. * Implemented decoding of riscv_flush_icache syscall. * Enhanced decoding of getsockopt and setsockopt syscalls for SOL_NETLINK level. * Enhanced decoding of BPF_MAP_CREATE command of bpf syscall. * Print values returned by mq_open syscall and first arguments of mq_getsetattr, mq_notify, mq_timedreceive, and mq_timedsend syscalls as file descriptors. * Added decoding of get_tls syscall on arm. * Added -e trace=%pure option for tracing system calls with no arguments that never fail. * Updated lists of IPV6_*, MAP_*, MEMBARRIER_CMD_*, MSG_*, NT_*, PKEY_*, SHM_*, and TCP_* constants. * Added manual page for the strace-log-merge command. OBS-URL: https://build.opensuse.org/request/show/576863 OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=83
2018-02-14 23:00:30 +00:00 · 2018-02-14 23:00:30 +00:00 · de3fae4164
commit de3fae4164
parent f8063c7aca
8 changed files with 232 additions and 245 deletions
--- a/strace-4.20.tar.xz
+++ b/strace-4.20.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5bf3148dd17306a42566f7da17368fdd781afa147db05ea63a4ca2b50f58c523
-size 1132460
--- a/strace-4.20.tar.xz.asc
+++ b/strace-4.20.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIcBAABCAAGBQJaChNMAAoJEKgEH6g54W425HQP/j5m7pXXJ9Pa4iL1SztgWDEC
-kM9apxVAENybKVxXYFRZwX/YCqEbJMwAzoqxeJAqYrhHNywUz1sJ5PaXKcmH6pCx
-ansyMes2Uu8qMfrdbYNAA2yqJqcVY1crx+U837zrIRaC3t6w/rWdy8YUnyI28GMF
-YcAQDSMFQLnXsD5uUcuOP9GqFHgN49bVlJs73+sjzR3gsy75q8V/voNdzTVrGGm3
-PEoDXanc4M5qyzGweblMpAs32EbeJqN80CyrWNnRC/X2z8hOsYYHY8T8fITpVVdu
-IBnAG9UWgCVlgsoSDoV7n4QqXBpfbF3WTI3KRMVU9vLOml+GjOgwFXLPgcSfAHLY
-ArGhC6VjGgKkKwGZW/HXSYDQnBReflzRKXSWI7oqqxzwnVzLmHmrnsbgcEq6M7BG
-Qr73YPrzRAIvnWz5BaJwz7XhWPEm+DWQHyHlPIVCdrohmk0TYV5G4lcWcMCUnUR5
-UsI8XCZfYSaWmmZ4mr1L0+UynKNFZw2xyNWnezF0glvfSWoBtCVURJ2pYl13zXtF
-s291b59UV3/c9cehAlCdD4Zy6aCU1Zf0bUslzFcKCTTeYEq1Gr3lNrYyZ0JfcZ93
-i0OkrpObHDYDkR4LJx5qvN7M7zFnLBydaBnYeUFWUG1nX9wKAxTVP0pdmDoEK7CB
-KM/CYL5PrIHVpJR7CFtY
-=l3+j
-----END PGP SIGNATURE-----
--- a/strace-4.21.tar.xz
+++ b/strace-4.21.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c7688db44073e94c59a5627744e5699454419824cc8166e8bcfd7ec58375c37
+size 1185908
--- a/strace-4.21.tar.xz.asc
+++ b/strace-4.21.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCAAGBQJag3RDAAoJEKgEH6g54W42TikP/3zOGcELCtvHBbnosYf+7Ppm
+N6Ra1R4GpC0Uexo5rj3KbbiuscG/5w1r8YGWJrBLuXlFt6rKpK+x9tYtEGRAU8d+
+P7XXRvHLlkjzH+E5qqcGwQcJD4EDQLx1woakvUAFl64P9i1eSUQkDzW1IYM9wjWC
+RdnCj1EtsdWRuT/KXkzOv4k5oRHIYUbHQbcMs7Vv5Px47Sm2NoAVbp3lhy5Vt46G
+cCrVKejuEYRP/FiG0pXJ1IV+fU25RnY9U9UBKBK30makEy//d6JMS/APM9vHb/vD
+Ftvb8VL2l+gjLI/LX7M/LcJl5Ry/QpXxf15Zt/SAD+I1Ci+0GD2iVOTyt+gmTOzk
+HuVtHTrGh4VuPb5noduG+QaL8ERLIkATexrnsWMhpGUAZP9y5OnD3XtNfaB7oVcY
+aM+GggcF+gK1mr9haSg7QifgWlOE9c7/V25sixDJG3kSSOKmMpuwxPz0i1f279bz
+WPcG7nw0CMy7500vEBnKJKpnRA4YXMxh/PBi+0b8oOZ7YCvdjMF35S3Ga47JvEGk
+Sx7phWvWczoiHGUN5k6dQCLC+whJEezPoH5PSKu13RnGgzQaCrgTp/wN3g0xtL/f
+3DF6Gg4W+CdsUR+ICXNoe2Jo+b4moC6wsRbFSXF14iN/oHQHFHcU/9qpXkZyIGtV
+Sn8seFfeh4phlV7pvpZm
+=rH5W
+-----END PGP SIGNATURE-----
--- a/strace.changes
+++ b/strace.changes
@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Wed Feb 14 22:30:56 UTC 2018 - schwab@linux-m68k.org
+
+- Update to strace 4.21
+  * Changes in behaviour
+    * Warning is now issued when -F option is used.
+    * Warning is now issued when a tracee with unsupported personality
+      is attached.
+    * Unknown syscall numbers are now printed in hexadecimal form.
+  * Improvements
+    * Implemented decoding of netlink descriptor attributes as file descriptors.
+    * Implemented decoding of hugetlb page size selection flags.
+    * Implemented decoding of BPF_PROG_TEST_RUN, BPF_PROG_GET_NEXT_ID,
+      BPF_MAP_GET_NEXT_ID, BPF_PROG_GET_FD_BY_ID, BPF_MAP_GET_FD_BY_ID,
+      and BPF_OBJ_GET_INFO_BY_FD commands of bpf syscall.
+    * Enhanced decoding of get_thread_area, memfd_create, modify_ldt,
+      perf_event_open, reboot, s390_guarded_storage, s390_pcio_mmio_read,
+      s390_pci_mmio_write, s390_runtime_instr, s390_sthyi, set_thread_area,
+      and shmget syscalls.
+    * Implemented decoding of KVM_* and DM_LIST_DEVICES ioctl commands.
+    * Implemented decoding of riscv_flush_icache syscall.
+    * Enhanced decoding of getsockopt and setsockopt syscalls for SOL_NETLINK
+      level.
+    * Enhanced decoding of BPF_MAP_CREATE command of bpf syscall.
+    * Print values returned by mq_open syscall and first arguments
+      of mq_getsetattr, mq_notify, mq_timedreceive, and mq_timedsend syscalls
+      as file descriptors.
+    * Added decoding of get_tls syscall on arm.
+    * Added -e trace=%pure option for tracing system calls with no arguments that
+      never fail.
+    * Updated lists of IPV6_*, MAP_*, MEMBARRIER_CMD_*, MSG_*, NT_*, PKEY_*,
+      SHM_*, and TCP_* constants.
+    * Added manual page for the strace-log-merge command.
+    * Updated lists of ioctl commands from Linux 4.15.
+    * Implemented biarch support for s390x.
+    * Implemented an optional support for symbol demangling in strace -k output
+      (activated by --with-libiberty configure option).
+    * Information about availability of demangling and reliable personality
+      decoding (on architectures with multiple personalities) is now available
+      in strace -V output.
+    * Added decoding of pkey_alloc, pkey_free, and pkey_mprotect syscalls on
+      powerpc and powerpc64.
+    * Enhanced manual page.
+  * Bug fixes
+    * Fixed multi-personality support in cross builds.
+    * Added mq_getsetattr, mq_notify, mq_open, mq_timedreceive, and mq_timedsend
+      syscalls to %desc tracing set.
+    * Fixed path tracing support for mmap syscalls with indirect arguments and
+      for old select syscall.
+    * Fixed decoding of arm-specific (__ARM_NR_*) syscalls.
+    * Fixed open mode flags decoding.
+    * Fixed corner cases in handling of strace -ff -ttt logs by strace-log-merge.
+    * Error counts that exceed one billion are now printed correctly in call
+      summary output.
+    * Fixed call summary header for x32 personality.
+    * Changes of tracee personalities are reported more reliably.
+    * Fixed the case when strace attaches to a tracee being inside exec and its
+      first syscall stop is syscall-exit-stop instead of syscall-enter-stop,
+      which messed up all the syscall state tracking.
+    * Fixed printing of higher 32 bits of the return value for x32 personality.
+- update-futex-test-in-accordance-with-kernel-s-v4.15-.patch: removed
+
 -------------------------------------------------------------------
 Thu Jan 25 15:04:49 UTC 2018 - jslaby@suse.com

--- a/strace.keyring
+++ b/strace.keyring
@ -1,11 +1,12 @@
-pub   4096R/A340AEB7 2015-10-21
-uid                  Dmitry V. Levin <ldv@altlinux.org>
-sub   4096R/39E16E36 2015-10-21 [expires: 2025-10-18]
-sub   4096R/559C2508 2015-10-21 [expires: 2025-10-18]
-sub   4096R/917E0309 2015-10-21 [expires: 2025-10-18]
+pub   4096R/2DB5BD89A340AEB7 2015-10-21
+      Key fingerprint = 296D 6F29 A020 808E 8717  A884 2DB5 BD89 A340 AEB7
+uid               [ unknown] Dmitry V. Levin <ldv@altlinux.org>
+sub   4096R/A8041FA839E16E36 2015-10-21 [expires: 2025-10-18]
+sub   4096R/05454FE0559C2508 2015-10-21 [expires: 2025-10-18]
+sub   4096R/8177632C917E0309 2015-10-21 [expires: 2025-10-18]

 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2

 mQINBFYnbLEBEACsADGvgMHHpUYlc+g0KnDHeolGcP0rNmIHKsRTt+/liKwaVDMk
 MlSsv/kyUwZPu0rVOnQy0lvVOjEXBViMbqcN6UTGMJbxLZKLgqY4a0B25CWKNuMT
@ -113,96 +114,142 @@ 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
-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
-fHF5wX5eev3jgv3kQaw9zhmLVKPbJFvnUzwY
-=zBsc
+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
+=xpVu
 -----END PGP PUBLIC KEY BLOCK-----
--- a/strace.spec
+++ b/strace.spec
@ -17,19 +17,18 @@


 Name:           strace
-Version:        4.20
+Version:        4.21
 Release:        0
 Summary:        A utility to trace the system calls of a program
 License:        BSD-3-Clause
 Group:          Development/Tools/Debuggers
-Url:            http://sourceforge.net/projects/strace/
+Url:            http://strace.io/
 #Freecode-URL:	http://freecode.com/projects/strace
-#Git-Clone:	git://git.code.sf.net/p/strace/code
-Source:         http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz
-Source2:        http://downloads.sourceforge.net/strace/%{name}-%{version}.tar.xz.asc
+#Git-Clone:	git://github.com/strace/strace
+Source:         https://github.com/strace/strace/releases/download/v%{version}/%{name}-%{version}.tar.xz
+Source2:        https://github.com/strace/strace/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc
 Source3:        %{name}.keyring
 Source4:        baselibs.conf
-Patch0:         update-futex-test-in-accordance-with-kernel-s-v4.15-.patch
 BuildRequires:  haveged
 BuildRequires:  libacl-devel
 BuildRequires:  libaio-devel
@ -55,7 +54,6 @@ and processes can be seen.  Child processes can also be tracked.

 %prep
 %setup -q
-%patch0 -p1

 %build
 %configure
@ -84,5 +82,6 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install
 %{_bindir}/strace-graph
 %{_bindir}/strace-log-merge
 %{_mandir}/man1/strace.1%{ext_man}
+%{_mandir}/man1/strace-log-merge.1%{ext_man}

 %changelog
--- a/update-futex-test-in-accordance-with-kernel-s-v4.15-.patch
+++ b/update-futex-test-in-accordance-with-kernel-s-v4.15-.patch
@ -1,121 +0,0 @@
-From: Eugene Syromyatnikov <evgsyr@gmail.com>
-Date: Wed, 24 Jan 2018 09:55:50 -0500
-Subject: Update futex test in accordance with kernel's v4.15-rc7-202-gfbe0e83
-Patch-mainline: yes
-References: fix new kernels
-
-* futex.c (VALP, VALP_PR, VAL2P, VAL2P_PR): New macro definitions.
-(main): Allow EINVAL on *REQUEUE* checks with VAL/VAL2 with higher bit
-being set, check that the existing behaviour preserved with VALP/VAL2P
-where higher bit is unset.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
- tests/futex.c | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
- 1 file changed, 43 insertions(+), 11 deletions(-)
-
-diff --git a/tests/futex.c b/tests/futex.c
-index 41e9d1bf048e..833a20f9591c 100644
--- a/tests/futex.c
-+++ b/tests/futex.c
-@@ -152,14 +152,20 @@ void invalid_op(int *val, int op, uint32_t argmask, ...)
- 	} while (0)
- 
- /* Value which differs from one stored in int *val */
-# define VAL     ((unsigned long) 0xbadda7a0facefeedLLU)
-# define VAL_PR  ((unsigned) VAL)
-+# define VAL      ((unsigned long) 0xbadda7a0facefeedLLU)
-+# define VAL_PR   ((unsigned) VAL)
- 
-# define VAL2    ((unsigned long) 0xbadda7a0ca7b100dLLU)
-# define VAL2_PR ((unsigned) VAL2)
-+# define VALP     ((unsigned long) 0xbadda7a01acefeedLLU)
-+# define VALP_PR  ((unsigned) VALP)
- 
-# define VAL3    ((unsigned long) 0xbadda7a09caffee1LLU)
-# define VAL3_PR ((unsigned) VAL3)
-+# define VAL2     ((unsigned long) 0xbadda7a0ca7b100dLLU)
-+# define VAL2_PR  ((unsigned) VAL2)
-+
-+# define VAL2P    ((unsigned long) 0xbadda7a07a7b100dLLU)
-+# define VAL2P_PR ((unsigned) VAL2P)
-+
-+# define VAL3     ((unsigned long) 0xbadda7a09caffee1LLU)
-+# define VAL3_PR  ((unsigned) VAL3)
- 
- int
- main(int argc, char *argv[])
-@@ -419,16 +425,26 @@ main(int argc, char *argv[])
- 
- 	/* Trying to re-queue some processes but there's nothing to re-queue */
- 	CHECK_FUTEX(uaddr, FUTEX_REQUEUE, VAL, VAL2, uaddr2, VAL3,
-		(rc == 0));
-+		(rc == 0) || ((rc == -1) && (errno == EINVAL)));
- 	printf("futex(%p, FUTEX_REQUEUE, %u, %u, %p) = %s\n",
- 		uaddr, VAL_PR, VAL2_PR, uaddr2, sprintrc(rc));
- 
-+	CHECK_FUTEX(uaddr, FUTEX_REQUEUE, VALP, VAL2P, uaddr2, VAL3,
-+		(rc == 0));
-+	printf("futex(%p, FUTEX_REQUEUE, %u, %u, %p) = %s\n",
-+		uaddr, VALP_PR, VAL2P_PR, uaddr2, sprintrc(rc));
-+
- 	/* Trying to re-queue some processes but there's nothing to re-queue */
- 	CHECK_FUTEX_ENOSYS(uaddr, FUTEX_PRIVATE_FLAG | FUTEX_REQUEUE, VAL, VAL2,
-		uaddr2, VAL3, (rc == 0));
-+		uaddr2, VAL3, (rc == 0) || ((rc == -1) && (errno == EINVAL)));
- 	printf("futex(%p, FUTEX_REQUEUE_PRIVATE, %u, %u, %p) = %s\n",
- 		uaddr, VAL_PR, VAL2_PR, uaddr2, sprintrc(rc));
- 
-+	CHECK_FUTEX_ENOSYS(uaddr, FUTEX_PRIVATE_FLAG | FUTEX_REQUEUE, VALP,
-+		VAL2P, uaddr2, VAL3, (rc == 0));
-+	printf("futex(%p, FUTEX_REQUEUE_PRIVATE, %u, %u, %p) = %s\n",
-+		uaddr, VALP_PR, VAL2P_PR, uaddr2, sprintrc(rc));
-+
- 	CHECK_INVALID_CLOCKRT(FUTEX_REQUEUE, ARG3 | ARG4 | ARG5, "%u", "%u",
- 		"%#lx");
- 
-@@ -445,22 +461,38 @@ main(int argc, char *argv[])
- 
- 	/* Comparison re-queue with wrong val value */
- 	CHECK_FUTEX(uaddr, FUTEX_CMP_REQUEUE, VAL, VAL2, uaddr2, VAL3,
-		(rc == -1) && (errno == EAGAIN));
-+		(rc == -1) && (errno == EAGAIN || errno == EINVAL));
- 	printf("futex(%p, FUTEX_CMP_REQUEUE, %u, %u, %p, %u) = %s\n",
- 		uaddr, VAL_PR, VAL2_PR, uaddr2, VAL3_PR, sprintrc(rc));
- 
-+	CHECK_FUTEX(uaddr, FUTEX_CMP_REQUEUE, VALP, VAL2P, uaddr2, VAL3,
-+		(rc == -1) && (errno == EAGAIN));
-+	printf("futex(%p, FUTEX_CMP_REQUEUE, %u, %u, %p, %u) = %s\n",
-+		uaddr, VALP_PR, VAL2P_PR, uaddr2, VAL3_PR, sprintrc(rc));
-+
- 	/* Successful comparison re-queue */
- 	CHECK_FUTEX(uaddr, FUTEX_CMP_REQUEUE, VAL, VAL2, uaddr2, *uaddr,
-		(rc == 0));
-+		(rc == 0) || ((rc == -1) && (errno == EINVAL)));
- 	printf("futex(%p, FUTEX_CMP_REQUEUE, %u, %u, %p, %u) = %s\n",
- 		uaddr, VAL_PR, VAL2_PR, uaddr2, *uaddr, sprintrc(rc));
- 
-+	CHECK_FUTEX(uaddr, FUTEX_CMP_REQUEUE, VALP, VAL2P, uaddr2, *uaddr,
-+		(rc == 0));
-+	printf("futex(%p, FUTEX_CMP_REQUEUE, %u, %u, %p, %u) = %s\n",
-+		uaddr, VALP_PR, VAL2P_PR, uaddr2, *uaddr, sprintrc(rc));
-+
- 	/* Successful comparison re-queue */
- 	CHECK_FUTEX_ENOSYS(uaddr, FUTEX_PRIVATE_FLAG | FUTEX_CMP_REQUEUE, VAL,
-		VAL2, uaddr2, *uaddr, (rc == 0));
-+		VAL2, uaddr2, *uaddr,
-+		(rc == 0) || ((rc == -1) && (errno == EINVAL)));
- 	printf("futex(%p, FUTEX_CMP_REQUEUE_PRIVATE, %u, %u, %p, %u) = %s\n",
- 		uaddr, VAL_PR, VAL2_PR, uaddr2, *uaddr, sprintrc(rc));
- 
-+	CHECK_FUTEX_ENOSYS(uaddr, FUTEX_PRIVATE_FLAG | FUTEX_CMP_REQUEUE, VALP,
-+		VAL2P, uaddr2, *uaddr, (rc == 0));
-+	printf("futex(%p, FUTEX_CMP_REQUEUE_PRIVATE, %u, %u, %p, %u) = %s\n",
-+		uaddr, VALP_PR, VAL2P_PR, uaddr2, *uaddr, sprintrc(rc));
-+
- 	CHECK_INVALID_CLOCKRT(FUTEX_CMP_REQUEUE, ARG3 | ARG4 | ARG5 | ARG6,
- 		"%u", "%u", "%#lx", "%u");
- 
-- 
-2.16.1
-