~qaul/community

clients/hubd: switch to directories-next v1 APPLIED

Alyssa Ross
Alyssa Ross: 2
 clients/hubd: switch to directories-next
 clients/hubd: switch to directories-next

 3 files changed, 19 insertions(+), 103 deletions(-)
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~qaul/community/patches/20668/mbox | git am -3
Learn more about email & git
View this thread in the archives

[PATCH] clients/hubd: switch to directories-next Export this patch

Alyssa Ross
The directories crate is no longer maintained.  directories-next is a
maintained fork.  directories-next 1.0 is a republish of directories 2.0,
so this is an upgrade.

Fixes: RUSTSEC-2020-0054
---
 clients/hubd/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/hubd/Cargo.toml b/clients/hubd/Cargo.toml
index 7715c870..c3cf63ff 100644
--- a/clients/hubd/Cargo.toml
+++ b/clients/hubd/Cargo.toml
@@ -16,7 +16,7 @@ qrpc-broker = { path = "../../rpc-core/qrpc-broker" }

async-std = { version = "=1.5", features = ["attributes"] }
clap = { version = "2.0", features = ["wrap_help", "color"] }
directories = "2.0"
directories-next = "2.0"
igd = "0.11"
tracing = "0.1"
tracing-subscriber = { version = "0.2", features = ["fmt", "env-filter"] }
-- 
2.30.0

[PATCH v2] clients/hubd: switch to directories-next Export this patch

Alyssa Ross
The directories crate is no longer maintained.  directories-next is a
maintained fork.  directories-next 1.0 is a republish of directories 2.0,
so this is an upgrade.

Fixes: RUSTSEC-2020-0054
---

For v2, I actually include the Cargo.lock diff...
Seems like quite a few dependencies have been dropped, so that's nice!

 Cargo.lock              | 118 ++++++----------------------------------
 clients/hubd/Cargo.toml |   2 +-
 2 files changed, 18 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 623cf3ec..c824d097 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -86,12 +86,6 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"

[[package]]
name = "arrayvec"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"

[[package]]
name = "as-slice"
version = "0.1.4"
@@ -131,7 +125,7 @@ dependencies = [
 "broadcaster",
 "crossbeam-channel",
 "crossbeam-deque",
 "crossbeam-utils 0.7.2",
 "crossbeam-utils",
 "futures-core",
 "futures-io",
 "futures-timer",
@@ -229,12 +223,6 @@ dependencies = [
 "byteorder",
]

[[package]]
name = "base64"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

[[package]]
name = "bincode"
version = "1.3.1"
@@ -304,17 +292,6 @@ dependencies = [
 "opaque-debug 0.2.3",
]

[[package]]
name = "blake2b_simd"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
dependencies = [
 "arrayref",
 "arrayvec",
 "constant_time_eq",
]

[[package]]
name = "block-buffer"
version = "0.3.3"
@@ -527,7 +504,7 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
dependencies = [
 "crossbeam-utils 0.7.2",
 "crossbeam-utils",
 "maybe-uninit",
]

@@ -538,7 +515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
dependencies = [
 "crossbeam-epoch",
 "crossbeam-utils 0.7.2",
 "crossbeam-utils",
 "maybe-uninit",
]

@@ -550,7 +527,7 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
dependencies = [
 "autocfg",
 "cfg-if 0.1.10",
 "crossbeam-utils 0.7.2",
 "crossbeam-utils",
 "lazy_static",
 "maybe-uninit",
 "memoffset",
@@ -568,18 +545,6 @@ dependencies = [
 "lazy_static",
]

[[package]]
name = "crossbeam-utils"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bae8f328835f8f5a6ceb6a7842a7f2d0c03692adb5c889347235d59194731fe3"
dependencies = [
 "autocfg",
 "cfg-if 1.0.0",
 "lazy_static",
 "loom",
]

[[package]]
name = "crypto-mac"
version = "0.5.2"
@@ -661,20 +626,20 @@ dependencies = [
]

[[package]]
name = "directories"
version = "2.0.2"
name = "directories-next"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
dependencies = [
 "cfg-if 0.1.10",
 "dirs-sys",
 "cfg-if 1.0.0",
 "dirs-sys-next",
]

[[package]]
name = "dirs-sys"
version = "0.3.5"
name = "dirs-sys-next"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
dependencies = [
 "libc",
 "redox_users",
@@ -899,19 +864,6 @@ dependencies = [
 "slab",
]

[[package]]
name = "generator"
version = "0.6.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c"
dependencies = [
 "cc",
 "libc",
 "log 0.4.14",
 "rustversion",
 "winapi 0.3.9",
]

[[package]]
name = "generic-array"
version = "0.9.0"
@@ -1295,17 +1247,6 @@ dependencies = [
 "value-bag",
]

[[package]]
name = "loom"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d44c73b4636e497b4917eb21c33539efa3816741a2d3ff26c6316f1b529481a4"
dependencies = [
 "cfg-if 1.0.0",
 "generator",
 "scoped-tls",
]

[[package]]
name = "matchers"
version = "0.0.1"
@@ -1798,7 +1739,7 @@ version = "0.2.0"
dependencies = [
 "async-std",
 "clap",
 "directories",
 "directories-next",
 "igd",
 "ipnetwork",
 "libqaul",
@@ -2084,13 +2025,12 @@ dependencies = [

[[package]]
name = "redox_users"
version = "0.3.5"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
dependencies = [
 "getrandom 0.1.16",
 "redox_syscall 0.1.57",
 "rust-argon2",
 "getrandom 0.2.2",
 "redox_syscall 0.2.5",
]

[[package]]
@@ -2130,18 +2070,6 @@ dependencies = [
 "winapi 0.3.9",
]

[[package]]
name = "rust-argon2"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
dependencies = [
 "base64 0.13.0",
 "blake2b_simd",
 "constant_time_eq",
 "crossbeam-utils 0.8.2",
]

[[package]]
name = "rustc-demangle"
version = "0.1.18"
@@ -2160,12 +2088,6 @@ version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"

[[package]]
name = "rustversion"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"

[[package]]
name = "ryu"
version = "1.0.5"
@@ -2187,12 +2109,6 @@ dependencies = [
 "winapi-util",
]

[[package]]
name = "scoped-tls"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"

[[package]]
name = "scopeguard"
version = "1.1.0"
diff --git a/clients/hubd/Cargo.toml b/clients/hubd/Cargo.toml
index 7ba812c0..fdf6d514 100644
--- a/clients/hubd/Cargo.toml
+++ b/clients/hubd/Cargo.toml
@@ -16,7 +16,7 @@ qrpc-broker = { path = "../../rpc-core/qrpc-broker" }

async-std = { version = "=1.5", features = ["attributes"] }
clap = { version = "2.0", features = ["wrap_help", "color"] }
directories = "2.0"
directories-next = "2.0"
igd = "0.11"
tracing = "0.1"
tracing-subscriber = { version = "0.2", features = ["fmt", "env-filter"] }
-- 
2.30.0