diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-08-07 17:00:01 +0200 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2023-08-11 16:23:04 +0200 |
| commit | a7ca2cd11667bfd4f06061b362c162e6380532f3 (patch) | |
| tree | 72e56c797bdfc1e6fbec3fe94bd2d4389a80afdd | |
| parent | 22d5f3af715af3d79ec6c002e8609ab8a35e69b9 (diff) | |
| download | justbuild-a7ca2cd11667bfd4f06061b362c162e6380532f3.tar.gz | |
external: Update libcurl to v8.2.1
| -rw-r--r-- | etc/import/TARGETS.curl | 8 | ||||
| -rw-r--r-- | etc/import/lib/TARGETS.curl | 13 | ||||
| -rw-r--r-- | etc/repos.json | 10 |
3 files changed, 26 insertions, 5 deletions
diff --git a/etc/import/TARGETS.curl b/etc/import/TARGETS.curl index 9f77fef4..988f905d 100644 --- a/etc/import/TARGETS.curl +++ b/etc/import/TARGETS.curl @@ -56,6 +56,7 @@ , "USE_GNU_STRERROR_R" , "HAVE_RAND_EGD" , "HAVE_BORINGSSL" + , "HAVE_AWSLC" , "HAVE_SSL_CTX_SET_QUIC_METHOD" , "HAVE_QUICHE_CONN_SET_QLOG_FD" , "HAVE_ZSTD_CREATEDSTREAM" @@ -173,6 +174,10 @@ [ "Boolean. OpenSSL is BoringSSL." , "If true, corresponding symbol detection logic is skipped." ] + , "HAVE_AWSLC": + [ "Boolean. OpenSSL is AWSLC." + , "If true, corresponding symbol detection logic is skipped." + ] , "HAVE_SSL_CTX_SET_QUIC_METHOD": [ "Boolean. `SSL_CTX_set_quic_method` present in OpenSSL." , "If true, corresponding symbol detection logic is skipped." @@ -234,6 +239,7 @@ , "USE_GNU_STRERROR_R" , "HAVE_RAND_EGD" , "HAVE_BORINGSSL" + , "HAVE_AWSLC" , "HAVE_SSL_CTX_SET_QUIC_METHOD" , "HAVE_QUICHE_CONN_SET_QLOG_FD" , "HAVE_ZSTD_CREATEDSTREAM" @@ -402,6 +408,7 @@ , [ "HAVE_BORINGSSL" , {"type": "var", "name": "HAVE_BORINGSSL", "default": false} ] + , ["HAVE_AWSLC", {"type": "var", "name": "HAVE_AWSLC", "default": false}] , [ "HAVE_SSL_CTX_SET_QUIC_METHOD" , { "type": "var" , "name": "HAVE_SSL_CTX_SET_QUIC_METHOD" @@ -459,6 +466,7 @@ , "USE_GNU_STRERROR_R" , "HAVE_RAND_EGD" , "HAVE_BORINGSSL" + , "HAVE_AWSLC" , "HAVE_SSL_CTX_SET_QUIC_METHOD" , "HAVE_QUICHE_CONN_SET_QLOG_FD" , "HAVE_ZSTD_CREATEDSTREAM" diff --git a/etc/import/lib/TARGETS.curl b/etc/import/lib/TARGETS.curl index f26139c6..397f1474 100644 --- a/etc/import/lib/TARGETS.curl +++ b/etc/import/lib/TARGETS.curl @@ -42,6 +42,7 @@ , "USE_GNU_STRERROR_R" , "HAVE_RAND_EGD" , "HAVE_BORINGSSL" + , "HAVE_AWSLC" , "HAVE_SSL_CTX_SET_QUIC_METHOD" , "HAVE_QUICHE_CONN_SET_QLOG_FD" , "HAVE_ZSTD_CREATEDSTREAM" @@ -126,6 +127,7 @@ , ["HAVE_VARIADIC_MACROS_GCC", 1] , ["HAVE_RAND_EGD", {"type": "var", "name": "HAVE_RAND_EGD"}] , ["HAVE_BORINGSSL", {"type": "var", "name": "HAVE_BORINGSSL"}] + , ["HAVE_AWSLC", {"type": "var", "name": "HAVE_AWSLC"}] , ["HAVE_LIBZ", {"type": "var", "name": "USE_ZLIB"}] ] , { "type": "if" @@ -439,6 +441,16 @@ } } , { "type": "if" + , "cond": {"type": "var", "name": "CURL_ENABLE_SSL"} + , "then": + { "type": "if" + , "cond": {"type": "var", "name": "HAVE_AWSLC"} + , "then": [] + , "else": + [["HAVE_AWSLC", ["OPENSSL_IS_AWSLC", ["openssl/base.h"]]]] + } + } + , { "type": "if" , "cond": {"type": "var", "name": "USE_QUICHE"} , "then": { "type": "if" @@ -921,6 +933,7 @@ } } , [["SIZEOF_CURL_OFF_T", "8"]] + , [["SIZEOF_CURL_SOCKET_T", "8"]] ] } ] diff --git a/etc/repos.json b/etc/repos.json index 47634286..a73989bb 100644 --- a/etc/repos.json +++ b/etc/repos.json @@ -437,11 +437,11 @@ , "com_github_curl_curl": { "repository": { "type": "archive" - , "content": "540b4de2edfa015b894ad86d51b33a55f451ac99" - , "fetch": "https://github.com/curl/curl/releases/download/curl-8_0_1/curl-8.0.1.tar.gz" - , "sha256": "5fd29000a4089934f121eff456101f0a5d09e2a3e89da1d714adf06c4be887cb" - , "sha512": "87d945e65176613c6296f8b130bd6c5355e3ca3c62ee4010edd481950cad9760482fd3be8a84e51501c118c29ebc284b8f87c49b06f9d248e9da5819fda38f8f" - , "subdir": "curl-8.0.1" + , "content": "23e33f9883e014ced35cc09f66b6b79a0b24e18d" + , "fetch": "https://github.com/curl/curl/releases/download/curl-8_2_1/curl-8.2.1.tar.gz" + , "sha256": "f98bdb06c0f52bdd19e63c4a77b5eb19b243bcbbd0f5b002b9f3cba7295a3a42" + , "sha512": "d0a906f4dff4c485e6dae930d9a7530147f4c0a0cbb46a83cb9be9d7bd6b9c320386c8be5bcdd3749f2d468b0daf39d06e8c581bab1fa792fd26da409a575cbd" + , "subdir": "curl-8.2.1" } , "target_root": "import targets" , "target_file_name": "TARGETS.curl" |