From 46acfe3b075e476861053afe2ced9a73424d8323 Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Sat, 15 Jun 2024 07:49:07 -0700 Subject: [PATCH] [LibSSH2] Re-build to lock compatibility with OpenSSL v3.0.14+ (#8898) In https://github.com/JuliaPackaging/Yggdrasil/pull/8393 we changed the layout of OpenSSL to put libraries in `${prefix}/lib` rather than `${prefix}/lib64`. While this doesn't effect Julia much, if one uses a tool such a `JLLPrefixes` to plop a bunch of JLL's artifacts in a single prefix and then try to use the binaries directly, the RPATHs no longer work. This rebuild will create a new version of LibSSH2 that will work with the new OpenSSL binaries. --- L/LibSSH2/build_tarballs.jl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/L/LibSSH2/build_tarballs.jl b/L/LibSSH2/build_tarballs.jl index bb9fd9f5866..d88f4875d61 100644 --- a/L/LibSSH2/build_tarballs.jl +++ b/L/LibSSH2/build_tarballs.jl @@ -3,12 +3,13 @@ using Pkg using BinaryBuilderBase: sanitize name = "LibSSH2" -version = v"1.11.0" +# This is a lie, we actually build 1.11.0, but we needed to bump the patch version to change our compat below +version = v"1.11.1" # Collection of sources required to build LibSSH2 sources = [ DirectorySource("./bundled"), - ArchiveSource("https://github.com/libssh2/libssh2/releases/download/libssh2-$(version)/libssh2-$(version).tar.gz", + ArchiveSource("https://github.com/libssh2/libssh2/releases/download/libssh2-1.11.0/libssh2-1.11.0.tar.gz", "3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461"), ] @@ -63,7 +64,7 @@ llvm_version = v"13.0.1" # Dependencies that must be installed before this package can be built dependencies = [ - Dependency("OpenSSL_jll"; compat="3.0.8", platforms=filter(!Sys.iswindows, platforms)), + Dependency("OpenSSL_jll"; compat="3.0.14", platforms=filter(!Sys.iswindows, platforms)), BuildDependency(PackageSpec(name="LLVMCompilerRT_jll", uuid="4e17d02c-6bf5-513e-be62-445f41c75a11", version=llvm_version); platforms=filter(p -> sanitize(p)=="memory", platforms)), ]