From d79ae9c67d77859772481c887e9f169255ce837d Mon Sep 17 00:00:00 2001 From: Mariotaku <mariotaku.lee@gmail.com> Date: Fri, 16 Jun 2023 13:50:43 +0900 Subject: [PATCH] updated libssh-rs --- Cargo.lock | 12 ++++++------ Cargo.toml | 6 +----- ares-device/Cargo.toml | 4 ++-- ares-device/src/picker/windows/mod.rs | 1 + ares-install/Cargo.toml | 2 +- ares-launch/Cargo.toml | 2 +- common/connection/Cargo.toml | 8 +++----- 7 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f2454d3..f817c96 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,8 +311,6 @@ dependencies = [ "common-device", "libssh-rs", "libssh-rs-sys", - "openssl", - "openssl-sys", "path-slash", "reqwest", "serde", @@ -1011,8 +1009,9 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libssh-rs" -version = "0.1.8" -source = "git+https://github.com/wez/libssh-rs.git?rev=74d845c1696b710b8b8388e193b3882c15edf2c1#74d845c1696b710b8b8388e193b3882c15edf2c1" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff892c443aa43a8e305913da313b5234bf33a7f17eae378f9c9ae4419dbbaa74" dependencies = [ "bitflags", "libssh-rs-sys", @@ -1022,8 +1021,9 @@ dependencies = [ [[package]] name = "libssh-rs-sys" -version = "0.1.3" -source = "git+https://github.com/wez/libssh-rs.git?rev=74d845c1696b710b8b8388e193b3882c15edf2c1#74d845c1696b710b8b8388e193b3882c15edf2c1" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aad2e95f77dde4d6a636ca1c713f3efdaa46bb2dae33d7d2abeea992baeb9cb3" dependencies = [ "cc", "libz-sys", diff --git a/Cargo.toml b/Cargo.toml index e747bc5..77624fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,8 +7,4 @@ members = [ "ares-push", "ares-launch", "ares-device", -] - -[patch.crates-io] -libssh-rs = { git = "https://github.com/wez/libssh-rs.git", rev = "74d845c1696b710b8b8388e193b3882c15edf2c1" } -libssh-rs-sys = { git = "https://github.com/wez/libssh-rs.git", rev = "74d845c1696b710b8b8388e193b3882c15edf2c1" } +] \ No newline at end of file diff --git a/ares-device/Cargo.toml b/ares-device/Cargo.toml index 3122bdd..d9a42bb 100644 --- a/ares-device/Cargo.toml +++ b/ares-device/Cargo.toml @@ -15,10 +15,10 @@ cfg-if = "1.0.0" [target.'cfg(target_os="windows")'.dependencies] native-windows-gui = { version = "1.0.12" } native-windows-derive = "1.0.3" -libssh-rs-sys = { version = "0.1.3", features = ["vendored-openssl", "libz-sys"] } +libssh-rs-sys = { version = "0.2.0", features = ["vendored-openssl", "libz-sys"] } [target.'cfg(not(target_os="windows"))'.dependencies] -libssh-rs-sys = { version = "0.1.3", default-features = false } +libssh-rs-sys = { version = "0.2.0", default-features = false } [target.'cfg(all(not(target_os="windows"), not(target_os="macos")))'.dependencies] gtk = "0.17.1" diff --git a/ares-device/src/picker/windows/mod.rs b/ares-device/src/picker/windows/mod.rs index 94524d6..74e75b8 100644 --- a/ares-device/src/picker/windows/mod.rs +++ b/ares-device/src/picker/windows/mod.rs @@ -35,6 +35,7 @@ impl PickPrompt for PickPromptWindows { .iter() .position(|d| d.as_ref().default.unwrap_or(false)), ); + ui.on_selection_change(); nwg::dispatch_thread_events(); diff --git a/ares-install/Cargo.toml b/ares-install/Cargo.toml index 5d9d5a6..0d7d77b 100644 --- a/ares-install/Cargo.toml +++ b/ares-install/Cargo.toml @@ -14,7 +14,7 @@ common-connection = { path = "../common/connection" } clap = { version = "4.2.4", features = ["derive", "env"] } serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" -libssh-rs = { version = "0.1.8" } +libssh-rs = { version = "0.2.0" } sha256 = "1.1.3" regex = "1.8.1" diff --git a/ares-launch/Cargo.toml b/ares-launch/Cargo.toml index ec74d2d..abc6bde 100644 --- a/ares-launch/Cargo.toml +++ b/ares-launch/Cargo.toml @@ -13,7 +13,7 @@ common-connection = { path = "../common/connection" } clap = { version = "4.2.4", features = ["derive", "env"] } serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" -libssh-rs = { version = "0.1.8" } +libssh-rs = { version = "0.2.0" } [package.metadata.deb] section = "devel" \ No newline at end of file diff --git a/common/connection/Cargo.toml b/common/connection/Cargo.toml index fa9e269..41031bb 100644 --- a/common/connection/Cargo.toml +++ b/common/connection/Cargo.toml @@ -10,15 +10,13 @@ name = "ares_connection_lib" common-device = { path = "../device" } serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" -libssh-rs = { version = "0.1.8" } +libssh-rs = { version = "0.2.0" } reqwest = { version = "0.11.16", features = ["blocking"] } snailquote = "0.3.1" path-slash = "0.2.1" -openssl = { version = "=0.10.35" } -openssl-sys = { version = "=0.9.71" } [target.'cfg(target_os="windows")'.dependencies] -libssh-rs-sys = { version = "0.1.3", features = ["vendored-openssl", "libz-sys"] } +libssh-rs-sys = { version = "0.2.0", features = ["vendored-openssl", "libz-sys"] } [target.'cfg(not(target_os="windows"))'.dependencies] -libssh-rs-sys = { version = "0.1.3", default-features = false } \ No newline at end of file +libssh-rs-sys = { version = "0.2.0", default-features = false } \ No newline at end of file