diff --git a/backport-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch b/backport-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch new file mode 100644 index 0000000000000000000000000000000000000000..bb572509a8345251f52eefd880cab8372e7dd69b --- /dev/null +++ b/backport-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 4e4ef5a..f889e6d 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.33.0 + diff --git a/debugedit.spec b/debugedit.spec index 84e9a9e68589e2b180da58f5af538803330faaae..f7f1817816ecb3fda4dcc824fb2ecfa01a9d629e 100644 --- a/debugedit.spec +++ b/debugedit.spec @@ -1,6 +1,6 @@ Name: debugedit Version: 5.0 -Release: 10 +Release: 11 Summary: Tools for debuginfo creation License: GPL-2.0-or-later and LGPL-2.1-only and GPL-3.0-only Group: Applications @@ -25,6 +25,7 @@ Patch6001: backport-tests-Ignore-stderr-output-of-readelf-in-debugedit.a.patch Patch6002: backport-find-debuginfo-remove-duplicate-filenames-when-creat.patch Patch6003: backport-find-debuginfo.sh-Exit-with-real-exit-status-in-para.patch Patch6004: backport-find-debuginfo-Check-files-are-writable-before-modif.patch +Patch6005: backport-find-debuginfo-Fix-skip_mini-.gnu_debugdata-handling.patch Patch9000: add-loongarch-support-for-debugedit.patch Patch9001: add-sw_64-support.patch @@ -42,6 +43,7 @@ paths in DWARF data for debugging, tracing and profiling. %patch6002 -p1 %patch6003 -p1 %patch6004 -p1 +%patch6005 -p1 %ifarch loongarch64 %patch9000 -p1 %endif @@ -83,6 +85,9 @@ make check %{?_smp_mflags} %{_rpmconfigdir}/debugedit %changelog +* Mon Apr 21 2025 hugel - 5.0-11 +- find-debuginfo: Fix skip_mini (".gnu_debugdata") handling + * Thu Feb 27 2025 liweigang - 5.0-10 - add sw_64 support