From c3cf993cd3f7453cfa3d1a871f0f4e60f9de8385 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 15 Apr 2025 18:53:17 +0200 Subject: [PATCH] find-debuginfo: Fix skip_mini (".gnu_debugdata") handling - Add 0001-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch Resolves: RHEL-71661 debugedit 5.1 regression with read-only exe/lib files and gdb-add-index error reporting [rhel9] --- ...ix-skip_mini-.gnu_debugdata-handling.patch | 33 +++++++++++++++++++ debugedit.spec | 6 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch diff --git a/0001-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch b/0001-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch new file mode 100644 index 0000000..0ed514a --- /dev/null +++ b/0001-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch @@ -0,0 +1,33 @@ +From 64d61a5f7d0ed685880f5c4f4b91f967445ba3a9 Mon Sep 17 00:00:00 2001 +From: Mark Wielaard +Date: Thu, 16 Jan 2025 12:02:11 +0100 +Subject: [PATCH] find-debuginfo: Fix skip_mini (".gnu_debugdata") handling + +The conditional that tests $skip_mini for true/false was inadvertently +flipped, causing the add_minidebug() function to no longer run for the +otherwise eligible binary files. + +Fixes: 971a74d79b48 ("find-debuginfo: Check files are writable before modifying them") + +Reported-by: Michal Domonkos +Signed-off-by: Mark Wielaard +--- + scripts/find-debuginfo.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/find-debuginfo.in b/scripts/find-debuginfo.in +index 4e4ef5a64005..f889e6d3b574 100755 +--- a/scripts/find-debuginfo.in ++++ b/scripts/find-debuginfo.in +@@ -550,7 +550,7 @@ do_file() + application/x-executable*) skip_mini=false ;; + application/x-pie-executable*) skip_mini=false ;; + esac +- if test "$skip_mini" = "true"; then ++ if test "$skip_mini" = "false"; then + if test "$f_writable" = "false"; then + chmod u+w "$f" + fi +-- +2.47.1 + diff --git a/debugedit.spec b/debugedit.spec index 890d3cf..88a85d9 100644 --- a/debugedit.spec +++ b/debugedit.spec @@ -1,6 +1,6 @@ Name: debugedit Version: 5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tools for debuginfo creation License: GPLv3+ and GPLv2+ and LGPLv2+ URL: https://sourceware.org/debugedit/ @@ -46,6 +46,7 @@ Patch5: 0004-compress.patch Patch6: 0005-writable.patch patch7: 0001-debug_str_offsets-header-version-and-padding-are-2-b.patch patch8: 0001-debugedit-Handle-unused-.debug_str_offsets-entries.patch +Patch9: 0001-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch %description The debugedit project provides programs and scripts for creating @@ -89,6 +90,9 @@ make check %{?_smp_mflags} %{_mandir}/man1/find-debuginfo.1* %changelog +* Tue Apr 15 2025 Mark Wielaard - 5.0-9 +- Add 0001-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch + * Fri Apr 11 2025 Mark Wielaard - 5.0-8 - Add 0001-debug_str_offsets-header-version-and-padding-are-2-b.patch - Add 0001-debugedit-Handle-unused-.debug_str_offsets-entries.patch