!103 Remove unnecessary patch because this patch is contained in elfutils-0.189.tar
From: @fly_fzc Reviewed-by: @ziyangc Signed-off-by: @ziyangc
This commit is contained in:
commit
7397dff4f9
@ -1,46 +0,0 @@
|
|||||||
From 9e18fcfeb2c8ff471c11da58b05215e219be20fd Mon Sep 17 00:00:00 2001
|
|
||||||
From: yixiangzhike <yixiangzhike007@163.com>
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,16 +1,15 @@
|
|||||||
# -*- rpm-spec from http://elfutils.org/ -*-
|
# -*- rpm-spec from http://elfutils.org/ -*-
|
||||||
Name: elfutils
|
Name: elfutils
|
||||||
Version: 0.189
|
Version: 0.189
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
|
Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
|
||||||
URL: http://elfutils.org/
|
URL: http://elfutils.org/
|
||||||
License: GPLv3+ and (GPLv2+ or LGPLv3+)
|
License: GPLv3+ and (GPLv2+ or LGPLv3+)
|
||||||
Source: ftp://sourceware.org/pub/elfutils/%{version}/elfutils-%{version}.tar.bz2
|
Source: ftp://sourceware.org/pub/elfutils/%{version}/elfutils-%{version}.tar.bz2
|
||||||
|
|
||||||
Patch0: Fix-segfault-in-eu-ar-m.patch
|
Patch0: Fix-segfault-in-eu-ar-m.patch
|
||||||
Patch1: Fix-error-of-parsing-object-file-perms.patch
|
Patch1: Fix-issue-of-moving-files-by-ar-or-br.patch
|
||||||
Patch2: Fix-issue-of-moving-files-by-ar-or-br.patch
|
Patch2: backport-elfcompress-Don-t-compress-if-section-already-compre.patch
|
||||||
Patch3: backport-elfcompress-Don-t-compress-if-section-already-compre.patch
|
|
||||||
|
|
||||||
Requires: elfutils-libelf = %{version}-%{release}
|
Requires: elfutils-libelf = %{version}-%{release}
|
||||||
Requires: elfutils-libs = %{version}-%{release}
|
Requires: elfutils-libs = %{version}-%{release}
|
||||||
@ -172,7 +171,6 @@ such servers to download those files on demand.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if "%toolchain" == "clang"
|
%if "%toolchain" == "clang"
|
||||||
@ -327,6 +325,12 @@ exit 0
|
|||||||
%systemd_postun_with_restart debuginfod.service
|
%systemd_postun_with_restart debuginfod.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 01 2023 fuanan <fuanan3@h-partners.com> - 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 <zhangruifang1@h-partners.com> - 0.189-2
|
* Tue Aug 29 2023 zhangruifang <zhangruifang1@h-partners.com> - 0.189-2
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user