diff options
Diffstat (limited to 'meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch')
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch b/meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch deleted file mode 100644 index 2d4c912e82..0000000000 --- a/meta/recipes-devtools/elfutils/files/0002-debuginfod-client-Use-CURLOPT_PROTOCOLS_STR-for-libc.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 6560fb26a62ef135a804357ef4f15a47de3e49b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Wielaard <mark@klomp.org> | ||
3 | Date: Tue, 10 Jan 2023 23:20:41 +0100 | ||
4 | Subject: [PATCH] debuginfod-client: Use CURLOPT_PROTOCOLS_STR for libcurl >= 7.85.0 | ||
5 | |||
6 | https://sourceware.org/bugzilla/show_bug.cgi?id=29926 | ||
7 | |||
8 | Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=6560fb26a62ef135a804357ef4f15a47de3e49b3] | ||
9 | Signed-off-by: Mark Wielaard <mark@klomp.org> | ||
10 | --- | ||
11 | debuginfod/debuginfod-client.c | 5 +++++ | ||
12 | 2 files changed, 10 insertions(+) | ||
13 | |||
14 | diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c | ||
15 | index a16165bd..1ce45632 100644 | ||
16 | --- a/debuginfod/debuginfod-client.c | ||
17 | +++ b/debuginfod/debuginfod-client.c | ||
18 | @@ -1336,8 +1336,13 @@ debuginfod_query_server (debuginfod_client *c, | ||
19 | |||
20 | /* Only allow http:// + https:// + file:// so we aren't being | ||
21 | redirected to some unsupported protocol. */ | ||
22 | +#if CURL_AT_LEAST_VERSION(7, 85, 0) | ||
23 | + curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS_STR, | ||
24 | + "http,https,file"); | ||
25 | +#else | ||
26 | curl_easy_setopt_ck(data[i].handle, CURLOPT_PROTOCOLS, | ||
27 | (CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FILE)); | ||
28 | +#endif | ||
29 | curl_easy_setopt_ck(data[i].handle, CURLOPT_URL, data[i].url); | ||
30 | if (vfd >= 0) | ||
31 | curl_easy_setopt_ck(data[i].handle, CURLOPT_ERRORBUFFER, | ||
32 | -- | ||
33 | 2.39.1 | ||
34 | |||