Skip to content

Commit 71dd725

Browse files
bluesmoonbluesmoon
committed
Bump LibCURL_jll to 8.16.0
This is a combined cherry-pick of with changes: * b9ac28a * b636acb * 16a2bf0 * 9a7aaec Additional changes: * Fixed LibCURL_jll version in doc/Manifest.toml and stdlib/Manifest.toml. This also needs to be fixed in `master` * Undo update of `Downloads` checksum since it is not part of the LibCURL change Originally authored by: * FX Coudert <[email protected]> * Erik Schnetter <[email protected]>
1 parent 1a8f80f commit 71dd725

File tree

7 files changed

+44
-50
lines changed

7 files changed

+44
-50
lines changed

‎deps/checksums/curl‎

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,38 @@
1-
LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/md5/e8c53aa3fb963c80921787d5d565eb2c
2-
LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/sha512/8e442ea834299df9c02acb87226c121395ad8e550025ac5ee1103df09c6ff43817e9e48dd1bcbc92c80331ef3ddff531962430269115179acbec2bab2de5b011
3-
LibCURL.v8.11.1+1.aarch64-apple-darwin.tar.gz/md5/890c65523227b4352344b78575cd4c5c
4-
LibCURL.v8.11.1+1.aarch64-apple-darwin.tar.gz/sha512/fae539243adc805d8da0ac88cf67901ff1f12ae94e40293dc6a7e17072f8c0cb9f0a54b7e324bd52ad9361b764c8bc88728ff4495e0cd6dbf1eb93d2bae8994b
5-
LibCURL.v8.11.1+1.aarch64-linux-gnu.tar.gz/md5/bf937fb6a8ea8a82b732821f3652641c
6-
LibCURL.v8.11.1+1.aarch64-linux-gnu.tar.gz/sha512/230c9983e4c7810d3eee1a5eff7e8b8c44f76db7af8a8312a608609f87bc8a56031c337c06af00a536c10ed33725200aa137c3153ef6dcf6575cc7c350b3b461
7-
LibCURL.v8.11.1+1.aarch64-linux-musl.tar.gz/md5/b40ea4266dc48a1fbfa016fb8d0ca987
8-
LibCURL.v8.11.1+1.aarch64-linux-musl.tar.gz/sha512/032d6208ebe226da90d0ef1f1f2d20580fd4e37db68146d1e836a9be4c1fc5f7890f1b808337ca41f46a07a833b55f06f09a4a164f26d0824a649ea40b30233f
9-
LibCURL.v8.11.1+1.aarch64-unknown-freebsd.tar.gz/md5/69097390c0bd3a32969e47608f24363f
10-
LibCURL.v8.11.1+1.aarch64-unknown-freebsd.tar.gz/sha512/391019370a9c122e6425a3097edafe0980dc2077be015919e7914aa781ba10060e3af9ee1fa881d8536d0ca57783d0616a1b5735e2ae7e06ea4edfaee2994120
11-
LibCURL.v8.11.1+1.armv6l-linux-gnueabihf.tar.gz/md5/bc4ab567f8cc4cd88b2239123d103113
12-
LibCURL.v8.11.1+1.armv6l-linux-gnueabihf.tar.gz/sha512/0ecbf2380852744815a8f7e99e7c276c342f847907eb7b0d256905ba854ee59d37f83456fcdc8931dc39dbaed58f0949205b80d23e43e2b59195d18a539d4047
13-
LibCURL.v8.11.1+1.armv6l-linux-musleabihf.tar.gz/md5/18c896c544f02f7f2b976c03fc3772f1
14-
LibCURL.v8.11.1+1.armv6l-linux-musleabihf.tar.gz/sha512/e9a73670f1c3638c3a886055b32df5baadc41aad9829cfa0d4e05acd46d2d012464114ed6fd1e3d182a4adc266c1da97e9a683c7ba69e93f61592acf8567e336
15-
LibCURL.v8.11.1+1.armv7l-linux-gnueabihf.tar.gz/md5/4672f9d67ff357a2eda6f77d8f470659
16-
LibCURL.v8.11.1+1.armv7l-linux-gnueabihf.tar.gz/sha512/a2f2dc8d8e10c652a324a4da3d2337d2886626e1c417c68efbcfcefa443cb3ec81b52f2a212c4a7dbd6a5ae920e54d1bfdc02b68c2607d09784206cd4d11ffb0
17-
LibCURL.v8.11.1+1.armv7l-linux-musleabihf.tar.gz/md5/49d297563fd44a03f88f67bb7ea2a0be
18-
LibCURL.v8.11.1+1.armv7l-linux-musleabihf.tar.gz/sha512/5cc3902571f04c96be38de53b5320876a3e7e54934090ff2a80304a7ca59a361ed9f3f328c3e3c06ef33550d221a8243e924b7ea49792753f839c12aceb1e979
19-
LibCURL.v8.11.1+1.i686-linux-gnu.tar.gz/md5/f05a86574278ecf7802edeffe1fee9ac
20-
LibCURL.v8.11.1+1.i686-linux-gnu.tar.gz/sha512/e493b5836022a6280f21237fef423034a9701097cb271683e81d4b4e487a6289080d00016fbaaa8bddeb004d44626a0076fa7832835fe7f58b60af6798223f89
21-
LibCURL.v8.11.1+1.i686-linux-musl.tar.gz/md5/03340412ba27f231dbf2de58a1af871f
22-
LibCURL.v8.11.1+1.i686-linux-musl.tar.gz/sha512/541fbdd5570432832d3835038b41df73aac8e0e7bc03f41c696dc12a57bd4784b4da1f485264fd1fba263fe9e520a7dbb0ef9a365275efc30dfc361ceab252f3
23-
LibCURL.v8.11.1+1.i686-w64-mingw32.tar.gz/md5/5f2071282d572bbb53dfcfb16d0d9608
24-
LibCURL.v8.11.1+1.i686-w64-mingw32.tar.gz/sha512/e4d6fbd518055e8f2a71b89ee9a33728e6e076729adeafc358fc40f47d032b739363c9b57df5bfb3c43244f7b833afc76ae255e70bcf43b81262d74278532a22
25-
LibCURL.v8.11.1+1.powerpc64le-linux-gnu.tar.gz/md5/806ee9b51c2bffd798c1682867a7a2a0
26-
LibCURL.v8.11.1+1.powerpc64le-linux-gnu.tar.gz/sha512/20ae5f47ad24e1fba8ecdc3a81aa81acb5c3c224041f12f8be48f9a0abd5ce44117b096a59fc8f861b6f8c6ad9e4177e3a3ba3e2dbecb2078d4bab19bdd4d239
27-
LibCURL.v8.11.1+1.riscv64-linux-gnu.tar.gz/md5/2e029213e81955f39423733608c4ffa8
28-
LibCURL.v8.11.1+1.riscv64-linux-gnu.tar.gz/sha512/a634ae9de047bd8a93cbfaa3cd5375d895baf9917b5062653f15472527836b51eeb15006b5e1888251e3f09d8177b489ea9975580fe6d95bc759708fc9654fd1
29-
LibCURL.v8.11.1+1.x86_64-apple-darwin.tar.gz/md5/56cf7cf4ea22123e516843a5751eea17
30-
LibCURL.v8.11.1+1.x86_64-apple-darwin.tar.gz/sha512/5ae5569ade42cdf0a1aa8acfda7d1dd3df30d498637f83e93bd9f8be883ae777e789b417be24df83e42ebe32fb67cc328bedac3dc231d3569f585641175ed257
31-
LibCURL.v8.11.1+1.x86_64-linux-gnu.tar.gz/md5/a4a733fe879693e83e1f05b6ef742ea6
32-
LibCURL.v8.11.1+1.x86_64-linux-gnu.tar.gz/sha512/2767f49d4a528080a5c7fcdecd8374dd5498c5b1e0d65f58d027f6a9138cd00203732e5da1806b689efbaacb1ee905a6839a09eab35f0174279af314a34fca81
33-
LibCURL.v8.11.1+1.x86_64-linux-musl.tar.gz/md5/837a64073c3d8fd115cadf4af1b19235
34-
LibCURL.v8.11.1+1.x86_64-linux-musl.tar.gz/sha512/cf0559b65c213889ab0bad388ca6dc1699891e5cd2c5c34faf80cd60404b5f363eaa624d425fd463407d35c5cfd814c1a9964a2b3b638fa7e7a0a2919980ba8c
35-
LibCURL.v8.11.1+1.x86_64-unknown-freebsd.tar.gz/md5/22726eb8caed9b279e6cddbfa328f2c6
36-
LibCURL.v8.11.1+1.x86_64-unknown-freebsd.tar.gz/sha512/b9e304575bb0e3241f938c545a91cc5b722e8dfc53d6ad270ea75b8fb05655ae8a03e5f844f5b8a75a84133d0883369bc6c46f0805be37ee840f2f1168994c37
37-
LibCURL.v8.11.1+1.x86_64-w64-mingw32.tar.gz/md5/aa5ce49a63d216776ef9fc11b6b3b012
38-
LibCURL.v8.11.1+1.x86_64-w64-mingw32.tar.gz/sha512/4e7fe5ff82ca9bafbaca476aa51273ee9590058350c889a6dd8a0eecaa024d19f0a26dd7078808d08dfdf2f5751daec51e88dc88253a4638274edb63ae93fd3c
39-
curl-8.11.1.tar.bz2/md5/31dc730e6fff880a6ba92bdacead9d38
40-
curl-8.11.1.tar.bz2/sha512/30041e15b919684c46b6b3853950cba22e6fbc21157b1f682097277d2b20066ba71e51eb5d2c34bbd81b8bf4c2791255d6492ee21d49f606d71f66e211a6adde
1+
LibCURL.v8.16.0+0.aarch64-apple-darwin.tar.gz/md5/bed3e7a90f3186a517e7333d758e8f12
2+
LibCURL.v8.16.0+0.aarch64-apple-darwin.tar.gz/sha512/6e11a7d9f3aef8ec31db0454dfe1f89eeb329d872d29dc223056c341159f975ce1c1c14d99c3ec106c2680241d1f3e563498fce68f92593e5b29a3f140bbe948
3+
LibCURL.v8.16.0+0.aarch64-linux-gnu.tar.gz/md5/1d64602a075928d2230d47e32a440932
4+
LibCURL.v8.16.0+0.aarch64-linux-gnu.tar.gz/sha512/ae68e1a758a1e751b4fb3b9c65022f3b4b611991ab3304076191e14a08785049201e719050cba86d2e27ac7244ffaaf8ffa4d6541524e090eeb0666b9403d38a
5+
LibCURL.v8.16.0+0.aarch64-linux-musl.tar.gz/md5/c238d891f15db56ae87b713620a2d125
6+
LibCURL.v8.16.0+0.aarch64-linux-musl.tar.gz/sha512/c2d3bc675cd723bb9f1876af2e681fc5b5f580b95188966eca33f37e2ee11f175074dc5114c5dd26bb16736498f8e396473ee7fabc55291489c83f25dde6bd28
7+
LibCURL.v8.16.0+0.aarch64-unknown-freebsd.tar.gz/md5/0fe37aaeb5c76cb75f8101c44a166aea
8+
LibCURL.v8.16.0+0.aarch64-unknown-freebsd.tar.gz/sha512/374e13185c5e9697059514fe6b24a4e3e65a2374905ba603a1a9111b53ac712dd3d1b62f75d149febe96f2722b9707295d35baef5efac59825e2119d7d132160
9+
LibCURL.v8.16.0+0.armv6l-linux-gnueabihf.tar.gz/md5/00eef43c511cc3186df6f52678865e74
10+
LibCURL.v8.16.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/2431867015f3373fab08d920a6cc32a7043cc8d64dd778fa7d655e1805c9980b709fd0b581afbf6d38d3fc8455296c0558c25e36ecf47a3a8afd5fc4178aafed
11+
LibCURL.v8.16.0+0.armv6l-linux-musleabihf.tar.gz/md5/8caa9df0e21ebe465829370beda281a3
12+
LibCURL.v8.16.0+0.armv6l-linux-musleabihf.tar.gz/sha512/e4b48405e796b574b634b79852adaab9a727e4363c46d5833c181743af9411a57c57bcfa4fb1c817a9bf6bdf74d816720c06d4dd2529e19f0e7863563aee4045
13+
LibCURL.v8.16.0+0.armv7l-linux-gnueabihf.tar.gz/md5/9a28acc2d36dd18996c806c5f7ff2605
14+
LibCURL.v8.16.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/5bc793972b43a86133eba9d52ad03cb55b2a80c66dfaa208abc578d77bb5d3a920628e9697154fa15fae5adcc85dd37b63b282bb263147a30ed117381d031263
15+
LibCURL.v8.16.0+0.armv7l-linux-musleabihf.tar.gz/md5/c334149808082c773832eb41616dab23
16+
LibCURL.v8.16.0+0.armv7l-linux-musleabihf.tar.gz/sha512/46c7c34dbcefe7dd5795df10dea2fdf04b9a0e3345361d7460a9adfe00434fc6686298b86f270e6197650d504412e22cfa794cc78ce0561f738bedc8e7b15f1d
17+
LibCURL.v8.16.0+0.i686-linux-gnu.tar.gz/md5/d193ff530cd7fb06a3427dad263392fd
18+
LibCURL.v8.16.0+0.i686-linux-gnu.tar.gz/sha512/6b126e642b5e925caf13125a6d216174df049c1682d037e9061d5ae942c47773fe33f37c5efaa161c832375619c4ba5b0e42d926473a2408ea07a04baf774fc9
19+
LibCURL.v8.16.0+0.i686-linux-musl.tar.gz/md5/af6d5ccae5c5b9fc0e9fdd383a47752c
20+
LibCURL.v8.16.0+0.i686-linux-musl.tar.gz/sha512/638cf2c8ededc0b2a3a0b0a7c780e7e164934e2f06b6937e00e3c275020ddd8e1c502df5cedd813d8c6393cf001220585ba993db7451554b60b308d4f6d4c846
21+
LibCURL.v8.16.0+0.i686-w64-mingw32.tar.gz/md5/1dcdcc66427f9a075a38ad8da3043f34
22+
LibCURL.v8.16.0+0.i686-w64-mingw32.tar.gz/sha512/cd4a6906468249af2efdb23cc885e6288ecfa0d2d384432fec6bff08da3425719447eac55847d6845b9c5a4ba6ca5d75db015a08b8351e195973a4269f4a9b75
23+
LibCURL.v8.16.0+0.powerpc64le-linux-gnu.tar.gz/md5/c40a3d1a07deca3265abbf029709ed7b
24+
LibCURL.v8.16.0+0.powerpc64le-linux-gnu.tar.gz/sha512/d5ec18b44dd4d513f4bc0ff1ec10b252c9f4a31c6464a5a0238c3b035e0089295501cb66fd648ab77e58fb0b0d14dbdcd978b57c7c4670b5d36a6f21a5d370a3
25+
LibCURL.v8.16.0+0.riscv64-linux-gnu.tar.gz/md5/77e564416d7c213681ab07f6488dcac7
26+
LibCURL.v8.16.0+0.riscv64-linux-gnu.tar.gz/sha512/176cbbdbefc52d6aa64ed8f305eaa3837ee24c18692b7a6649765389e25d699d261ee4b3b0764a1ee7bcda3444d77eff5c5a94ac687e31ce942ad0dd7458a730
27+
LibCURL.v8.16.0+0.x86_64-apple-darwin.tar.gz/md5/f45eaaaf619b3ace25b835480594270c
28+
LibCURL.v8.16.0+0.x86_64-apple-darwin.tar.gz/sha512/6de197c91747f4dc605ad804d76230886ff395b26eea76eb1e1a0025cca9f0b85406ff41b2a1af1059a69fb33a36188ecd68994c0cbcff312d132a720e7060ec
29+
LibCURL.v8.16.0+0.x86_64-linux-gnu.tar.gz/md5/1a07f8331ef86e76a07b9a02f9f4cc19
30+
LibCURL.v8.16.0+0.x86_64-linux-gnu.tar.gz/sha512/fdf41e374c2589c3e5217cc8b6aa6b9d4427caeec1dbdc04d20abe3102064821b7e4b6eb1ec532da1fba5a0193837e1dd9db2cd64cf5fffc35e693ac7840325e
31+
LibCURL.v8.16.0+0.x86_64-linux-musl.tar.gz/md5/4969ed3da400229799a5375bc165ceb7
32+
LibCURL.v8.16.0+0.x86_64-linux-musl.tar.gz/sha512/d523c255cdcace127b4675485bb38e2300405ac31b750c83f44b5962895df43b25b5b21b5ce1225219832e366276e63a1fde218c69beaaee149821f61e259e5b
33+
LibCURL.v8.16.0+0.x86_64-unknown-freebsd.tar.gz/md5/7333c33e5bc1462a986928f21e3dca56
34+
LibCURL.v8.16.0+0.x86_64-unknown-freebsd.tar.gz/sha512/9a85b148d078815f070c3a21c77b95594d1476ffa9ad9fcc8ef7d518dae44f1f68a3ca3297fa7f3c4477d3655e869ce277eaa5664089c073fc4e6a8116382237
35+
LibCURL.v8.16.0+0.x86_64-w64-mingw32.tar.gz/md5/d9d3883ce76b59244a3ad660172bbcc3
36+
LibCURL.v8.16.0+0.x86_64-w64-mingw32.tar.gz/sha512/a31fc178ec17f3a92342f604eadc5e91cf75c7b32de99594cde7b62de9b5ab8868682cee714d1f572c2a9a4bdeaba5434bbff51fbdff37ffdad21327917aabb6
37+
curl-8.16.0.tar.bz2/md5/56d29893410d4d539e44a03e3f8b162b
38+
curl-8.16.0.tar.bz2/sha512/c1f92aa40f28ac47bdde3ef79d38b41ffb7eb6202ae130ff176b75baf62e745e3e39755866f4ac5b8bed0e2c6dcd20d6f27c03a466c7d1a2e6c1323f26a47611

