From b65eb6164de54cb37def076e533ed93d00f454ec Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Fri, 29 Mar 2024 13:16:51 +0100 Subject: [PATCH 01/19] deps: build openssl --- Make.inc | 3 +- Makefile | 1 + base/Makefile | 2 + contrib/refresh_checksums.mk | 2 +- deps/Makefile | 9 +++- deps/openssl.mk | 98 ++++++++++++++++++++++++++++++++++++ deps/openssl.version | 5 ++ 7 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 deps/openssl.mk create mode 100644 deps/openssl.version diff --git a/Make.inc b/Make.inc index b1a878e728473..25ddbc958c2d6 100644 --- a/Make.inc +++ b/Make.inc @@ -57,6 +57,7 @@ USE_SYSTEM_MPFR:=0 USE_SYSTEM_LIBSUITESPARSE:=0 USE_SYSTEM_LIBUV:=0 USE_SYSTEM_UTF8PROC:=0 +USE_SYSTEM_OPENSSL:=0 USE_SYSTEM_MBEDTLS:=0 USE_SYSTEM_LIBSSH2:=0 USE_SYSTEM_NGHTTP2:=0 @@ -1268,7 +1269,7 @@ CSL_NEXT_GLIBCXX_VERSION=GLIBCXX_3\.4\.33|GLIBCXX_3\.5\.|GLIBCXX_4\. # Note: we explicitly _do not_ define `CSL` here, since it requires some more # advanced techniques to decide whether it should be installed from a BB source # or not. See `deps/csl.mk` for more detail. -BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT +BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM LIBSUITESPARSE OPENLIBM GMP MBEDTLS OPENSSL LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP LLD LIBTRACYCLIENT define SET_BB_DEFAULT # First, check to see if BB is disabled on a global setting ifeq ($$(USE_BINARYBUILDER),0) diff --git a/Makefile b/Makefile index 34f239fcbaa17..9779c0b72c43b 100644 --- a/Makefile +++ b/Makefile @@ -217,6 +217,7 @@ JL_PRIVATE_LIBS-$(USE_SYSTEM_MPFR) += libmpfr JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSSH2) += libssh2 JL_PRIVATE_LIBS-$(USE_SYSTEM_NGHTTP2) += libnghttp2 JL_PRIVATE_LIBS-$(USE_SYSTEM_MBEDTLS) += libmbedtls libmbedcrypto libmbedx509 +JL_PRIVATE_LIBS-$(USE_SYSTEM_OPENSSL) += libcrypto libssl JL_PRIVATE_LIBS-$(USE_SYSTEM_CURL) += libcurl JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBGIT2) += libgit2 JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBUV) += libuv diff --git a/base/Makefile b/base/Makefile index 9a6c0d0d03833..7a12b975a76b3 100644 --- a/base/Makefile +++ b/base/Makefile @@ -267,6 +267,8 @@ $(eval $(call symlink_system_library,MPFR,libmpfr)) $(eval $(call symlink_system_library,MBEDTLS,libmbedtls)) $(eval $(call symlink_system_library,MBEDTLS,libmbedcrypto)) $(eval $(call symlink_system_library,MBEDTLS,libmbedx509)) +$(eval $(call symlink_system_library,OPENSSL,libcrypto)) +$(eval $(call symlink_system_library,OPENSSL,libssl)) $(eval $(call symlink_system_library,LIBSSH2,libssh2)) $(eval $(call symlink_system_library,NGHTTP2,libnghttp2)) $(eval $(call symlink_system_library,CURL,libcurl)) diff --git a/contrib/refresh_checksums.mk b/contrib/refresh_checksums.mk index f67088141ccd4..71f8c5066d53e 100644 --- a/contrib/refresh_checksums.mk +++ b/contrib/refresh_checksums.mk @@ -24,7 +24,7 @@ CLANG_TRIPLETS=$(filter %-darwin %-freebsd,$(TRIPLETS)) NON_CLANG_TRIPLETS=$(filter-out %-darwin %-freebsd,$(TRIPLETS)) # These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded: -BB_PROJECTS=mbedtls libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib libsuitesparse openlibm blastrampoline libtracyclient +BB_PROJECTS=mbedtls openssl libssh2 nghttp2 mpfr curl libgit2 pcre libuv unwind llvmunwind dsfmt objconv p7zip zlib libsuitesparse openlibm blastrampoline libtracyclient BB_GCC_EXPANDED_PROJECTS=openblas csl BB_CXX_EXPANDED_PROJECTS=gmp llvm clang llvm-tools lld # These are non-BB source-only deps diff --git a/deps/Makefile b/deps/Makefile index fd8f5267e9d7e..3caf3741fec44 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -22,7 +22,7 @@ BUILDDIR := $(BUILDDIR)$(MAYBE_HOST) # additionally all targets should be listed in the getall target for easier off-line compilation # if you are adding a new target, it can help to copy an similar, existing target # -# autoconf configure-driven scripts: pcre unwind gmp mpfr patchelf libuv curl +# autoconf configure-driven scripts: pcre unwind gmp mpfr openssl patchelf libuv curl # custom Makefile rules: openlibm dsfmt libsuitesparse lapack blastrampoline openblas utf8proc objconv libwhich # CMake libs: llvm llvmunwind libgit2 libssh2 mbedtls libtracyclient # @@ -143,6 +143,10 @@ ifeq ($(USE_SYSTEM_MPFR), 0) DEP_LIBS += mpfr endif +ifeq ($(USE_SYSTEM_OPENSSL), 0) +DEP_LIBS += openssl +endif + ifeq ($(USE_GPL_LIBS), 1) ifeq ($(USE_SYSTEM_LIBSUITESPARSE), 0) DEP_LIBS += libsuitesparse @@ -192,7 +196,7 @@ DEP_LIBS_STAGED := $(DEP_LIBS) # list all targets DEP_LIBS_STAGED_ALL := llvm llvm-tools clang llvmunwind unwind libuv pcre \ - openlibm dsfmt blastrampoline openblas lapack gmp mpfr patchelf utf8proc \ + openlibm dsfmt blastrampoline openblas lapack gmp mpfr openssl patchelf utf8proc \ objconv mbedtls libssh2 nghttp2 curl libgit2 libwhich zlib p7zip csl \ sanitizers libsuitesparse lld libtracyclient ittapi JuliaSyntax DEP_LIBS_ALL := $(DEP_LIBS_STAGED_ALL) @@ -245,6 +249,7 @@ include $(SRCDIR)/zlib.mk include $(SRCDIR)/unwind.mk include $(SRCDIR)/gmp.mk include $(SRCDIR)/mpfr.mk +include $(SRCDIR)/openssl.mk include $(SRCDIR)/patchelf.mk include $(SRCDIR)/mbedtls.mk include $(SRCDIR)/libssh2.mk diff --git a/deps/openssl.mk b/deps/openssl.mk new file mode 100644 index 0000000000000..28aeb0f77675b --- /dev/null +++ b/deps/openssl.mk @@ -0,0 +1,98 @@ +## OpenSSL ## +include $(SRCDIR)/openssl.version + +ifneq ($(USE_BINARYBUILDER_OPENSSL),1) + +ifeq ($(OS),Darwin) +ifeq ($(APPLE_ARCH),arm64) +OPENSSL_TARGET := darwin64-arm64-cc +else +OPENSSL_TARGET := darwin64-x86_64-cc +endif +else ifeq ($(OS),WINNT) +ifeq ($(ARCH),x86_64) +OPENSSL_TARGET := mingw64 +else +OPENSSL_TARGET := mingw +endif +else ifeq ($(OS),FreeBSD) +OPENSSL_TARGET := BSD-x86_64 +else ifeq ($(OS),Linux) +ifeq ($(ARCH),x86_64) +OPENSSL_TARGET := linux-x86_64 +else ifeq ($(ARCH),i686) +OPENSSL_TARGET := linux-x86 +else ifeq ($(ARCH),arm) +OPENSSL_TARGET := linux-armv4 +else ifeq ($(ARCH),aarch64) +OPENSSL_TARGET := linux-aarch64 +else ifeq ($(ARCH),ppc64le) +OPENSSL_TARGET := linux-ppc64le +else ifeq ($(ARCH),powerpc64le) +OPENSSL_TARGET := linux-ppc64le +endif +else +OPENSSL_TARGET := unknown +endif + +$(SRCCACHE)/openssl-$(OPENSSL_VER).tar.gz: | $(SRCCACHE) + $(JLDOWNLOAD) $@ https://www.openssl.org/source/$(notdir $@) + +$(SRCCACHE)/openssl-$(OPENSSL_VER)/source-extracted: $(SRCCACHE)/openssl-$(OPENSSL_VER).tar.gz + $(JLCHECKSUM) $< + cd $(dir $<) && $(TAR) -zxf $< + touch -c $(SRCCACHE)/openssl-$(OPENSSL_VER)/configure # old target + echo 1 > $@ + +checksum-openssl: $(SRCCACHE)/openssl-$(OPENSSL_VER).tar.gz + $(JLCHECKSUM) $< + +# We cannot use $(CONFIGURE_COMMON) in this step, because openssl's Configure scripts is picky +# and does not like that we pass make variables as arguments, it wants them in the environment +$(BUILDDIR)/openssl-$(OPENSSL_VER)/build-configured: $(SRCCACHE)/openssl-$(OPENSSL_VER)/source-extracted + mkdir -p $(dir $@) + cd $(dir $@) && \ + CC="$(CC) $(SANITIZE_OPTS)" CXX="$(CXX) $(SANITIZE_OPTS)" LDFLAGS="$(LDFLAGS) $(RPATH_ESCAPED_ORIGIN) $(SANITIZE_LDFLAGS)" \ + $(dir $<)/Configure shared --prefix=$(abspath $(build_prefix)) $(OPENSSL_TARGET) + echo 1 > $@ + +$(BUILDDIR)/openssl-$(OPENSSL_VER)/build-compiled: $(BUILDDIR)/openssl-$(OPENSSL_VER)/build-configured + $(MAKE) -C $(dir $<) + echo 1 > $@ + +$(BUILDDIR)/openssl-$(OPENSSL_VER)/build-checked: $(BUILDDIR)/openssl-$(OPENSSL_VER)/build-compiled +ifeq ($(OS),$(BUILD_OS)) + $(MAKE) -C $(dir $@) test +endif + echo 1 > $@ + +$(eval $(call staged-install, \ + openssl,openssl-$(OPENSSL_VER), \ + MAKE_INSTALL,,, \ + $$(WIN_MAKE_HARD_LINK) $(build_bindir)/libcrypto-*.dll $(build_bindir)/libcrypto.dll && \ + $$(WIN_MAKE_HARD_LINK) $(build_bindir)/libssl-*.dll $(build_bindir)/libssl.dll && \ + $$(INSTALL_NAME_CMD)libcrypto.$$(SHLIB_EXT) $$(build_shlibdir)/libcrypto.$$(SHLIB_EXT) && \ + $$(INSTALL_NAME_CMD)libssl.$$(SHLIB_EXT) $$(build_shlibdir)/libssl.$$(SHLIB_EXT) && \ + $$(INSTALL_NAME_CHANGE_CMD) $$(build_shlibdir)/libcrypto.3.dylib @rpath/libcrypto.$$(SHLIB_EXT) $$(build_shlibdir)/libssl.$$(SHLIB_EXT))) + +clean-openssl: + -rm -f $(BUILDDIR)/-openssl-$(OPENSSL_VER)/build-configured $(BUILDDIR)/-openssl-$(OPENSSL_VER)/build-compiled + -$(MAKE) -C $(BUILDDIR)/-openssl-$(OPENSSL_VER) clean + +distclean-openssl: + rm -rf $(SRCCACHE)/-openssl-$(OPENSSL_VER).tar.gz \ + $(SRCCACHE)/-openssl-$(OPENSSL_VER) \ + $(BUILDDIR)/-openssl-$(OPENSSL_VER) + +get-openssl: $(SRCCACHE)/openssl-$(OPENSSL_VER).tar.gz +extract-openssl: $(SRCCACHE)/openssl-$(OPENSSL_VER)/source-extracted +configure-openssl: $(BUILDDIR)/openssl-$(OPENSSL_VER)/build-configured +compile-openssl: $(BUILDDIR)/openssl-$(OPENSSL_VER)/build-compiled +fastcheck-openssl: check-openssl +check-openssl: $(BUILDDIR)/openssl-$(OPENSSL_VER)/build-checked + +else # USE_BINARYBUILDER_OPENSSL + +$(eval $(call bb-install,openssl,OPENSSL,false)) + +endif diff --git a/deps/openssl.version b/deps/openssl.version new file mode 100644 index 0000000000000..9aa02a664c4c4 --- /dev/null +++ b/deps/openssl.version @@ -0,0 +1,5 @@ +## jll artifact +OPENSSL_JLL_NAME := OpenSSL + +## source build +OPENSSL_VER := 3.0.13 From 9839d2195acce08f174ccf6b77ee890ccebe648b Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Fri, 29 Mar 2024 13:17:12 +0100 Subject: [PATCH 02/19] doc: mention OpenSSL --- THIRDPARTY.md | 1 + doc/src/devdocs/build/build.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/THIRDPARTY.md b/THIRDPARTY.md index 89d1ce3de3d97..28903489b475e 100644 --- a/THIRDPARTY.md +++ b/THIRDPARTY.md @@ -40,6 +40,7 @@ Julia's `stdlib` uses the following external libraries, which have their own lic - [MBEDTLS](https://github.com/ARMmbed/mbedtls/blob/development/LICENSE) [Apache 2.0] - [MPFR](https://www.mpfr.org/mpfr-current/mpfr.html#Copying) [LGPL3+] - [OPENBLAS](https://raw.github.com/xianyi/OpenBLAS/master/LICENSE) [BSD-3] +- [OPENSSL](https://www.openssl.org/source/license.html) [Apache 2.0] - [LAPACK](https://netlib.org/lapack/LICENSE.txt) [BSD-3] - [PCRE](https://www.pcre.org/licence.txt) [BSD-3] - [SUITESPARSE](https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/master/LICENSE.txt) [mix of LGPL2+ and GPL2+; see individual module licenses] diff --git a/doc/src/devdocs/build/build.md b/doc/src/devdocs/build/build.md index e8092df493df7..05333d98f8a45 100644 --- a/doc/src/devdocs/build/build.md +++ b/doc/src/devdocs/build/build.md @@ -194,6 +194,7 @@ uses are listed in [`deps/$(libname).version`](https://github.com/JuliaLang/juli - **[libgit2]** — Git linkable library, used by Julia's package manager. - **[curl]** — libcurl provides download and proxy support. - **[libssh2]** — library for SSH transport, used by libgit2 for packages with SSH remotes. +- **[OpenSSL]** — library used for cryptography and transport layer security, used by libssh2. - **[mbedtls]** — library used for cryptography and transport layer security, used by libssh2 - **[utf8proc]** — a library for processing UTF-8 encoded Unicode strings. - **[LLVM libunwind]** — LLVM's fork of [libunwind], a library that determines the call-chain of a program. @@ -229,6 +230,7 @@ uses are listed in [`deps/$(libname).version`](https://github.com/JuliaLang/juli [utf8proc]: https://julialang.org/utf8proc/ [libunwind]: https://www.nongnu.org/libunwind [libssh2]: https://www.libssh2.org +[OpenSSL]: https://www.openssl.org/ [mbedtls]: https://tls.mbed.org/ [pkg-config]: https://www.freedesktop.org/wiki/Software/pkg-config/ [powershell]: https://docs.microsoft.com/en-us/powershell/scripting/wmf/overview From f1e63c7a292e3d64fc2df4a88588d3a6cbd59a73 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Fri, 29 Mar 2024 13:27:15 +0100 Subject: [PATCH 03/19] Migrate curl, libssh2, libgit2 to OpenSSL --- deps/Makefile | 4 ++-- deps/curl.mk | 4 ++-- deps/libgit2.mk | 6 +++--- deps/libssh2.mk | 15 ++++----------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index 3caf3741fec44..a63194fabf8ac 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -120,8 +120,8 @@ DEP_LIBS += gmp endif ifeq ($(USE_SYSTEM_LIBGIT2), 0) -ifeq ($(USE_SYSTEM_MBEDTLS), 0) -DEP_LIBS += mbedtls +ifeq ($(USE_SYSTEM_OPENSSL), 0) +DEP_LIBS += openssl endif ifeq ($(USE_SYSTEM_LIBSSH2), 0) diff --git a/deps/curl.mk b/deps/curl.mk index 444334b581fed..f2edffef7f21f 100644 --- a/deps/curl.mk +++ b/deps/curl.mk @@ -47,13 +47,13 @@ CURL_CONFIGURE_FLAGS += --enable-versioned-symbols \ # We use different TLS libraries on different platforms. # On Windows, we use schannel # On MacOS, we use SecureTransport -# On Linux, we use mbedTLS +# On Linux, 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-mbedtls=$(build_prefix) +CURL_TLS_CONFIGURE_FLAGS := --with-openssl endif CURL_CONFIGURE_FLAGS += $(CURL_TLS_CONFIGURE_FLAGS) diff --git a/deps/libgit2.mk b/deps/libgit2.mk index b65ac022885a3..b0b953ee3f209 100644 --- a/deps/libgit2.mk +++ b/deps/libgit2.mk @@ -9,8 +9,8 @@ ifeq ($(USE_SYSTEM_LIBSSH2), 0) $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/libssh2 endif -ifeq ($(USE_SYSTEM_MBEDTLS), 0) -$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/mbedtls +ifeq ($(USE_SYSTEM_OPENSSL), 0) +$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/openssl endif LIBGIT2_OPTS := $(CMAKE_COMMON) -DCMAKE_BUILD_TYPE=Release -DUSE_THREADS=ON -DUSE_BUNDLED_ZLIB=ON -DUSE_SSH=ON -DBUILD_CLI=OFF @@ -39,7 +39,7 @@ LIBGIT2_OPTS += -DCMAKE_C_FLAGS="-I/usr/local/include" endif ifneq (,$(findstring $(OS),Linux FreeBSD OpenBSD)) -LIBGIT2_OPTS += -DUSE_HTTPS="mbedTLS" -DUSE_SHA1="CollisionDetection" -DCMAKE_INSTALL_RPATH="\$$ORIGIN" +LIBGIT2_OPTS += -DUSE_HTTPS="OpenSSL" -DUSE_SHA1="CollisionDetection" -DCMAKE_INSTALL_RPATH="\$$ORIGIN" endif LIBGIT2_SRC_PATH := $(SRCCACHE)/$(LIBGIT2_SRC_DIR) diff --git a/deps/libssh2.mk b/deps/libssh2.mk index c293d8309d2bc..0b075677fe2c5 100644 --- a/deps/libssh2.mk +++ b/deps/libssh2.mk @@ -4,10 +4,11 @@ LIBSSH2_GIT_URL := https://github.com/libssh2/libssh2.git LIBSSH2_TAR_URL = https://api.github.com/repos/libssh2/libssh2/tarball/$1 $(eval $(call git-external,libssh2,LIBSSH2,CMakeLists.txt,,$(SRCCACHE))) -ifeq ($(USE_SYSTEM_MBEDTLS), 0) -$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/mbedtls +ifeq ($(USE_SYSTEM_OPENSSL), 0) +$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: | $(build_prefix)/manifest/openssl endif + LIBSSH2_OPTS := $(CMAKE_COMMON) -DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF \ -DCMAKE_BUILD_TYPE=Release @@ -21,7 +22,7 @@ ifeq ($(BUILD_OS),WINNT) LIBSSH2_OPTS += -G"MSYS Makefiles" endif else -LIBSSH2_OPTS += -DCRYPTO_BACKEND=mbedTLS -DENABLE_ZLIB_COMPRESSION=OFF +LIBSSH2_OPTS += -DCRYPTO_BACKEND=OpenSSL -DENABLE_ZLIB_COMPRESSION=OFF endif ifneq (,$(findstring $(OS),Linux FreeBSD OpenBSD)) @@ -34,14 +35,6 @@ endif LIBSSH2_SRC_PATH := $(SRCCACHE)/$(LIBSSH2_SRC_DIR) -$(LIBSSH2_SRC_PATH)/libssh2-mbedtls-size_t.patch-applied: $(LIBSSH2_SRC_PATH)/source-extracted - cd $(LIBSSH2_SRC_PATH) && \ - patch -p1 -f < $(SRCDIR)/patches/libssh2-mbedtls-size_t.patch - echo 1 > $@ - -$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: \ - $(LIBSSH2_SRC_PATH)/libssh2-mbedtls-size_t.patch-applied - $(BUILDDIR)/$(LIBSSH2_SRC_DIR)/build-configured: $(LIBSSH2_SRC_PATH)/source-extracted mkdir -p $(dir $@) cd $(dir $@) && \ From 2c0f874da4f8e8b4057304222bfc7b4dbe3c51a2 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Fri, 29 Mar 2024 13:28:53 +0100 Subject: [PATCH 04/19] Ensure we still build mbedtls from source --- deps/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deps/Makefile b/deps/Makefile index a63194fabf8ac..62d448fecdcf2 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -139,6 +139,10 @@ endif DEP_LIBS += libgit2 endif # USE_SYSTEM_LIBGIT2 +ifeq ($(USE_SYSTEM_MBEDTLS), 0) +DEP_LIBS += mbedtls +endif + ifeq ($(USE_SYSTEM_MPFR), 0) DEP_LIBS += mpfr endif From 487f7808a39947e71e63d861847a1e183cc347e7 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Fri, 29 Mar 2024 16:57:00 +0100 Subject: [PATCH 05/19] Add OpenSSL_JLL --- stdlib/Makefile | 4 +- stdlib/Manifest.toml | 5 +++ stdlib/OpenSSL_jll/Project.toml | 16 ++++++++ stdlib/OpenSSL_jll/src/OpenSSL_jll.jl | 53 +++++++++++++++++++++++++++ stdlib/OpenSSL_jll/test/runtests.jl | 10 +++++ stdlib/Project.toml | 1 + stdlib/stdlib.mk | 2 +- 7 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 stdlib/OpenSSL_jll/Project.toml create mode 100644 stdlib/OpenSSL_jll/src/OpenSSL_jll.jl create mode 100644 stdlib/OpenSSL_jll/test/runtests.jl diff --git a/stdlib/Makefile b/stdlib/Makefile index ebc40c9db2b12..d0c30a5d7c04e 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -18,8 +18,8 @@ DIRS := $(build_datarootdir)/julia/stdlib/$(VERSDIR) $(build_prefix)/manifest/$( $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir)))) JLLS = DSFMT GMP CURL LIBGIT2 LLVM LIBSSH2 LIBUV MBEDTLS MPFR NGHTTP2 \ - BLASTRAMPOLINE OPENBLAS OPENLIBM P7ZIP PCRE LIBSUITESPARSE ZLIB \ - LLVMUNWIND CSL UNWIND LLD + BLASTRAMPOLINE OPENBLAS OPENLIBM OPENSSL P7ZIP PCRE LIBSUITESPARSE \ + ZLIB LLVMUNWIND CSL UNWIND LLD # Initialize this with JLLs that aren't in "deps/$(LibName).version" JLL_NAMES := MozillaCACerts_jll diff --git a/stdlib/Manifest.toml b/stdlib/Manifest.toml index 8d59f63c4733c..6dc8580f1ba5b 100644 --- a/stdlib/Manifest.toml +++ b/stdlib/Manifest.toml @@ -171,6 +171,11 @@ deps = ["Artifacts", "Libdl"] uuid = "05823500-19ac-5b8b-9628-191a04bc5112" version = "0.8.1+2" +[[deps.OpenSSL_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" +version = "3.0.13+0" + [[deps.PCRE2_jll]] deps = ["Artifacts", "Libdl"] uuid = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" diff --git a/stdlib/OpenSSL_jll/Project.toml b/stdlib/OpenSSL_jll/Project.toml new file mode 100644 index 0000000000000..90f99b05e5d56 --- /dev/null +++ b/stdlib/OpenSSL_jll/Project.toml @@ -0,0 +1,16 @@ +name = "OpenSSL_jll" +uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" +version = "3.0.13+0" + +[deps] +Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" + +[compat] +julia = "1.6" + +[extras] +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["Test"] diff --git a/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl b/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl new file mode 100644 index 0000000000000..26eb3d243efe2 --- /dev/null +++ b/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl @@ -0,0 +1,53 @@ +# This file is a part of Julia. License is MIT: https://julialang.org/license + +## dummy stub for https://github.com/JuliaBinaryWrappers/OpenSSL_jll.jl + +baremodule OpenSSL_jll +using Base, Libdl + +const PATH_list = String[] +const LIBPATH_list = String[] + +export libcrypto, libssl + +# These get calculated in __init__() +const PATH = Ref("") +const LIBPATH = Ref("") +artifact_dir::String = "" +libcrypto_handle::Ptr{Cvoid} = C_NULL +libcrypto_path::String = "" +libssl_handle::Ptr{Cvoid} = C_NULL +libssl_path::String = "" + +if Sys.iswindows() + const libcrypto = "libcrypto.dll" + const libssl = "libssl.dll" +elseif Sys.isapple() + const libcrypto = "@rpath/libcrypto.3.dylib" + const libssl = "@rpath/libssl.3.dylib" +else + const libcrypto = "libcrypto.so.3" + const libssl = "libssl.so.3" +end + +function __init__() + global libcrypto_handle = dlopen(libcrypto) + global libcrypto_path = dlpath(libcrypto_handle) + global libssl_handle = dlopen(libssl) + global libssl_path = dlpath(libssl_handle) + global artifact_dir = dirname(Sys.BINDIR) + LIBPATH[] = dirname(libssl_path) + push!(LIBPATH_list, LIBPATH[]) +end + +# JLLWrappers API compatibility shims. Note that not all of these will really make sense. +# For instance, `find_artifact_dir()` won't actually be the artifact directory, because +# there isn't one. It instead returns the overall Julia prefix. +is_available() = true +find_artifact_dir() = artifact_dir +dev_jll() = error("stdlib JLLs cannot be dev'ed") +best_wrapper = nothing +get_libcrypto_path() = libcrypto_path +get_libssl_path() = libssl_path + +end # module OpenSSL_jll diff --git a/stdlib/OpenSSL_jll/test/runtests.jl b/stdlib/OpenSSL_jll/test/runtests.jl new file mode 100644 index 0000000000000..9c20db436e9f3 --- /dev/null +++ b/stdlib/OpenSSL_jll/test/runtests.jl @@ -0,0 +1,10 @@ +# This file is a part of Julia. License is MIT: https://julialang.org/license + +using Test, Libdl, OpenSSL_jll + +@testset "OpenSSL_jll" begin + major = ccall((:OPENSSL_version_major, libcrypto), Cuint, ()) + minor = ccall((:OPENSSL_version_minor, libcrypto), Cuint, ()) + patch = ccall((:OPENSSL_version_patch, libcrypto), Cuint, ()) + @test VersionNumber(major, minor, patch) == v"3.0.13" +end diff --git a/stdlib/Project.toml b/stdlib/Project.toml index cc7ba99dd4e4f..e7918e988f37d 100644 --- a/stdlib/Project.toml +++ b/stdlib/Project.toml @@ -34,6 +34,7 @@ MozillaCACerts_jll = "14a3606d-f60d-562e-9121-12d972cd8159" NetworkOptions = "ca575930-c2e3-43a9-ace4-1e988b2c1908" OpenBLAS_jll = "4536629a-c528-5b80-bd46-f80d51c5b363" OpenLibm_jll = "05823500-19ac-5b8b-9628-191a04bc5112" +OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95" PCRE2_jll = "efcefdf7-47ab-520b-bdef-62a2eaa19f15" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" diff --git a/stdlib/stdlib.mk b/stdlib/stdlib.mk index b79059d3368b1..f8e5a125fb975 100644 --- a/stdlib/stdlib.mk +++ b/stdlib/stdlib.mk @@ -9,7 +9,7 @@ INDEPENDENT_STDLIBS := \ SparseArrays Statistics StyledStrings SuiteSparse_jll Tar Test TOML Unicode UUIDs \ dSFMT_jll GMP_jll libLLVM_jll LLD_jll LLVMLibUnwind_jll LibUnwind_jll LibUV_jll \ LibCURL_jll LibSSH2_jll LibGit2_jll nghttp2_jll MozillaCACerts_jll MbedTLS_jll \ - MPFR_jll OpenLibm_jll PCRE2_jll p7zip_jll Zlib_jll + MPFR_jll OpenLibm_jll OpenSSL_jll PCRE2_jll p7zip_jll Zlib_jll STDLIBS := $(STDLIBS_WITHIN_SYSIMG) $(INDEPENDENT_STDLIBS) VERSDIR := v$(shell cut -d. -f1-2 < $(JULIAHOME)/VERSION) From 8fe95c697a2f46518b7816929ec456def0524221 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sun, 31 Mar 2024 11:33:01 +0200 Subject: [PATCH 06/19] Update JLL to new versions based on OpenSSL --- stdlib/LibCURL_jll/Project.toml | 4 ++-- stdlib/LibGit2_jll/Project.toml | 4 ++-- stdlib/LibGit2_jll/src/LibGit2_jll.jl | 2 +- stdlib/LibSSH2_jll/Project.toml | 4 ++-- stdlib/LibSSH2_jll/src/LibSSH2_jll.jl | 2 +- stdlib/Manifest.toml | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stdlib/LibCURL_jll/Project.toml b/stdlib/LibCURL_jll/Project.toml index d17090a1e5c3b..219b175cb7c61 100644 --- a/stdlib/LibCURL_jll/Project.toml +++ b/stdlib/LibCURL_jll/Project.toml @@ -1,11 +1,11 @@ name = "LibCURL_jll" uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.6.0+0" +version = "8.7.1+1" [deps] LibSSH2_jll = "29816b5a-b9ab-546f-933c-edad1886dfa8" nghttp2_jll = "8e850ede-7688-5339-a07c-302acd2aaf8d" -MbedTLS_jll = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" +OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95" Zlib_jll = "83775a58-1f1d-513f-b197-d71354ab007a" Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" diff --git a/stdlib/LibGit2_jll/Project.toml b/stdlib/LibGit2_jll/Project.toml index ceeb394f26231..d2f60ba3c99ff 100644 --- a/stdlib/LibGit2_jll/Project.toml +++ b/stdlib/LibGit2_jll/Project.toml @@ -1,9 +1,9 @@ name = "LibGit2_jll" uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.8.0+0" +version = "1.8.0+2" [deps] -MbedTLS_jll = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" +OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95" LibSSH2_jll = "29816b5a-b9ab-546f-933c-edad1886dfa8" Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl index 15d303dfea6ee..f2caec3a2395a 100644 --- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl +++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl @@ -3,7 +3,7 @@ ## dummy stub for https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl baremodule LibGit2_jll -using Base, Libdl, MbedTLS_jll, LibSSH2_jll +using Base, Libdl, OpenSSL_jll, LibSSH2_jll const PATH_list = String[] const LIBPATH_list = String[] diff --git a/stdlib/LibSSH2_jll/Project.toml b/stdlib/LibSSH2_jll/Project.toml index def4fb02e399c..5476f6f870a90 100644 --- a/stdlib/LibSSH2_jll/Project.toml +++ b/stdlib/LibSSH2_jll/Project.toml @@ -1,9 +1,9 @@ name = "LibSSH2_jll" uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" -version = "1.11.0+1" +version = "1.11.0+4" [deps] -MbedTLS_jll = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" +OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95" Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" diff --git a/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl b/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl index 351cbe0e3729b..bc21339478596 100644 --- a/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl +++ b/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl @@ -3,7 +3,7 @@ ## dummy stub for https://github.com/JuliaBinaryWrappers/LibSSH2_jll.jl baremodule LibSSH2_jll -using Base, Libdl, MbedTLS_jll +using Base, Libdl, OpenSSL_jll const PATH_list = String[] const LIBPATH_list = String[] diff --git a/stdlib/Manifest.toml b/stdlib/Manifest.toml index 6dc8580f1ba5b..f0a717f11cdaf 100644 --- a/stdlib/Manifest.toml +++ b/stdlib/Manifest.toml @@ -91,9 +91,9 @@ uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" version = "0.6.4" [[deps.LibCURL_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.6.0+0" +version = "8.7.1+1" [[deps.LibGit2]] deps = ["LibGit2_jll", "NetworkOptions", "Printf", "SHA"] @@ -101,14 +101,14 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" version = "1.11.0" [[deps.LibGit2_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.8.0+0" +version = "1.8.0+2" [[deps.LibSSH2_jll]] -deps = ["Artifacts", "Libdl", "MbedTLS_jll"] +deps = ["Artifacts", "Libdl", "OpenSSL_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" -version = "1.11.0+1" +version = "1.11.0+4" [[deps.LibUV_jll]] deps = ["Artifacts", "Libdl"] From eefe323003dbc7c7fb9bb72b414ebc5a21b72ed4 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sun, 31 Mar 2024 11:33:48 +0200 Subject: [PATCH 07/19] Update curl version to match JLL --- deps/curl.mk | 2 +- deps/curl.version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/curl.mk b/deps/curl.mk index f2edffef7f21f..db91e6308b7c0 100644 --- a/deps/curl.mk +++ b/deps/curl.mk @@ -37,7 +37,7 @@ checksum-curl: $(SRCCACHE)/curl-$(CURL_VER).tar.bz2 # Disable....almost everything CURL_CONFIGURE_FLAGS := $(CONFIGURE_COMMON) \ --without-gnutls --without-libidn2 --without-librtmp \ - --without-nss --without-libpsl --without-libgsasl --without-fish-functions-dir \ + --without-libpsl --without-libgsasl --without-fish-functions-dir \ --disable-ares --disable-manual --disable-ldap --disable-ldaps --disable-static \ --without-gssapi --without-brotli # A few things we actually enable diff --git a/deps/curl.version b/deps/curl.version index 5ecfcc2b642a1..59ceb7371a956 100644 --- a/deps/curl.version +++ b/deps/curl.version @@ -3,4 +3,4 @@ CURL_JLL_NAME := LibCURL ## source build -CURL_VER := 8.6.0 +CURL_VER := 8.7.1 From 988b7c43efffde3add04cecb789ded60bd6b8880 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Fri, 29 Mar 2024 13:17:33 +0100 Subject: [PATCH 08/19] Update checksums --- deps/checksums/curl | 68 +++++++++++++++++++++--------------------- deps/checksums/libgit2 | 64 +++++++++++++++++++-------------------- deps/checksums/libssh2 | 64 +++++++++++++++++++-------------------- deps/checksums/openssl | 34 +++++++++++++++++++++ 4 files changed, 132 insertions(+), 98 deletions(-) create mode 100644 deps/checksums/openssl diff --git a/deps/checksums/curl b/deps/checksums/curl index e6f7989db33d7..2fe4f897d0073 100644 --- a/deps/checksums/curl +++ b/deps/checksums/curl @@ -1,36 +1,36 @@ LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/md5/e8c53aa3fb963c80921787d5d565eb2c LibCURL-a65b64f6eabc932f63c2c0a4a5fb5d75f3e688d0.tar.gz/sha512/8e442ea834299df9c02acb87226c121395ad8e550025ac5ee1103df09c6ff43817e9e48dd1bcbc92c80331ef3ddff531962430269115179acbec2bab2de5b011 -LibCURL.v8.6.0+0.aarch64-apple-darwin.tar.gz/md5/83854e8cdd078ec1fc5f92da2816e379 -LibCURL.v8.6.0+0.aarch64-apple-darwin.tar.gz/sha512/f3b3cc5804d9a7986ed9ea7c3186caa8dba0f4d6bbcb9b5d2070b4e6412234f2ed7908446dbe217323510c6d3b042540e18ec7839093c2c3c66f3195937a6a3b -LibCURL.v8.6.0+0.aarch64-linux-gnu.tar.gz/md5/880014fface52bddaa1a0240e0668dde -LibCURL.v8.6.0+0.aarch64-linux-gnu.tar.gz/sha512/a29b923e14425ad729484648ce15577e717a97acf6138e0ec3d35a8000aeef17f27ce01d1fdc1642c6eda72d8d8b46642d79844ef9a50f30a0148e29452565c1 -LibCURL.v8.6.0+0.aarch64-linux-musl.tar.gz/md5/b84fcb98f1305803d941f7a5accbfdb1 -LibCURL.v8.6.0+0.aarch64-linux-musl.tar.gz/sha512/0880dc91109aedd9b108f2e28a25bf7091ac976a6f94e65000f647802c57a01e8111d421b91a91244c3cfb56990155af2c47b3499997be2af8ab93d344b8331d -LibCURL.v8.6.0+0.armv6l-linux-gnueabihf.tar.gz/md5/24249f42db0bc99c2dde4cf61d61f11f -LibCURL.v8.6.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/350443c86f7b6733fb6a28f8a2fe7a6c0e91462b9e4078fed3475059ec7e12fef5014e22d0d0babe44f172ace7258292de577a0ab90f90c65d825d74940c9c47 -LibCURL.v8.6.0+0.armv6l-linux-musleabihf.tar.gz/md5/375c01cef98204c4f63ac218b08c4c7b -LibCURL.v8.6.0+0.armv6l-linux-musleabihf.tar.gz/sha512/ed0981d458c6ddc9f380b90f1ec25cbaa6be910f0dab5d5485e4d1e9a33f8a918d210722a5e6685b4d3b917e0800194856f826164ee2e90b8a886ada7498a52b -LibCURL.v8.6.0+0.armv7l-linux-gnueabihf.tar.gz/md5/4c81aa99065cf797d6e09ce172dd2fa7 -LibCURL.v8.6.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/08bbb1bc80411a5fd65699a0d721fc70a9bba1005194f2937accc2e98f7f803bac4a704c88aa1fc1d72e54e7c327a113963f8a4c52ebb1e5921778d1dd549143 -LibCURL.v8.6.0+0.armv7l-linux-musleabihf.tar.gz/md5/6865b2f2d93754b5206d618048c32b57 -LibCURL.v8.6.0+0.armv7l-linux-musleabihf.tar.gz/sha512/c1a5891f4c487d5f7cf91db7cd2d85394d9686cda01c89cddaf7afba09782aa9f00713592d72ed8a0dd20439884dd75c1e001a9ecb16dd8ce5f08f79c194c7c8 -LibCURL.v8.6.0+0.i686-linux-gnu.tar.gz/md5/3f35cc6a2dc7e9dba5e3b4aeaf130160 -LibCURL.v8.6.0+0.i686-linux-gnu.tar.gz/sha512/b34c5ba2fee272e6ca848c42335ffa0c4d0c06337608504a3a2cfeb111e228da3f82d91c0c4387c76fc347babbf50b368992b5b8d5fda1a60ed5c0ce5d9242db -LibCURL.v8.6.0+0.i686-linux-musl.tar.gz/md5/0072b83eaf91d9da4a8d25ef65fd8ca8 -LibCURL.v8.6.0+0.i686-linux-musl.tar.gz/sha512/029552e3dac29857726988352a01a3b57859bfe5e327e7b759bd9968ed5af5498fd27ab490810d2d3ef05b1003c1a950fd092d1dbce7732a911f7cb6e5714303 -LibCURL.v8.6.0+0.i686-w64-mingw32.tar.gz/md5/d58ef948bc9a04a8c934a88b7ab5599d -LibCURL.v8.6.0+0.i686-w64-mingw32.tar.gz/sha512/1e1742ea39f2fe1f13b0aff5907f96401276e3fc469a8f09f2bc31fffc72367a92856973db66eb9b05d20fd708764ad9429e385913f6236ce8067ec4e11dbb33 -LibCURL.v8.6.0+0.powerpc64le-linux-gnu.tar.gz/md5/60ec16b6dfd3e30eb0655cf177b026c7 -LibCURL.v8.6.0+0.powerpc64le-linux-gnu.tar.gz/sha512/f591897972c8b01edf64701885f636fc1d5c04cce8fc63577d06108e14e5480bad74306d6ee31515911bd8ba3db10d1f2c733a6149aceae32aa4b77e263087c3 -LibCURL.v8.6.0+0.x86_64-apple-darwin.tar.gz/md5/c6bc0d9cd0a9f9c35ed2aac058ae332f -LibCURL.v8.6.0+0.x86_64-apple-darwin.tar.gz/sha512/038f55bfb06dce877540ea7d50f5a0b8fdc070539c505774139a7c23df276a5fc75b5cecabecbc2826417e091028382d79298a51ed73c3d776249b4ff35f9f26 -LibCURL.v8.6.0+0.x86_64-linux-gnu.tar.gz/md5/18bf9d909dd5eebc0554d23bf4a4ee0f -LibCURL.v8.6.0+0.x86_64-linux-gnu.tar.gz/sha512/35e60faa1ee072003fdd5cd510295bc310aa99375aee6ef94eee3ee2d5e0b7844145866a74927c588c14131939c1d9865d6f5128ac4f6b93606a68042a94f39f -LibCURL.v8.6.0+0.x86_64-linux-musl.tar.gz/md5/213190e1d79c9c291ff460e1648a61d3 -LibCURL.v8.6.0+0.x86_64-linux-musl.tar.gz/sha512/4ea063982520400c02dcdf44ed3f018dec19607ad20762231316eb745cdb1cd054b18677fee1b5c5fb0bd55eb845121a2113704c5301be1d76edfc8a4a09d93f -LibCURL.v8.6.0+0.x86_64-unknown-freebsd.tar.gz/md5/30dda5aaeb7977eb3563c603af08cd6c -LibCURL.v8.6.0+0.x86_64-unknown-freebsd.tar.gz/sha512/edf603a6c013d3f6e01fc4fd6f12caf93ff99df9baf14bc73b610638a5b5ff90ec3118b112d9a39221294f5f419f3bf12232c16eaf91b07a68d92342a5c56912 -LibCURL.v8.6.0+0.x86_64-w64-mingw32.tar.gz/md5/9a2c980db329393f5274d42f87c2aec6 -LibCURL.v8.6.0+0.x86_64-w64-mingw32.tar.gz/sha512/6b926a87a3470796eb111e448c459a8ff1267533513f14d58f6e08cbebfb3e838c114827fcf39298bcefe8d76b8578bb4d3903c848bfafb0590022e6a49b2a00 -curl-8.6.0.tar.bz2/md5/4418e0d94f29d352afafdab445e37a3d -curl-8.6.0.tar.bz2/sha512/726fe7e21f8a2a925ab4ab6fe4e4ad099105f00656bfdc702beec12e1549ba2cb63d908d1d19f43b90feeb1d950ae5a6ac9a72a27447f5acf1907df396d1823c +LibCURL.v8.7.1+1.aarch64-apple-darwin.tar.gz/md5/245ffacc48db91f72594316f94669573 +LibCURL.v8.7.1+1.aarch64-apple-darwin.tar.gz/sha512/9b959d0c1835b55171a97e51d8fbf6573fdb247fb6616b519620cdbe87fcc40b41d11b76fcda02a6baf872f6eb62a868ec6634ae7729fc0210fe59ed077f1d01 +LibCURL.v8.7.1+1.aarch64-linux-gnu.tar.gz/md5/c511a95a6bac9c2d8cfe7d801a797fe4 +LibCURL.v8.7.1+1.aarch64-linux-gnu.tar.gz/sha512/07695231237f09ad29ec3f8f72b9a92ddc10daac24638ee519b0c81b5ee99b8128ee47a61959dbb84e164bdf5782657153148dff3063a1cdb50e431c3045be58 +LibCURL.v8.7.1+1.aarch64-linux-musl.tar.gz/md5/0971bc0485aacb2ea157d89da0ac249f +LibCURL.v8.7.1+1.aarch64-linux-musl.tar.gz/sha512/fcaab2b68ce312224c9d7dabb998605b318b9689b4fb5193a8acbc9f353ecae577f3cb0858f4c90ed9e7c869e0aa06e6bbd33097f0ffafd328a5919d93936175 +LibCURL.v8.7.1+1.armv6l-linux-gnueabihf.tar.gz/md5/b1c61184f43b3e9eb36fd688ed86b8f4 +LibCURL.v8.7.1+1.armv6l-linux-gnueabihf.tar.gz/sha512/2b8cee90c12860ede61859717534c2bdf450027dbcb629db055fe1798bb7d96c232a6c85ff12828740a954b5a2a93dbb580fbfecb7dacf23c191702828c979f1 +LibCURL.v8.7.1+1.armv6l-linux-musleabihf.tar.gz/md5/3db28f06f6ec26a4f4a274742b9d966f +LibCURL.v8.7.1+1.armv6l-linux-musleabihf.tar.gz/sha512/3315ed4a303d54beae2515787c0cce0232e0c48eb56255e3e14cbce3ed01b52ea2b1b302736d134a32c39664605ace1aa8426783bbb9693d88e10e6c0f6dd7e8 +LibCURL.v8.7.1+1.armv7l-linux-gnueabihf.tar.gz/md5/bff67eb717843f830eb4fb12a724d221 +LibCURL.v8.7.1+1.armv7l-linux-gnueabihf.tar.gz/sha512/d26cb6df44ae42ed487a4eb4918e5bc03c00d25cb4eba1d69c0aa57bb081e8410fb6dec25052663d089c1cef46497c7097762de81a79754406400222598ebe0f +LibCURL.v8.7.1+1.armv7l-linux-musleabihf.tar.gz/md5/5c9d04c9a4783151b0725a261f5c5ce4 +LibCURL.v8.7.1+1.armv7l-linux-musleabihf.tar.gz/sha512/6b7ce5e84f0e7432dd8caeab4b49c6c48b3203f59b14be2317e3fa1eb81d25267944865ad16d5348f1913ccd530750808940043705096027e03aaa25391bdb58 +LibCURL.v8.7.1+1.i686-linux-gnu.tar.gz/md5/4d17ae2004a438fa4d1e26ca49677459 +LibCURL.v8.7.1+1.i686-linux-gnu.tar.gz/sha512/d44bd52640a2e513f7b5123567529ea41e14c78640b544c260aad9c3c256016cddc9855d3c5f3d0bd228e213e31f2f2aa6f52ce3e686ec5ec37f7ba68527d399 +LibCURL.v8.7.1+1.i686-linux-musl.tar.gz/md5/d7577614f22ec54e20b488595ef1c8c8 +LibCURL.v8.7.1+1.i686-linux-musl.tar.gz/sha512/5858c4ab86d49d060d74fa0991096509e58c97ba35e89440d55cd82ff07b25287e6dbe8069fb4b9f6e83b8296a3a47a8112ab38135740a2000c88d044c6b5300 +LibCURL.v8.7.1+1.i686-w64-mingw32.tar.gz/md5/8abb0cb4d6d4045a942f73e51667f525 +LibCURL.v8.7.1+1.i686-w64-mingw32.tar.gz/sha512/84ab9a01fe3ef9929de74962232201f2481ef587340b6d242ece5d949d27b5bf66223bd3ceed49b1fabd9be3f4db6d16dad39ae6498f3931acc71aa6a6a623ff +LibCURL.v8.7.1+1.powerpc64le-linux-gnu.tar.gz/md5/6a42c4fe9cdea7954597ed9ec03b2b6a +LibCURL.v8.7.1+1.powerpc64le-linux-gnu.tar.gz/sha512/dfeb44c1f3a8c2f9cff6b0b213e93904d070cfb2f5432788ee1545fdd6ea792528a707eb08057c261587b9f82d2632011d47be303ad806d64c027a71b60d4b94 +LibCURL.v8.7.1+1.x86_64-apple-darwin.tar.gz/md5/c00b0df6dd6fe758acf2f6b469751908 +LibCURL.v8.7.1+1.x86_64-apple-darwin.tar.gz/sha512/d2bc627e563e2b53791f02c39dc014a57c919f7caca73d639a42d2fe7e90dfff69687e085bfd374ff853eaa5499608dd3ab305367fb6de531db7cd52afcaec3a +LibCURL.v8.7.1+1.x86_64-linux-gnu.tar.gz/md5/cb9e684239cbae5cfa3718220baf8b81 +LibCURL.v8.7.1+1.x86_64-linux-gnu.tar.gz/sha512/1b15b390e9e2c3ae166e74eed0df3d41f3d555d9f7e52a857798445c05a0ab7d4324656dfcf668d903066d43b3939f8ea18313d974296fd27a6934337f9a56bd +LibCURL.v8.7.1+1.x86_64-linux-musl.tar.gz/md5/06c9e58a59cebb4e3c2d0b42f262ad7c +LibCURL.v8.7.1+1.x86_64-linux-musl.tar.gz/sha512/3f097758bcf22a337d2f93efd17cedf53905545b37b7a5161c49192037ac5cb602ad6b24f98eeca85509a91d29c7dbf552089c132e0bda24c0bb031419db6fd0 +LibCURL.v8.7.1+1.x86_64-unknown-freebsd.tar.gz/md5/da9920a242c3836661026535116c8b6a +LibCURL.v8.7.1+1.x86_64-unknown-freebsd.tar.gz/sha512/6873f196ab64d3fb5606cee4d242681632a38597dd216eb18991cf64271da98fdd2431558318749a6a53579c70e63723201da622cdcfb3862d903ab47990870e +LibCURL.v8.7.1+1.x86_64-w64-mingw32.tar.gz/md5/4c0a32b2248fb786995a883aa447aa3a +LibCURL.v8.7.1+1.x86_64-w64-mingw32.tar.gz/sha512/4f03c3c0d593391e7a198bc44275302f6b1e15faa68cf7c38011ccd7b3fd3945f3736fe68624398d2aab816ea36c8971c6140040fba7fa706ff24af2af81b654 +curl-8.7.1.tar.bz2/md5/a7335b3daf80b9a0ee884fcb62324f88 +curl-8.7.1.tar.bz2/sha512/f6ba02470c1772ee5479dcf27d32df7cdcca8ebd2feb94fa12fa7ecccfcfb1f5d20428dbb1d93e81108f711ee721f4d4583678355d71570f6c93ffd03535753b diff --git a/deps/checksums/libgit2 b/deps/checksums/libgit2 index 629a5f0601fcd..9e64c04e83044 100644 --- a/deps/checksums/libgit2 +++ b/deps/checksums/libgit2 @@ -1,34 +1,34 @@ -LibGit2.v1.8.0+0.aarch64-apple-darwin.tar.gz/md5/c19f3a4f6567b7504f607fc6f328312f -LibGit2.v1.8.0+0.aarch64-apple-darwin.tar.gz/sha512/0a776ab3eb4593abe0f2198a7371cbcf653ac5cf71ab7af9d5520c2bbbbbc981cf07ba3afa70f1ef6ea56f81e2d4b33b1be1482f9e215e61178b3dd1149ecb80 -LibGit2.v1.8.0+0.aarch64-linux-gnu.tar.gz/md5/8137d530bea16d41a614983068c1909d -LibGit2.v1.8.0+0.aarch64-linux-gnu.tar.gz/sha512/bdcb6249acd8df887a8af7c084d409132694a39f5e9f90bd70bba0f3eba2bad3eab6958cce9f060b2a4392d99352ccda8be92000f24ed4498c85ba55e0cbf13f -LibGit2.v1.8.0+0.aarch64-linux-musl.tar.gz/md5/4b9508ea58d4b1bd99f8471bd7c9a839 -LibGit2.v1.8.0+0.aarch64-linux-musl.tar.gz/sha512/e0996627a3d3ab9b3b1d103bbdd3e1179ede5479816f6b1be54471f120f76fe0495d3c7587c382985173c0614b634903b58c67ac3badbead82b4d797cc5915d7 -LibGit2.v1.8.0+0.armv6l-linux-gnueabihf.tar.gz/md5/02d6fae1745562cf724190929383688e -LibGit2.v1.8.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/11c14c5f395252143218a495c7dd2817c8f18f73320200a521f5ccd5f0c3c87403dee2c3b9e8166022fde1a67e83cbb83e6f222aac38b41efa43a6c0254548a9 -LibGit2.v1.8.0+0.armv6l-linux-musleabihf.tar.gz/md5/afa7b90751565b865f443b5a0a870d8b -LibGit2.v1.8.0+0.armv6l-linux-musleabihf.tar.gz/sha512/3594c223883a7da3bc0c78ae656fb15e47cc9dd196cf08f0abc0a1fb5f799842261e125440c07e92ba82896ad7427814bb43b63ba64d9b72ba38e9149132c26b -LibGit2.v1.8.0+0.armv7l-linux-gnueabihf.tar.gz/md5/ead27583a1cc5748c84d58a07fa6fc7e -LibGit2.v1.8.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/c81c3582fda7b299aaed72de07e9d0bd06c0c231aed73bb980c12c89b2b7593b2fb7990421bc2e45173f3d107ab50660842289675efa31f24ff752f0ebc63875 -LibGit2.v1.8.0+0.armv7l-linux-musleabihf.tar.gz/md5/71e38f112e8629682cc383c510f1f13f -LibGit2.v1.8.0+0.armv7l-linux-musleabihf.tar.gz/sha512/0b4b2677bdfc4f8e2a5ef3b9adf8fa2c0c1e76bd240b2173c268835b59cda29cbffc4241319fe36dcd63d1507ecf0e0e843f48fca80e3fbe4d3df53601ad7dec -LibGit2.v1.8.0+0.i686-linux-gnu.tar.gz/md5/b54cdd02201c1481746ab81db6f39aac -LibGit2.v1.8.0+0.i686-linux-gnu.tar.gz/sha512/0496a607b0d6841fc0c87477274b61eb95afa24d48d2624f8aaf230028a24d0248336902b01a326010fdbc45d8d73eecedb14c82313e1b1a94b3b6a4296e2607 -LibGit2.v1.8.0+0.i686-linux-musl.tar.gz/md5/b8946f9c1b83a7c22b2a8ca6da05b23b -LibGit2.v1.8.0+0.i686-linux-musl.tar.gz/sha512/931ff27da4e35749a5c020af72b750dce0b1d672cd98c04ad5a340f4f33ddb61c4df6711c36c6601063262fb733d45a3bb24eb1141e9d2fd2e0ab7b9bfbf54c8 -LibGit2.v1.8.0+0.i686-w64-mingw32.tar.gz/md5/cb9db0b590efe0c60f6e2f9558de4e5b -LibGit2.v1.8.0+0.i686-w64-mingw32.tar.gz/sha512/b9f637ec10cd751dfb2156e154a68809af400cdecbf0d25910792937c63ea56e60b703c7b78e3038ab34b1100bb20df79dce6346f40f1d24e5188fefe9517ccc -LibGit2.v1.8.0+0.powerpc64le-linux-gnu.tar.gz/md5/4ac1fa6b1ca43d3f6e97d590d1d27127 -LibGit2.v1.8.0+0.powerpc64le-linux-gnu.tar.gz/sha512/5cc3b9b9d85068bb3c6711c63ccb2672be765888a114147f70cae0eebf96f5bde00a40f163202c20e18a4cf4af2488fd1c304060daa3dd35748b30ab5a1fdb1d -LibGit2.v1.8.0+0.x86_64-apple-darwin.tar.gz/md5/26c2d1dcf68bc7b9919dfd24eb2fabc7 -LibGit2.v1.8.0+0.x86_64-apple-darwin.tar.gz/sha512/9c3ba94c438682f321cb2130f71028587a4a21b960f94f8c3f633dbe007210ff1b7b5e0b0bc4972e818458843a47a9e8d50d88f1bd3fb03a8fe129fa66332a38 -LibGit2.v1.8.0+0.x86_64-linux-gnu.tar.gz/md5/8d48ad388cca20d6338095cf8a36c3c9 -LibGit2.v1.8.0+0.x86_64-linux-gnu.tar.gz/sha512/9ddf4dc7420a9129ff8c34eb07ee94d9213c1a1c22700521199032a773353ab2413fd70d002b273a06dd951558128cd5577b7e917de6575d379911831d737bed -LibGit2.v1.8.0+0.x86_64-linux-musl.tar.gz/md5/5d9fd50bdf38ec99311e9627f254b95d -LibGit2.v1.8.0+0.x86_64-linux-musl.tar.gz/sha512/eae36cc70cb414e15924c22c9b03a98949b89fd8ca429fbe23fa215253266ed4cd11530adb2feccc9a19299ebf2048f1f5929c1faffba463b593b6c3e1808bee -LibGit2.v1.8.0+0.x86_64-unknown-freebsd.tar.gz/md5/af9e9d4bbe0df291f07f41416809a6f2 -LibGit2.v1.8.0+0.x86_64-unknown-freebsd.tar.gz/sha512/859786f13ba1fb5cd448dd5f22ebdf3381f5290d4875d65840fb31567ccd012f283a1849a82f2b2f58c3d73eda4c748d3da07d84a99665e0f50aeb39c37a4fb2 -LibGit2.v1.8.0+0.x86_64-w64-mingw32.tar.gz/md5/b51e3e238d776d52e396dd749f895e4f -LibGit2.v1.8.0+0.x86_64-w64-mingw32.tar.gz/sha512/2581d4b1d6fd4d0f15b406f050bd8a2a41e13dc2a1699a9b956e56426778beb994e6552988bf50ddad682349209a8694eace9450dab0570434cdfbed9c9f0b24 +LibGit2.v1.8.0+2.aarch64-apple-darwin.tar.gz/md5/bde56ca02c033dd843d115f6dad89430 +LibGit2.v1.8.0+2.aarch64-apple-darwin.tar.gz/sha512/b454af4d724e9c19d9be01c88269b36bcf6a195abce7f664faa6baa3a23c9cdb28891d0cb82d581b81d4f6b446d875733c990db74909b8f7d2043ea11652232d +LibGit2.v1.8.0+2.aarch64-linux-gnu.tar.gz/md5/b27963307c706bdba7255bfc64dab8cc +LibGit2.v1.8.0+2.aarch64-linux-gnu.tar.gz/sha512/c3121ea9684b7e0bb0485b45467d68292bc59204bbcc50254f7a0b93651bfb93b309fa85cc42ed794c425dda349d9e3bb13251f8235bb68967fdf45bea0b3a4d +LibGit2.v1.8.0+2.aarch64-linux-musl.tar.gz/md5/076a94d5dd65e4b6ccee547a54a18f5e +LibGit2.v1.8.0+2.aarch64-linux-musl.tar.gz/sha512/e83e8cf68c69e5fa5e04fc42c17b88ccc1d0fb2d751facfff1ca01107f96be7772f62a2f9d2d0f38f07603594c965b1fedb54cf2df9cfa574797ad6f7e4c93ef +LibGit2.v1.8.0+2.armv6l-linux-gnueabihf.tar.gz/md5/1bbe4936b6152bbcc46b8b8e858b9154 +LibGit2.v1.8.0+2.armv6l-linux-gnueabihf.tar.gz/sha512/a0fa73fa7a42107ce3d4eaf1f09a49f76498cb9ca6053c7d42d6c17c49d9faf637f5ba05d1eada749ec24ce43af55e8be5b0d211313b9950bbb78affa3a557f5 +LibGit2.v1.8.0+2.armv6l-linux-musleabihf.tar.gz/md5/9c9839c820791c3b82171706efd825c2 +LibGit2.v1.8.0+2.armv6l-linux-musleabihf.tar.gz/sha512/426b4202885bd3fc0fc1f97dd76020d602366c8175a1a362bb01285a4fb6b8383a5a9d4de93a148dc46467e32e495c66b0305f48f2bf930d20b26d57fc32e4bf +LibGit2.v1.8.0+2.armv7l-linux-gnueabihf.tar.gz/md5/655e9087630a5046e566c18d31809fc4 +LibGit2.v1.8.0+2.armv7l-linux-gnueabihf.tar.gz/sha512/2826f9d382e1db140acabf4442549e4aad883c4cd3399a264a3288cb5235b7053946365a3655b374db744f71d97896385811d0aea7da7bae7da5e585c5176d5c +LibGit2.v1.8.0+2.armv7l-linux-musleabihf.tar.gz/md5/1926d45609e7199e61981776dce3f37f +LibGit2.v1.8.0+2.armv7l-linux-musleabihf.tar.gz/sha512/f1c57592b661eefc5ab706bfffbfc7294432b00cca569385158857055b65961704fdb2e901aa55719f70085fbd6502d9f7cf28156eb896b4ee1b9349444ff19e +LibGit2.v1.8.0+2.i686-linux-gnu.tar.gz/md5/751e72149d967aac0c62ee8c60a9badd +LibGit2.v1.8.0+2.i686-linux-gnu.tar.gz/sha512/c2e48ab0561ffa62aa98740838b88a5729ccc9124006bf5d0674a07896d9bea3237b278c351eedc426ecc70c49d6166ba8ec5ba4a794942734d6e89a0aa4b11f +LibGit2.v1.8.0+2.i686-linux-musl.tar.gz/md5/e10968f78a45e856c4623e5b830b79fd +LibGit2.v1.8.0+2.i686-linux-musl.tar.gz/sha512/3ed5e110466dc103e4e955df32096585ff3f3cc5920d54d00dcfb74a1ce3b8b3be2eb28640436d68a72ed81704d927a65bed5723008860870ef897b0c4ec4d66 +LibGit2.v1.8.0+2.i686-w64-mingw32.tar.gz/md5/37ebdafca6349342fdb117d68da93ec8 +LibGit2.v1.8.0+2.i686-w64-mingw32.tar.gz/sha512/44cc765731437bfdd67c10963b95b86aa881f1ae633618ebc820e2be905606be73d637cf18013e5fb7abcbeabc826062ec3fdcc289e065592d6367b45a9f35e5 +LibGit2.v1.8.0+2.powerpc64le-linux-gnu.tar.gz/md5/cfc69b32962a5b6b263311835e65f956 +LibGit2.v1.8.0+2.powerpc64le-linux-gnu.tar.gz/sha512/bc955578f20723bd3b9645fdd1d5a75c60e767e286bee12004ea46ef44ebe1e321e92534aba884d5526d3aa25bff68b8c36167d35459d8a2f61d150773282705 +LibGit2.v1.8.0+2.x86_64-apple-darwin.tar.gz/md5/ed78b6c77fcc8f6573cff1d0cd7d4237 +LibGit2.v1.8.0+2.x86_64-apple-darwin.tar.gz/sha512/bef8403d43ccf3ff055f0d09964bba0ff469f1ab803b5f833df55f4b801b90f6115557f26a674b4c0e1b47e96f0a498a49e17b7badc1458f47de3ee6e9df7000 +LibGit2.v1.8.0+2.x86_64-linux-gnu.tar.gz/md5/87ce491ce6ac6133379ef6bb9e04d4bd +LibGit2.v1.8.0+2.x86_64-linux-gnu.tar.gz/sha512/783b777dc35ac9882daf857c27cd4e7728a6601ca6270217084693ef029f956dc0c5d2adb452239b08df2587594e65972dee7abe6f822edafa8d8b6774b253b9 +LibGit2.v1.8.0+2.x86_64-linux-musl.tar.gz/md5/8a2eb52dd2d74aac32f2b119504a08d5 +LibGit2.v1.8.0+2.x86_64-linux-musl.tar.gz/sha512/635149d2a428021b73c21d4dbf0937301eca237f8f319e22c47650c866a843e216bf04646114a661506ce344cc044bd298f136ea5a0b34a851561ef61b58f776 +LibGit2.v1.8.0+2.x86_64-unknown-freebsd.tar.gz/md5/3da951eee7fe6f59d81013a83efec741 +LibGit2.v1.8.0+2.x86_64-unknown-freebsd.tar.gz/sha512/84a9eaf1bbd4c1648661aa2ffde782cfdc95282756600613adc762f867ec23b8f36dfd1c6e9051df1018100955e754313649797432b426610a019baecb393bad +LibGit2.v1.8.0+2.x86_64-w64-mingw32.tar.gz/md5/650e341d3b981802f960096f18b9a694 +LibGit2.v1.8.0+2.x86_64-w64-mingw32.tar.gz/sha512/55eba907df8807a3cc1083cdf0dae086591c82ba3ee31a4a8c3ed64c1668af7c1714d0b628eb9c5361ca9ea33d90e7fe92ba5eb3ce02eabc063efee00c1774c7 libgit2-d74d491481831ddcd23575d376e56d2197e95910.tar.gz/md5/2420def04a290dd7ad0e67f93789f106 libgit2-d74d491481831ddcd23575d376e56d2197e95910.tar.gz/sha512/496c6640d2453c58b66bc53c6e4e9e84f48d89eb8f240aefc1eea7e2d19b6c601614764590f2d2ca9e51e7e1de8fcdd5bf67f27f32bab628eae40d26ed382048 diff --git a/deps/checksums/libssh2 b/deps/checksums/libssh2 index 697601a037132..d07c843c394e7 100644 --- a/deps/checksums/libssh2 +++ b/deps/checksums/libssh2 @@ -1,34 +1,34 @@ -LibSSH2.v1.11.0+1.aarch64-apple-darwin.tar.gz/md5/462442a50f5dd719d251f65e7170dbf6 -LibSSH2.v1.11.0+1.aarch64-apple-darwin.tar.gz/sha512/8f0d9916c1e1abb8ba2d4baef0f850f9f5aa8d24f5eeefd7c7d30697b15d33180b32588f50328f4999e1d4136a2951c4e3319c5a5dca6f34a84fba30ac90518f -LibSSH2.v1.11.0+1.aarch64-linux-gnu.tar.gz/md5/63d8a681bcce23e76650719cf3c6999b -LibSSH2.v1.11.0+1.aarch64-linux-gnu.tar.gz/sha512/9dc722d866d27f378481e4787a5bb932facc0c7b828e75e812c9c875ac10e7194d090d94e01a46bb2b3c5624e18d013f0226c5f574269df96f1de0ed16897571 -LibSSH2.v1.11.0+1.aarch64-linux-musl.tar.gz/md5/e85cfee900145726857d3609b541f7b5 -LibSSH2.v1.11.0+1.aarch64-linux-musl.tar.gz/sha512/ad42ddf4674f6359e61fb23ef6fb5942e716c6f0cd50378e93b8c3af799b9b21cc9cefc471d27e19bc31686c7aa469a5ed81918ea9926d5d432c3c5f70e83fcb -LibSSH2.v1.11.0+1.armv6l-linux-gnueabihf.tar.gz/md5/acb3b46ec386e9d41dd73cb3c9b60d1e -LibSSH2.v1.11.0+1.armv6l-linux-gnueabihf.tar.gz/sha512/bddc50ab698c280256d819cd7ea1a39a33366f2eb6004df6b66f6a45ce4b5bdb1525f724aee35f3b9796809f9e68db4a6dab01ab035c8a88bec291b59fd55854 -LibSSH2.v1.11.0+1.armv6l-linux-musleabihf.tar.gz/md5/d4efa89a3b4e1d3be80f6790e183ad07 -LibSSH2.v1.11.0+1.armv6l-linux-musleabihf.tar.gz/sha512/8da36af6514189b7bf3422ccbbbf69d271208e7d9b0af469cbbd476ddd3d62f2f9a0d25f38f22123a603e448c285936f0692a31d91d6d79dfc66baacb8af4522 -LibSSH2.v1.11.0+1.armv7l-linux-gnueabihf.tar.gz/md5/d4eeaf06f64997a4f46737798c15ccb0 -LibSSH2.v1.11.0+1.armv7l-linux-gnueabihf.tar.gz/sha512/4cb24ec2b13c9f56220a6cd3bb0ea1dda687a7ebbf062caa8fad9d17c903a2982f12340b93e82b42567e29b4326acda373f81c0ebb4f4d968a12ff7807f5d066 -LibSSH2.v1.11.0+1.armv7l-linux-musleabihf.tar.gz/md5/319db985d453fc32a69eaad85bdbeac4 -LibSSH2.v1.11.0+1.armv7l-linux-musleabihf.tar.gz/sha512/5f7f35e3cb1362ecda3236c1686a211409937e90fdb29dd9e4032d541b8fe45c28f24067cd012edef879d668d7b1040e887ea594eac03ffe5412d5f2c49cc294 -LibSSH2.v1.11.0+1.i686-linux-gnu.tar.gz/md5/e7cb7d9d6db13b46250da30969f8504d -LibSSH2.v1.11.0+1.i686-linux-gnu.tar.gz/sha512/fe8983aa012787361cadb5a78df8eec6ac5640a514c3fe4b4ab23d584b018ba4fa7d3514f0951d2b687cf56bf9ee17e247049d99a4e9360aec4ecbb636d2a6f1 -LibSSH2.v1.11.0+1.i686-linux-musl.tar.gz/md5/d7c5d3e8ecd86e216d97d4912457a66c -LibSSH2.v1.11.0+1.i686-linux-musl.tar.gz/sha512/4d64996d837cfec15b42ca7f850cda32ee3b3a8f93001d24f95ff6f8c94b76517e5dfc7e525e8335fc8788ecf7e196bdb7cc64c8c53f536c592afb337d98ee82 -LibSSH2.v1.11.0+1.i686-w64-mingw32.tar.gz/md5/9562e41b5dda94c23150668559e9b123 -LibSSH2.v1.11.0+1.i686-w64-mingw32.tar.gz/sha512/d13d022ec9eb82f8afa3954c730bd1840a8d1bb16cdbd07a89fff6ce07b1c0c2ba6a9e934b2585abf7dddcb0522e1ba0f38df4385447c66986d5fcb6dddc2d15 -LibSSH2.v1.11.0+1.powerpc64le-linux-gnu.tar.gz/md5/4e2463eb11a5dde8c3e0d3fab6c58169 -LibSSH2.v1.11.0+1.powerpc64le-linux-gnu.tar.gz/sha512/d8794571d051cf206da87a4f7f0f71c8b41be061691b08333df7678c4e40fb9abbe63812a5ff5243fabca9eb2e599d81a69520cd854afbddbc16b44678fbe1b7 -LibSSH2.v1.11.0+1.x86_64-apple-darwin.tar.gz/md5/5729492b3a91e0d8e3fcc459de784157 -LibSSH2.v1.11.0+1.x86_64-apple-darwin.tar.gz/sha512/8e49b2ff1c9b5ae499f14be238776d7da2b64231592f1d46a6f769f200681342ff157d76102fa7c16b2972c7fe603919f7d2ce7c8a30b46c98ecaf2ef809fe3c -LibSSH2.v1.11.0+1.x86_64-linux-gnu.tar.gz/md5/0f7f2214d453f562107fe22af5004e8a -LibSSH2.v1.11.0+1.x86_64-linux-gnu.tar.gz/sha512/bd510f25dc26c05362ff204adcc356521bfdacd665411a99e07071ea0c4638274a2e78f009644cdf5e472a1d81c80e353f4673071d90411e6122b55160140f3e -LibSSH2.v1.11.0+1.x86_64-linux-musl.tar.gz/md5/ee98538d67b8b091c4ddcf632e72e7d1 -LibSSH2.v1.11.0+1.x86_64-linux-musl.tar.gz/sha512/38cbb59ffa420e4299db848b6ae95098e8e3e6e1334e05369089d17b04fcd0787ad22ba69465611f3e335a1efab228990db776916f40a937b21b18ca511a4484 -LibSSH2.v1.11.0+1.x86_64-unknown-freebsd.tar.gz/md5/0abe5a971abe63c3db4353e7e9b181e9 -LibSSH2.v1.11.0+1.x86_64-unknown-freebsd.tar.gz/sha512/8e8199bc0634a8ec51460cb8628c3b33d765b7060ca79aac3e80a0b29d55de5562cdbb36945b4a9feab5392f7f16d2dc48684e43d54c62a9fdb1f07f36b71810 -LibSSH2.v1.11.0+1.x86_64-w64-mingw32.tar.gz/md5/d30fc8e9b74388a1c642cb15ed33dba3 -LibSSH2.v1.11.0+1.x86_64-w64-mingw32.tar.gz/sha512/e278b87d081fbbe15f88bafa8870f0f294cea3ff8c8c1fc9a6c10228da91717aa3caa268cdb10f78c8e55651a90243962f85101eeb4433f85c1dfacc1461d96d +LibSSH2.v1.11.0+4.aarch64-apple-darwin.tar.gz/md5/75b4dd743804c9fdf06dbd2f1090e06f +LibSSH2.v1.11.0+4.aarch64-apple-darwin.tar.gz/sha512/ded55b7bfb24399fc23bffef01825c57b64b9ba07fda75a04804f0519282b0fb03b4d3db0e16b0bc2535528305f5ef082611bae69bbc13f224c5d53e80da12c9 +LibSSH2.v1.11.0+4.aarch64-linux-gnu.tar.gz/md5/0b161afe2b79cdd77e6243eb6fc9e58a +LibSSH2.v1.11.0+4.aarch64-linux-gnu.tar.gz/sha512/313b111214f98ac40ee0e607379d0437f49092bcf6ab3259b343e11523fcd185686569c819dd1a54bd9b1a76c5fb68fcf0a4f735e1307e690a4788fa53717213 +LibSSH2.v1.11.0+4.aarch64-linux-musl.tar.gz/md5/76ec53f0cdde9b866af56b7698fea53f +LibSSH2.v1.11.0+4.aarch64-linux-musl.tar.gz/sha512/0bd25c60ee94bf5daf147b483d317e38ed42e6cc138d1a3ea15854e04a64333507242aabe371a4b529818802b3de7ae73010493dcdc2e69613ea11430fc8a054 +LibSSH2.v1.11.0+4.armv6l-linux-gnueabihf.tar.gz/md5/02f67fa5481325924839340f74dfbdb3 +LibSSH2.v1.11.0+4.armv6l-linux-gnueabihf.tar.gz/sha512/fe7df5647e23c7f72df53d9a863f625454dc4512204a31b25cdac2ea4acd8e832394eedea20a0aca6e597a0fd75e3534a55c9c0e2b32b342c4664de7ff5aeec8 +LibSSH2.v1.11.0+4.armv6l-linux-musleabihf.tar.gz/md5/0991fceaf4730f0056bfdcf87ed1c6cc +LibSSH2.v1.11.0+4.armv6l-linux-musleabihf.tar.gz/sha512/4073cc748febfad2ba1b31183a2f792dd7aa48741777d3cf6091b6660122ac8f93569c358490cacdb74183ef4cfcc36c670012726d155eb3e5bf8697d2383e21 +LibSSH2.v1.11.0+4.armv7l-linux-gnueabihf.tar.gz/md5/00371eef9522f65611c0bcfe39726593 +LibSSH2.v1.11.0+4.armv7l-linux-gnueabihf.tar.gz/sha512/7e9599cc71a2b3252907fd3dd92de02ff1e2770c312717c1f1562e5444fc6d87e9d3091b2e7c5129a1cdfaf66f59c6a2c9dc11f1a3d5371bc341a8b890182176 +LibSSH2.v1.11.0+4.armv7l-linux-musleabihf.tar.gz/md5/9969d638e632828eb023c898335e02be +LibSSH2.v1.11.0+4.armv7l-linux-musleabihf.tar.gz/sha512/118ffb94ed516c69254b958bed4fc72368f899cf56a6c2b4c4eac1f0fb05dccb8a25ccb7cac382e11b4fb1253b8ca647d1e17835129683bb8d98c2d62f222dd0 +LibSSH2.v1.11.0+4.i686-linux-gnu.tar.gz/md5/923ad9666497bb4e1c2422b3509043dd +LibSSH2.v1.11.0+4.i686-linux-gnu.tar.gz/sha512/df26fcebf7ec61ee50855c00777756b05a7efd972071830232b4d6d4b5b8c8c4ecea347dcfbfeef8364a34de37ad815b3bd2a9b180e3877bba65466a2635cd23 +LibSSH2.v1.11.0+4.i686-linux-musl.tar.gz/md5/01523a895e0f4447b59f98d0905bc499 +LibSSH2.v1.11.0+4.i686-linux-musl.tar.gz/sha512/fb9e8ee9c0f69d449defc89cd41e0f11a59ae724a6de3e5fdb4bf29b42b4d44759fe36fcadefa0dbb53cac78a5f2742f16214c4660f096a4f70f884a0732eedd +LibSSH2.v1.11.0+4.i686-w64-mingw32.tar.gz/md5/7d3174be68f80883a096a9526354c2a3 +LibSSH2.v1.11.0+4.i686-w64-mingw32.tar.gz/sha512/c2883050bf2d7c8976748e696db7c56c6d4eae1f519cde8d86ec7158cd666996734760012e655eade5e4f32c9269be0150b1377ef1a4ce94fce5f4bd1073c571 +LibSSH2.v1.11.0+4.powerpc64le-linux-gnu.tar.gz/md5/c8cc748cd1f7768dd0455cae1d7cf870 +LibSSH2.v1.11.0+4.powerpc64le-linux-gnu.tar.gz/sha512/887a46e48ce052cb7303f50bb327a432ea5705c586bdcad5f6da29f5dfc45467084bbe3c406aceda806a511a50c90a5eebad6fd327069b7bb215454c81a3cb66 +LibSSH2.v1.11.0+4.x86_64-apple-darwin.tar.gz/md5/c81ee858047808f921b3cba404582adb +LibSSH2.v1.11.0+4.x86_64-apple-darwin.tar.gz/sha512/b1f226d97fa40264c1bd6342c9848aeed873661c2a7a964e6299068017c863d5fe9281362c742dc5f61f2978a510e155184d746f8713ded8b38bada30b4540ca +LibSSH2.v1.11.0+4.x86_64-linux-gnu.tar.gz/md5/125679f3052a83476eb842160cd58718 +LibSSH2.v1.11.0+4.x86_64-linux-gnu.tar.gz/sha512/96f790bd32990bc703e5908513ef05449c7b39f25386ce205b9b783512c60a0236611fac0d7a9c1b66cabcf91945aad6edebf55f5c67dce5d9d2836ba02926d1 +LibSSH2.v1.11.0+4.x86_64-linux-musl.tar.gz/md5/85eea97ab7bb6e18ee4d514425cd148b +LibSSH2.v1.11.0+4.x86_64-linux-musl.tar.gz/sha512/a692de84f1bd2b45bddb78b5996038fec43506af8eca71b1c51f6f23b30a18afaabf70fe944b784b70ba651570cacc3dec7ca5635aa2353df66bd1a2d1f224b2 +LibSSH2.v1.11.0+4.x86_64-unknown-freebsd.tar.gz/md5/0781da8b1119e4cae13b26e2abddb924 +LibSSH2.v1.11.0+4.x86_64-unknown-freebsd.tar.gz/sha512/3fa706b80d0deaab747d5fadaaa4c83845d843e2041828caab896f14ed682eddf60237c00c23d530d64eb8a6e21e29ff8a2a20ef4d07eb1157fe7d681b403493 +LibSSH2.v1.11.0+4.x86_64-w64-mingw32.tar.gz/md5/6500b56560418bf8b985e4c6456854df +LibSSH2.v1.11.0+4.x86_64-w64-mingw32.tar.gz/sha512/23123862fe6bf5bbd52a310583430c32236e9b3f2dc322e6c020ae7338d55754e78649c829c01d2966c8ae6101f87597597dae8a35072cbe8eabc60637c0b158 libssh2-1c3f1b7da588f2652260285529ec3c1f1125eb4e.tar.gz/md5/7b52de6ff70e16aa78cd699fee3e997a libssh2-1c3f1b7da588f2652260285529ec3c1f1125eb4e.tar.gz/sha512/7c99d33e60862e2d89bbcc4a09ffff3fbfb921ed674e0d3166a255c72a8e0622a9c6be64f0eb2f8c12ddd80da0307b05d761615b876194bd854aa2c62e26f4ad diff --git a/deps/checksums/openssl b/deps/checksums/openssl new file mode 100644 index 0000000000000..3c64f20b79b41 --- /dev/null +++ b/deps/checksums/openssl @@ -0,0 +1,34 @@ +OpenSSL.v3.0.13+0.aarch64-apple-darwin.tar.gz/md5/e020b4f51a3406622c5802eeb86e9540 +OpenSSL.v3.0.13+0.aarch64-apple-darwin.tar.gz/sha512/440d596e8fc35b1ba2b53ea554dfe5f7276de71710be071b43ae5a01b3d954cf715096c90e8cfdb5a337ee9c898ffb3fc4e6bc45aa601d39be360fc9f7321580 +OpenSSL.v3.0.13+0.aarch64-linux-gnu.tar.gz/md5/5d568359fd3dd062b00985d5076a88d5 +OpenSSL.v3.0.13+0.aarch64-linux-gnu.tar.gz/sha512/e8d5dbd5ae49bd44e7fb00b7b88cdfcda0da5a5066a753ee9b8877ed1717f4adc2f07be744f283b348cb10da2bbef335179594c7f92d5f102b314318a3e1db69 +OpenSSL.v3.0.13+0.aarch64-linux-musl.tar.gz/md5/8726451f808a11ccde6b0f4a06db0d8c +OpenSSL.v3.0.13+0.aarch64-linux-musl.tar.gz/sha512/959fa7fbefb94d2ee6c3b2161e084945a69a5fd5c77210f52854d11e9ab8344b441a003df602fadb71f79aa9f5c6ab961e3aef57188e9436f1b4870a87e78373 +OpenSSL.v3.0.13+0.armv6l-linux-gnueabihf.tar.gz/md5/63d34cdac0eea9967500117d4d8c4be5 +OpenSSL.v3.0.13+0.armv6l-linux-gnueabihf.tar.gz/sha512/31483c1c2dc0a26e7d344fccee202f7e264aef6bc5d7c87ec6a5ad79866668666e671c9a65eb3ff438e0d4b5889820c6ce5edac71f3fcb82263c64519b47a261 +OpenSSL.v3.0.13+0.armv6l-linux-musleabihf.tar.gz/md5/54c072fa984067de71f06d7523b7ef37 +OpenSSL.v3.0.13+0.armv6l-linux-musleabihf.tar.gz/sha512/d6d8825cca5c820f2d258a889431a43da980634b3581d83229ff6bdc819f4f5e719c9196b985c0e183f4bdc3d417a6989ac9fa3b8ea41c0ab5ff0e0f3917dbbc +OpenSSL.v3.0.13+0.armv7l-linux-gnueabihf.tar.gz/md5/dd6f622acf1f17ab6fa1abf4b8494009 +OpenSSL.v3.0.13+0.armv7l-linux-gnueabihf.tar.gz/sha512/5cb6e1561b995e224091c7748450c2eeb2ad0230e48262f46380cfb1b4741e267535d53362c2b1ddf8ec8ab34fe8846c4d056ed9ebb7b59c175d39461a1ea57f +OpenSSL.v3.0.13+0.armv7l-linux-musleabihf.tar.gz/md5/322f18422e8707cf3aa9fdfc94ea4b52 +OpenSSL.v3.0.13+0.armv7l-linux-musleabihf.tar.gz/sha512/52427756bd4da008e1ccd637dd544f04496c601832634cb9d8da07c66cfff5e91b34088cea1f21bfa5aa0c270c485ebde735aa0d5bb5fce3becdc120a5495c07 +OpenSSL.v3.0.13+0.i686-linux-gnu.tar.gz/md5/f655604f32342e3ff9020249d28e5225 +OpenSSL.v3.0.13+0.i686-linux-gnu.tar.gz/sha512/202badcc5ddddcea14ded6849c7de816f4f25509c8bf4b17498402bc61f3d49dd69d2be2bacf5d26950f35a3a18025c8f398d5b01d4588b82c75537a8854d2a4 +OpenSSL.v3.0.13+0.i686-linux-musl.tar.gz/md5/935ee98c2283f1e8e0b4d31bf81ddb32 +OpenSSL.v3.0.13+0.i686-linux-musl.tar.gz/sha512/5e7044ccb517ec95a46fa23342235ee7f646b393579d124bbf2471377aef66b8c53307a9bc77b66e68af48da975abfe252eceb604b5a294513d6bf9a8c21c806 +OpenSSL.v3.0.13+0.i686-w64-mingw32.tar.gz/md5/b8f9a7449f1c33cd5d23037a6c1b7951 +OpenSSL.v3.0.13+0.i686-w64-mingw32.tar.gz/sha512/42a52ffe58d6607f06eaeed4448a88b1a7fd5d2e9f6da7cde13aef4b21e4643242956c19d487d26f1a5f959ed980a1a16384144f3748669d8ca2fe43a9aae665 +OpenSSL.v3.0.13+0.powerpc64le-linux-gnu.tar.gz/md5/392cab70776910beb3f4b1c5920b0730 +OpenSSL.v3.0.13+0.powerpc64le-linux-gnu.tar.gz/sha512/52d04101783e7b1651316ea2f73b0c7b9a119adc413d243fcf6b11cb1a27e9f2c19e1275329d22c723639f9611e3312941323d888d1302f293ed361e4c4aee02 +OpenSSL.v3.0.13+0.x86_64-apple-darwin.tar.gz/md5/5ae9d2c01b0295bbdc6693998f955723 +OpenSSL.v3.0.13+0.x86_64-apple-darwin.tar.gz/sha512/dd69958131364606ed4533aad02aba55a4adbb10a9fb94380ba697fc3daa3448c4ed967929281cf38790958ecfa2bd4339a0241f07d624eff2189f1971cb9ec2 +OpenSSL.v3.0.13+0.x86_64-linux-gnu.tar.gz/md5/15448bdb9c42848cb960b71f2b57436d +OpenSSL.v3.0.13+0.x86_64-linux-gnu.tar.gz/sha512/48998bb4d0c975b703461fa904b767995485126779e251176cd4e594c055c78dc44de6f3253e425fcfbe8ea440c9f9fa4fac6be9019bcc9e76863b4fe291362d +OpenSSL.v3.0.13+0.x86_64-linux-musl.tar.gz/md5/b90cc68aacc9157546500d16df395567 +OpenSSL.v3.0.13+0.x86_64-linux-musl.tar.gz/sha512/25a770f3ec8d7f009231f2b1e7eb494fa34d5a10c36b11f5072fa3e3957400ca9651e2dc308321d51076aa9d9b71df81180563784091eef0f9a2b0262191e812 +OpenSSL.v3.0.13+0.x86_64-unknown-freebsd.tar.gz/md5/434ef987d7a932eb80203a2b0ccde3ed +OpenSSL.v3.0.13+0.x86_64-unknown-freebsd.tar.gz/sha512/784548695b9dcb2c8953680dd1f36644fd4116b2ad096115cec12592ce9d173bbca45b9246e5f122e5dd128a31641ff20801b6b3f709483faec21c739865ade8 +OpenSSL.v3.0.13+0.x86_64-w64-mingw32.tar.gz/md5/8b2a80aea87de4d95f691f8b4382e7c3 +OpenSSL.v3.0.13+0.x86_64-w64-mingw32.tar.gz/sha512/884b56b3961515bc526ac786e2cd67008d8ae6ed7670cd7ab51074d90e6c1fc95344d7a2425a2a812115fc8c8161125259f825728fe91b411470fe4972d3f081 +openssl-3.0.13.tar.gz/md5/c15e53a62711002901d3515ac8b30b86 +openssl-3.0.13.tar.gz/sha512/22f4096781f0b075f5bf81bd39a0f97e111760dfa73b6f858f6bb54968a7847944d74969ae10f9a51cc21a2f4af20d9a4c463649dc824f5e439e196d6764c4f9 From 56d1a2cba2e361d08d05de3f08dbefccd42f5a27 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sun, 31 Mar 2024 14:08:17 +0200 Subject: [PATCH 09/19] Update doc manifest --- doc/Manifest.toml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index cb9d42561be5f..86ef82ea49278 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -110,9 +110,9 @@ uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" version = "0.6.4" [[deps.LibCURL_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"] uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" -version = "8.6.0+0" +version = "8.7.1+1" [[deps.JuliaSyntaxHighlighting]] deps = ["StyledStrings"] @@ -124,14 +124,14 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" version = "1.11.0" [[deps.LibGit2_jll]] -deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll"] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.8.0+0" +version = "1.8.0+1" [[deps.LibSSH2_jll]] -deps = ["Artifacts", "Libdl", "MbedTLS_jll"] +deps = ["Artifacts", "Libdl", "OpenSSL_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" -version = "1.11.0+1" +version = "1.11.0+3" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -159,11 +159,6 @@ git-tree-sha1 = "465a70f0fc7d443a00dcdc3267a497397b8a3899" uuid = "d0879d2d-cac2-40c8-9cee-1863dc0c7391" version = "0.1.2" -[[deps.MbedTLS_jll]] -deps = ["Artifacts", "Libdl"] -uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.28.6+0" - [[deps.Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" version = "1.11.0" @@ -177,10 +172,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" [[deps.OpenSSL_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "3da7367955dcc5c54c1ba4d402ccdc09a1a3e046" +deps = ["Artifacts", "Libdl"] uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.13+1" +version = "3.0.13+0" [[deps.PCRE2_jll]] deps = ["Artifacts", "Libdl"] From 703f28b6d1886fc90f8f6c5a65d14543813db82e Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sun, 31 Mar 2024 18:40:42 +0200 Subject: [PATCH 10/19] Find DLLs on Windows --- stdlib/OpenSSL_jll/src/OpenSSL_jll.jl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl b/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl index 26eb3d243efe2..bba9a0a299de9 100644 --- a/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl +++ b/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl @@ -3,7 +3,7 @@ ## dummy stub for https://github.com/JuliaBinaryWrappers/OpenSSL_jll.jl baremodule OpenSSL_jll -using Base, Libdl +using Base, Libdl, Base.BinaryPlatforms const PATH_list = String[] const LIBPATH_list = String[] @@ -20,8 +20,13 @@ libssl_handle::Ptr{Cvoid} = C_NULL libssl_path::String = "" if Sys.iswindows() - const libcrypto = "libcrypto.dll" - const libssl = "libssl.dll" + if arch(HostPlatform()) == "x86_64" + const libcrypto = "libcrypto-3-x64.dll" + const libssl = "libssl-3-x64.dll" + else + const libcrypto = "libcrypto-3.dll" + const libssl = "libssl-3.dll" + end elseif Sys.isapple() const libcrypto = "@rpath/libcrypto.3.dylib" const libssl = "@rpath/libssl.3.dylib" From 6671e9f57a5a305854a129e0d050681bfb01e438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Sun, 31 Mar 2024 22:24:39 +0200 Subject: [PATCH 11/19] [OpenSSL_jll] Update to build v3.0.13+1 --- deps/checksums/openssl | 64 ++++++++++++++++----------------- stdlib/OpenSSL_jll/Project.toml | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/deps/checksums/openssl b/deps/checksums/openssl index 3c64f20b79b41..f75e442beca55 100644 --- a/deps/checksums/openssl +++ b/deps/checksums/openssl @@ -1,34 +1,34 @@ -OpenSSL.v3.0.13+0.aarch64-apple-darwin.tar.gz/md5/e020b4f51a3406622c5802eeb86e9540 -OpenSSL.v3.0.13+0.aarch64-apple-darwin.tar.gz/sha512/440d596e8fc35b1ba2b53ea554dfe5f7276de71710be071b43ae5a01b3d954cf715096c90e8cfdb5a337ee9c898ffb3fc4e6bc45aa601d39be360fc9f7321580 -OpenSSL.v3.0.13+0.aarch64-linux-gnu.tar.gz/md5/5d568359fd3dd062b00985d5076a88d5 -OpenSSL.v3.0.13+0.aarch64-linux-gnu.tar.gz/sha512/e8d5dbd5ae49bd44e7fb00b7b88cdfcda0da5a5066a753ee9b8877ed1717f4adc2f07be744f283b348cb10da2bbef335179594c7f92d5f102b314318a3e1db69 -OpenSSL.v3.0.13+0.aarch64-linux-musl.tar.gz/md5/8726451f808a11ccde6b0f4a06db0d8c -OpenSSL.v3.0.13+0.aarch64-linux-musl.tar.gz/sha512/959fa7fbefb94d2ee6c3b2161e084945a69a5fd5c77210f52854d11e9ab8344b441a003df602fadb71f79aa9f5c6ab961e3aef57188e9436f1b4870a87e78373 -OpenSSL.v3.0.13+0.armv6l-linux-gnueabihf.tar.gz/md5/63d34cdac0eea9967500117d4d8c4be5 -OpenSSL.v3.0.13+0.armv6l-linux-gnueabihf.tar.gz/sha512/31483c1c2dc0a26e7d344fccee202f7e264aef6bc5d7c87ec6a5ad79866668666e671c9a65eb3ff438e0d4b5889820c6ce5edac71f3fcb82263c64519b47a261 -OpenSSL.v3.0.13+0.armv6l-linux-musleabihf.tar.gz/md5/54c072fa984067de71f06d7523b7ef37 -OpenSSL.v3.0.13+0.armv6l-linux-musleabihf.tar.gz/sha512/d6d8825cca5c820f2d258a889431a43da980634b3581d83229ff6bdc819f4f5e719c9196b985c0e183f4bdc3d417a6989ac9fa3b8ea41c0ab5ff0e0f3917dbbc -OpenSSL.v3.0.13+0.armv7l-linux-gnueabihf.tar.gz/md5/dd6f622acf1f17ab6fa1abf4b8494009 -OpenSSL.v3.0.13+0.armv7l-linux-gnueabihf.tar.gz/sha512/5cb6e1561b995e224091c7748450c2eeb2ad0230e48262f46380cfb1b4741e267535d53362c2b1ddf8ec8ab34fe8846c4d056ed9ebb7b59c175d39461a1ea57f -OpenSSL.v3.0.13+0.armv7l-linux-musleabihf.tar.gz/md5/322f18422e8707cf3aa9fdfc94ea4b52 -OpenSSL.v3.0.13+0.armv7l-linux-musleabihf.tar.gz/sha512/52427756bd4da008e1ccd637dd544f04496c601832634cb9d8da07c66cfff5e91b34088cea1f21bfa5aa0c270c485ebde735aa0d5bb5fce3becdc120a5495c07 -OpenSSL.v3.0.13+0.i686-linux-gnu.tar.gz/md5/f655604f32342e3ff9020249d28e5225 -OpenSSL.v3.0.13+0.i686-linux-gnu.tar.gz/sha512/202badcc5ddddcea14ded6849c7de816f4f25509c8bf4b17498402bc61f3d49dd69d2be2bacf5d26950f35a3a18025c8f398d5b01d4588b82c75537a8854d2a4 -OpenSSL.v3.0.13+0.i686-linux-musl.tar.gz/md5/935ee98c2283f1e8e0b4d31bf81ddb32 -OpenSSL.v3.0.13+0.i686-linux-musl.tar.gz/sha512/5e7044ccb517ec95a46fa23342235ee7f646b393579d124bbf2471377aef66b8c53307a9bc77b66e68af48da975abfe252eceb604b5a294513d6bf9a8c21c806 -OpenSSL.v3.0.13+0.i686-w64-mingw32.tar.gz/md5/b8f9a7449f1c33cd5d23037a6c1b7951 -OpenSSL.v3.0.13+0.i686-w64-mingw32.tar.gz/sha512/42a52ffe58d6607f06eaeed4448a88b1a7fd5d2e9f6da7cde13aef4b21e4643242956c19d487d26f1a5f959ed980a1a16384144f3748669d8ca2fe43a9aae665 -OpenSSL.v3.0.13+0.powerpc64le-linux-gnu.tar.gz/md5/392cab70776910beb3f4b1c5920b0730 -OpenSSL.v3.0.13+0.powerpc64le-linux-gnu.tar.gz/sha512/52d04101783e7b1651316ea2f73b0c7b9a119adc413d243fcf6b11cb1a27e9f2c19e1275329d22c723639f9611e3312941323d888d1302f293ed361e4c4aee02 -OpenSSL.v3.0.13+0.x86_64-apple-darwin.tar.gz/md5/5ae9d2c01b0295bbdc6693998f955723 -OpenSSL.v3.0.13+0.x86_64-apple-darwin.tar.gz/sha512/dd69958131364606ed4533aad02aba55a4adbb10a9fb94380ba697fc3daa3448c4ed967929281cf38790958ecfa2bd4339a0241f07d624eff2189f1971cb9ec2 -OpenSSL.v3.0.13+0.x86_64-linux-gnu.tar.gz/md5/15448bdb9c42848cb960b71f2b57436d -OpenSSL.v3.0.13+0.x86_64-linux-gnu.tar.gz/sha512/48998bb4d0c975b703461fa904b767995485126779e251176cd4e594c055c78dc44de6f3253e425fcfbe8ea440c9f9fa4fac6be9019bcc9e76863b4fe291362d -OpenSSL.v3.0.13+0.x86_64-linux-musl.tar.gz/md5/b90cc68aacc9157546500d16df395567 -OpenSSL.v3.0.13+0.x86_64-linux-musl.tar.gz/sha512/25a770f3ec8d7f009231f2b1e7eb494fa34d5a10c36b11f5072fa3e3957400ca9651e2dc308321d51076aa9d9b71df81180563784091eef0f9a2b0262191e812 -OpenSSL.v3.0.13+0.x86_64-unknown-freebsd.tar.gz/md5/434ef987d7a932eb80203a2b0ccde3ed -OpenSSL.v3.0.13+0.x86_64-unknown-freebsd.tar.gz/sha512/784548695b9dcb2c8953680dd1f36644fd4116b2ad096115cec12592ce9d173bbca45b9246e5f122e5dd128a31641ff20801b6b3f709483faec21c739865ade8 -OpenSSL.v3.0.13+0.x86_64-w64-mingw32.tar.gz/md5/8b2a80aea87de4d95f691f8b4382e7c3 -OpenSSL.v3.0.13+0.x86_64-w64-mingw32.tar.gz/sha512/884b56b3961515bc526ac786e2cd67008d8ae6ed7670cd7ab51074d90e6c1fc95344d7a2425a2a812115fc8c8161125259f825728fe91b411470fe4972d3f081 +OpenSSL.v3.0.13+1.aarch64-apple-darwin.tar.gz/md5/3e9dde25d324eff9886789654208a5aa +OpenSSL.v3.0.13+1.aarch64-apple-darwin.tar.gz/sha512/79affe30e0755ac434d4b66a2ab306c71c5cf67fc64d35e9e2e4b73a5b6759bf6595e23c48575908197ed209b838559f652bfcfc01d6eb6a3eedc223a50ab281 +OpenSSL.v3.0.13+1.aarch64-linux-gnu.tar.gz/md5/7870fa6a8980b70024f33fae3205156b +OpenSSL.v3.0.13+1.aarch64-linux-gnu.tar.gz/sha512/bab37ed8aa2623ae2db6ad58008a824c56884fa23ae44f8268e079353bbc350a6962789faa215b9225fc0cad6119686f9ed92fb8ae583d527419a929d6ce5675 +OpenSSL.v3.0.13+1.aarch64-linux-musl.tar.gz/md5/85e8840878b576a8aa1886a8307df7d7 +OpenSSL.v3.0.13+1.aarch64-linux-musl.tar.gz/sha512/de024340eb565ef7fff86aa61a1e4178916ce7444105317cdb1a3966bf73d9bc385477bfcbde1a9c4f04aafad3e5e2c83d41583f52633905ed32da7c839151cb +OpenSSL.v3.0.13+1.armv6l-linux-gnueabihf.tar.gz/md5/896b97e4fcb3e333d96abb5c54b74a44 +OpenSSL.v3.0.13+1.armv6l-linux-gnueabihf.tar.gz/sha512/8c3a5dc411a121214118c889e2abd6debf64eb119dc9245ca2a07ea896b4415a2930d24e051040a119e032dbb8ee91d420430fc087f3dc21e99769a6d64580d9 +OpenSSL.v3.0.13+1.armv6l-linux-musleabihf.tar.gz/md5/7a9e5119a9c8ac57857ddd9d0fa16de6 +OpenSSL.v3.0.13+1.armv6l-linux-musleabihf.tar.gz/sha512/e3ca956bee45adc86470a3604d75ffbc2e5f3f903739c0b8b1ee4ae6d74094938bb1d3a179563f80f265b946190a7239360f4afb1de4fb14c8a52e65bc6aa7ff +OpenSSL.v3.0.13+1.armv7l-linux-gnueabihf.tar.gz/md5/2356ed14000d4b1f835a83c2fafb1959 +OpenSSL.v3.0.13+1.armv7l-linux-gnueabihf.tar.gz/sha512/04bb6858a87ecca2340c401ee2c9aeddc1cdb4e7b7e1de6117383f812249923f586fd66422b58c687ba5daeef9058bc02a12a3a1ba46a90fc7477cb33016be8b +OpenSSL.v3.0.13+1.armv7l-linux-musleabihf.tar.gz/md5/d396422b2ed9ac2a2ab8aee228f4aecd +OpenSSL.v3.0.13+1.armv7l-linux-musleabihf.tar.gz/sha512/b2068210205b0b9ea30f7cb0d846c408c051003e6b6c67818410a56a139a6d0351df4991fedb9dbde02f3b2e1b5b4969bc7d40e5b8576709fa3d449b2393f7d2 +OpenSSL.v3.0.13+1.i686-linux-gnu.tar.gz/md5/48e52915c0ee014c9a845304bdab09af +OpenSSL.v3.0.13+1.i686-linux-gnu.tar.gz/sha512/81707dbb119ee5d1758a55806b1a25b99cbbd6f36827d5b8458eb86009e35ff9defc67965a791021a4537e325e828284060b67073434282d451947fdc3f407c2 +OpenSSL.v3.0.13+1.i686-linux-musl.tar.gz/md5/ecaeaa3d22e1951f726b687c5919cf21 +OpenSSL.v3.0.13+1.i686-linux-musl.tar.gz/sha512/0da7fb69b7de5e10489da59b9cee7f63df6e8536427c01d3337893fe6326dc1bba8a683221595528e33d4551e23e5eedd495def2fae4e875e91fb63ed3a51a18 +OpenSSL.v3.0.13+1.i686-w64-mingw32.tar.gz/md5/8f75541ff2b6429800a5370f0d50223c +OpenSSL.v3.0.13+1.i686-w64-mingw32.tar.gz/sha512/5b2d09766b6cc48e7d76469dc23aaa40e174070020c29ba46061de4b69e5d415fd347e2c83df204ab10656f284b63571f95200609484ac5d250cd5f7684ca525 +OpenSSL.v3.0.13+1.powerpc64le-linux-gnu.tar.gz/md5/67c1a43a1fbf37ce52392d4c10fefec8 +OpenSSL.v3.0.13+1.powerpc64le-linux-gnu.tar.gz/sha512/2560ff07574eab3cda761ffd308291590feda869cf91177fb4bad5554b7008ba8fb8099cbf52fe2ece794f1c16e93be9b65afb4c27fc19774cc7142827507fdd +OpenSSL.v3.0.13+1.x86_64-apple-darwin.tar.gz/md5/391560803e062ba637c05b17c2ac8a9f +OpenSSL.v3.0.13+1.x86_64-apple-darwin.tar.gz/sha512/ff30235d8ed4afa1b54172f027f9891e143b4ff16b68500cf458e9eb420dfb3f53dca4d9a3894cb5a89b7097161a02abd092527afb7e7032d1caad3273dff5cf +OpenSSL.v3.0.13+1.x86_64-linux-gnu.tar.gz/md5/ba9066946e7b8ab840ca18cd07c152fd +OpenSSL.v3.0.13+1.x86_64-linux-gnu.tar.gz/sha512/951165ff5b5f723173f2020f091bbed5f5f340a83409c58718e4dfd7182dc6e1671196a14cdd397df157c3cf12cff63f23e62d82cc6f69b94100f186cbb25e53 +OpenSSL.v3.0.13+1.x86_64-linux-musl.tar.gz/md5/87f2c709074d778ee12d742f895f83ce +OpenSSL.v3.0.13+1.x86_64-linux-musl.tar.gz/sha512/2ae395048418ca46dce3c37a5b21f71e645a38f8e67a96e94a4cfa6ccd2bf07f6b30c229f644ff3b361690e1376197273be741096d451184f7be5eb1877dd3bf +OpenSSL.v3.0.13+1.x86_64-unknown-freebsd.tar.gz/md5/34a3d95f3069e507c0a64fbd6e57743a +OpenSSL.v3.0.13+1.x86_64-unknown-freebsd.tar.gz/sha512/0e3f2ffc1ef05db703b655719fb126f54aa39f58d18708cc5c65561b66ca7e715246498ea2b67a1d4ef375473934921f2702b6106614a71ce585df0c68f3411e +OpenSSL.v3.0.13+1.x86_64-w64-mingw32.tar.gz/md5/7722f890965a713082b705d2c7b34639 +OpenSSL.v3.0.13+1.x86_64-w64-mingw32.tar.gz/sha512/8a75b08306ab2e2395e0b8d4aeb00f20974728e76b3c7afd6987cd4df758a1c8b3e9b308779bcdf4432b41f5068de609878867ef6ef3518c423ea8df90b925b4 openssl-3.0.13.tar.gz/md5/c15e53a62711002901d3515ac8b30b86 openssl-3.0.13.tar.gz/sha512/22f4096781f0b075f5bf81bd39a0f97e111760dfa73b6f858f6bb54968a7847944d74969ae10f9a51cc21a2f4af20d9a4c463649dc824f5e439e196d6764c4f9 diff --git a/stdlib/OpenSSL_jll/Project.toml b/stdlib/OpenSSL_jll/Project.toml index 90f99b05e5d56..a8da7828ac69f 100644 --- a/stdlib/OpenSSL_jll/Project.toml +++ b/stdlib/OpenSSL_jll/Project.toml @@ -1,6 +1,6 @@ name = "OpenSSL_jll" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.13+0" +version = "3.0.13+1" [deps] Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" From 5f507a109151e2c15ee860903d57f22a8f246645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Sun, 31 Mar 2024 22:27:07 +0200 Subject: [PATCH 12/19] Set filetype of `deps/openssl.version` --- deps/openssl.version | 1 + 1 file changed, 1 insertion(+) diff --git a/deps/openssl.version b/deps/openssl.version index 9aa02a664c4c4..cef6704d1ae70 100644 --- a/deps/openssl.version +++ b/deps/openssl.version @@ -1,3 +1,4 @@ +# -*- makefile -*- ## jll artifact OPENSSL_JLL_NAME := OpenSSL From 4d204a15e2aeaddfb11d56a558a8e0c4e77fbe55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Sun, 31 Mar 2024 22:28:05 +0200 Subject: [PATCH 13/19] [LibCURL_jll] Load also `LibSSH2_jll`, `OpenSSL_jll`, `Zlib_jll` --- stdlib/LibCURL_jll/src/LibCURL_jll.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/LibCURL_jll/src/LibCURL_jll.jl b/stdlib/LibCURL_jll/src/LibCURL_jll.jl index 3291c97d811cb..2c2bebf8bdc95 100644 --- a/stdlib/LibCURL_jll/src/LibCURL_jll.jl +++ b/stdlib/LibCURL_jll/src/LibCURL_jll.jl @@ -3,7 +3,7 @@ ## dummy stub for https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl baremodule LibCURL_jll -using Base, Libdl, nghttp2_jll +using Base, Libdl, nghttp2_jll, LibSSH2_jll, OpenSSL_jll, Zlib_jll const PATH_list = String[] const LIBPATH_list = String[] From 6384bc58cda55678f85f232e1502a44a22e01ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Mon, 1 Apr 2024 19:27:50 +0200 Subject: [PATCH 14/19] Update manfests --- doc/Manifest.toml | 6 +++--- stdlib/Manifest.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 86ef82ea49278..94563897680d5 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -126,12 +126,12 @@ version = "1.11.0" [[deps.LibGit2_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.8.0+1" +version = "1.8.0+3" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "OpenSSL_jll"] uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" -version = "1.11.0+3" +version = "1.11.0+4" [[deps.Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" @@ -174,7 +174,7 @@ version = "1.2.0" [[deps.OpenSSL_jll]] deps = ["Artifacts", "Libdl"] uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "3.0.13+0" +version = "3.0.13+1" [[deps.PCRE2_jll]] deps = ["Artifacts", "Libdl"] diff --git a/stdlib/Manifest.toml b/stdlib/Manifest.toml index f0a717f11cdaf..c4c374a9b3aa2 100644 --- a/stdlib/Manifest.toml +++ b/stdlib/Manifest.toml @@ -103,7 +103,7 @@ version = "1.11.0" [[deps.LibGit2_jll]] deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll"] uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.8.0+2" +version = "1.8.0+3" [[deps.LibSSH2_jll]] deps = ["Artifacts", "Libdl", "OpenSSL_jll"] From 6f32b8e30fc6fee23a5a1ee41df984e68cc66934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Mon, 1 Apr 2024 19:28:41 +0200 Subject: [PATCH 15/19] [LibGit2_jll] [LibSSH2_jll] Load `OpenSSL_jll` only when necessary --- stdlib/LibGit2_jll/src/LibGit2_jll.jl | 6 +++++- stdlib/LibSSH2_jll/src/LibSSH2_jll.jl | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl index f2caec3a2395a..b7ed19a939c5e 100644 --- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl +++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl @@ -3,7 +3,11 @@ ## dummy stub for https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl baremodule LibGit2_jll -using Base, Libdl, OpenSSL_jll, LibSSH2_jll +using Base, Libdl, LibSSH2_jll +if !(Sys.iswindows() || Sys.isapple()) + # On Windows and macOS we use system SSL/crypto libraries + using OpenSSL_jll +end const PATH_list = String[] const LIBPATH_list = String[] diff --git a/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl b/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl index bc21339478596..e9392fe34a918 100644 --- a/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl +++ b/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl @@ -3,7 +3,11 @@ ## dummy stub for https://github.com/JuliaBinaryWrappers/LibSSH2_jll.jl baremodule LibSSH2_jll -using Base, Libdl, OpenSSL_jll +using Base, Libdl +if !Sys.iswindows() + # On Windows we use system SSL/crypto libraries + using OpenSSL_jll +end const PATH_list = String[] const LIBPATH_list = String[] From 50aeba6c6a4ac469fea3b9ade2b2f7b4e2249bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Mon, 1 Apr 2024 19:30:11 +0200 Subject: [PATCH 16/19] [LibGit2_jll] Update to build v1.8.0+3 --- deps/checksums/libgit2 | 64 ++++++++++++++++----------------- stdlib/LibGit2_jll/Project.toml | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/deps/checksums/libgit2 b/deps/checksums/libgit2 index 9e64c04e83044..36a30426aac35 100644 --- a/deps/checksums/libgit2 +++ b/deps/checksums/libgit2 @@ -1,34 +1,34 @@ -LibGit2.v1.8.0+2.aarch64-apple-darwin.tar.gz/md5/bde56ca02c033dd843d115f6dad89430 -LibGit2.v1.8.0+2.aarch64-apple-darwin.tar.gz/sha512/b454af4d724e9c19d9be01c88269b36bcf6a195abce7f664faa6baa3a23c9cdb28891d0cb82d581b81d4f6b446d875733c990db74909b8f7d2043ea11652232d -LibGit2.v1.8.0+2.aarch64-linux-gnu.tar.gz/md5/b27963307c706bdba7255bfc64dab8cc -LibGit2.v1.8.0+2.aarch64-linux-gnu.tar.gz/sha512/c3121ea9684b7e0bb0485b45467d68292bc59204bbcc50254f7a0b93651bfb93b309fa85cc42ed794c425dda349d9e3bb13251f8235bb68967fdf45bea0b3a4d -LibGit2.v1.8.0+2.aarch64-linux-musl.tar.gz/md5/076a94d5dd65e4b6ccee547a54a18f5e -LibGit2.v1.8.0+2.aarch64-linux-musl.tar.gz/sha512/e83e8cf68c69e5fa5e04fc42c17b88ccc1d0fb2d751facfff1ca01107f96be7772f62a2f9d2d0f38f07603594c965b1fedb54cf2df9cfa574797ad6f7e4c93ef -LibGit2.v1.8.0+2.armv6l-linux-gnueabihf.tar.gz/md5/1bbe4936b6152bbcc46b8b8e858b9154 -LibGit2.v1.8.0+2.armv6l-linux-gnueabihf.tar.gz/sha512/a0fa73fa7a42107ce3d4eaf1f09a49f76498cb9ca6053c7d42d6c17c49d9faf637f5ba05d1eada749ec24ce43af55e8be5b0d211313b9950bbb78affa3a557f5 -LibGit2.v1.8.0+2.armv6l-linux-musleabihf.tar.gz/md5/9c9839c820791c3b82171706efd825c2 -LibGit2.v1.8.0+2.armv6l-linux-musleabihf.tar.gz/sha512/426b4202885bd3fc0fc1f97dd76020d602366c8175a1a362bb01285a4fb6b8383a5a9d4de93a148dc46467e32e495c66b0305f48f2bf930d20b26d57fc32e4bf -LibGit2.v1.8.0+2.armv7l-linux-gnueabihf.tar.gz/md5/655e9087630a5046e566c18d31809fc4 -LibGit2.v1.8.0+2.armv7l-linux-gnueabihf.tar.gz/sha512/2826f9d382e1db140acabf4442549e4aad883c4cd3399a264a3288cb5235b7053946365a3655b374db744f71d97896385811d0aea7da7bae7da5e585c5176d5c -LibGit2.v1.8.0+2.armv7l-linux-musleabihf.tar.gz/md5/1926d45609e7199e61981776dce3f37f -LibGit2.v1.8.0+2.armv7l-linux-musleabihf.tar.gz/sha512/f1c57592b661eefc5ab706bfffbfc7294432b00cca569385158857055b65961704fdb2e901aa55719f70085fbd6502d9f7cf28156eb896b4ee1b9349444ff19e -LibGit2.v1.8.0+2.i686-linux-gnu.tar.gz/md5/751e72149d967aac0c62ee8c60a9badd -LibGit2.v1.8.0+2.i686-linux-gnu.tar.gz/sha512/c2e48ab0561ffa62aa98740838b88a5729ccc9124006bf5d0674a07896d9bea3237b278c351eedc426ecc70c49d6166ba8ec5ba4a794942734d6e89a0aa4b11f -LibGit2.v1.8.0+2.i686-linux-musl.tar.gz/md5/e10968f78a45e856c4623e5b830b79fd -LibGit2.v1.8.0+2.i686-linux-musl.tar.gz/sha512/3ed5e110466dc103e4e955df32096585ff3f3cc5920d54d00dcfb74a1ce3b8b3be2eb28640436d68a72ed81704d927a65bed5723008860870ef897b0c4ec4d66 -LibGit2.v1.8.0+2.i686-w64-mingw32.tar.gz/md5/37ebdafca6349342fdb117d68da93ec8 -LibGit2.v1.8.0+2.i686-w64-mingw32.tar.gz/sha512/44cc765731437bfdd67c10963b95b86aa881f1ae633618ebc820e2be905606be73d637cf18013e5fb7abcbeabc826062ec3fdcc289e065592d6367b45a9f35e5 -LibGit2.v1.8.0+2.powerpc64le-linux-gnu.tar.gz/md5/cfc69b32962a5b6b263311835e65f956 -LibGit2.v1.8.0+2.powerpc64le-linux-gnu.tar.gz/sha512/bc955578f20723bd3b9645fdd1d5a75c60e767e286bee12004ea46ef44ebe1e321e92534aba884d5526d3aa25bff68b8c36167d35459d8a2f61d150773282705 -LibGit2.v1.8.0+2.x86_64-apple-darwin.tar.gz/md5/ed78b6c77fcc8f6573cff1d0cd7d4237 -LibGit2.v1.8.0+2.x86_64-apple-darwin.tar.gz/sha512/bef8403d43ccf3ff055f0d09964bba0ff469f1ab803b5f833df55f4b801b90f6115557f26a674b4c0e1b47e96f0a498a49e17b7badc1458f47de3ee6e9df7000 -LibGit2.v1.8.0+2.x86_64-linux-gnu.tar.gz/md5/87ce491ce6ac6133379ef6bb9e04d4bd -LibGit2.v1.8.0+2.x86_64-linux-gnu.tar.gz/sha512/783b777dc35ac9882daf857c27cd4e7728a6601ca6270217084693ef029f956dc0c5d2adb452239b08df2587594e65972dee7abe6f822edafa8d8b6774b253b9 -LibGit2.v1.8.0+2.x86_64-linux-musl.tar.gz/md5/8a2eb52dd2d74aac32f2b119504a08d5 -LibGit2.v1.8.0+2.x86_64-linux-musl.tar.gz/sha512/635149d2a428021b73c21d4dbf0937301eca237f8f319e22c47650c866a843e216bf04646114a661506ce344cc044bd298f136ea5a0b34a851561ef61b58f776 -LibGit2.v1.8.0+2.x86_64-unknown-freebsd.tar.gz/md5/3da951eee7fe6f59d81013a83efec741 -LibGit2.v1.8.0+2.x86_64-unknown-freebsd.tar.gz/sha512/84a9eaf1bbd4c1648661aa2ffde782cfdc95282756600613adc762f867ec23b8f36dfd1c6e9051df1018100955e754313649797432b426610a019baecb393bad -LibGit2.v1.8.0+2.x86_64-w64-mingw32.tar.gz/md5/650e341d3b981802f960096f18b9a694 -LibGit2.v1.8.0+2.x86_64-w64-mingw32.tar.gz/sha512/55eba907df8807a3cc1083cdf0dae086591c82ba3ee31a4a8c3ed64c1668af7c1714d0b628eb9c5361ca9ea33d90e7fe92ba5eb3ce02eabc063efee00c1774c7 +LibGit2.v1.8.0+3.aarch64-apple-darwin.tar.gz/md5/bde56ca02c033dd843d115f6dad89430 +LibGit2.v1.8.0+3.aarch64-apple-darwin.tar.gz/sha512/b454af4d724e9c19d9be01c88269b36bcf6a195abce7f664faa6baa3a23c9cdb28891d0cb82d581b81d4f6b446d875733c990db74909b8f7d2043ea11652232d +LibGit2.v1.8.0+3.aarch64-linux-gnu.tar.gz/md5/b27963307c706bdba7255bfc64dab8cc +LibGit2.v1.8.0+3.aarch64-linux-gnu.tar.gz/sha512/c3121ea9684b7e0bb0485b45467d68292bc59204bbcc50254f7a0b93651bfb93b309fa85cc42ed794c425dda349d9e3bb13251f8235bb68967fdf45bea0b3a4d +LibGit2.v1.8.0+3.aarch64-linux-musl.tar.gz/md5/076a94d5dd65e4b6ccee547a54a18f5e +LibGit2.v1.8.0+3.aarch64-linux-musl.tar.gz/sha512/e83e8cf68c69e5fa5e04fc42c17b88ccc1d0fb2d751facfff1ca01107f96be7772f62a2f9d2d0f38f07603594c965b1fedb54cf2df9cfa574797ad6f7e4c93ef +LibGit2.v1.8.0+3.armv6l-linux-gnueabihf.tar.gz/md5/1bbe4936b6152bbcc46b8b8e858b9154 +LibGit2.v1.8.0+3.armv6l-linux-gnueabihf.tar.gz/sha512/a0fa73fa7a42107ce3d4eaf1f09a49f76498cb9ca6053c7d42d6c17c49d9faf637f5ba05d1eada749ec24ce43af55e8be5b0d211313b9950bbb78affa3a557f5 +LibGit2.v1.8.0+3.armv6l-linux-musleabihf.tar.gz/md5/9c9839c820791c3b82171706efd825c2 +LibGit2.v1.8.0+3.armv6l-linux-musleabihf.tar.gz/sha512/426b4202885bd3fc0fc1f97dd76020d602366c8175a1a362bb01285a4fb6b8383a5a9d4de93a148dc46467e32e495c66b0305f48f2bf930d20b26d57fc32e4bf +LibGit2.v1.8.0+3.armv7l-linux-gnueabihf.tar.gz/md5/655e9087630a5046e566c18d31809fc4 +LibGit2.v1.8.0+3.armv7l-linux-gnueabihf.tar.gz/sha512/2826f9d382e1db140acabf4442549e4aad883c4cd3399a264a3288cb5235b7053946365a3655b374db744f71d97896385811d0aea7da7bae7da5e585c5176d5c +LibGit2.v1.8.0+3.armv7l-linux-musleabihf.tar.gz/md5/1926d45609e7199e61981776dce3f37f +LibGit2.v1.8.0+3.armv7l-linux-musleabihf.tar.gz/sha512/f1c57592b661eefc5ab706bfffbfc7294432b00cca569385158857055b65961704fdb2e901aa55719f70085fbd6502d9f7cf28156eb896b4ee1b9349444ff19e +LibGit2.v1.8.0+3.i686-linux-gnu.tar.gz/md5/751e72149d967aac0c62ee8c60a9badd +LibGit2.v1.8.0+3.i686-linux-gnu.tar.gz/sha512/c2e48ab0561ffa62aa98740838b88a5729ccc9124006bf5d0674a07896d9bea3237b278c351eedc426ecc70c49d6166ba8ec5ba4a794942734d6e89a0aa4b11f +LibGit2.v1.8.0+3.i686-linux-musl.tar.gz/md5/e10968f78a45e856c4623e5b830b79fd +LibGit2.v1.8.0+3.i686-linux-musl.tar.gz/sha512/3ed5e110466dc103e4e955df32096585ff3f3cc5920d54d00dcfb74a1ce3b8b3be2eb28640436d68a72ed81704d927a65bed5723008860870ef897b0c4ec4d66 +LibGit2.v1.8.0+3.i686-w64-mingw32.tar.gz/md5/37ebdafca6349342fdb117d68da93ec8 +LibGit2.v1.8.0+3.i686-w64-mingw32.tar.gz/sha512/44cc765731437bfdd67c10963b95b86aa881f1ae633618ebc820e2be905606be73d637cf18013e5fb7abcbeabc826062ec3fdcc289e065592d6367b45a9f35e5 +LibGit2.v1.8.0+3.powerpc64le-linux-gnu.tar.gz/md5/cfc69b32962a5b6b263311835e65f956 +LibGit2.v1.8.0+3.powerpc64le-linux-gnu.tar.gz/sha512/bc955578f20723bd3b9645fdd1d5a75c60e767e286bee12004ea46ef44ebe1e321e92534aba884d5526d3aa25bff68b8c36167d35459d8a2f61d150773282705 +LibGit2.v1.8.0+3.x86_64-apple-darwin.tar.gz/md5/ed78b6c77fcc8f6573cff1d0cd7d4237 +LibGit2.v1.8.0+3.x86_64-apple-darwin.tar.gz/sha512/bef8403d43ccf3ff055f0d09964bba0ff469f1ab803b5f833df55f4b801b90f6115557f26a674b4c0e1b47e96f0a498a49e17b7badc1458f47de3ee6e9df7000 +LibGit2.v1.8.0+3.x86_64-linux-gnu.tar.gz/md5/87ce491ce6ac6133379ef6bb9e04d4bd +LibGit2.v1.8.0+3.x86_64-linux-gnu.tar.gz/sha512/783b777dc35ac9882daf857c27cd4e7728a6601ca6270217084693ef029f956dc0c5d2adb452239b08df2587594e65972dee7abe6f822edafa8d8b6774b253b9 +LibGit2.v1.8.0+3.x86_64-linux-musl.tar.gz/md5/8a2eb52dd2d74aac32f2b119504a08d5 +LibGit2.v1.8.0+3.x86_64-linux-musl.tar.gz/sha512/635149d2a428021b73c21d4dbf0937301eca237f8f319e22c47650c866a843e216bf04646114a661506ce344cc044bd298f136ea5a0b34a851561ef61b58f776 +LibGit2.v1.8.0+3.x86_64-unknown-freebsd.tar.gz/md5/3da951eee7fe6f59d81013a83efec741 +LibGit2.v1.8.0+3.x86_64-unknown-freebsd.tar.gz/sha512/84a9eaf1bbd4c1648661aa2ffde782cfdc95282756600613adc762f867ec23b8f36dfd1c6e9051df1018100955e754313649797432b426610a019baecb393bad +LibGit2.v1.8.0+3.x86_64-w64-mingw32.tar.gz/md5/650e341d3b981802f960096f18b9a694 +LibGit2.v1.8.0+3.x86_64-w64-mingw32.tar.gz/sha512/55eba907df8807a3cc1083cdf0dae086591c82ba3ee31a4a8c3ed64c1668af7c1714d0b628eb9c5361ca9ea33d90e7fe92ba5eb3ce02eabc063efee00c1774c7 libgit2-d74d491481831ddcd23575d376e56d2197e95910.tar.gz/md5/2420def04a290dd7ad0e67f93789f106 libgit2-d74d491481831ddcd23575d376e56d2197e95910.tar.gz/sha512/496c6640d2453c58b66bc53c6e4e9e84f48d89eb8f240aefc1eea7e2d19b6c601614764590f2d2ca9e51e7e1de8fcdd5bf67f27f32bab628eae40d26ed382048 diff --git a/stdlib/LibGit2_jll/Project.toml b/stdlib/LibGit2_jll/Project.toml index d2f60ba3c99ff..47fb9c5fb8e8e 100644 --- a/stdlib/LibGit2_jll/Project.toml +++ b/stdlib/LibGit2_jll/Project.toml @@ -1,6 +1,6 @@ name = "LibGit2_jll" uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5" -version = "1.8.0+2" +version = "1.8.0+3" [deps] OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95" From 256ebee59f7048f8eeaf8bdcf69aa144b8d3568c Mon Sep 17 00:00:00 2001 From: Gabriel Baraldi Date: Mon, 1 Apr 2024 17:44:59 -0300 Subject: [PATCH 17/19] Change test so the output isn't hidden --- test/cmdlineargs.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl index e18fe3d026251..eafa35ef65ce1 100644 --- a/test/cmdlineargs.jl +++ b/test/cmdlineargs.jl @@ -1136,9 +1136,9 @@ end # test --bug-report=rr if Sys.islinux() && Sys.ARCH in (:i686, :x86_64) # rr is only available on these platforms mktempdir() do temp_trace_dir - @test success(pipeline(setenv(`$(Base.julia_cmd()) --bug-report=rr-local -e 'exit()'`, + @test success(run(pipeline(setenv(`$(Base.julia_cmd()) --bug-report=rr-local -e 'exit()'`, "JULIA_RR_RECORD_ARGS" => "-n --nested=ignore", - "_RR_TRACE_DIR" => temp_trace_dir); #=stderr, stdout=#)) + "_RR_TRACE_DIR" => temp_trace_dir); #=stderr, stdout=#))) end end From d8ba63dec986da6603adb40810ec8a0beb748da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Sun, 12 May 2024 19:30:08 +0100 Subject: [PATCH 18/19] [OpenSSL_jll] Set `SSL_CERT_FILE` if necessary --- doc/Manifest.toml | 2 +- stdlib/OpenSSL_jll/Project.toml | 1 + stdlib/OpenSSL_jll/src/OpenSSL_jll.jl | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 94563897680d5..a9206593b1163 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -172,7 +172,7 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" version = "1.2.0" [[deps.OpenSSL_jll]] -deps = ["Artifacts", "Libdl"] +deps = ["Artifacts", "Libdl", "NetworkOptions"] uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" version = "3.0.13+1" diff --git a/stdlib/OpenSSL_jll/Project.toml b/stdlib/OpenSSL_jll/Project.toml index a8da7828ac69f..2e83a667b0d23 100644 --- a/stdlib/OpenSSL_jll/Project.toml +++ b/stdlib/OpenSSL_jll/Project.toml @@ -5,6 +5,7 @@ version = "3.0.13+1" [deps] Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +NetworkOptions = "ca575930-c2e3-43a9-ace4-1e988b2c1908" [compat] julia = "1.6" diff --git a/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl b/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl index bba9a0a299de9..e02f9faaafa96 100644 --- a/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl +++ b/stdlib/OpenSSL_jll/src/OpenSSL_jll.jl @@ -4,6 +4,7 @@ baremodule OpenSSL_jll using Base, Libdl, Base.BinaryPlatforms +using NetworkOptions: ca_roots const PATH_list = String[] const LIBPATH_list = String[] @@ -43,6 +44,12 @@ function __init__() global artifact_dir = dirname(Sys.BINDIR) LIBPATH[] = dirname(libssl_path) push!(LIBPATH_list, LIBPATH[]) + + # If not already done, set the environment variable `SSL_CERT_FILE` when necessary. + cert_loc = ca_roots() + if cert_loc isa String + get!(ENV, "SSL_CERT_FILE", cert_loc) + end end # JLLWrappers API compatibility shims. Note that not all of these will really make sense. From 61c4d743dc0f474cfd15f0206ef7b8caca84348b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Sun, 12 May 2024 19:30:33 +0100 Subject: [PATCH 19/19] [LibCURL_jll] Do not load `OpenSSL_jll` on macOS and Windows --- stdlib/LibCURL_jll/src/LibCURL_jll.jl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stdlib/LibCURL_jll/src/LibCURL_jll.jl b/stdlib/LibCURL_jll/src/LibCURL_jll.jl index 2c2bebf8bdc95..5c1c2aa14b23a 100644 --- a/stdlib/LibCURL_jll/src/LibCURL_jll.jl +++ b/stdlib/LibCURL_jll/src/LibCURL_jll.jl @@ -3,7 +3,11 @@ ## dummy stub for https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl baremodule LibCURL_jll -using Base, Libdl, nghttp2_jll, LibSSH2_jll, OpenSSL_jll, Zlib_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 + using OpenSSL_jll +end const PATH_list = String[] const LIBPATH_list = String[]