From 274742d6d9b178a6763d22c5e409d635580a970b Mon Sep 17 00:00:00 2001
From: veeso <christian.visintin@veeso.dev>
Date: Sat, 15 Mar 2025 20:04:21 +0100
Subject: [PATCH] build: bump to ssh2-config 0.4 and remotefs 0.6 to have
 support for Include in config files

fix #309
---
 CHANGELOG.md |  4 ++--
 Cargo.lock   | 59 +++++++++++++++-------------------------------------
 Cargo.toml   |  9 ++++----
 3 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5ee860..6183214 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,8 +53,8 @@ Released on ??
   - `dirs` to `6`
   - `magic-crypt` to `4`
   - `notify` to `8`
-  - `ssh2-config` to `0.3`
-  - `remotefs-ssh` to `0.4`
+  - `ssh2-config` to `0.4`
+  - `remotefs-ssh` to `0.6`
   - `rust` edition to `2024`
 
 ## 0.16.1
diff --git a/Cargo.lock b/Cargo.lock
index ff8c3ae..01042e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -742,22 +742,13 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "dirs"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
-dependencies = [
- "dirs-sys 0.4.1",
-]
-
 [[package]]
 name = "dirs"
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
 dependencies = [
- "dirs-sys 0.5.0",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -770,18 +761,6 @@ dependencies = [
  "dirs-sys-next",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users 0.4.6",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "dirs-sys"
 version = "0.5.0"
@@ -1132,6 +1111,12 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+
 [[package]]
 name = "h2"
 version = "0.3.26"
@@ -2975,9 +2960,9 @@ dependencies = [
 
 [[package]]
 name = "remotefs-ssh"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cefa6893f2510787c917be88fb9e14db4b0726bfee069ed22945fdefdcaad18"
+checksum = "1b903d59822f962aa9ddcb922b4ca45a78c13b509df7d0b9be6daf9bda133300"
 dependencies = [
  "chrono",
  "lazy-regex",
@@ -2985,7 +2970,7 @@ dependencies = [
  "path-slash 0.2.1",
  "remotefs",
  "ssh2",
- "ssh2-config 0.2.3",
+ "ssh2-config",
 ]
 
 [[package]]
@@ -3723,24 +3708,14 @@ dependencies = [
 
 [[package]]
 name = "ssh2-config"
-version = "0.2.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98150bad1e8fe53df07f38b53364f4d34e84a6cc2ee9f933e43629571060af65"
+checksum = "b54c1f8a904a031c129e6e258994999839d6f0ffad4964062cb76d975259a0d8"
 dependencies = [
  "bitflags 2.9.0",
- "dirs 5.0.1",
- "thiserror 1.0.69",
- "wildmatch",
-]
-
-[[package]]
-name = "ssh2-config"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f7fc951533455d92036f8130c7888d883b9f776b1aa700cda1f7e63e515845"
-dependencies = [
- "bitflags 2.9.0",
- "dirs 5.0.1",
+ "dirs",
+ "glob",
+ "log",
  "thiserror 2.0.12",
  "wildmatch",
 ]
@@ -3931,7 +3906,7 @@ dependencies = [
  "cfg_aliases",
  "chrono",
  "content_inspector",
- "dirs 6.0.0",
+ "dirs",
  "edit",
  "filetime",
  "hostname",
@@ -3959,7 +3934,7 @@ dependencies = [
  "serde",
  "serial_test",
  "simplelog",
- "ssh2-config 0.3.0",
+ "ssh2-config",
  "tempfile",
  "thiserror 2.0.12",
  "tokio",
diff --git a/Cargo.toml b/Cargo.toml
index 2e90d50..6fc376c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@ name = "termscp"
 readme = "README.md"
 repository = "https://github.com/veeso/termscp"
 version = "0.17.0"
+rust-version = "1.85.0"
 
 [package.metadata.rpm]
 package = "termscp"
@@ -23,7 +24,7 @@ termscp = { path = "/usr/bin/termscp" }
 
 [package.metadata.deb]
 maintainer = "Christian Visintin <christian.visintin@veeso.dev>"
-copyright = "2022, Christian Visintin <christian.visintin@veeso.dev>"
+copyright = "2025, Christian Visintin <christian.visintin@veeso.dev>"
 extended-description-file = "docs/misc/README.deb.txt"
 
 [[bin]]
@@ -72,7 +73,7 @@ self_update = { version = "^0.42", default-features = false, features = [
 ] }
 serde = { version = "^1", features = ["derive"] }
 simplelog = "^0.12"
-ssh2-config = "^0.3"
+ssh2-config = "^0.4"
 tempfile = "3"
 thiserror = "2"
 tokio = { version = "1.44", features = ["rt"] }
@@ -106,12 +107,12 @@ remotefs-smb = { version = "^0.3", optional = true }
 [target."cfg(target_family = \"windows\")"]
 [target."cfg(target_family = \"windows\")".dependencies]
 remotefs-ftp = { version = "^0.2", features = ["native-tls"] }
-remotefs-ssh = "^0.5"
+remotefs-ssh = "^0.6"
 
 [target."cfg(target_family = \"unix\")"]
 [target."cfg(target_family = \"unix\")".dependencies]
 remotefs-ftp = { version = "^0.2", features = ["vendored", "native-tls"] }
-remotefs-ssh = { version = "^0.5", features = ["ssh2-vendored"] }
+remotefs-ssh = { version = "^0.6", features = ["ssh2-vendored"] }
 uzers = "0.12"
 
 [profile.dev]