Accepting request 873344 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/873344 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/strace?expand=0&rev=87
2021-02-23 19:17:45 +00:00 · 2021-02-23 19:17:45 +00:00 · 38584c6f72
commit 38584c6f72
parent 544a68aafa 08e1547c39
7 changed files with 82 additions and 23 deletions
--- a/strace-5.10.tar.xz
+++ b/strace-5.10.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c
-size 1859688
--- a/strace-5.10.tar.xz.asc
+++ b/strace-5.10.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIcBAABCAAGBQJf1x0jAAoJEKgEH6g54W42GpEQAJ1tvCXs8OldHsbB6N+aiXls
-Az0aiZSYUJoaDXGOg9l1SfT1pJWipmmefOFd/zMi1zeEMHift4XcdY63BPYsJ1Z7
-sQEknfwYBGqTGWKwDNxCyt3AtCZralK9uYWzymeiZnUAPi+5lHpNBqa3bbJ8VQD9
-mE8r+WX2p55zOO7tHy702Wtb2iXhNlf+ghWoFtDKJItCfVz5xRMXzvyBlGGMpE4O
-/wB+6rh3vzbOlvGJT17S2cPmyXcIvK+9/HwI8Bdd7noyClMjtUwOyebZg03Mdjuz
-OLYMGckz6TSQZ7uCH6nBrFWMi9ndw1xZH8ZXv/QbcfVfA6PAJP9QHMEfRedGlWV2
-+ovtscu4+rmaTMrRUe4tY2pgohOYIzBTEbETAqx5v9cAOj5rWWJfXkJm7vfmk/un
-e7J6OTYk2hEPYcA9z2FHayRigB2FKy5d+nd8AGlXgY/zfuxIG4wvJ5fXBdedZ57F
-LToeiSpLW7HZIGLHvRxtgN95W9k3YzpeCqZcVrDgc/lRMyyRd5cjAo1DkRhce52Z
-70MR79EZdyE9vCSnDxzK3A5OwEZx5gfhTfezVw0+/0tQHcK4tDiAMD5Pc00gn4qe
-QOjJPa9teRaSLd4KZ/dtdf2cQiyLmAqR9YeTAb8TE3FUZf/lqGWvJBaz2pEWdoMW
-hssHTDdbUpHNqibmKS/z
-=DhDS
-----END PGP SIGNATURE-----
--- a/strace-5.11.tar.xz
+++ b/strace-5.11.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879
+size 1926632
--- a/strace-5.11.tar.xz.asc
+++ b/strace-5.11.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCAAGBQJgLTjfAAoJEKgEH6g54W42cZAQAKGwmbekvgfnZFu12Eg/AB18
+EzIJCymdIEM0vnN8loMAXQcWlDRBd1QKoEYP9AmFC3zn6yKzu+Rp8yHC3VHcn8op
+U4766RU2KPtw1qhzDq7ToDcd217ljYWZOPN1PMFAGGZydi642rVqnaYUJ+z+e6IH
+snSr5V3BvBfWJtcORHLiZTdP+ppugRLU6WsOwmlDDthtisr5Vt5KQnTSMemn1xGW
+d+4z6dAPE0s48BXUR9S+6U+m1jOfE8j+p6/104AUmPjjsFAMqQjU5NHUdssKJPjx
+t25O3uNOqfhow6Jaf5tdR6DuWiYGEJboMRPEa9tYKQr03UNobjaazLp2T39CaWMx
+r8QcAaBjEaWSt5AEQwE+q+4ScRa1dAyyzQoS+PelSNvf6fpmja7U9kh7QXUjeGLM
+NOklkD8tXb8fzxEoD/yuVX6AQLyjJtdpNIZdgjngR97zvVvJjYt/L5F9vwDmvrKM
+EkiMeEFXWBc+D+hvvZvTYKz7pUudF5Y4Z89ZNxUMsqz6jIAcfkYLO1KphT4W/s7N
+8fGTZIe21IUhzwltrOnLg55LLzLszwEBONgl1xxAC3V5Wk1QuZzWl6Zcyf/83Ptq
+Q6TtdqA/W2FOF7svmvblu7oiwlzuuaFbRM0SGAK/AJRoZfBTSyP4gEdAd2SIXnZk
+EMQyNspPD+SSB/Pr8Gze
+=qelp
+-----END PGP SIGNATURE-----
--- a/strace-readelf-debug-dump-info-wide-output-changes-in-2.36.patch
+++ b/strace-readelf-debug-dump-info-wide-output-changes-in-2.36.patch
@ -0,0 +1,27 @@
+From 6d092c52d00b99780f6eee546af04fc6b944cdd6 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Wed, 3 Feb 2021 11:54:26 +0100
+Subject: [PATCH] readelf --debug-dump=info --wide output changes in 2.36
+
+As seen here https://sourceware.org/bugzilla/show_bug.cgi?id=27309
+the output format is changed. Not using --wide mode fixes the problem.
+---
+ mpers.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mpers.sh b/src/mpers.sh
+index b28ef703..942da080 100755
+--- a/src/mpers.sh
+++ b/src/mpers.sh
+@@ -46,7 +46,7 @@ for m_type; do
+ 		continue
+ 	sed -i -e '/DEF_MPERS_TYPE/d' "${f_c}"
+ 	$CC $CFLAGS $CC_ARCH_FLAG "${f_c}" -o "${f_o}"
+-	$READELF --wide --debug-dump=info "${f_o}" > "${f_d1}"
+	$READELF --debug-dump=info "${f_o}" > "${f_d1}"
+ 	sed -r -n '
+ 		/^[[:space:]]*<1>/,/^[[:space:]]*<1><[^>]+>: Abbrev Number: 0/!d
+ 		/^[[:space:]]*<[^>]*><[^>]*>: Abbrev Number: 0/d
+-- 
+2.30.0
+
--- a/strace.changes
+++ b/strace.changes
@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Thu Feb 18 08:22:51 UTC 2021 - Martin Liška <mliska@suse.cz>
+
+- Add strace-readelf-debug-dump-info-wide-output-changes-in-2.36.patch
+  in order to workaround gh#171 issue related to the latest
+  binutils release (https://sourceware.org/bugzilla/show_bug.cgi?id=27309).
+
+-------------------------------------------------------------------
+Wed Feb 17 19:17:11 UTC 2021 - Andreas Schwab <schwab@linux-m68k.org>
+
+- Update to strace 5.11
+  * Improvements
+    * Implemented poke injection (--inject=SET:poke_enter= and
+      --inject=SET:poke_exit= options).
+    * Implemented decoding of epoll_pwait2 syscall introduced in Linux 5.11.
+    * Implemented decoding of GPIO_* ioctl commands.
+    * Implemented decoding of FS_IOC_FS[GS]ETXATTR, FS_IOC_[GS]ETFLAGS,
+      and FS_IOC32_[GS]ETFLAGS ioctl commands.
+    * Implemented decoding of SIOCADDMULTI, SIOCDELMULTI, SIOCGIFENCAP,
+      SIOCOUTQNSD, SIOCSIFENCAP, and SIOCSIFHWBROADCAST ioctl commands.
+    * Implemented decoding of UBI_IOCRPEB and UBI_IOCSPEB ioctl commands.
+    * Implemented decoding of V4L2_BUF_TYPE_META_CAPTURE,
+      V4L2_BUF_TYPE_META_OUTPUT, and VIDIOC_QUERY_EXT_CTRL ioctl commands.
+    * Updated lists of BPF_*, BTRFS_*, CLOSE_RANGE_*, ETH_*, IORING_*, KVM_*,
+      PR_*, PTRACE_*, RTA_*, RTAX_*, RTM_*, RTNH_*, SCTP_*, SO_*, SYS_*, UFFD_*,
+      and V4L2_* constants.
+    * Updated lists of ioctl commands from Linux 5.11.
+  * Bug fixes
+    * Fixed decoding of SIOCGIFINDEX, SIOCBRADDIF, and SIOCBRDELIF ioctl
+      commands.
+
 -------------------------------------------------------------------
 Mon Dec 14 09:43:57 UTC 2020 - Andreas Schwab <schwab@linux-m68k.org>

--- a/strace.spec
+++ b/strace.spec
@ -1,7 +1,7 @@
 #
 # spec file for package strace
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@


 Name:           strace
-Version:        5.10
+Version:        5.11
 Release:        0
 Summary:        A utility to trace the system calls of a program
 License:        BSD-3-Clause
@ -29,6 +29,7 @@ Source:         https://github.com/strace/strace/releases/download/v%{version}/%
 Source2:        https://github.com/strace/strace/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc
 Source3:        %{name}.keyring
 Source4:        baselibs.conf
+Patch0:         strace-readelf-debug-dump-info-wide-output-changes-in-2.36.patch
 BuildRequires:  haveged
 BuildRequires:  libacl-devel
 BuildRequires:  libaio-devel
@ -58,6 +59,7 @@ and processes can be seen.  Child processes can also be tracked.

 %prep
 %setup -q
+%patch0 -p1

 %build
 # Make sure LTO doesn't break mpers.sh
@ -89,9 +91,8 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install

 %files
 %defattr(-,root,root)
-%doc CREDITS README README-linux-ptrace NEWS
+%doc CREDITS README doc/README-linux-ptrace NEWS
 %{_bindir}/strace
-%{_bindir}/strace-graph
 %{_bindir}/strace-log-merge
 %{_mandir}/man1/strace.1%{ext_man}
 %{_mandir}/man1/strace-log-merge.1%{ext_man}