From b2fe717a49dc9ca8a7514d7c64392c727dce969b Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 27 Jan 2023 15:42:31 -0500 Subject: file: Avoid using deprecated curl progress callback --- Utilities/IWYU/mapping.imp | 1 + 1 file changed, 1 insertion(+) (limited to 'Utilities') diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp index b0ed911bb0..b4fb76e65c 100644 --- a/Utilities/IWYU/mapping.imp +++ b/Utilities/IWYU/mapping.imp @@ -101,6 +101,7 @@ # Wrappers for 3rd-party libraries { include: [ "@<.*curl/curlver.h>", private, "", public ] }, + { include: [ "@<.*curl/system.h>", private, "", public ] }, { include: [ "@<.*json/config.h>", private, "", public ] }, { include: [ "@<.*json/forwards.h>", private, "", public ] }, { include: [ "@<.*uv/.+\\.h>", private, "", public ] }, -- cgit v1.2.1 From 39dcf9469d3dae1c319dbe9d1fbd86bef91b73e0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 27 Jan 2023 15:10:58 -0500 Subject: curl: Update script to get curl 7.87.0 --- Utilities/Scripts/update-curl.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Utilities') diff --git a/Utilities/Scripts/update-curl.bash b/Utilities/Scripts/update-curl.bash index 5b66d15ee2..856ae8156e 100755 --- a/Utilities/Scripts/update-curl.bash +++ b/Utilities/Scripts/update-curl.bash @@ -8,7 +8,7 @@ readonly name="curl" readonly ownership="Curl Upstream " readonly subtree="Utilities/cmcurl" readonly repo="https://github.com/curl/curl.git" -readonly tag="curl-7_86_0" +readonly tag="curl-7_87_0" readonly shortlog=false readonly paths=" CMake/* -- cgit v1.2.1 From 8443dfa94663531c8481611cc35b807c1cea2c75 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 30 Jan 2023 08:20:40 -0500 Subject: curl: Work around missing OpenSSL symbol on machine with LCC 1.23 On a nightly build using LCC 1.23, OpenSSL 2.0.0 is found but does not seem to have the `X509_STORE_up_ref` symbol used by curl 7.87. Pending further investigation, disable use of the symbol based on the compiler version. --- Utilities/cmcurl/lib/vtls/openssl.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Utilities') diff --git a/Utilities/cmcurl/lib/vtls/openssl.c b/Utilities/cmcurl/lib/vtls/openssl.c index d86e4b7f5c..c5085be3c3 100644 --- a/Utilities/cmcurl/lib/vtls/openssl.c +++ b/Utilities/cmcurl/lib/vtls/openssl.c @@ -271,6 +271,12 @@ #define HAVE_SSL_X509_STORE_SHARE #endif +/* FIXME: On a specific machine using LCC 1.23, OpenSSL 2.0.0 + * is found but does not seem to have X509_STORE_up_ref. */ +#if defined(__LCC__) && defined(__EDG__) && (__LCC__ == 123) +#undef HAVE_SSL_X509_STORE_SHARE +#endif + /* What API version do we use? */ #if defined(LIBRESSL_VERSION_NUMBER) #define USE_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x2070000f) -- cgit v1.2.1