diff --git a/CHANGELOG.md b/CHANGELOG.md index b6ec064..4a5a1d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Removed +## [0.16.1] - 2022-05-13 +### Changed +- Lock in to Rust openssl 0.10.38 as it is the last version that supports using + openssl 3.x.x before reverting + ## [0.16.0] - 2022-05-12 ### Added - New `environment` session type that prints out environment variable diff --git a/Cargo.lock b/Cargo.lock index dd3fcc3..5d70bd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -539,7 +539,7 @@ dependencies = [ [[package]] name = "distant" -version = "0.16.0" +version = "0.16.1" dependencies = [ "assert_cmd", "assert_fs", @@ -567,7 +567,7 @@ dependencies = [ [[package]] name = "distant-core" -version = "0.16.0" +version = "0.16.1" dependencies = [ "assert_fs", "bitflags", @@ -596,7 +596,7 @@ dependencies = [ [[package]] name = "distant-ssh2" -version = "0.16.0" +version = "0.16.1" dependencies = [ "assert_cmd", "assert_fs", @@ -607,6 +607,7 @@ dependencies = [ "indoc", "log", "once_cell", + "openssl", "predicates", "rand 0.8.4", "rpassword", @@ -729,6 +730,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "fork" version = "0.1.18" @@ -1298,6 +1314,20 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl" +version = "0.10.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-sys", +] + [[package]] name = "openssl-src" version = "300.0.4+3.0.1" diff --git a/Cargo.toml b/Cargo.toml index 1382847..a920a1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "distant" description = "Operate on a remote computer through file and process manipulation" categories = ["command-line-utilities"] keywords = ["cli"] -version = "0.16.0" +version = "0.16.1" authors = ["Chip Senkbeil "] edition = "2018" homepage = "https://github.com/chipsenkbeil/distant" @@ -25,7 +25,7 @@ ssh2 = ["distant-ssh2"] [dependencies] derive_more = { version = "0.99.16", default-features = false, features = ["display", "from", "error", "is_variant"] } -distant-core = { version = "=0.16.0", path = "distant-core", features = ["structopt"] } +distant-core = { version = "=0.16.1", path = "distant-core", features = ["structopt"] } flexi_logger = "0.18.0" indoc = "1.0.3" log = "0.4.14" @@ -42,7 +42,7 @@ termwiz = "0.15.0" whoami = "1.1.2" # Optional native SSH functionality -distant-ssh2 = { version = "=0.16.0", path = "distant-ssh2", features = ["serde"], optional = true } +distant-ssh2 = { version = "=0.16.1", path = "distant-ssh2", features = ["serde"], optional = true } [target.'cfg(unix)'.dependencies] fork = "0.1.18" diff --git a/distant-core/Cargo.toml b/distant-core/Cargo.toml index 291dfc9..3117592 100644 --- a/distant-core/Cargo.toml +++ b/distant-core/Cargo.toml @@ -3,7 +3,7 @@ name = "distant-core" description = "Core library for distant, enabling operation on a remote computer through file and process manipulation" categories = ["network-programming"] keywords = ["api", "async"] -version = "0.16.0" +version = "0.16.1" authors = ["Chip Senkbeil "] edition = "2018" homepage = "https://github.com/chipsenkbeil/distant" diff --git a/distant-ssh2/Cargo.toml b/distant-ssh2/Cargo.toml index 18d6829..d9342f5 100644 --- a/distant-ssh2/Cargo.toml +++ b/distant-ssh2/Cargo.toml @@ -2,7 +2,7 @@ name = "distant-ssh2" description = "Library to enable native ssh-2 protocol for use with distant sessions" categories = ["network-programming"] -version = "0.16.0" +version = "0.16.1" authors = ["Chip Senkbeil "] edition = "2018" homepage = "https://github.com/chipsenkbeil/distant" @@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0" [dependencies] async-compat = "0.2.1" -distant-core = { version = "=0.16.0", path = "../distant-core" } +distant-core = { version = "=0.16.1", path = "../distant-core" } futures = "0.3.16" log = "0.4.14" rand = { version = "0.8.4", features = ["getrandom"] } @@ -22,6 +22,14 @@ smol = "1.2" tokio = { version = "1.12.0", features = ["full"] } wezterm-ssh = { version = "0.4.0", features = ["vendored-openssl"] } +# Constrained to the last version of openssl that builds together with +# `openssl-sys = "=0.9.71"` which we are constrained to in libssh-rs used +# by wezterm-ssh until it switches back to openssl 3.x. +# https://github.com/sfackler/rust-openssl/issues/1630 +# https://github.com/sfackler/rust-openssl/pull/1578 +# https://github.com/wez/libssh-rs/blob/main/libssh-rs-sys/Cargo.toml +openssl = "=0.10.38" + # Optional serde support for data structures serde = { version = "1.0.126", features = ["derive"], optional = true }