Skip to content

Commit 16a2bf0

Browse files
eschnettgiordano
eschnett
and
giordano
authored
LibCURL_jll: New version 8.15.0 (#59057)
Note that CURL 8.15.0 does not support using Secure Transport on MacOS any more. This PR thus switches CURL to using OpenSSL on MacOS. --------- Co-authored-by: Mosè Giordano <[email protected]>
1 parent 99eb121 commit 16a2bf0

File tree

11 files changed

+47
-51
lines changed

11 files changed

+47
-51
lines changed

‎deps/checksums/Downloads-06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3.tar.gz/md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ac2209576b09a9c7a4da02a058e9ec87

‎deps/checksums/Downloads-06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3.tar.gz/sha512

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0636b4e7f17d8747408949b77470f5f7f1b4c4b618dc905e20d84d0a5ca4713834e8a4d6a10bcccf7a28982edefe03eeff11bb0aca7d8cb49cb230b7e1ddc06f

‎deps/checksums/Downloads-1199e9039dcce6072601c3f29cea8da4a0acbff6.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎deps/checksums/Downloads-1199e9039dcce6072601c3f29cea8da4a0acbff6.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎deps/checksums/curl

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
LibCURL.v8.14.1+1.aarch64-apple-darwin.tar.gz/md5/77465587a033e919ce347c9df3909b23
2-
LibCURL.v8.14.1+1.aarch64-apple-darwin.tar.gz/sha512/04a6bb04f6fc190423349787a1b345923f52b140099a3c62fdd077b3145a22a20ea06808c488712d686bc6d51fe86caea3b13cd9acde36822fec7249905ff16d
3-
LibCURL.v8.14.1+1.aarch64-linux-gnu.tar.gz/md5/a5b78f4d06821de8c57abba8fbfc1c23
4-
LibCURL.v8.14.1+1.aarch64-linux-gnu.tar.gz/sha512/a09f94bd8556d63b7850b8ac29f8272c7437cc32c8440200d7044a4eb89bba8752d74ad26d3da0433ab07565dfefb1edb058ef13a1949546994321ea88e9e515
5-
LibCURL.v8.14.1+1.aarch64-linux-musl.tar.gz/md5/09e1b11301296cddb9039e0247ba0cde
6-
LibCURL.v8.14.1+1.aarch64-linux-musl.tar.gz/sha512/380159eec2b638a190d284a02fdb6c60e925f4f0268ea4e2ae7272fffe19bfff5de93d9a71f3830147ece69417bbd2f7faca229cb1a4b4df4f1828e3f8a0ff53
7-
LibCURL.v8.14.1+1.aarch64-unknown-freebsd.tar.gz/md5/f872ba79808c0b24dfee579bf2fc7229
8-
LibCURL.v8.14.1+1.aarch64-unknown-freebsd.tar.gz/sha512/aa6ac50c0c3eaed768f228b2a4d320d44afe1bd34ee81273f976ca4027ccbafe996c2e349eab87718e962da0a18afa8b3c5d297e913d46ba09a8d68bba7dabf1
9-
LibCURL.v8.14.1+1.armv6l-linux-gnueabihf.tar.gz/md5/4e28def7a2d3bffc8d2adddbe670dd04
10-
LibCURL.v8.14.1+1.armv6l-linux-gnueabihf.tar.gz/sha512/444df0655e0d85cd35e20013e79787af17138dc16a292bf4557ebbd049c8f855449b9aa78eb45b0a00255e8320a4ad2b44a08c6161b7155467c9da95e8bb0a7d
11-
LibCURL.v8.14.1+1.armv6l-linux-musleabihf.tar.gz/md5/4c037de41ff577fe217792e5d7c7f9a0
12-
LibCURL.v8.14.1+1.armv6l-linux-musleabihf.tar.gz/sha512/65122b75188cc7dfb8dd97c27398f614d2e3149c73e95bd9c60cdad2eb1c95a3c3dd7558a02a5d24b0e129c8c3a315efe45dd49f5f219a525dbeea0b4ab9b93f
13-
LibCURL.v8.14.1+1.armv7l-linux-gnueabihf.tar.gz/md5/f7dedafd8eb09c7bf9cbac4c0adae37a
14-
LibCURL.v8.14.1+1.armv7l-linux-gnueabihf.tar.gz/sha512/7c8187ce79de364488b7d8606638f7cfc1094f9a1d5a26dc71dc5a1a6135834641fe459b08f71999556d5ff2dfd1820ff3f1371c2b5fa94b8ea5985744044527
15-
LibCURL.v8.14.1+1.armv7l-linux-musleabihf.tar.gz/md5/6ede02ecc42e088e60d5a6c8a0181fd9
16-
LibCURL.v8.14.1+1.armv7l-linux-musleabihf.tar.gz/sha512/e3ea55dd8035506b5c2cc11ea2dbf30533f3fdef017decdca35fafe19a09f9b945f821f722fa60651fb083204a8d0aab47bb2024544b4d81b5b647b7bf260e01
17-
LibCURL.v8.14.1+1.i686-linux-gnu.tar.gz/md5/b823b709fd3a26a2861962b8f538718b
18-
LibCURL.v8.14.1+1.i686-linux-gnu.tar.gz/sha512/4d94062910ed94cdf013ba3ce546231e733a780078f106a42937e26400de65634991df440e27865368b4f1f395743629cfd88dd62dd27b90654f4766c0a5f468
19-
LibCURL.v8.14.1+1.i686-linux-musl.tar.gz/md5/a80641db6cc9731342c08e85835481cd
20-
LibCURL.v8.14.1+1.i686-linux-musl.tar.gz/sha512/9983e83469b38f17645b4cfdf9c0005684fb35a29bf97b1be8c2a34bdeb1115cf029353811eef7a4c96c2c7da3e0c4e1ba8fa7c589b8452675232544f591cf7d
21-
LibCURL.v8.14.1+1.i686-w64-mingw32.tar.gz/md5/f1703e82d19e3a9c9fe5068532a2f98e
22-
LibCURL.v8.14.1+1.i686-w64-mingw32.tar.gz/sha512/03a98243ea31f04a05ad94b0ce378830ee486d313bc33e652f44fd11fa812d3bff31556484c66a1fe467815affb5f191e7e8212996ac0a7b89b46b7743db58e1
23-
LibCURL.v8.14.1+1.powerpc64le-linux-gnu.tar.gz/md5/324982f4b780aba414384c369580ec85
24-
LibCURL.v8.14.1+1.powerpc64le-linux-gnu.tar.gz/sha512/b6c0d05ce457e8d1c97098891982921c4282a1a9f2984ed82735fc4251cf12d230826d7e96bcbbaf073ae6cfa9357adfd51341abb937db3ffca57156eac2a0eb
25-
LibCURL.v8.14.1+1.riscv64-linux-gnu.tar.gz/md5/363f5480fd9d59c232ae30e799e96090
26-
LibCURL.v8.14.1+1.riscv64-linux-gnu.tar.gz/sha512/3a821895af3d6ed2363a39057f691bec2f139c196fe430c8d4f6b6404ecdc4d5d563e02c451dea8304fe403b7c1b3b2fe5fb8a7376db594037e31f29bb07cfb6
27-
LibCURL.v8.14.1+1.x86_64-apple-darwin.tar.gz/md5/e369db8d77ea5234de6f2efad75c856a
28-
LibCURL.v8.14.1+1.x86_64-apple-darwin.tar.gz/sha512/5de40ee8f893d36a91d547c70ecbb396e4a3bef63eaaa7dab37a9374ce20651a3b51b2a415d7803183a76f5828bb39e3df428e6f4bd913e735226bd7732e0f23
29-
LibCURL.v8.14.1+1.x86_64-linux-gnu.tar.gz/md5/7af620f052ca833f495f8a770685877d
30-
LibCURL.v8.14.1+1.x86_64-linux-gnu.tar.gz/sha512/443dccf17f1946e12b53a50b1a65494b1101a7d61853f9357df49891c36e49eae6f309a49f860534bd359d1e258c43fdd3e1d1e2e81a00084ddd6a6a47ae11f0
31-
LibCURL.v8.14.1+1.x86_64-linux-musl.tar.gz/md5/84bd751a151c3eb27d64a49f3d6a86ca
32-
LibCURL.v8.14.1+1.x86_64-linux-musl.tar.gz/sha512/2c2b52bb5eaf980acd1ae0db7b8b2c0b7f88dbd9f4e2dde7e2f06052492479fafe7ac17e54e255dccf7f9ef5b4ef095ad54a4ae614a670d2efad713cac83bbb5
33-
LibCURL.v8.14.1+1.x86_64-unknown-freebsd.tar.gz/md5/0575d2d4b334bc5bae99c04b6534cff2
34-
LibCURL.v8.14.1+1.x86_64-unknown-freebsd.tar.gz/sha512/3aed29b4a762d300247a9a5a6b90393c8d8d41c895a334060a296983c8d8fdb47a2c4f59f8f3467aacb88f2034b0969b5bfabace97a619e26f5194d9f8baba4d
35-
LibCURL.v8.14.1+1.x86_64-w64-mingw32.tar.gz/md5/03391a09da53b96531f95f764ebf5a49
36-
LibCURL.v8.14.1+1.x86_64-w64-mingw32.tar.gz/sha512/231f76cdf61cda36e4aa94bb8d4a5cb2607bde11cad172e516dd8c8689f36628eb01629c36bfc89be4c578866723d7e42257027ebb5be8dc16edc3d242deb86d
37-
curl-8.14.1.tar.bz2/md5/bf683fcf55bed4c5bf66ca57ab99a96b
38-
curl-8.14.1.tar.bz2/sha512/95fd0fffb354e60bc2a7251ce53122dc41d5b0aae00863654cae65f2e9698f02ff67d60b367f1a9dd556bfa77e3bac1e5e985efe00aaecfb99e1ea68148f3344
1+
LibCURL.v8.15.0+0.aarch64-apple-darwin.tar.gz/md5/47db9bf4549442b466ae465b48544f46
2+
LibCURL.v8.15.0+0.aarch64-apple-darwin.tar.gz/sha512/a4819a6a94958cfeb0b035b87cfe6cb40ac3c0f015b7b52b5314ec3f8a129a9aa96ccae04fe3774318bc1a9316299c3fbe1a47b2e2e5ce37a38d9a8e01d6f5e5
3+
LibCURL.v8.15.0+0.aarch64-linux-gnu.tar.gz/md5/7e04291557b99a53f8b8fca1235862b3
4+
LibCURL.v8.15.0+0.aarch64-linux-gnu.tar.gz/sha512/399b9a538dc54647b5ca1ad182e5c1c4da8ba0f3217fe8d01737bf0a689a67ed0be185ebbd98d60b2739900df664feae6cedb90643c2e53dc7c12ec5a5a8b57d
5+
LibCURL.v8.15.0+0.aarch64-linux-musl.tar.gz/md5/63f3e0171c8f56592a3c810136154ccd
6+
LibCURL.v8.15.0+0.aarch64-linux-musl.tar.gz/sha512/03b67d73bd41597c6080155e5a0eb58d8cb559d1325c2954aa92c54905dd6f425ba46dd16c5411b16ac683c041ed685893954c4ab431d794bd3f929c11de4ae7
7+
LibCURL.v8.15.0+0.aarch64-unknown-freebsd.tar.gz/md5/31f249d293bbea3a0669197e6559d467
8+
LibCURL.v8.15.0+0.aarch64-unknown-freebsd.tar.gz/sha512/bb047b609e69926d3837dfe39d68057c55c7380427a3807ccc71e631530d75f64e9edd0a4ef5ab30b44e3d763d2798e9f8c4727fb565674de228cf95ebccd922
9+
LibCURL.v8.15.0+0.armv6l-linux-gnueabihf.tar.gz/md5/462094d229be838090eb6d3353bb3907
10+
LibCURL.v8.15.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/3bac7d0b0a065e5793d466823eb2a62d8256d41291c9bf6926bafc434eaec51a72ca289b2803b0b6fc19c4d0e6776205e55b235701496e84d56abdd4da7be8a2
11+
LibCURL.v8.15.0+0.armv6l-linux-musleabihf.tar.gz/md5/3f95a180a1fe427b642f05814029f9d0
12+
LibCURL.v8.15.0+0.armv6l-linux-musleabihf.tar.gz/sha512/8a4483486dd355d61f0c6f60d0a1b38d9942dc126b36368adcb9499daf2a134087fb54ffbd2930adf3fe1cc39497f2f7e1f6304f48f7540cf05ebeb792d0ec1f
13+
LibCURL.v8.15.0+0.armv7l-linux-gnueabihf.tar.gz/md5/d033e4eba1455ef17b5d86d9911d2d32
14+
LibCURL.v8.15.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/91e31ec413ee15574ee7e4258eebd6963d6679ea8b41c43e0f02f18521d52f5a9f258c46f8df27163019dd89a2598b7c3bcd3d2aa2bd3fd3a545de9060ef7dd1
15+
LibCURL.v8.15.0+0.armv7l-linux-musleabihf.tar.gz/md5/3ba22fe71ba61b92e297f64593d69387
16+
LibCURL.v8.15.0+0.armv7l-linux-musleabihf.tar.gz/sha512/a87bc28cac150d76c281b1baa6f79da8140bf849595dcca684fcd64299fc801c3c2dcd733b264c5a809fbba95dbe8dfac0c30ecd7c5d0bb77fee7d3da91d6816
17+
LibCURL.v8.15.0+0.i686-linux-gnu.tar.gz/md5/67612302faac6b9822271d01c1959d78
18+
LibCURL.v8.15.0+0.i686-linux-gnu.tar.gz/sha512/0f47c1f8307054eca308650f13dfee62a6eaae70f5385f460339a821cb73f97eb56ac5f685cb9e14d51e109a510508e6e0e7b6f31319e57413396473ac19a1c6
19+
LibCURL.v8.15.0+0.i686-linux-musl.tar.gz/md5/b14f7012d2aa9ed353387c3b357255c6
20+
LibCURL.v8.15.0+0.i686-linux-musl.tar.gz/sha512/177b4581c4717854420073731398dc8bb2a3370a572fd6b61e545a8e852dcb9ce76f4c26bf28e1250cece1dcbe34e53d0edd2c421c6251c117e2f3255b8945a6
21+
LibCURL.v8.15.0+0.i686-w64-mingw32.tar.gz/md5/2afb5832ab12120e755505916cad0e95
22+
LibCURL.v8.15.0+0.i686-w64-mingw32.tar.gz/sha512/4e78b5d0a8ec3e1bc7131c66fc5f041090f5fb64fe6b85224fea1e3ebcbdbf56604492a059ae311281052da7ff67c066910c6c74fb7d19b3e46b4d3cdb7163b7
23+
LibCURL.v8.15.0+0.powerpc64le-linux-gnu.tar.gz/md5/9d5bd94798a63a14ba945949b054195f
24+
LibCURL.v8.15.0+0.powerpc64le-linux-gnu.tar.gz/sha512/eb4c6a555b1b6dc39a890e819803d4d5015e9ad8a841e21b484fa7442330ea0b3c2da07fcc1afb09faf115fc4818eaf2f328f92fc07400a523aca45828b71e4b
25+
LibCURL.v8.15.0+0.riscv64-linux-gnu.tar.gz/md5/68b576c1f2086490a3d7997ce8627a32
26+
LibCURL.v8.15.0+0.riscv64-linux-gnu.tar.gz/sha512/e7dc57b985a6f6289d7a56a1cae49522cc623831167ec317bcdb66b578f1d967befb5d849d2c24dc49e183524a6f3b72b6c688e3500c5cb8a3f00ce748728fc6
27+
LibCURL.v8.15.0+0.x86_64-apple-darwin.tar.gz/md5/75320e06cd2370343684279f744b694a
28+
LibCURL.v8.15.0+0.x86_64-apple-darwin.tar.gz/sha512/198f520a860337aaf367db970083db8c7a3742b3f37f5594e4dc86669b319cc4dc4bdfc9e875c3e4ca9f93aae24705b7c47711bac66daa629ed0d386d352b053
29+
LibCURL.v8.15.0+0.x86_64-linux-gnu.tar.gz/md5/3f159aada40e7f4489b179a570d36c9a
30+
LibCURL.v8.15.0+0.x86_64-linux-gnu.tar.gz/sha512/42e646400aca6d0b233ab8feb3b32c3a9e89ca4b27fb0c82e0c52b4b008e9d9aad6640988f32397d705cc52c36ffa4379f6ba4c015ee24b6e2bd750235c8f10c
31+
LibCURL.v8.15.0+0.x86_64-linux-musl.tar.gz/md5/d4e35eee8af7d9e640f9f2616abf1ebf
32+
LibCURL.v8.15.0+0.x86_64-linux-musl.tar.gz/sha512/16a9ee5afe025db931e7209fbc711494ff7795a9463cf81a307e7ea74cf53b64a1c5413d388e328a372e4480255b4b1324448e17f51db141adcb2716aa00d698
33+
LibCURL.v8.15.0+0.x86_64-unknown-freebsd.tar.gz/md5/94e871b6200ab1768112aa3a7195f31e
34+
LibCURL.v8.15.0+0.x86_64-unknown-freebsd.tar.gz/sha512/84474b36d21ab1d90331850b914908add5afd239f9111a48dec9b6e7ff770e9a730c7cad6d322f0cdd3567822fb157e1470716e181dd29b594a4e471b8fd6c54
35+
LibCURL.v8.15.0+0.x86_64-w64-mingw32.tar.gz/md5/99c54cbc43fc719281b48bb3137e9364
36+
LibCURL.v8.15.0+0.x86_64-w64-mingw32.tar.gz/sha512/d817951ec0ba4513e50c2bf2159ccefb6b38fa74478b84b8f006b6a47897c610fe6c9f1c9db0533595c243f8b84d40456aa9fd1aa3afb22ea272dced5b6e237c
37+
curl-8.15.0.tar.bz2/md5/8b475c3eec74c5e78a9fb45a902dae76
38+
curl-8.15.0.tar.bz2/sha512/797fc9af599de88ceb36c8bc284d3f1a2a1ca0703c7bdd377d67ce6da4317ca673ba4a946c61f3bd5a66febee37b5aa88826f26fbbb398f5e20630769a0de033

‎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.14.1
6+
CURL_VER := 8.15.0

‎stdlib/Downloads.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
DOWNLOADS_BRANCH = master
2-
DOWNLOADS_SHA1 = 1199e9039dcce6072601c3f29cea8da4a0acbff6
2+
DOWNLOADS_SHA1 = 06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3
33
DOWNLOADS_GIT_URL := https://github.com/JuliaLang/Downloads.jl.git
44
DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1

‎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.14.1+1"
3+
version = "8.15.0+0"
44

55
[deps]
66
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"

‎stdlib/LibCURL_jll/src/LibCURL_jll.jl

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

55
baremodule LibCURL_jll
66
using Base, Libdl, nghttp2_jll, LibSSH2_jll, Zlib_jll
7-
if !(Sys.iswindows() || Sys.isapple())
7+
if !Sys.iswindows()
88
using OpenSSL_jll
99
end
1010
if Sys.iswindows() && Sys.WORD_SIZE == 32
@@ -37,10 +37,8 @@ const libcurl = LazyLibrary(
3737
else
3838
LazyLibrary[libz, libnghttp2, libssh2]
3939
end
40-
elseif Sys.islinux() || Sys.isfreebsd()
40+
else
4141
LazyLibrary[libz, libnghttp2, libssh2, libssl, libcrypto]
42-
elseif Sys.isapple()
43-
LazyLibrary[libz, libnghttp2, libssh2]
4442
end
4543
)
4644

0 commit comments

Comments
 (0)