!111 upgrade version to 0.190
From: @tong_1001 Reviewed-by: @hubin95 Signed-off-by: @hubin95
This commit is contained in:
commit
81e5f33276
@ -1,4 +1,4 @@
|
|||||||
From e155af3cf1ed9a215459ee161f7632b8b8b62e52 Mon Sep 17 00:00:00 2001
|
From 665f6beeeb98bac769e6a072b88339ecad5c23e4 Mon Sep 17 00:00:00 2001
|
||||||
From: yixiangzhike <yixiangzhike007@163.com>
|
From: yixiangzhike <yixiangzhike007@163.com>
|
||||||
Date: Wed, 17 Aug 2022 16:44:03 +0800
|
Date: Wed, 17 Aug 2022 16:44:03 +0800
|
||||||
Subject: [PATCH] fix issue of moving files by ar or br
|
Subject: [PATCH] fix issue of moving files by ar or br
|
||||||
@ -10,10 +10,10 @@ it forgets to add the files to the new linked list. As a result, the files are l
|
|||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/ar.c b/src/ar.c
|
diff --git a/src/ar.c b/src/ar.c
|
||||||
index 42126aa..56fb9ed 100644
|
index 072ca2e..e824b59 100644
|
||||||
--- a/src/ar.c
|
--- a/src/ar.c
|
||||||
+++ b/src/ar.c
|
+++ b/src/ar.c
|
||||||
@@ -1342,7 +1342,8 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc,
|
@@ -1341,7 +1341,8 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc,
|
||||||
|
|
||||||
struct armem *last_added = after_memberelem;
|
struct armem *last_added = after_memberelem;
|
||||||
for (int cnt = 0; cnt < argc; ++cnt)
|
for (int cnt = 0; cnt < argc; ++cnt)
|
||||||
|
|||||||
@ -1,19 +1,18 @@
|
|||||||
From 7170b990d3dc3974b8e670b3c0e4ca6dcc20c853 Mon Sep 17 00:00:00 2001
|
From 68d0321a35c4bf3ccd8c8a74747739658f02e01a Mon Sep 17 00:00:00 2001
|
||||||
From: xiezhipeng <xiezhipeng1@huawei.com>
|
From: xiezhipeng <xiezhipeng1@huawei.com>
|
||||||
Date: Wed, 8 Dec 2021 09:47:36 +0800
|
Date: Wed, 8 Dec 2021 09:47:36 +0800
|
||||||
Subject: [PATCH] fix segfault in eu-ar -m
|
Subject: [PATCH] fix segfault in eu-ar -m
|
||||||
|
|
||||||
Fix segfaultineu-ar-m.
|
Fix segfaultineu-ar-m.
|
||||||
|
|
||||||
---
|
---
|
||||||
src/ar.c | 2 ++
|
src/ar.c | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/src/ar.c b/src/ar.c
|
diff --git a/src/ar.c b/src/ar.c
|
||||||
index ab6098f..ed5fe2f 100644
|
index 3bcb18f..072ca2e 100644
|
||||||
--- a/src/ar.c
|
--- a/src/ar.c
|
||||||
+++ b/src/ar.c
|
+++ b/src/ar.c
|
||||||
@@ -1159,6 +1159,7 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc,
|
@@ -1155,6 +1155,7 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc,
|
||||||
goto next;
|
goto next;
|
||||||
|
|
||||||
struct armem *newp = alloca (sizeof (struct armem));
|
struct armem *newp = alloca (sizeof (struct armem));
|
||||||
@ -21,7 +20,7 @@ index ab6098f..ed5fe2f 100644
|
|||||||
newp->old_off = elf_getaroff (subelf);
|
newp->old_off = elf_getaroff (subelf);
|
||||||
newp->size = arhdr->ar_size;
|
newp->size = arhdr->ar_size;
|
||||||
newp->sec = arhdr->ar_date;
|
newp->sec = arhdr->ar_date;
|
||||||
@@ -1251,6 +1252,7 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc,
|
@@ -1247,6 +1248,7 @@ do_oper_insert (int oper, const char *arfname, char **argv, int argc,
|
||||||
if (found[cnt] == NULL)
|
if (found[cnt] == NULL)
|
||||||
{
|
{
|
||||||
found[cnt] = alloca (sizeof (struct armem));
|
found[cnt] = alloca (sizeof (struct armem));
|
||||||
|
|||||||
@ -1,95 +0,0 @@
|
|||||||
From 6cad4e56a930034765f8e79ba2eaa2ff1cd8394f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mark Wielaard <mark@klomp.org>
|
|
||||||
Date: Sat, 22 Apr 2023 01:45:43 +0200
|
|
||||||
Subject: [PATCH] elfcompress: Don't compress if section already compressed
|
|
||||||
unless forced
|
|
||||||
|
|
||||||
Before commit a5b07cdf9 "support ZSTD compression algorithm"
|
|
||||||
elfcompress would not try to compress a section if it already
|
|
||||||
had the requested compression type (or was already uncompressed)
|
|
||||||
unless the --force flag was given. An else if construct was changed
|
|
||||||
to an if in the commit causing elfcompress to warn (in verbose mode)
|
|
||||||
but then still try to (re)compress the section.
|
|
||||||
|
|
||||||
Add an explicit check so if nothing needs (un)compressing, the file
|
|
||||||
isn't changed.
|
|
||||||
|
|
||||||
The diff looks large, but git diff -b -w is just:
|
|
||||||
|
|
||||||
+ if (force || type != schtype)
|
|
||||||
+ {
|
|
||||||
if (shdr->sh_type != SHT_NOBITS
|
|
||||||
&& (shdr->sh_flags & SHF_ALLOC) == 0)
|
|
||||||
{
|
|
||||||
@@ -554,6 +556,7 @@ process_file (const char *fname)
|
|
||||||
printf ("[%zd] %s ignoring %s section\n", ndx, sname,
|
|
||||||
(shdr->sh_type == SHT_NOBITS ? "no bits" : "allocated"));
|
|
||||||
}
|
|
||||||
+ }
|
|
||||||
|
|
||||||
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
|
||||||
---
|
|
||||||
src/elfcompress.c | 43 +++++++++++++++++++++++--------------------
|
|
||||||
1 file changed, 23 insertions(+), 20 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/elfcompress.c b/src/elfcompress.c
|
|
||||||
index 18ade66f..f771b92a 100644
|
|
||||||
--- a/src/elfcompress.c
|
|
||||||
+++ b/src/elfcompress.c
|
|
||||||
@@ -529,30 +529,33 @@ process_file (const char *fname)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (shdr->sh_type != SHT_NOBITS
|
|
||||||
- && (shdr->sh_flags & SHF_ALLOC) == 0)
|
|
||||||
+ if (force || type != schtype)
|
|
||||||
{
|
|
||||||
- set_section (sections, ndx);
|
|
||||||
- /* Check if we might want to change this section name. */
|
|
||||||
- if (! adjust_names
|
|
||||||
- && ((type != ZLIB_GNU
|
|
||||||
- && startswith (sname, ".zdebug"))
|
|
||||||
- || (type == ZLIB_GNU
|
|
||||||
- && startswith (sname, ".debug"))))
|
|
||||||
- adjust_names = true;
|
|
||||||
-
|
|
||||||
- /* We need a buffer this large if we change the names. */
|
|
||||||
- if (adjust_names)
|
|
||||||
+ if (shdr->sh_type != SHT_NOBITS
|
|
||||||
+ && (shdr->sh_flags & SHF_ALLOC) == 0)
|
|
||||||
{
|
|
||||||
- size_t slen = strlen (sname);
|
|
||||||
- if (slen > maxnamelen)
|
|
||||||
- maxnamelen = slen;
|
|
||||||
+ set_section (sections, ndx);
|
|
||||||
+ /* Check if we might want to change this section name. */
|
|
||||||
+ if (! adjust_names
|
|
||||||
+ && ((type != ZLIB_GNU
|
|
||||||
+ && startswith (sname, ".zdebug"))
|
|
||||||
+ || (type == ZLIB_GNU
|
|
||||||
+ && startswith (sname, ".debug"))))
|
|
||||||
+ adjust_names = true;
|
|
||||||
+
|
|
||||||
+ /* We need a buffer this large if we change the names. */
|
|
||||||
+ if (adjust_names)
|
|
||||||
+ {
|
|
||||||
+ size_t slen = strlen (sname);
|
|
||||||
+ if (slen > maxnamelen)
|
|
||||||
+ maxnamelen = slen;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
+ else
|
|
||||||
+ if (verbose >= 0)
|
|
||||||
+ printf ("[%zd] %s ignoring %s section\n", ndx, sname,
|
|
||||||
+ (shdr->sh_type == SHT_NOBITS ? "no bits" : "allocated"));
|
|
||||||
}
|
|
||||||
- else
|
|
||||||
- if (verbose >= 0)
|
|
||||||
- printf ("[%zd] %s ignoring %s section\n", ndx, sname,
|
|
||||||
- (shdr->sh_type == SHT_NOBITS ? "no bits" : "allocated"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (shdr->sh_type == SHT_SYMTAB)
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
Binary file not shown.
@ -1,15 +1,14 @@
|
|||||||
# -*- rpm-spec from http://elfutils.org/ -*-
|
# -*- rpm-spec from http://elfutils.org/ -*-
|
||||||
Name: elfutils
|
Name: elfutils
|
||||||
Version: 0.189
|
Version: 0.190
|
||||||
Release: 3
|
Release: 1
|
||||||
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: https://sourceware.orgelfutils/ftp/%{version}/elfutils-%{version}.tar.bz2
|
||||||
|
|
||||||
Patch0: Fix-segfault-in-eu-ar-m.patch
|
Patch0: Fix-segfault-in-eu-ar-m.patch
|
||||||
Patch1: Fix-issue-of-moving-files-by-ar-or-br.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-libelf = %{version}-%{release}
|
||||||
Requires: elfutils-libs = %{version}-%{release}
|
Requires: elfutils-libs = %{version}-%{release}
|
||||||
@ -167,10 +166,7 @@ The ELF/DWARF file searching functions in libdwfl can query
|
|||||||
such servers to download those files on demand.
|
such servers to download those files on demand.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -n %{name}-%{version}
|
%autosetup -n %{name}-%{version} -p1
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if "%toolchain" == "clang"
|
%if "%toolchain" == "clang"
|
||||||
@ -234,6 +230,7 @@ fi
|
|||||||
%{_bindir}/eu-stack
|
%{_bindir}/eu-stack
|
||||||
%{_bindir}/eu-strings
|
%{_bindir}/eu-strings
|
||||||
%{_bindir}/eu-unstrip
|
%{_bindir}/eu-unstrip
|
||||||
|
%{_bindir}/eu-srcfiles
|
||||||
|
|
||||||
%files libs
|
%files libs
|
||||||
%license COPYING-GPLV2 COPYING-LGPLV3
|
%license COPYING-GPLV2 COPYING-LGPLV3
|
||||||
@ -325,6 +322,12 @@ exit 0
|
|||||||
%systemd_postun_with_restart debuginfod.service
|
%systemd_postun_with_restart debuginfod.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 25 2024 shixuantong <shixuantong1@huawei.com> - 0.190-1
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:upgrade version to 0.190
|
||||||
|
|
||||||
* Fri Sep 01 2023 fuanan <fuanan3@h-partners.com> - 0.189-3
|
* Fri Sep 01 2023 fuanan <fuanan3@h-partners.com> - 0.189-3
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user