wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-17 17:57:28 +03:00
Code Issues Projects Releases Wiki Activity

remove patched openssl-sys crate

Browse Source 
The appropriate openssl-src is now used upstream
This commit is contained in:
Wez Furlong 2021-11-03 06:38:20 -07:00
parent 539d72a97f
commit e736d02d9e
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Cargo.lock generated
View File

@ -2383,7 +2383,7 @@ dependencies = [
[[package]]
name = "libssh-rs"
version = "0.1.0"
source = "git+https://github.com/wez/libssh-rs.git?rev=ca6472c16ca3ff5b271d64543d0461b39bae4c66#ca6472c16ca3ff5b271d64543d0461b39bae4c66"
source = "git+https://github.com/wez/libssh-rs.git?rev=daf2151db6081490649241b0118c3c0b81b65964#daf2151db6081490649241b0118c3c0b81b65964"
dependencies = [
"bitflags",
"libssh-rs-sys",
@ -2393,7 +2393,7 @@ dependencies = [
[[package]]
name = "libssh-rs-sys"
version = "0.1.0"
source = "git+https://github.com/wez/libssh-rs.git?rev=ca6472c16ca3ff5b271d64543d0461b39bae4c66#ca6472c16ca3ff5b271d64543d0461b39bae4c66"
source = "git+https://github.com/wez/libssh-rs.git?rev=daf2151db6081490649241b0118c3c0b81b65964#daf2151db6081490649241b0118c3c0b81b65964"
dependencies = [
"cc",
"libz-sys",
@ -3106,8 +3106,9 @@ dependencies = [
[[package]]
name = "openssl-sys"
version = "0.9.67"
source = "git+https://github.com/wez/rust-openssl.git?branch=openssl-src-300#173970ddebf98bdaf8c28481a84092c85a3a9376"
version = "0.9.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf"
dependencies = [
"autocfg",
"cc",

4
Cargo.toml
View File

@ -12,10 +12,6 @@ resolver = "2"
opt-level = 3
# debug = 1
[patch.crates-io]
# We can remove my fork once openssl-sys points at openssl-src 300+
openssl-sys = { git="https://github.com/wez/rust-openssl.git", branch="openssl-src-300" }
[profile.dev]
# https://jakedeichert.com/blog/reducing-rust-incremental-compilation-times-on-macos-by-70-percent/
split-debuginfo = "unpacked"

2
wezterm-ssh/Cargo.toml
View File

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