quick fix for mpers config breakage with binutils 2.36; rel 2

taken from pull request but fix not considered final:
https://github.com/strace/strace/pull/171

diff --git a/strace-binutils2.36.patch b/strace-binutils2.36.patch
new file mode 100644 (file)
index 0000000..6dd575f
--- /dev/null
+++ b/strace-binutils2.36.patch
@@ -0,0 +1,24 @@
+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/mpers.sh b/mpers.sh
+index b28ef703b..942da0807 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

diff --git a/strace.spec b/strace.spec
index 65f559633f8d292b0a259a46f43590ff784838e8..a443d6eb881a0b58ce17e9f3dbaf7ee3a51ed717 100644 (file)
--- a/strace.spec
+++ b/strace.spec
@@ -22,12 +22,13 @@ Summary(tr.UTF-8):  Çalışan bir sürecin yaptığı sistem çağrılarını li
 Summary(uk.UTF-8):     Відслідковує та показує системні виклики, пов'язані із запущеним процесом
 Name:          strace
 Version:       5.11
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         Development/Debuggers
 Source0:       https://github.com/strace/strace/releases/download/v%{version}/%{name}-%{version}.tar.xz
 # Source0-md5: f5a317fd535465cf9130d0547661f5c4
 Source1:       %{name}.1.pl
+Patch0:                %{name}-binutils2.36.patch
 URL:           https://strace.io/
 # acl and libaio for headers only
 BuildRequires: acl-devel
@@ -109,6 +110,7 @@ Doda wtedy upływający czas dla każdego procesu.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if %{with libunwind}