wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-27 23:46:31 +03:00
Code Issues Projects Releases Wiki Activity

fix windows build

Browse Source 
A recent cargo update caused openssl-sys to do a minor semver update
from 0.9.71 -> 0.9.72, but that release downgraded from openssl 3
to openssl 1 to resolve a performance regression:
<https://github.com/sfackler/rust-openssl/pull/1578>

That in turn caused libssh to fail to build because the ENGINE
feature required by libssh isn't compiled in in openssl-src 1
crate when vendoring on windows.

For now, my libssh git repo is constrained to openssl-sys 0.9.71,
and we're pointing to that from the wezterm repo.
This commit is contained in:
Wez Furlong 2021-12-13 09:00:13 -07:00
parent c33f548db3
commit 36a16cb70d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@ -1950,8 +1950,7 @@ dependencies = [
[[package]]
name = "libssh-rs"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5ca687cb078f24216be3c269a1a7b9279f9d33adcd17b4b0747bfc8902472e7"
source = "git+https://github.com/wez/libssh-rs.git#3dc392c2b6c1a4104d1478e744c6ae8f12a4e9de"
dependencies = [
"bitflags",
"libssh-rs-sys",
@ -1961,8 +1960,7 @@ dependencies = [
[[package]]
name = "libssh-rs-sys"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ac4307688493d1f2cf3f026b683cea3d30b4b65f365d4c8b6c464471c18dca2"
source = "git+https://github.com/wez/libssh-rs.git#3dc392c2b6c1a4104d1478e744c6ae8f12a4e9de"
dependencies = [
"cc",
"libz-sys",
@ -2624,18 +2622,18 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
[[package]]
name = "openssl-src"
version = "111.16.0+1.1.1l"
version = "300.0.3+3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ab2173f69416cf3ec12debb5823d244127d23a9b127d5a5189aa97c5fa2859f"
checksum = "c51ecedef28dcb23c303944dce1d44a9729f3d28d59f39e56f0c847329d1b134"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
version = "0.9.72"
version = "0.9.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73"
dependencies = [
"autocfg",
"cc",

2
wezterm-ssh/Cargo.toml
View File

@ -27,7 +27,7 @@ portable-pty = { version="0.7", path = "../pty" }
regex = "1"
smol = "1.2"
ssh2 = {version="0.9.3", features=["openssl-on-win32"]}
libssh-rs = {version="0.1.2", features=["vendored"]}
libssh-rs = {version="0.1.2", features=["vendored"], git="https://github.com/wez/libssh-rs.git"}
#libssh-rs = {path="../../libssh-rs/libssh-rs", features=["vendored", "vendored-openssl"]}
thiserror = "1.0"