* debugedit now handles DWARF5

- Add workaround-missing-linked-file.patch (boo#1233368)
- Use -p1 with autosetup

OBS-URL: https://build.opensuse.org/package/show/Base:System/debugedit?expand=0&rev=12

debugedit.changes

@@ -6,10 +6,12 @@ Mon Nov 11 08:23:09 UTC 2024 - Michal Suchanek <msuchanek@suse.de>
   * Switch to xxhash for buildid recomputation (much faster!)
   * find-debuginfo supports -v,--verbose and -q,--quiet
   * find-debuginfo passes -j down to dwz
-  * debugedit now handles Handle DWARF5
+  * debugedit now handles DWARF5
   * debugedit handles compressed DWARF debug sections
 - Refresh debugsubpkg.patch finddebuginfo.patch
 - Remove upstreamed remove-bad-shift.patch
+- Add workaround-missing-linked-file.patch (boo#1233368)
+- Use -p1 with autosetup
 
 -------------------------------------------------------------------
 Wed Nov 16 07:28:09 UTC 2022 - Ludwig Nussel <lnussel@suse.de>

debugedit.spec

@@ -32,6 +32,7 @@ Patch1:         finddebuginfo-absolute-links.patch
 Patch2:         debugsubpkg.patch
 Patch3:         debuglink.patch
 Patch4:         debuginfo-mono.patch
+Patch5:         workaround-missing-linked-file.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  help2man
@@ -55,7 +56,7 @@ debugedit provides programs and scripts for creating debuginfo and source file d
 collect build-ids and rewrite source paths in DWARF data for debugging, tracing and profiling.
 
 %prep
-%autosetup -p0
+%autosetup -p1
 
 %build
 autoreconf -fiv

debuginfo-mono.patch

@@ -1,7 +1,7 @@
 Index: scripts/find-debuginfo.in
 ===================================================================
---- scripts/find-debuginfo.in.orig
-+++ scripts/find-debuginfo.in
+--- a/scripts/find-debuginfo.in
++++ b/scripts/find-debuginfo.in
 @@ -434,6 +434,16 @@ while read nlinks inum f; do
        ;;
      *) continue ;;

debuglink.patch

@@ -1,7 +1,7 @@
 Index: scripts/find-debuginfo.in
 ===================================================================
---- scripts/find-debuginfo.in.orig
-+++ scripts/find-debuginfo.in
+--- a/scripts/find-debuginfo.in
++++ b/scripts/find-debuginfo.in
 @@ -407,7 +407,7 @@ debug_link()
  get_debugfn()
  {

debugsubpkg.patch

@@ -1,7 +1,7 @@
 Index: scripts/find-debuginfo.in
 ===================================================================
---- scripts/find-debuginfo.in.orig
-+++ scripts/find-debuginfo.in
+--- a/scripts/find-debuginfo.in
++++ b/scripts/find-debuginfo.in
 @@ -684,20 +684,26 @@ if $run_dwz \
    fi
  fi

finddebuginfo-absolute-links.patch

@@ -7,8 +7,8 @@ behavior to reflect that policy.
 
 Signed-off-by: Jan Blunck <jblunck@suse.de>
 
---- ./scripts/find-debuginfo.in.orig	2017-12-01 15:26:21.939199791 +0000
-+++ ./scripts/find-debuginfo.in	2017-12-01 15:27:03.153081225 +0000
+--- a/scripts/find-debuginfo.in	2017-12-01 15:26:21.939199791 +0000
++++ b/scripts/find-debuginfo.in	2017-12-01 15:27:03.153081225 +0000
 @@ -305,7 +305,17 @@ debug_link()
    local l="/usr/lib/debug$2"
    local t="$1"

finddebuginfo.patch

@@ -1,7 +1,7 @@
 Index: scripts/find-debuginfo.in
 ===================================================================
---- scripts/find-debuginfo.in.orig
-+++ scripts/find-debuginfo.in
+--- a/scripts/find-debuginfo.in
++++ b/scripts/find-debuginfo.in
 @@ -434,12 +434,18 @@ trap 'rm -rf "$temp"' EXIT
  
  # Build a list of unstripped ELF files and their hardlinks

workaround-missing-linked-file.patch

@@ -0,0 +1,20 @@
+Previously this error was ignored but now return value of parallel jobs is
+propagated, and missing this file fails package build.
+
+It is not clear if this is the correct fix (ie the file accumulates link data,
+and initially is missing because no data is accumulated yet) or if this should
+have been created elsewhere.
+
+Index: debugedit-5.1/scripts/find-debuginfo.in
+===================================================================
+--- debugedit-5.1.orig/scripts/find-debuginfo.in
++++ debugedit-5.1/scripts/find-debuginfo.in
+@@ -578,7 +578,7 @@ do_file()
+   # If this file has multiple links, make the corresponding .debug files
+   # all links to one file too.
+   if [ $nlinks -gt 1 ]; then
+-    grep "^$inum " "$temp/linked" | while read inum linked; do
++    { grep -s "^$inum " "$temp/linked" ||: ; } | while read inum linked; do
+       link=$debugfn
+       get_debugfn "$linked"
+       $verbose && echo "hard linked $link to $debugfn"