diff --git a/deps/checksums/Downloads-06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3.tar.gz/md5 b/deps/checksums/Downloads-06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3.tar.gz/md5 new file mode 100644 index 0000000000000..ed84729b00910 --- /dev/null +++ b/deps/checksums/Downloads-06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3.tar.gz/md5 @@ -0,0 +1 @@ +ac2209576b09a9c7a4da02a058e9ec87 diff --git a/deps/checksums/Downloads-06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3.tar.gz/sha512 b/deps/checksums/Downloads-06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3.tar.gz/sha512 new file mode 100644 index 0000000000000..aa81c3a943f3f --- /dev/null +++ b/deps/checksums/Downloads-06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3.tar.gz/sha512 @@ -0,0 +1 @@ +0636b4e7f17d8747408949b77470f5f7f1b4c4b618dc905e20d84d0a5ca4713834e8a4d6a10bcccf7a28982edefe03eeff11bb0aca7d8cb49cb230b7e1ddc06f diff --git a/deps/checksums/Downloads-e692e77fb5427bf3c6e81514b323c39a88217eec.tar.gz/md5 b/deps/checksums/Downloads-e692e77fb5427bf3c6e81514b323c39a88217eec.tar.gz/md5 deleted file mode 100644 index 221a62b1cf231..0000000000000 --- a/deps/checksums/Downloads-e692e77fb5427bf3c6e81514b323c39a88217eec.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -cdaea923f7fa855409e8456159251f54 diff --git a/deps/checksums/Downloads-e692e77fb5427bf3c6e81514b323c39a88217eec.tar.gz/sha512 b/deps/checksums/Downloads-e692e77fb5427bf3c6e81514b323c39a88217eec.tar.gz/sha512 deleted file mode 100644 index b537ef2e9e1f6..0000000000000 --- a/deps/checksums/Downloads-e692e77fb5427bf3c6e81514b323c39a88217eec.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -e893fbe079a433c3038b79c4c2998d1ae9abaf92ff74152820a67e97ffee6f7f052085a7108410cbb1a3bd8cc6670736b0827c8b0608cc31941251dd6500d36a diff --git a/deps/checksums/LibCURL-038790a793203248362cf2bd8d85e42f8c56a72d.tar.gz/md5 b/deps/checksums/LibCURL-038790a793203248362cf2bd8d85e42f8c56a72d.tar.gz/md5 new file mode 100644 index 0000000000000..264c8e5ea6293 --- /dev/null +++ b/deps/checksums/LibCURL-038790a793203248362cf2bd8d85e42f8c56a72d.tar.gz/md5 @@ -0,0 +1 @@ +b3a67e92f5a9d5832699623e34abf1b2 diff --git a/deps/checksums/LibCURL-038790a793203248362cf2bd8d85e42f8c56a72d.tar.gz/sha512 b/deps/checksums/LibCURL-038790a793203248362cf2bd8d85e42f8c56a72d.tar.gz/sha512 new file mode 100644 index 0000000000000..78f04bb4becb8 --- /dev/null +++ b/deps/checksums/LibCURL-038790a793203248362cf2bd8d85e42f8c56a72d.tar.gz/sha512 @@ -0,0 +1 @@ +d558321aa6099ddb61cc402f85d3ea7f0d5c875aee1371f10e6b50c53d8b578045a132a3fd361b96fabf44658b364496d0377371d1ec232962fc8450eb242217 diff --git a/deps/checksums/curl b/deps/checksums/curl index b0a223f42c5e2..9ce2d704e6637 100644 --- a/deps/checksums/curl +++ b/deps/checksums/curl @@ -1,40 +1,40 @@ -LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/md5/e8c53aa3fb963c80921787d5d565eb2c -LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/sha512/8e442ea834299df9c02acb87226c121395ad8e550025ac5ee1103df09c6ff43817e9e48dd1bcbc92c80331ef3ddff531962430269115179acbec2bab2de5b011 -LibCURL.v8.11.1+1.aarch64-apple-darwin.tar.gz/md5/890c65523227b4352344b78575cd4c5c -LibCURL.v8.11.1+1.aarch64-apple-darwin.tar.gz/sha512/fae539243adc805d8da0ac88cf67901ff1f12ae94e40293dc6a7e17072f8c0cb9f0a54b7e324bd52ad9361b764c8bc88728ff4495e0cd6dbf1eb93d2bae8994b -LibCURL.v8.11.1+1.aarch64-linux-gnu.tar.gz/md5/bf937fb6a8ea8a82b732821f3652641c -LibCURL.v8.11.1+1.aarch64-linux-gnu.tar.gz/sha512/230c9983e4c7810d3eee1a5eff7e8b8c44f76db7af8a8312a608609f87bc8a56031c337c06af00a536c10ed33725200aa137c3153ef6dcf6575cc7c350b3b461 -LibCURL.v8.11.1+1.aarch64-linux-musl.tar.gz/md5/b40ea4266dc48a1fbfa016fb8d0ca987 -LibCURL.v8.11.1+1.aarch64-linux-musl.tar.gz/sha512/032d6208ebe226da90d0ef1f1f2d20580fd4e37db68146d1e836a9be4c1fc5f7890f1b808337ca41f46a07a833b55f06f09a4a164f26d0824a649ea40b30233f -LibCURL.v8.11.1+1.aarch64-unknown-freebsd.tar.gz/md5/69097390c0bd3a32969e47608f24363f -LibCURL.v8.11.1+1.aarch64-unknown-freebsd.tar.gz/sha512/391019370a9c122e6425a3097edafe0980dc2077be015919e7914aa781ba10060e3af9ee1fa881d8536d0ca57783d0616a1b5735e2ae7e06ea4edfaee2994120 -LibCURL.v8.11.1+1.armv6l-linux-gnueabihf.tar.gz/md5/bc4ab567f8cc4cd88b2239123d103113 -LibCURL.v8.11.1+1.armv6l-linux-gnueabihf.tar.gz/sha512/0ecbf2380852744815a8f7e99e7c276c342f847907eb7b0d256905ba854ee59d37f83456fcdc8931dc39dbaed58f0949205b80d23e43e2b59195d18a539d4047 -LibCURL.v8.11.1+1.armv6l-linux-musleabihf.tar.gz/md5/18c896c544f02f7f2b976c03fc3772f1 -LibCURL.v8.11.1+1.armv6l-linux-musleabihf.tar.gz/sha512/e9a73670f1c3638c3a886055b32df5baadc41aad9829cfa0d4e05acd46d2d012464114ed6fd1e3d182a4adc266c1da97e9a683c7ba69e93f61592acf8567e336 -LibCURL.v8.11.1+1.armv7l-linux-gnueabihf.tar.gz/md5/4672f9d67ff357a2eda6f77d8f470659 -LibCURL.v8.11.1+1.armv7l-linux-gnueabihf.tar.gz/sha512/a2f2dc8d8e10c652a324a4da3d2337d2886626e1c417c68efbcfcefa443cb3ec81b52f2a212c4a7dbd6a5ae920e54d1bfdc02b68c2607d09784206cd4d11ffb0 -LibCURL.v8.11.1+1.armv7l-linux-musleabihf.tar.gz/md5/49d297563fd44a03f88f67bb7ea2a0be -LibCURL.v8.11.1+1.armv7l-linux-musleabihf.tar.gz/sha512/5cc3902571f04c96be38de53b5320876a3e7e54934090ff2a80304a7ca59a361ed9f3f328c3e3c06ef33550d221a8243e924b7ea49792753f839c12aceb1e979 -LibCURL.v8.11.1+1.i686-linux-gnu.tar.gz/md5/f05a86574278ecf7802edeffe1fee9ac -LibCURL.v8.11.1+1.i686-linux-gnu.tar.gz/sha512/e493b5836022a6280f21237fef423034a9701097cb271683e81d4b4e487a6289080d00016fbaaa8bddeb004d44626a0076fa7832835fe7f58b60af6798223f89 -LibCURL.v8.11.1+1.i686-linux-musl.tar.gz/md5/03340412ba27f231dbf2de58a1af871f -LibCURL.v8.11.1+1.i686-linux-musl.tar.gz/sha512/541fbdd5570432832d3835038b41df73aac8e0e7bc03f41c696dc12a57bd4784b4da1f485264fd1fba263fe9e520a7dbb0ef9a365275efc30dfc361ceab252f3 -LibCURL.v8.11.1+1.i686-w64-mingw32.tar.gz/md5/5f2071282d572bbb53dfcfb16d0d9608 -LibCURL.v8.11.1+1.i686-w64-mingw32.tar.gz/sha512/e4d6fbd518055e8f2a71b89ee9a33728e6e076729adeafc358fc40f47d032b739363c9b57df5bfb3c43244f7b833afc76ae255e70bcf43b81262d74278532a22 -LibCURL.v8.11.1+1.powerpc64le-linux-gnu.tar.gz/md5/806ee9b51c2bffd798c1682867a7a2a0 -LibCURL.v8.11.1+1.powerpc64le-linux-gnu.tar.gz/sha512/20ae5f47ad24e1fba8ecdc3a81aa81acb5c3c224041f12f8be48f9a0abd5ce44117b096a59fc8f861b6f8c6ad9e4177e3a3ba3e2dbecb2078d4bab19bdd4d239 -LibCURL.v8.11.1+1.riscv64-linux-gnu.tar.gz/md5/2e029213e81955f39423733608c4ffa8 -LibCURL.v8.11.1+1.riscv64-linux-gnu.tar.gz/sha512/a634ae9de047bd8a93cbfaa3cd5375d895baf9917b5062653f15472527836b51eeb15006b5e1888251e3f09d8177b489ea9975580fe6d95bc759708fc9654fd1 -LibCURL.v8.11.1+1.x86_64-apple-darwin.tar.gz/md5/56cf7cf4ea22123e516843a5751eea17 -LibCURL.v8.11.1+1.x86_64-apple-darwin.tar.gz/sha512/5ae5569ade42cdf0a1aa8acfda7d1dd3df30d498637f83e93bd9f8be883ae777e789b417be24df83e42ebe32fb67cc328bedac3dc231d3569f585641175ed257 -LibCURL.v8.11.1+1.x86_64-linux-gnu.tar.gz/md5/a4a733fe879693e83e1f05b6ef742ea6 -LibCURL.v8.11.1+1.x86_64-linux-gnu.tar.gz/sha512/2767f49d4a528080a5c7fcdecd8374dd5498c5b1e0d65f58d027f6a9138cd00203732e5da1806b689efbaacb1ee905a6839a09eab35f0174279af314a34fca81 -LibCURL.v8.11.1+1.x86_64-linux-musl.tar.gz/md5/837a64073c3d8fd115cadf4af1b19235 -LibCURL.v8.11.1+1.x86_64-linux-musl.tar.gz/sha512/cf0559b65c213889ab0bad388ca6dc1699891e5cd2c5c34faf80cd60404b5f363eaa624d425fd463407d35c5cfd814c1a9964a2b3b638fa7e7a0a2919980ba8c -LibCURL.v8.11.1+1.x86_64-unknown-freebsd.tar.gz/md5/22726eb8caed9b279e6cddbfa328f2c6 -LibCURL.v8.11.1+1.x86_64-unknown-freebsd.tar.gz/sha512/b9e304575bb0e3241f938c545a91cc5b722e8dfc53d6ad270ea75b8fb05655ae8a03e5f844f5b8a75a84133d0883369bc6c46f0805be37ee840f2f1168994c37 -LibCURL.v8.11.1+1.x86_64-w64-mingw32.tar.gz/md5/aa5ce49a63d216776ef9fc11b6b3b012 -LibCURL.v8.11.1+1.x86_64-w64-mingw32.tar.gz/sha512/4e7fe5ff82ca9bafbaca476aa51273ee9590058350c889a6dd8a0eecaa024d19f0a26dd7078808d08dfdf2f5751daec51e88dc88253a4638274edb63ae93fd3c -curl-8.11.1.tar.bz2/md5/31dc730e6fff880a6ba92bdacead9d38 -curl-8.11.1.tar.bz2/sha512/30041e15b919684c46b6b3853950cba22e6fbc21157b1f682097277d2b20066ba71e51eb5d2c34bbd81b8bf4c2791255d6492ee21d49f606d71f66e211a6adde +LibCURL-038790a793203248362cf2bd8d85e42f8c56a72d.tar.gz/md5/b3a67e92f5a9d5832699623e34abf1b2 +LibCURL-038790a793203248362cf2bd8d85e42f8c56a72d.tar.gz/sha512/d558321aa6099ddb61cc402f85d3ea7f0d5c875aee1371f10e6b50c53d8b578045a132a3fd361b96fabf44658b364496d0377371d1ec232962fc8450eb242217 +LibCURL.v8.15.0+0.aarch64-apple-darwin.tar.gz/md5/47db9bf4549442b466ae465b48544f46 +LibCURL.v8.15.0+0.aarch64-apple-darwin.tar.gz/sha512/a4819a6a94958cfeb0b035b87cfe6cb40ac3c0f015b7b52b5314ec3f8a129a9aa96ccae04fe3774318bc1a9316299c3fbe1a47b2e2e5ce37a38d9a8e01d6f5e5 +LibCURL.v8.15.0+0.aarch64-linux-gnu.tar.gz/md5/7e04291557b99a53f8b8fca1235862b3 +LibCURL.v8.15.0+0.aarch64-linux-gnu.tar.gz/sha512/399b9a538dc54647b5ca1ad182e5c1c4da8ba0f3217fe8d01737bf0a689a67ed0be185ebbd98d60b2739900df664feae6cedb90643c2e53dc7c12ec5a5a8b57d +LibCURL.v8.15.0+0.aarch64-linux-musl.tar.gz/md5/63f3e0171c8f56592a3c810136154ccd +LibCURL.v8.15.0+0.aarch64-linux-musl.tar.gz/sha512/03b67d73bd41597c6080155e5a0eb58d8cb559d1325c2954aa92c54905dd6f425ba46dd16c5411b16ac683c041ed685893954c4ab431d794bd3f929c11de4ae7 +LibCURL.v8.15.0+0.aarch64-unknown-freebsd.tar.gz/md5/31f249d293bbea3a0669197e6559d467 +LibCURL.v8.15.0+0.aarch64-unknown-freebsd.tar.gz/sha512/bb047b609e69926d3837dfe39d68057c55c7380427a3807ccc71e631530d75f64e9edd0a4ef5ab30b44e3d763d2798e9f8c4727fb565674de228cf95ebccd922 +LibCURL.v8.15.0+0.armv6l-linux-gnueabihf.tar.gz/md5/462094d229be838090eb6d3353bb3907 +LibCURL.v8.15.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/3bac7d0b0a065e5793d466823eb2a62d8256d41291c9bf6926bafc434eaec51a72ca289b2803b0b6fc19c4d0e6776205e55b235701496e84d56abdd4da7be8a2 +LibCURL.v8.15.0+0.armv6l-linux-musleabihf.tar.gz/md5/3f95a180a1fe427b642f05814029f9d0 +LibCURL.v8.15.0+0.armv6l-linux-musleabihf.tar.gz/sha512/8a4483486dd355d61f0c6f60d0a1b38d9942dc126b36368adcb9499daf2a134087fb54ffbd2930adf3fe1cc39497f2f7e1f6304f48f7540cf05ebeb792d0ec1f +LibCURL.v8.15.0+0.armv7l-linux-gnueabihf.tar.gz/md5/d033e4eba1455ef17b5d86d9911d2d32 +LibCURL.v8.15.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/91e31ec413ee15574ee7e4258eebd6963d6679ea8b41c43e0f02f18521d52f5a9f258c46f8df27163019dd89a2598b7c3bcd3d2aa2bd3fd3a545de9060ef7dd1 +LibCURL.v8.15.0+0.armv7l-linux-musleabihf.tar.gz/md5/3ba22fe71ba61b92e297f64593d69387 +LibCURL.v8.15.0+0.armv7l-linux-musleabihf.tar.gz/sha512/a87bc28cac150d76c281b1baa6f79da8140bf849595dcca684fcd64299fc801c3c2dcd733b264c5a809fbba95dbe8dfac0c30ecd7c5d0bb77fee7d3da91d6816 +LibCURL.v8.15.0+0.i686-linux-gnu.tar.gz/md5/67612302faac6b9822271d01c1959d78 +LibCURL.v8.15.0+0.i686-linux-gnu.tar.gz/sha512/0f47c1f8307054eca308650f13dfee62a6eaae70f5385f460339a821cb73f97eb56ac5f685cb9e14d51e109a510508e6e0e7b6f31319e57413396473ac19a1c6 +LibCURL.v8.15.0+0.i686-linux-musl.tar.gz/md5/b14f7012d2aa9ed353387c3b357255c6 +LibCURL.v8.15.0+0.i686-linux-musl.tar.gz/sha512/177b4581c4717854420073731398dc8bb2a3370a572fd6b61e545a8e852dcb9ce76f4c26bf28e1250cece1dcbe34e53d0edd2c421c6251c117e2f3255b8945a6 +LibCURL.v8.15.0+0.i686-w64-mingw32.tar.gz/md5/2afb5832ab12120e755505916cad0e95 +LibCURL.v8.15.0+0.i686-w64-mingw32.tar.gz/sha512/4e78b5d0a8ec3e1bc7131c66fc5f041090f5fb64fe6b85224fea1e3ebcbdbf56604492a059ae311281052da7ff67c066910c6c74fb7d19b3e46b4d3cdb7163b7 +LibCURL.v8.15.0+0.powerpc64le-linux-gnu.tar.gz/md5/9d5bd94798a63a14ba945949b054195f +LibCURL.v8.15.0+0.powerpc64le-linux-gnu.tar.gz/sha512/eb4c6a555b1b6dc39a890e819803d4d5015e9ad8a841e21b484fa7442330ea0b3c2da07fcc1afb09faf115fc4818eaf2f328f92fc07400a523aca45828b71e4b +LibCURL.v8.15.0+0.riscv64-linux-gnu.tar.gz/md5/68b576c1f2086490a3d7997ce8627a32 +LibCURL.v8.15.0+0.riscv64-linux-gnu.tar.gz/sha512/e7dc57b985a6f6289d7a56a1cae49522cc623831167ec317bcdb66b578f1d967befb5d849d2c24dc49e183524a6f3b72b6c688e3500c5cb8a3f00ce748728fc6 +LibCURL.v8.15.0+0.x86_64-apple-darwin.tar.gz/md5/75320e06cd2370343684279f744b694a +LibCURL.v8.15.0+0.x86_64-apple-darwin.tar.gz/sha512/198f520a860337aaf367db970083db8c7a3742b3f37f5594e4dc86669b319cc4dc4bdfc9e875c3e4ca9f93aae24705b7c47711bac66daa629ed0d386d352b053 +LibCURL.v8.15.0+0.x86_64-linux-gnu.tar.gz/md5/3f159aada40e7f4489b179a570d36c9a +LibCURL.v8.15.0+0.x86_64-linux-gnu.tar.gz/sha512/42e646400aca6d0b233ab8feb3b32c3a9e89ca4b27fb0c82e0c52b4b008e9d9aad6640988f32397d705cc52c36ffa4379f6ba4c015ee24b6e2bd750235c8f10c +LibCURL.v8.15.0+0.x86_64-linux-musl.tar.gz/md5/d4e35eee8af7d9e640f9f2616abf1ebf +LibCURL.v8.15.0+0.x86_64-linux-musl.tar.gz/sha512/16a9ee5afe025db931e7209fbc711494ff7795a9463cf81a307e7ea74cf53b64a1c5413d388e328a372e4480255b4b1324448e17f51db141adcb2716aa00d698 +LibCURL.v8.15.0+0.x86_64-unknown-freebsd.tar.gz/md5/94e871b6200ab1768112aa3a7195f31e +LibCURL.v8.15.0+0.x86_64-unknown-freebsd.tar.gz/sha512/84474b36d21ab1d90331850b914908add5afd239f9111a48dec9b6e7ff770e9a730c7cad6d322f0cdd3567822fb157e1470716e181dd29b594a4e471b8fd6c54 +LibCURL.v8.15.0+0.x86_64-w64-mingw32.tar.gz/md5/99c54cbc43fc719281b48bb3137e9364 +LibCURL.v8.15.0+0.x86_64-w64-mingw32.tar.gz/sha512/d817951ec0ba4513e50c2bf2159ccefb6b38fa74478b84b8f006b6a47897c610fe6c9f1c9db0533595c243f8b84d40456aa9fd1aa3afb22ea272dced5b6e237c +curl-8.15.0.tar.bz2/md5/8b475c3eec74c5e78a9fb45a902dae76 +curl-8.15.0.tar.bz2/sha512/797fc9af599de88ceb36c8bc284d3f1a2a1ca0703c7bdd377d67ce6da4317ca673ba4a946c61f3bd5a66febee37b5aa88826f26fbbb398f5e20630769a0de033 diff --git a/deps/curl.mk b/deps/curl.mk index 6232d56e5e333..5de8c1f766072 100644 --- a/deps/curl.mk +++ b/deps/curl.mk @@ -31,7 +31,7 @@ $(SRCCACHE)/curl-$(CURL_VER).tar.bz2: | $(SRCCACHE) $(SRCCACHE)/curl-$(CURL_VER)/source-extracted: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 $(JLCHECKSUM) $< - cd $(dir $<) && $(TAR) jxf $(notdir $<) + cd $(dir $<) && $(TAR) -jxf $(notdir $<) echo 1 > $@ checksum-curl: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 @@ -54,12 +54,9 @@ CURL_CONFIGURE_FLAGS += \ # We use different TLS libraries on different platforms. # On Windows, we use schannel -# On MacOS, we use SecureTransport -# On Linux, we use OpenSSL +# On other platforms, we use OpenSSL ifeq ($(OS), WINNT) CURL_TLS_CONFIGURE_FLAGS := --with-schannel -else ifeq ($(OS), Darwin) -CURL_TLS_CONFIGURE_FLAGS := --with-secure-transport else CURL_TLS_CONFIGURE_FLAGS := --with-openssl endif diff --git a/deps/curl.version b/deps/curl.version index fbbb55ffb17ea..ecd8089d9fd1f 100644 --- a/deps/curl.version +++ b/deps/curl.version @@ -3,4 +3,4 @@ CURL_JLL_NAME := LibCURL ## source build -CURL_VER := 8.11.1 +CURL_VER := 8.15.0 diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 05dd8edebe5a6..3cdd97bdcb4f1 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -117,7 +117,7 @@ version = "0.6.4" [[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.11.1+1" +version = "8.15.0+0" [[deps.LibGit2]] deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"] diff --git a/stdlib/Downloads.version b/stdlib/Downloads.version index 40004d8337091..4829d63b31668 100644 --- a/stdlib/Downloads.version +++ b/stdlib/Downloads.version @@ -1,4 +1,4 @@ DOWNLOADS_BRANCH = master -DOWNLOADS_SHA1 = e692e77fb5427bf3c6e81514b323c39a88217eec +DOWNLOADS_SHA1 = 06916258c3ff7bd37a0ff8b525f2bb58ce1ba1b3 DOWNLOADS_GIT_URL := https://github.com/JuliaLang/Downloads.jl.git DOWNLOADS_TAR_URL = https://api.github.com/repos/JuliaLang/Downloads.jl/tarball/$1 diff --git a/stdlib/LibCURL.version b/stdlib/LibCURL.version index 216ab4e7aca22..9bf12e7a8287b 100644 --- a/stdlib/LibCURL.version +++ b/stdlib/LibCURL.version @@ -1,4 +1,4 @@ LIBCURL_BRANCH = master -LIBCURL_SHA1 = a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0 +LIBCURL_SHA1 = 038790a793203248362cf2bd8d85e42f8c56a72d LIBCURL_GIT_URL := https://github.com/JuliaWeb/LibCURL.jl.git LIBCURL_TAR_URL = https://api.github.com/repos/JuliaWeb/LibCURL.jl/tarball/$1 diff --git a/stdlib/LibCURL_jll/Project.toml b/stdlib/LibCURL_jll/Project.toml index 61d44beac14e1..5f48426bf6fa3 100644 --- a/stdlib/LibCURL_jll/Project.toml +++ b/stdlib/LibCURL_jll/Project.toml @@ -1,6 +1,6 @@ name = "LibCURL_jll" uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.11.1+1" +version = "8.15.0+0" [deps] LibSSH2_jll = "29816b5a-b9ab-546f-933c-edad1886dfa8" diff --git a/stdlib/LibCURL_jll/src/LibCURL_jll.jl b/stdlib/LibCURL_jll/src/LibCURL_jll.jl index 5c1c2aa14b23a..21cb7335785ae 100644 --- a/stdlib/LibCURL_jll/src/LibCURL_jll.jl +++ b/stdlib/LibCURL_jll/src/LibCURL_jll.jl @@ -4,8 +4,7 @@ baremodule LibCURL_jll using Base, Libdl, nghttp2_jll, LibSSH2_jll, Zlib_jll -if !(Sys.iswindows() || Sys.isapple()) - # On Windows and macOS we use system SSL/crypto libraries +if !Sys.iswindows() using OpenSSL_jll end diff --git a/stdlib/Manifest.toml b/stdlib/Manifest.toml index 8d6093f744f14..c0f4e7c929713 100644 --- a/stdlib/Manifest.toml +++ b/stdlib/Manifest.toml @@ -93,7 +93,7 @@ version = "0.6.4" [[deps.LibCURL_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.11.1+1" +version = "8.15.0+0" [[deps.LibGit2]] deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"]