diff --git a/Fix-error-of-parsing-object-file-perms.patch b/Fix-error-of-parsing-object-file-perms.patch deleted file mode 100644 index e50e96f98fc598ac5c31d541f20ffae31c2ed32f..0000000000000000000000000000000000000000 --- a/Fix-error-of-parsing-object-file-perms.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9e18fcfeb2c8ff471c11da58b05215e219be20fd Mon Sep 17 00:00:00 2001 -From: yixiangzhike -Date: Tue, 16 Aug 2022 09:49:35 +0800 -Subject: [PATCH] fix error of parsing object file perms - ---- - libelf/elf_begin.c | 20 +++++++++++++++++++- - 1 file changed, 19 insertions(+), 1 deletion(-) - -diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c -index 17d9b1f..581d8ef 100644 ---- a/libelf/elf_begin.c -+++ b/libelf/elf_begin.c -@@ -997,10 +997,28 @@ __libelf_next_arhdr_wrlock (Elf *elf) - } \ - while (0) - -+#define INT_FIELD_HN(FIELD, HN) \ -+ do \ -+ { \ -+ char buf[sizeof (ar_hdr->FIELD) + 1]; \ -+ const char *string = ar_hdr->FIELD; \ -+ if (ar_hdr->FIELD[sizeof (ar_hdr->FIELD) - 1] != ' ') \ -+ { \ -+ *((char *) mempcpy (buf, ar_hdr->FIELD, sizeof (ar_hdr->FIELD))) \ -+ = '\0'; \ -+ string = buf; \ -+ } \ -+ if (sizeof (elf_ar_hdr->FIELD) <= sizeof (long int)) \ -+ elf_ar_hdr->FIELD = (__typeof (elf_ar_hdr->FIELD)) strtol (string, NULL, HN); \ -+ else \ -+ elf_ar_hdr->FIELD = (__typeof (elf_ar_hdr->FIELD)) strtoll (string, NULL, HN); \ -+ } \ -+ while (0) -+ - INT_FIELD (ar_date); - INT_FIELD (ar_uid); - INT_FIELD (ar_gid); -- OCT_FIELD (ar_mode); -+ INT_FIELD_HN (ar_mode, 8); - INT_FIELD (ar_size); - - if (elf_ar_hdr->ar_size < 0) --- -2.27.0 - diff --git a/elfutils.spec b/elfutils.spec index 2cffcd10ac715c73d9e1fc79e6b981af672c8df7..517c81410e59e5f4eba40b6209cc5f9bd90f4a49 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,16 +1,15 @@ # -*- rpm-spec from http://elfutils.org/ -*- Name: elfutils Version: 0.189 -Release: 2 +Release: 3 Summary: A collection of utilities and DSOs to handle ELF files and DWARF data URL: http://elfutils.org/ License: GPLv3+ and (GPLv2+ or LGPLv3+) 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 -Patch3: backport-elfcompress-Don-t-compress-if-section-already-compre.patch +Patch1: Fix-issue-of-moving-files-by-ar-or-br.patch +Patch2: backport-elfcompress-Don-t-compress-if-section-already-compre.patch Requires: elfutils-libelf = %{version}-%{release} Requires: elfutils-libs = %{version}-%{release} @@ -172,7 +171,6 @@ such servers to download those files on demand. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build %if "%toolchain" == "clang" @@ -327,6 +325,12 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Fri Sep 01 2023 fuanan - 0.189-3 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:Remove unnecessary patch because this patch is contained in elfutils-0.189.tar + * Tue Aug 29 2023 zhangruifang - 0.189-2 - Type:bugfix - CVE:NA