‎deps/curl.mk‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,9 @@ CURL_CONFIGURE_FLAGS += \
5454

5555
# We use different TLS libraries on different platforms.
5656
# On Windows, we use schannel
57-
# On MacOS, we use SecureTransport
58-
# On Linux, we use OpenSSL
57+
# On other platforms, we use OpenSSL
5958
ifeq ($(OS), WINNT)
6059
CURL_TLS_CONFIGURE_FLAGS := --with-schannel
61-
else ifeq ($(OS), Darwin)
62-
CURL_TLS_CONFIGURE_FLAGS := --with-secure-transport
6360
else
6461
CURL_TLS_CONFIGURE_FLAGS := --with-openssl
6562
endif

‎deps/curl.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
CURL_JLL_NAME := LibCURL
44

55
## source build
6-
CURL_VER := 8.11.1
6+
CURL_VER := 8.16.0

‎doc/Manifest.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ version = "0.6.4"
117117
[[deps.LibCURL_jll]]
118118
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"]
119119
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
120-
version = "8.11.1+1"
120+
version = "8.16.0+0"
121121

122122
[[deps.LibGit2]]
123123
deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"]

‎stdlib/LibCURL_jll/Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "LibCURL_jll"
22
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
3-
version = "8.11.1+1"
3+
version = "8.16.0+0"
44

55
[deps]
66
LibSSH2_jll = "29816b5a-b9ab-546f-933c-edad1886dfa8"

‎stdlib/LibCURL_jll/src/LibCURL_jll.jl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
baremodule LibCURL_jll
66
using Base, Libdl, nghttp2_jll, LibSSH2_jll, Zlib_jll
7-
if !(Sys.iswindows() || Sys.isapple())
8-
# On Windows and macOS we use system SSL/crypto libraries
7+
if !Sys.iswindows()
98
using OpenSSL_jll
109
end
1110

‎stdlib/Manifest.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ version = "0.6.4"
9393
[[deps.LibCURL_jll]]
9494
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"]
9595
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
96-
version = "8.11.1+1"
96+
version = "8.16.0+0"
9797

9898
[[deps.LibGit2]]
9999
deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"]

0 commit comments

Comments
 (0)