From 781294e4b5286b6136d7dc3337e03d8a3d805a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Fri, 9 Dec 2022 13:22:58 +0100
Subject: [PATCH] switch regular dependencies to workspace ones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

where applicable.

notable changes:
- serde now uses 'derive' feature across the board
- serde removed from pbs-tools (not used)
- openssl bumped to 0.40 (and patched comment removed)
- removed invalid zstd comment

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 Cargo.toml                        | 79 +++++++++++++++++++++++--------
 pbs-api-types/Cargo.toml          | 12 ++---
 pbs-client/Cargo.toml             | 44 ++++++++---------
 pbs-config/Cargo.toml             | 20 ++++----
 pbs-datastore/Cargo.toml          | 32 ++++++-------
 pbs-fuse-loop/Cargo.toml          | 16 +++----
 pbs-pxar-fuse/Cargo.toml          | 10 ++--
 pbs-tape/Cargo.toml               | 26 +++++-----
 pbs-tools/Cargo.toml              | 46 +++++++++---------
 proxmox-backup-banner/Cargo.toml  |  4 +-
 proxmox-backup-client/Cargo.toml  | 28 +++++------
 proxmox-file-restore/Cargo.toml   | 21 ++++----
 proxmox-restore-daemon/Cargo.toml | 30 ++++++------
 proxmox-rrd/Cargo.toml            | 17 ++++---
 pxar-bin/Cargo.toml               | 12 ++---
 15 files changed, 215 insertions(+), 182 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0d70ae470..fb873276c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -94,20 +94,17 @@ pbs-tape = { path = "pbs-tape" }
 pbs-tools = { path = "pbs-tools" }
 proxmox-rrd = { path = "proxmox-rrd" }
 
-[dependencies]
-apt-pkg-native = "0.3.2"
+# regular crates
+anyhow = "1.0"
 base64 = "0.13"
 bitflags = "1.2.1"
 bytes = "1.0"
-cidr = "0.2.1"
 crc32fast = "1"
+crossbeam-channel = "0.5"
 endian_trait = { version = "0.6", features = ["arrays"] }
 flate2 = "1.0"
-anyhow = "1.0"
-thiserror = "1.0"
 futures = "0.3"
 h2 = { version = "0.3", features = [ "stream" ] }
-handlebars = "3.0"
 hex = "0.4.3"
 http = "0.2"
 hyper = { version = "0.14", features = [ "full" ] }
@@ -115,35 +112,75 @@ lazy_static = "1.4"
 libc = "0.2"
 log = "0.4.17"
 nix = "0.24"
-num-traits = "0.2"
+nom = "7"
 once_cell = "1.3.1"
-openssl = "0.10.38" # currently patched!
-pam = "0.7"
-pam-sys = "0.5"
+openssl = "0.10.40"
 percent-encoding = "2.1"
 regex = "1.5.5"
 rustyline = "9"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-siphasher = "0.3"
