update version to 0.189
This commit is contained in:
parent
368f419af2
commit
74b8b2e2a4
@ -36,7 +36,7 @@ index 17d9b1f..581d8ef 100644
|
|||||||
INT_FIELD (ar_date);
|
INT_FIELD (ar_date);
|
||||||
INT_FIELD (ar_uid);
|
INT_FIELD (ar_uid);
|
||||||
INT_FIELD (ar_gid);
|
INT_FIELD (ar_gid);
|
||||||
- INT_FIELD (ar_mode);
|
- OCT_FIELD (ar_mode);
|
||||||
+ INT_FIELD_HN (ar_mode, 8);
|
+ INT_FIELD_HN (ar_mode, 8);
|
||||||
INT_FIELD (ar_size);
|
INT_FIELD (ar_size);
|
||||||
|
|
||||||
|
|||||||
@ -1,34 +0,0 @@
|
|||||||
From 246d6d0ffcfe9ac6ef3581ca74399036aa827590 Mon Sep 17 00:00:00 2001
|
|
||||||
From: panxiaohe <panxh.life@foxmail.com>
|
|
||||||
Date: Fri, 12 Aug 2022 17:05:40 +0800
|
|
||||||
Subject: [PATCH] get instance correctly for eu-ar -N option
|
|
||||||
|
|
||||||
---
|
|
||||||
src/ar.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/ar.c b/src/ar.c
|
|
||||||
index 42126aa..f8166d3 100644
|
|
||||||
--- a/src/ar.c
|
|
||||||
+++ b/src/ar.c
|
|
||||||
@@ -518,7 +518,7 @@ do_oper_extract (int oper, const char *arfname, char **argv, int argc,
|
|
||||||
ENTRY entry;
|
|
||||||
entry.key = arhdr->ar_name;
|
|
||||||
ENTRY *res = hsearch (entry, FIND);
|
|
||||||
- if (res != NULL && (instance < 0 || instance-- == 0)
|
|
||||||
+ if (res != NULL && (instance < 0 || --instance == 0)
|
|
||||||
&& !found[(char **) res->data - argv])
|
|
||||||
found[(char **) res->data - argv] = do_extract = true;
|
|
||||||
}
|
|
||||||
@@ -952,7 +952,7 @@ do_oper_delete (const char *arfname, char **argv, int argc,
|
|
||||||
ENTRY entry;
|
|
||||||
entry.key = arhdr->ar_name;
|
|
||||||
ENTRY *res = hsearch (entry, FIND);
|
|
||||||
- if (res != NULL && (instance < 0 || instance-- == 0)
|
|
||||||
+ if (res != NULL && (instance < 0 || --instance == 0)
|
|
||||||
&& !found[(char **) res->data - argv])
|
|
||||||
found[(char **) res->data - argv] = do_delete = true;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
From d2bf497b12fbd49b4996ccf0744303ffd67735b1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andrew Paprocki <andrew@ishiboo.com>
|
|
||||||
Date: Wed, 21 Dec 2022 11:15:00 -0500
|
|
||||||
Subject: [PATCH] PR29926: debuginfod: Fix usage of deprecated CURLINFO_*
|
|
||||||
|
|
||||||
The `CURLINFO_SIZE_DOWNLOAD_T` and `CURLINFO_CONTENT_LENGTH_DOWNLOAD_T`
|
|
||||||
identifiers are `enum`s, not pre-processor definitions, so the current
|
|
||||||
`#ifdef` logic is not selecting the newer API. This results in the
|
|
||||||
older identifiers being used and they now generate errors when compiled
|
|
||||||
against Curl 7.87, which has silently deprecated them, causing GCC to
|
|
||||||
emit `-Werror=deprecated-declarations`.
|
|
||||||
|
|
||||||
Instead, the newer identifiers were added in Curl 7.55, so explicitly
|
|
||||||
check for `CURL_AT_LEAST_VERSION(7, 55, 0)` instead of the current
|
|
||||||
logic. This eliminates the error when compiling against Curl 7.87.
|
|
||||||
|
|
||||||
Ref: https://github.com/curl/curl/pull/1511
|
|
||||||
|
|
||||||
Signed-off-by: Andrew Paprocki <andrew@ishiboo.com>
|
|
||||||
---
|
|
||||||
debuginfod/debuginfod-client.c | 4 ++--
|
|
||||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
|
|
||||||
index 8873fcc8..692aecce 100644
|
|
||||||
--- a/debuginfod/debuginfod-client.c
|
|
||||||
+++ b/debuginfod/debuginfod-client.c
|
|
||||||
@@ -1456,7 +1456,7 @@ debuginfod_query_server (debuginfod_client *c,
|
|
||||||
deflate-compressing proxies, this number is likely to be
|
|
||||||
unavailable, so -1 may show. */
|
|
||||||
CURLcode curl_res;
|
|
||||||
-#ifdef CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
|
|
||||||
+#if CURL_AT_LEAST_VERSION(7, 55, 0)
|
|
||||||
curl_off_t cl;
|
|
||||||
curl_res = curl_easy_getinfo(target_handle,
|
|
||||||
CURLINFO_CONTENT_LENGTH_DOWNLOAD_T,
|
|
||||||
@@ -1491,7 +1491,7 @@ debuginfod_query_server (debuginfod_client *c,
|
|
||||||
if (target_handle) /* we've committed to a server; report its download progress */
|
|
||||||
{
|
|
||||||
CURLcode curl_res;
|
|
||||||
-#ifdef CURLINFO_SIZE_DOWNLOAD_T
|
|
||||||
+#if CURL_AT_LEAST_VERSION(7, 55, 0)
|
|
||||||
curl_off_t dl;
|
|
||||||
curl_res = curl_easy_getinfo(target_handle,
|
|
||||||
CURLINFO_SIZE_DOWNLOAD_T,
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
From 304741e11018c29e7ff17751e05dcc5c786a3fd9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mark Wielaard <mark@klomp.org>
|
|
||||||
Date: Wed, 21 Dec 2022 18:21:08 +0100
|
|
||||||
Subject: [PATCH] debuginfod: Define CURL_AT_LEAST_VERSION if necessary
|
|
||||||
|
|
||||||
Older curl.h don't define CURL_AT_LEAST_VERSION, so define it
|
|
||||||
ourselves because it is nicer than doing hex encoded version
|
|
||||||
comparisons.
|
|
||||||
|
|
||||||
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
|
||||||
---
|
|
||||||
debuginfod/debuginfod-client.c | 7 +++++++
|
|
||||||
1 files changed, 7 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
|
|
||||||
index 692aecce..a16165bd 100644
|
|
||||||
--- a/debuginfod/debuginfod-client.c
|
|
||||||
+++ b/debuginfod/debuginfod-client.c
|
|
||||||
@@ -105,6 +105,13 @@ void debuginfod_end (debuginfod_client *c) { }
|
|
||||||
#include <fts.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/* Older curl.h don't define CURL_AT_LEAST_VERSION. */
|
|
||||||
+#ifndef CURL_AT_LEAST_VERSION
|
|
||||||
+ #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
|
|
||||||
+ #define CURL_AT_LEAST_VERSION(x,y,z) \
|
|
||||||
+ (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#include <pthread.h>
|
|
||||||
|
|
||||||
static pthread_once_t init_control = PTHREAD_ONCE_INIT;
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
From 6560fb26a62ef135a804357ef4f15a47de3e49b3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mark Wielaard <mark@klomp.org>
|
|
||||||
Date: Tue, 10 Jan 2023 23:20:41 +0100
|
|
||||||
Subject: [PATCH] debuginfod-client: Use CURLOPT_PROTOCOLS_STR for libcurl >=
|
|
||||||
7.85.0
|
|
||||||
|
|
||||||
https://sourceware.org/bugzilla/show_bug.cgi?id=29926
|
|
||||||
|
|
||||||
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
|
||||||
---
|
|
||||||
debuginfod/debuginfod-client.c | 5 +++++
|
|
||||||
1 files changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
|
|
||||||
index 5ebddbd..4326b59 100644
|
|
||||||
--- a/debuginfod/debuginfod-client.c
|
|
||||||
+++ b/debuginfod/debuginfod-client.c
|
|
||||||
@@ -1024,8 +1024,13 @@ debuginfod_query_server (debuginfod_client *c,
|
|
||||||
|
|
||||||
/* Only allow http:// + https:// + file:// so we aren't being
|
|
||||||
redirected to some unsupported protocol. */
|
|
||||||
+#if CURL_AT_LEAST_VERSION(7, 85, 0)
|
|
||||||
+ curl_easy_setopt(data[i].handle, CURLOPT_PROTOCOLS_STR,
|
|
||||||
+ "http,https,file");
|
|
||||||
+#else
|
|
||||||
curl_easy_setopt(data[i].handle, CURLOPT_PROTOCOLS,
|
|
||||||
CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FILE);
|
|
||||||
+#endif
|
|
||||||
curl_easy_setopt(data[i].handle, CURLOPT_URL, data[i].url);
|
|
||||||
if (vfd >= 0)
|
|
||||||
curl_easy_setopt(data[i].handle, CURLOPT_ERRORBUFFER, data[i].errbuf);
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
# -*- rpm-spec from http://elfutils.org/ -*-
|
# -*- rpm-spec from http://elfutils.org/ -*-
|
||||||
Name: elfutils
|
Name: elfutils
|
||||||
Version: 0.187
|
Version: 0.189
|
||||||
Release: 12
|
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+)
|
||||||
@ -10,11 +10,6 @@ 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-error-of-parsing-object-file-perms.patch
|
||||||
Patch2: Fix-issue-of-moving-files-by-ar-or-br.patch
|
Patch2: Fix-issue-of-moving-files-by-ar-or-br.patch
|
||||||
Patch3: Get-instance-correctly-for-eu-ar-N-option.patch
|
|
||||||
Patch4: elfutils-Add-sw64-architecture.patch
|
|
||||||
Patch5: backport-PR29926-debuginfod-Fix-usage-of-deprecated-CURLINFO_.patch
|
|
||||||
Patch6: backport-debuginfod-Define-CURL_AT_LEAST_VERSION-if-necessary.patch
|
|
||||||
Patch7: backport-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch
|
|
||||||
|
|
||||||
Requires: elfutils-libelf = %{version}-%{release}
|
Requires: elfutils-libelf = %{version}-%{release}
|
||||||
Requires: elfutils-libs = %{version}-%{release}
|
Requires: elfutils-libs = %{version}-%{release}
|
||||||
@ -176,13 +171,6 @@ such servers to download those files on demand.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
|
||||||
%ifarch sw_64
|
|
||||||
%patch4 -p1
|
|
||||||
%endif
|
|
||||||
%patch5 -p1
|
|
||||||
%patch6 -p1
|
|
||||||
%patch7 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if "%toolchain" == "clang"
|
%if "%toolchain" == "clang"
|
||||||
@ -299,7 +287,7 @@ fi
|
|||||||
%{_mandir}/man3/debuginfod_*.3*
|
%{_mandir}/man3/debuginfod_*.3*
|
||||||
%{_mandir}/man3/elf_*.3*
|
%{_mandir}/man3/elf_*.3*
|
||||||
%{_mandir}/man7/debuginfod*.7.*
|
%{_mandir}/man7/debuginfod*.7.*
|
||||||
%{_mandir}/man8/debuginfod.8*
|
%{_mandir}/man8/debuginfod*.8*
|
||||||
|
|
||||||
%files debuginfod-client
|
%files debuginfod-client
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -337,6 +325,12 @@ exit 0
|
|||||||
%systemd_postun_with_restart debuginfod.service
|
%systemd_postun_with_restart debuginfod.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 13 2023 fuanan <fuanan3@h-partners.com> - 0.189-1
|
||||||
|
- Type:enhancement
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:update version to 0.189
|
||||||
|
|
||||||
* Tue Apr 25 2023 jammyjellyfish <jammyjellyfish255@outlook.com> - 0.187-12
|
* Tue Apr 25 2023 jammyjellyfish <jammyjellyfish255@outlook.com> - 0.187-12
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user