diff --git a/Fix-issue-of-moving-files-by-ar-or-br.patch b/Fix-issue-of-moving-files-by-ar-or-br.patch new file mode 100644 index 0000000000000000000000000000000000000000..669c0094a8651ebaec8fc86cba2670cdf77b7770 --- /dev/null +++ b/Fix-issue-of-moving-files-by-ar-or-br.patch @@ -0,0 +1,28 @@ +From e155af3cf1ed9a215459ee161f7632b8b8b62e52 Mon Sep 17 00:00:00 2001 +From: yixiangzhike +Date: Wed, 17 Aug 2022 16:44:03 +0800 +Subject: [PATCH] fix issue of moving files by ar or br + +When eu-ar uses the combination of br or ar parameters to move the exist files, +it forgets to add the files to the new linked list. As a result, the files are lost. +--- + src/ar.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/ar.c b/src/ar.c +index 42126aa..56fb9ed 100644 +--- a/src/ar.c ++++ b/src/ar.c +@@ -1342,7 +1342,8 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc, + + struct armem *last_added = after_memberelem; + for (int cnt = 0; cnt < argc; ++cnt) +- if (oper != oper_replace || found[cnt]->old_off == -1) ++ if (((oper == oper_replace) && (ipos != ipos_none) && (found[cnt]->old_off != -1)) || \ ++ oper != oper_replace || found[cnt]->old_off == -1) + { + if (last_added == NULL) + { +-- +2.27.0 + diff --git a/elfutils.spec b/elfutils.spec index 4b35846ab4dd2fcecc554769ec032afbe39ef0c3..da0c2b009b5328ef82d76af37beb423d91b18e8d 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,7 +1,7 @@ # -*- rpm-spec from http://elfutils.org/ -*- Name: elfutils Version: 0.187 -Release: 3 +Release: 4 Summary: A collection of utilities and DSOs to handle ELF files and DWARF data URL: http://elfutils.org/ License: GPLv3+ and (GPLv2+ or LGPLv3+) @@ -9,6 +9,7 @@ Source: ftp://sourceware.org/pub/elfutils/%{version}/elfutils-%{version}.tar.bz2 Patch0: Fix-segfault-in-eu-ar-m.patch Patch1: Fix-error-of-parsing-object-file-perms.patch +Patch2: Fix-issue-of-moving-files-by-ar-or-br.patch Requires: elfutils-libelf = %{version}-%{release} Requires: elfutils-libs = %{version}-%{release} @@ -304,6 +305,9 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Wed Aug 24 2022 yixiangzhike - 0.187-4 +- Fix issue of moving files by ar or br + * Tue Aug 16 2022 yixiangzhike - 0.187-3 - Fix error of parsing object file perms