-syslog = "4.0"
-termcolor = "1.1.2"
-tokio = { version = "1.6", features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
-tokio-openssl = "0.6.1"
+thiserror = "1.0"
+tokio = "1.6"
 tokio-stream = "0.1.0"
-tokio-util = { version = "0.7", features = [ "codec", "io" ] }
+tokio-util = { version = "0.7", features = [ "io" ] }
 tower-service = "0.3.0"
 udev = "0.4"
 url = "2.1"
-#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
 walkdir = "2"
 xdg = "2.2"
-nom = "7"
-crossbeam-channel = "0.5"
-
-# Used only by examples currently:
 zstd = { version = "0.6", features = [ "bindgen" ] }
 
+[dependencies]
+anyhow.workspace = true
+apt-pkg-native = "0.3.2"
+base64.workspace = true
+bitflags.workspace = true
+bytes.workspace = true
+cidr = "0.2.1"
+crc32fast.workspace = true
+crossbeam-channel.workspace = true
+endian_trait.workspace = true
+flate2.workspace = true
+thiserror.workspace = true
+futures.workspace = true
+h2.workspace = true
+handlebars = "3.0"
+hex.workspace = true
+http.workspace = true
+hyper.workspace = true
+lazy_static.workspace = true
+libc.workspace = true
+log.workspace = true
+nix.workspace = true
+nom.workspace = true
+num-traits = "0.2"
+once_cell.workspace = true
+openssl.workspace = true
+pam = "0.7"
+pam-sys = "0.5"
+percent-encoding.workspace = true
+regex.workspace = true
+rustyline.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+siphasher = "0.3"
+syslog = "4.0"
+termcolor = "1.1.2"
+tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
+tokio-openssl = "0.6.1"
+tokio-stream.workspace = true
+tokio-util = { workspace = true, features = [ "codec" ] }
+tower-service.workspace = true
+udev.workspace = true
+url.workspace = true
+walkdir.workspace = true
+xdg.workspace = true
+zstd.workspace = true
+
+#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
+
+
 proxmox-async.workspace = true
 proxmox-compression.workspace = true
 proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async" ] } # pbs-client doesn't use these
diff --git a/pbs-api-types/Cargo.toml b/pbs-api-types/Cargo.toml
index 0b60e1cb6..94740c705 100644
--- a/pbs-api-types/Cargo.toml
+++ b/pbs-api-types/Cargo.toml
@@ -6,12 +6,12 @@ edition.workspace = true
 description = "general API type helpers for PBS"
 
 [dependencies]
-anyhow = "1.0"
-hex = "0.4.3"
-lazy_static = "1.4"
-percent-encoding = "2.1"
-regex = "1.5.5"
-serde = { version = "1.0", features = ["derive"] }
+anyhow.workspace = true
+hex.workspace = true
+lazy_static.workspace = true
+percent-encoding.workspace = true
+regex.workspace = true
+serde.workspace = true
 serde_plain = "1"
 
 proxmox-lang.workspace=true
diff --git a/pbs-client/Cargo.toml b/pbs-client/Cargo.toml
index 06129c618..0f91653a9 100644
--- a/pbs-client/Cargo.toml
+++ b/pbs-client/Cargo.toml
@@ -6,29 +6,29 @@ edition.workspace = true
 description = "The main proxmox backup client crate"
 
 [dependencies]
-anyhow = "1.0"
-bitflags = "1.2.1"
-bytes = "1.0"
-futures = "0.3"
-hex = "0.4.3"
-h2 = { version = "0.3", features = [ "stream" ] }
-http = "0.2"
-hyper = { version = "0.14", features = [ "full" ] }
-lazy_static = "1.4"
-libc = "0.2"
-nix = "0.24"
-log = "0.4"
-openssl = "0.10"
-percent-encoding = "2.1"
+anyhow.workspace = true
+bitflags.workspace = true
+bytes.workspace = true
+futures.workspace = true
+hex.workspace = true
+h2.workspace = true
+http.workspace = true
+hyper.workspace = true
+lazy_static.workspace = true
+libc.workspace = true
+nix.workspace = true
+log.workspace = true
+openssl.workspace = true
+percent-encoding.workspace = true
 pin-project-lite = "0.2"
-regex = "1.5"
-rustyline = "9"
-serde = "1.0"
-serde_json = "1.0"
-tokio = { version = "1.6", features = [ "fs", "signal" ] }
-tokio-stream = "0.1.0"
-tower-service = "0.3.0"
-xdg = "2.2"
+regex.workspace = true
+rustyline.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio = { workspace = true, features = [ "fs", "signal" ] }
+tokio-stream.workspace = true
+tower-service.workspace = true
+xdg.workspace = true
 tar = "0.4"
 
 pathpatterns.workspace = true
diff --git a/pbs-config/Cargo.toml b/pbs-config/Cargo.toml
index cb7999574..ee4fda944 100644
--- a/pbs-config/Cargo.toml
+++ b/pbs-config/Cargo.toml
@@ -6,16 +6,16 @@ edition.workspace = true
 description = "Configuration file management for PBS"
 
 [dependencies]
-anyhow = "1.0"
-hex = "0.4.3"
-lazy_static = "1.4"
-libc = "0.2"
-nix = "0.24"
-once_cell = "1.3.1"
-openssl = "0.10"
-regex = "1.5"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+anyhow.workspace = true
+hex.workspace = true
+lazy_static.workspace = true
+libc.workspace = true
+nix.workspace = true
+once_cell.workspace = true
+openssl.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_json.workspace = true
 
 proxmox-lang.workspace=true
 proxmox-metrics.workspace = true
diff --git a/pbs-datastore/Cargo.toml b/pbs-datastore/Cargo.toml
index b40a1aa59..440430eb5 100644
--- a/pbs-datastore/Cargo.toml
+++ b/pbs-datastore/Cargo.toml
@@ -6,22 +6,22 @@ edition.workspace = true
 description = "low level pbs data storage access"
 
 [dependencies]
-anyhow = "1.0"
-base64 = "0.13"
-crc32fast = "1"
-endian_trait = { version = "0.6", features = [ "arrays" ] }
-futures = "0.3"
-hex = { version = "0.4.3", features = [ "serde" ] }
-lazy_static = "1.4"
-libc = "0.2"
-log = "0.4.17"
-nix = "0.24"
-openssl = "0.10"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-tokio = { version = "1.6", features = [] }
-walkdir = "2"
-zstd = { version = "0.6", features = [ "bindgen" ] }
+anyhow.workspace = true
+base64.workspace = true
+crc32fast.workspace = true
+endian_trait.workspace = true
+futures.workspace = true
+hex = { workspace = true, features = [ "serde" ] }
+lazy_static.workspace = true
+libc.workspace = true
+log.workspace = true
+nix.workspace = true
+openssl.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio = { workspace = true, features = [] }
+walkdir.workspace = true
+zstd.workspace = true
 
 pathpatterns.workspace = true
 pxar.workspace = true
diff --git a/pbs-fuse-loop/Cargo.toml b/pbs-fuse-loop/Cargo.toml
index c45a64694..0cf087fcb 100644
--- a/pbs-fuse-loop/Cargo.toml
+++ b/pbs-fuse-loop/Cargo.toml
@@ -6,14 +6,14 @@ edition.workspace = true
 description = "fuse and loop device helpers"
 
 [dependencies]
-anyhow = "1.0"
-futures = "0.3"
-lazy_static = "1.4"
-libc = "0.2"
-nix = "0.24"
-log = "0.4"
-regex = "1.5"
-tokio = { version = "1.6", features = ["io-util"] }
+anyhow.workspace = true
+futures.workspace = true
+lazy_static.workspace = true
+libc.workspace = true
+nix.workspace = true
+log.workspace = true
+regex.workspace = true
+tokio = { workspace = true, features = ["io-util"] }
 
 proxmox-time.workspace = true
 proxmox-fuse.workspace = true
diff --git a/pbs-pxar-fuse/Cargo.toml b/pbs-pxar-fuse/Cargo.toml
index 10cb05e7f..c350e30ae 100644
--- a/pbs-pxar-fuse/Cargo.toml
+++ b/pbs-pxar-fuse/Cargo.toml
@@ -5,11 +5,11 @@ edition.workspace = true
 description = "pxar fuse file system code"
 
 [dependencies]
-anyhow = "1.0"
-futures = "0.3"
-libc = "0.2"
-log = "0.4"
-tokio = "1.6"
+anyhow.workspace = true
+futures.workspace = true
+libc.workspace = true
+log.workspace = true
+tokio.workspace = true
 
 proxmox-fuse.workspace = true
 proxmox-io.workspace = true
diff --git a/pbs-tape/Cargo.toml b/pbs-tape/Cargo.toml
index 78f3c7c59..409a44431 100644
--- a/pbs-tape/Cargo.toml
+++ b/pbs-tape/Cargo.toml
@@ -6,19 +6,19 @@ edition.workspace = true
 description = "LTO tape support"
 
 [dependencies]
-lazy_static = "1.4"
-libc = "0.2"
-log = "0.4"
-anyhow = "1.0"
-thiserror = "1.0"
-endian_trait = { version = "0.6", features = ["arrays"] }
-hex = "0.4.3"
-nix = "0.24"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-bitflags = "1.2.1"
-regex = "1.5"
-udev = "0.4"
+lazy_static.workspace = true
+libc.workspace = true
+log.workspace = true
+anyhow.workspace = true
+thiserror.workspace = true
+endian_trait.workspace = true
+hex.workspace = true
+nix.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+bitflags.workspace = true
+regex.workspace = true
+udev.workspace = true
 
 proxmox-io.workspace = true
 proxmox-lang.workspace=true
diff --git a/pbs-tools/Cargo.toml b/pbs-tools/Cargo.toml
index 410ea85a4..d583e28d5 100644
--- a/pbs-tools/Cargo.toml
+++ b/pbs-tools/Cargo.toml
@@ -7,32 +7,30 @@ description = "common tools used throughout pbs"
 
 # This must not depend on any subcrates more closely related to pbs itself.
 [dependencies]
-anyhow = "1.0"
-base64 = "0.13"
-bytes = "1.0"
-crc32fast = "1"
-endian_trait = { version = "0.6", features = ["arrays"] }
-flate2 = "1.0"
+anyhow.workspace = true
+base64.workspace = true
+bytes.workspace = true
+crc32fast.workspace = true
+endian_trait.workspace = true
+flate2.workspace = true
 foreign-types = "0.3"
-futures = "0.3"
-hex = "0.4.3"
-lazy_static = "1.4"
-libc = "0.2"
-log = "0.4.17"
-nix = "0.24"
-nom = "7"
-openssl = "0.10"
-percent-encoding = "2.1"
-regex = "1.5"
-serde = "1.0"
-serde_json = "1.0"
+futures.workspace = true
+hex.workspace = true
+lazy_static.workspace = true
+libc.workspace = true
+log.workspace = true
+nix.workspace = true
+nom.workspace = true
+openssl.workspace = true
+percent-encoding.workspace = true
+regex.workspace = true
+serde_json.workspace = true
 # rt-multi-thread is required for block_in_place
-tokio = { version = "1.6", features = [ "fs", "io-util", "rt", "rt-multi-thread", "sync" ] }
-url = "2.1"
-walkdir = "2"
-zstd = { version = "0.6", features = [ "bindgen" ] }
+tokio = { workspace = true, features = [ "fs", "io-util", "rt", "rt-multi-thread", "sync" ] }
+url.workspace = true
+walkdir.workspace = true
+zstd.workspace = true
 
-#proxmox = { version = "0.15.3", default-features = false, features = [ "tokio" ] }
 proxmox-async.workspace = true
 proxmox-io= { workspace = true, features = [ "tokio" ] }
 proxmox-lang.workspace=true
@@ -43,4 +41,4 @@ pbs-buildcfg.workspace = true
 pbs-api-types.workspace = true
 
 [dev-dependencies]
-tokio = { version = "1.6", features = [ "macros" ] }
+tokio = { workspace = true, features = [ "macros" ] }
diff --git a/proxmox-backup-banner/Cargo.toml b/proxmox-backup-banner/Cargo.toml
index df1126242..06008ba24 100644
--- a/proxmox-backup-banner/Cargo.toml
+++ b/proxmox-backup-banner/Cargo.toml
@@ -5,5 +5,5 @@ authors.workspace = true
 edition.workspace = true
 
 [dependencies]
-anyhow = "1"
-nix = "0.24"
+anyhow.workspace = true
+nix.workspace = true
diff --git a/proxmox-backup-client/Cargo.toml b/proxmox-backup-client/Cargo.toml
index 6beab72b0..d5dbb1bdc 100644
--- a/proxmox-backup-client/Cargo.toml
+++ b/proxmox-backup-client/Cargo.toml
@@ -5,20 +5,20 @@ authors.workspace = true
 edition.workspace = true
 
 [dependencies]
-anyhow = "1.0"
-futures = "0.3"
-hyper = { version = "0.14", features = [ "full" ] }
-libc = "0.2"
-log = "0.4"
-nix = "0.24"
-openssl = "0.10"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-tokio = { version = "1.6", features = [ "rt", "rt-multi-thread" ] }
-tokio-stream = "0.1.0"
-tokio-util = { version = "0.7", features = [ "codec", "io" ] }
-xdg = "2.2"
-zstd = { version = "0.6", features = [ "bindgen" ] }
+anyhow.workspace = true
+futures.workspace = true
+hyper.workspace = true
+libc.workspace = true
+log.workspace = true
+nix.workspace = true
+openssl.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio = { workspace = true, features = [ "rt", "rt-multi-thread" ] }
+tokio-stream.workspace = true
+tokio-util = { workspace = true, features = [ "codec" ] }
+xdg.workspace = true
+zstd.workspace = true
 
 pathpatterns.workspace = true
 pxar.workspace = true
diff --git a/proxmox-file-restore/Cargo.toml b/proxmox-file-restore/Cargo.toml
index e61cd82e3..c1975eb85 100644
--- a/proxmox-file-restore/Cargo.toml
+++ b/proxmox-file-restore/Cargo.toml
@@ -5,20 +5,19 @@ authors.workspace = true
 edition.workspace = true
 
 [dependencies]
-anyhow = "1.0"
-base64 = "0.13"
-futures = "0.3"
-libc = "0.2"
-nix = "0.24"
-log = "0.4"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-tokio = { version = "1.6", features = [ "io-std", "rt", "rt-multi-thread", "time" ] }
-tokio-util = { version = "0.7", features = ["io"] }
+anyhow.workspace = true
+base64.workspace = true
+futures.workspace = true
+libc.workspace = true
+nix.workspace = true
+log.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio = { workspace = true, features = [ "io-std", "rt", "rt-multi-thread", "time" ] }
+tokio-util.workspace = true
 
 pxar.workspace = true
 
-#proxmox = { version = "0.15.3" }
 proxmox-async.workspace = true
 proxmox-lang.workspace=true
 proxmox-router = { workspace = true, features = [ "cli" ] }
diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml
index 264be5d28..382c57f16 100644
--- a/proxmox-restore-daemon/Cargo.toml
+++ b/proxmox-restore-daemon/Cargo.toml
@@ -6,22 +6,22 @@ edition.workspace = true
 description = "Proxmox Restore Daemon"
 
 [dependencies]
-anyhow = "1.0"
-base64 = "0.13"
+anyhow.workspace = true
+base64.workspace = true
 env_logger = "0.9"
-futures = "0.3"
-http = "0.2"
-hyper = { version = "0.14", features = [ "full" ] }
-lazy_static = "1.4"
-libc = "0.2"
-log = "0.4.17"
-nix = "0.24"
-regex = "1.5"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-tokio = { version = "1.6", features = ["macros", "parking_lot", "sync"] }
-tokio-stream = "0.1.0"
-tokio-util = { version = "0.7", features = [ "codec", "io" ] }
+futures.workspace = true
+http.workspace = true
+hyper.workspace = true
+lazy_static.workspace = true
+libc.workspace = true
+log.workspace = true
+nix.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio = { workspace = true, features = ["macros", "parking_lot", "sync"] }
+tokio-stream.workspace = true
+tokio-util = { workspace = true, features = [ "codec" ] }
 
 pathpatterns.workspace = true
 pxar.workspace = true
diff --git a/proxmox-rrd/Cargo.toml b/proxmox-rrd/Cargo.toml
index 0955b86f5..b49809fdf 100644
--- a/proxmox-rrd/Cargo.toml
+++ b/proxmox-rrd/Cargo.toml
@@ -10,17 +10,16 @@ description = "Simple RRD database implementation."
 proxmox-router = { workspace = true, features = ["cli", "server"] }
 
 [dependencies]
-anyhow = "1.0"
-bitflags = "1.2.1"
-crossbeam-channel = "0.5"
-libc = "0.2"
-log = "0.4.17"
-nix = "0.24"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+anyhow.workspace = true
+bitflags.workspace = true
+crossbeam-channel.workspace = true
+libc.workspace = true
+log.workspace = true
+nix.workspace = true
+serde.workspace = true
+serde_json.workspace = true
 serde_cbor = "0.11.1"
 
-#proxmox = { version = "0.15.3" }
 proxmox-time.workspace = true
 proxmox-schema = { workspace = true, features = [ "api-macro" ] }
 proxmox-sys.workspace = true
diff --git a/pxar-bin/Cargo.toml b/pxar-bin/Cargo.toml
index 5a687f78a..23e6464e5 100644
--- a/pxar-bin/Cargo.toml
+++ b/pxar-bin/Cargo.toml
@@ -9,12 +9,12 @@ name = "pxar"
 path = "src/main.rs"
 
 [dependencies]
-anyhow = "1.0"
-futures = "0.3"
-nix = "0.24"
-log = "0.4"
-serde_json = "1.0"
-tokio = { version = "1.6", features = [ "rt", "rt-multi-thread" ] }
+anyhow.workspace = true
+futures.workspace = true
+nix.workspace = true
+log.workspace = true
+serde_json.workspace = true
+tokio = { workspace = true, features = [ "rt", "rt-multi-thread" ] }
 
 pathpatterns.workspace = true
 pxar.workspace = true