c468385a0e
- Add elfutils-0.188-deprecated-CURLINFO.patch, elfutils-0.188-CURL_AT_LEAST_VERSION.patch and elfutils-0.188-CURLOPT_PROTOCOLS_STR.patch
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
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 1/8] 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/ChangeLog | 4 ++++
|
|
debuginfod/debuginfod-client.c | 4 ++--
|
|
2 files changed, 6 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.39.1
|
|
|