diff options
author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-07 00:50:19 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-14 22:27:54 +0300 |
commit | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (patch) | |
tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0004-Handle-empty-CAInfo-in-curl-plugin-correctly.patch | |
parent | 32777eec25d2c527a62e5ffab90a3dfef35855aa (diff) | |
download | openbmc-1fc0d70f658da30091bcd49f9bf29aecd6b99ba7.tar.xz |
Update to internal 0.86
Signed-off-by: Jason M. Bills <jason.m.bills@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0004-Handle-empty-CAInfo-in-curl-plugin-correctly.patch')
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0004-Handle-empty-CAInfo-in-curl-plugin-correctly.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0004-Handle-empty-CAInfo-in-curl-plugin-correctly.patch b/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0004-Handle-empty-CAInfo-in-curl-plugin-correctly.patch deleted file mode 100644 index 867f2e166..000000000 --- a/meta-openbmc-mods/meta-common/recipes-utilities/nbdkit/nbdkit/0004-Handle-empty-CAInfo-in-curl-plugin-correctly.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f86b22a450589cdcac6bb3afa1818dfa6d2eefe4 Mon Sep 17 00:00:00 2001 -From: Wiktor Golgowski <wiktor.golgowski@intel.com> -Date: Fri, 27 Aug 2021 17:39:59 +0200 -Subject: [PATCH] Handle empty CAInfo in curl plugin correctly. - -Recent change in libcurl causes CAINFO option to be set when -the library is compiled. If we do not want to use the default -certificate store, we set the option to an empty string. -This change recognizes zero-length CAInfo and clears the libcurl -option. - -Signed-off-by: Wiktor Golgowski <wiktor.golgowski@intel.com> ---- - plugins/curl/curl.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c -index fad84140..176f9a1f 100644 ---- a/plugins/curl/curl.c -+++ b/plugins/curl/curl.c -@@ -498,8 +498,12 @@ curl_open (int readonly) - curl_easy_setopt (h->c, CURLOPT_FAILONERROR, 1L); - - /* Options. */ -- if (cainfo) -- curl_easy_setopt (h->c, CURLOPT_CAINFO, cainfo); -+ if (cainfo) { -+ if (strlen (cainfo) == 0) -+ curl_easy_setopt (h->c, CURLOPT_CAINFO, NULL); -+ else -+ curl_easy_setopt (h->c, CURLOPT_CAINFO, cainfo); -+ } - if (capath) - curl_easy_setopt (h->c, CURLOPT_CAPATH, capath); - if (cookie) |