Accepting request 873302 from home:marxin:branches:devel:tools

- 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).

OBS-URL: https://build.opensuse.org/request/show/873302
OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=132

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
+

strace.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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>
 

strace.spec

@@ -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