diff options
author | Janik <80165193+Janik-Haag@users.noreply.github.com> | 2023-07-03 17:00:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-03 17:00:11 +0200 |
commit | a68c8fb273ec457f15db5c895e22e5c5b1692d1b (patch) | |
tree | 158af49050242b4e100ba88563623186c503bb37 | |
parent | de64b63c9a676230ea7a0d6bfa8dc659d2b0524e (diff) | |
parent | ce105275e5c098b2a59664ac876500903c3e24e9 (diff) |
Merge pull request #240559 from christoph-heiss/pkgs/proxmox-backup-client
-rw-r--r-- | pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch (renamed from pkgs/applications/backup/proxmox-backup-client/0003-docs-Add-target-path-fixup-variable.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/backup/proxmox-backup-client/0001-re-route-dependencies-not-available-on-crates.io-to-.patch | 182 | ||||
-rw-r--r-- | pkgs/applications/backup/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch | 72 | ||||
-rw-r--r-- | pkgs/applications/backup/proxmox-backup-client/Cargo.lock | 593 | ||||
-rw-r--r-- | pkgs/applications/backup/proxmox-backup-client/default.nix | 57 |
5 files changed, 335 insertions, 569 deletions
diff --git a/pkgs/applications/backup/proxmox-backup-client/0003-docs-Add-target-path-fixup-variable.patch b/pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch index 1999461ade5a2..1999461ade5a2 100644 --- a/pkgs/applications/backup/proxmox-backup-client/0003-docs-Add-target-path-fixup-variable.patch +++ b/pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch diff --git a/pkgs/applications/backup/proxmox-backup-client/0001-re-route-dependencies-not-available-on-crates.io-to-.patch b/pkgs/applications/backup/proxmox-backup-client/0001-re-route-dependencies-not-available-on-crates.io-to-.patch deleted file mode 100644 index 5f1d234e8c6ab..0000000000000 --- a/pkgs/applications/backup/proxmox-backup-client/0001-re-route-dependencies-not-available-on-crates.io-to-.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thomas Lamprecht <thomas@lamprecht.org> -Date: Wed, 18 May 2022 08:41:14 +0200 -Subject: [PATCH] re-route dependencies not available on crates.io to git repos - -Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org> ---- - Cargo.toml | 130 +++++++++-------------------------------------------- - 1 file changed, 21 insertions(+), 109 deletions(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 0c86cd1b..7d5c282b 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -41,9 +41,6 @@ members = [ - - "proxmox-backup-banner", - "proxmox-backup-client", -- "proxmox-file-restore", -- "proxmox-restore-daemon", -- "proxmox-rrd", - - "pxar-bin", - ] -@@ -101,7 +98,6 @@ proxmox-rrd = { path = "proxmox-rrd" } - - # regular crates - anyhow = "1.0" --apt-pkg-native = "0.3.2" - base64 = "0.13" - bitflags = "1.2.1" - bytes = "1.0" -@@ -114,7 +110,6 @@ flate2 = "1.0" - foreign-types = "0.3" - 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" ] } -@@ -152,120 +147,37 @@ walkdir = "2" - xdg = "2.2" - zstd = { version = "0.6", features = [ "bindgen" ] } - --[dependencies] --anyhow.workspace = true --apt-pkg-native.workspace = true --base64.workspace = true --bitflags.workspace = true --bytes.workspace = true --cidr.workspace = true --crc32fast.workspace = true --crossbeam-channel.workspace = true --endian_trait.workspace = true --flate2.workspace = true --futures.workspace = true --h2.workspace = true --handlebars.workspace = true --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.workspace = true --once_cell.workspace = true --openssl.workspace = true --pam-sys.workspace = true --pam.workspace = true --percent-encoding.workspace = true --regex.workspace = true --rustyline.workspace = true --serde.workspace = true --serde_json.workspace = true --siphasher.workspace = true --syslog.workspace = true --termcolor.workspace = true --thiserror.workspace = true --tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] } --tokio-openssl.workspace = true --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-auth-api = { workspace = true, features = [ "api", "pam-authenticator" ] } --proxmox-compression.workspace = true --proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async", "rate-limited-stream" ] } # pbs-client doesn't use these --proxmox-io.workspace = true --proxmox-lang.workspace = true --proxmox-ldap.workspace = true --proxmox-metrics.workspace = true --proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] } --proxmox-router = { workspace = true, features = [ "cli", "server"] } --proxmox-schema = { workspace = true, features = [ "api-macro" ] } --proxmox-section-config.workspace = true --proxmox-serde = { workspace = true, features = [ "serde_json" ] } --proxmox-shared-memory.workspace = true --proxmox-sortable-macro.workspace = true --proxmox-subscription.workspace = true --proxmox-sys = { workspace = true, features = [ "timer" ] } --proxmox-tfa.workspace = true --proxmox-time.workspace = true --proxmox-uuid.workspace = true -- --pathpatterns.workspace = true --proxmox-acme-rs.workspace = true --proxmox-apt.workspace = true --proxmox-openid.workspace = true --pxar.workspace = true -- --pbs-api-types.workspace = true --pbs-buildcfg.workspace = true --pbs-client.workspace = true --pbs-config.workspace = true --pbs-datastore.workspace = true --pbs-key-config.workspace = true --pbs-tape.workspace = true --pbs-tools.workspace = true --proxmox-rrd.workspace = true -- - # Local path overrides - # NOTE: You must run `cargo update` after changing this for it to take effect! - [patch.crates-io] - #proxmox-acme-rs = { path = "../proxmox-acme-rs" } --#proxmox-async = { path = "../proxmox/proxmox-async" } --#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" } --#proxmox-borrow = { path = "../proxmox/proxmox-borrow" } --#proxmox-compression = { path = "../proxmox/proxmox-compression" } --#proxmox-fuse = { path = "../proxmox-fuse" } --#proxmox-http = { path = "../proxmox/proxmox-http" } --#proxmox-io = { path = "../proxmox/proxmox-io" } --#proxmox-lang = { path = "../proxmox/proxmox-lang" } --#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" } --#proxmox-router = { path = "../proxmox/proxmox-router" } --#proxmox-schema = { path = "../proxmox/proxmox-schema" } --#proxmox-section-config = { path = "../proxmox/proxmox-section-config" } --#proxmox-serde = { path = "../proxmox/proxmox-serde" } --#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" } --#proxmox-subscription = { path = "../proxmox/proxmox-subscription" } --#proxmox-sys = { path = "../proxmox/proxmox-sys" } --#proxmox-tfa = { path = "../proxmox/proxmox-tfa" } --#proxmox-time = { path = "../proxmox/proxmox-time" } --#proxmox-uuid = { path = "../proxmox/proxmox-uuid" } -+proxmox-async = { path = "../proxmox/proxmox-async" } -+proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" } -+proxmox-borrow = { path = "../proxmox/proxmox-borrow" } -+proxmox-compression = { path = "../proxmox/proxmox-compression" } -+proxmox-fuse = { path = "../proxmox-fuse" } -+proxmox-http = { path = "../proxmox/proxmox-http" } -+proxmox-io = { path = "../proxmox/proxmox-io" } -+proxmox-lang = { path = "../proxmox/proxmox-lang" } -+proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" } -+proxmox-router = { path = "../proxmox/proxmox-router" } -+proxmox-schema = { path = "../proxmox/proxmox-schema" } -+proxmox-section-config = { path = "../proxmox/proxmox-section-config" } -+proxmox-serde = { path = "../proxmox/proxmox-serde" } -+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" } -+proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" } -+proxmox-subscription = { path = "../proxmox/proxmox-subscription" } -+proxmox-sys = { path = "../proxmox/proxmox-sys" } -+proxmox-tfa = { path = "../proxmox/proxmox-tfa" } -+proxmox-time = { path = "../proxmox/proxmox-time" } -+proxmox-uuid = { path = "../proxmox/proxmox-uuid" } - - #proxmox-apt = { path = "../proxmox-apt" } - #proxmox-openid = { path = "../proxmox-openid-rs" } - --#pxar = { path = "../pxar" } -+pxar = { path = "../pxar" } - - [features] - default = [] diff --git a/pkgs/applications/backup/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch b/pkgs/applications/backup/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch deleted file mode 100644 index da83e14988cdd..0000000000000 --- a/pkgs/applications/backup/proxmox-backup-client/0002-docs-drop-all-but-client-man-pages.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thomas Lamprecht <thomas@lamprecht.org> -Date: Tue, 29 Nov 2022 17:20:28 +0100 -Subject: [PATCH] docs: drop all but client man pages - -Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org> ---- - docs/Makefile | 16 ---------------- - docs/conf.py | 19 ------------------- - 2 files changed, 35 deletions(-) - -diff --git a/docs/Makefile b/docs/Makefile -index b06badff..94130228 100644 ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -1,25 +1,9 @@ - include ../defines.mk - - GENERATED_SYNOPSIS := \ -- proxmox-tape/synopsis.rst \ - proxmox-backup-client/synopsis.rst \ - proxmox-backup-client/catalog-shell-synopsis.rst \ -- proxmox-backup-manager/synopsis.rst \ -- proxmox-backup-debug/synopsis.rst \ -- proxmox-file-restore/synopsis.rst \ - pxar/synopsis.rst \ -- pmtx/synopsis.rst \ -- pmt/synopsis.rst \ -- config/media-pool/config.rst \ -- config/tape/config.rst \ -- config/tape-job/config.rst \ -- config/user/config.rst \ -- config/remote/config.rst \ -- config/sync/config.rst \ -- config/verification/config.rst \ -- config/acl/roles.rst \ -- config/datastore/config.rst \ -- config/domains/config.rst - - MAN1_PAGES := \ - pxar.1 \ -diff --git a/docs/conf.py b/docs/conf.py -index 8944926e..deeb63bf 100644 ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -93,26 +93,7 @@ rst_epilog += f"\n.. |pbs-copyright| replace:: Copyright (C) {copyright}" - man_pages = [ - # CLI - ('proxmox-backup-client/man1', 'proxmox-backup-client', 'Command line tool for Backup and Restore', [author], 1), -- ('proxmox-backup-manager/man1', 'proxmox-backup-manager', 'Command line tool to manage and configure the backup server.', [author], 1), -- ('proxmox-backup-debug/man1', 'proxmox-backup-debug', 'Debugging command line tool for Backup and Restore', [author], 1), -- ('proxmox-backup-proxy/man1', 'proxmox-backup-proxy', 'Proxmox Backup Public API Server', [author], 1), -- ('proxmox-backup/man1', 'proxmox-backup', 'Proxmox Backup Local API Server', [author], 1), -- ('proxmox-file-restore/man1', 'proxmox-file-restore', 'CLI tool for restoring files and directories from Proxmox Backup Server archives', [author], 1), -- ('proxmox-tape/man1', 'proxmox-tape', 'Proxmox Tape Backup CLI Tool', [author], 1), - ('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1), -- ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1), -- ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1), -- # configs -- ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5), -- ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5), -- ('config/domains/man5', 'domains.cfg', 'Realm Configuration', [author], 5), -- ('config/media-pool/man5', 'media-pool.cfg', 'Media Pool Configuration', [author], 5), -- ('config/remote/man5', 'remote.cfg', 'Remote Server Configuration', [author], 5), -- ('config/sync/man5', 'sync.cfg', 'Synchronization Job Configuration', [author], 5), -- ('config/tape-job/man5', 'tape-job.cfg', 'Tape Job Configuration', [author], 5), -- ('config/tape/man5', 'tape.cfg', 'Tape Drive and Changer Configuration', [author], 5), -- ('config/user/man5', 'user.cfg', 'User Configuration', [author], 5), -- ('config/verification/man5', 'verification.cfg', 'Verification Job Configuration', [author], 5), - ] - - diff --git a/pkgs/applications/backup/proxmox-backup-client/Cargo.lock b/pkgs/applications/backup/proxmox-backup-client/Cargo.lock index bd178094e6cea..38d5f82f1c381 100644 --- a/pkgs/applications/backup/proxmox-backup-client/Cargo.lock +++ b/pkgs/applications/backup/proxmox-backup-client/Cargo.lock @@ -3,6 +3,15 @@ version = 3 [[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -21,27 +30,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "atty" @@ -61,6 +61,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.6.2", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -68,24 +83,22 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bindgen" -version = "0.57.0" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ "bitflags", "cexpr", "clang-sys", - "clap", - "env_logger 0.8.4", "lazy_static", "lazycell", - "log", "peeking_take_while", - "proc-macro2 1.0.54", - "quote 1.0.26", + "proc-macro2 1.0.63", + "quote 1.0.29", "regex", "rustc-hash", "shlex", + "syn 1.0.109", "which", ] @@ -97,9 +110,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytes" @@ -118,11 +131,11 @@ dependencies = [ [[package]] name = "cexpr" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom 5.1.2", + "nom", ] [[package]] @@ -133,9 +146,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -143,21 +156,6 @@ dependencies = [ ] [[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] name = "clipboard-win" version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -178,15 +176,6 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] name = "dirs-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -197,17 +186,6 @@ dependencies = [ ] [[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] name = "dirs-sys-next" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -219,6 +197,12 @@ dependencies = [ ] [[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] name = "endian-type" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -245,19 +229,6 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" @@ -271,9 +242,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", @@ -302,9 +273,9 @@ dependencies = [ [[package]] name = "fd-lock" -version = "3.0.11" +version = "3.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9799aefb4a2e4a01cc47610b1dd47c18ab13d991f27bbcaed9296f5a53d5cbad" +checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" dependencies = [ "cfg-if", "rustix", @@ -313,9 +284,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", @@ -325,12 +296,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -356,18 +327,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -380,9 +351,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -390,15 +361,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -407,38 +378,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.54", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.63", + "quote 1.0.29", + "syn 2.0.22", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -454,9 +425,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -464,6 +435,12 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -471,9 +448,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.16" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -508,15 +485,6 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" @@ -531,6 +499,15 @@ dependencies = [ ] [[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + +[[package]] name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -572,9 +549,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -596,9 +573,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -616,9 +593,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -642,9 +619,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -663,9 +640,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" @@ -689,18 +666,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.0" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "memchr" @@ -742,13 +716,21 @@ dependencies = [ ] [[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi", "windows-sys", ] @@ -791,16 +773,6 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - -[[package]] -name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" @@ -811,25 +783,34 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "libc", ] [[package]] +name = "object" +version = "0.30.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.48" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags", "cfg-if", @@ -842,22 +823,21 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.54", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.63", + "quote 1.0.29", + "syn 2.0.22", ] [[package]] name = "openssl-sys" -version = "0.9.83" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -883,6 +863,7 @@ dependencies = [ "lazy_static", "percent-encoding", "proxmox-auth-api", + "proxmox-human-byte", "proxmox-lang", "proxmox-schema", "proxmox-serde", @@ -895,7 +876,7 @@ dependencies = [ [[package]] name = "pbs-buildcfg" -version = "2.4.1" +version = "3.0.1" [[package]] name = "pbs-client" @@ -925,6 +906,7 @@ dependencies = [ "proxmox-auth-api", "proxmox-compression", "proxmox-http", + "proxmox-human-byte", "proxmox-io", "proxmox-lang", "proxmox-router", @@ -989,6 +971,7 @@ dependencies = [ "pbs-key-config", "pbs-tools", "proxmox-borrow", + "proxmox-human-byte", "proxmox-io", "proxmox-lang", "proxmox-schema", @@ -1099,11 +1082,12 @@ dependencies = [ "libc", "log", "nix 0.26.2", - "nom 7.1.3", + "nom", "openssl", "pbs-api-types", "pbs-buildcfg", "proxmox-async", + "proxmox-human-byte", "proxmox-io", "proxmox-lang", "proxmox-sys", @@ -1124,9 +1108,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" @@ -1142,9 +1126,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro2" @@ -1157,9 +1141,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -1169,8 +1153,8 @@ name = "proxmox-api-macro" version = "1.0.4" dependencies = [ "anyhow", - "proc-macro2 1.0.54", - "quote 1.0.26", + "proc-macro2 1.0.63", + "quote 1.0.29", "syn 1.0.109", ] @@ -1189,7 +1173,7 @@ dependencies = [ [[package]] name = "proxmox-auth-api" -version = "0.1.0" +version = "0.3.0" dependencies = [ "anyhow", "lazy_static", @@ -1201,7 +1185,7 @@ dependencies = [ [[package]] name = "proxmox-backup" -version = "2.4.1" +version = "3.0.1" [[package]] name = "proxmox-backup-banner" @@ -1234,6 +1218,7 @@ dependencies = [ "pbs-tools", "proxmox-async", "proxmox-fuse", + "proxmox-human-byte", "proxmox-io", "proxmox-router", "proxmox-schema", @@ -1256,7 +1241,7 @@ version = "1.0.1" [[package]] name = "proxmox-compression" -version = "0.1.2" +version = "0.2.1" dependencies = [ "anyhow", "bytes", @@ -1287,7 +1272,7 @@ dependencies = [ [[package]] name = "proxmox-http" -version = "0.8.0" +version = "0.9.0" dependencies = [ "anyhow", "base64", @@ -1305,6 +1290,16 @@ dependencies = [ ] [[package]] +name = "proxmox-human-byte" +version = "0.1.0" +dependencies = [ + "anyhow", + "proxmox-schema", + "proxmox-serde", + "serde", +] + +[[package]] name = "proxmox-io" version = "1.0.1" dependencies = [ @@ -1321,7 +1316,7 @@ name = "proxmox-router" version = "1.3.1" dependencies = [ "anyhow", - "env_logger 0.9.3", + "env_logger", "http", "hyper", "libc", @@ -1347,7 +1342,7 @@ dependencies = [ "regex", "serde", "serde_json", - "textwrap 0.16.0", + "textwrap", ] [[package]] @@ -1375,7 +1370,7 @@ dependencies = [ [[package]] name = "proxmox-shared-memory" -version = "0.2.3" +version = "0.3.0" dependencies = [ "anyhow", "libc", @@ -1387,14 +1382,14 @@ dependencies = [ name = "proxmox-sortable-macro" version = "0.1.2" dependencies = [ - "proc-macro2 1.0.54", - "quote 1.0.26", + "proc-macro2 1.0.63", + "quote 1.0.29", "syn 1.0.109", ] [[package]] name = "proxmox-sys" -version = "0.4.2" +version = "0.5.0" dependencies = [ "anyhow", "base64", @@ -1419,7 +1414,7 @@ dependencies = [ "js-sys", "lazy_static", "libc", - "nom 7.1.3", + "nom", ] [[package]] @@ -1474,11 +1469,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ - "proc-macro2 1.0.54", + "proc-macro2 1.0.63", ] [[package]] @@ -1513,9 +1508,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", @@ -1524,9 +1519,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -1536,9 +1537,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.4" +version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c348b5dc624ecee40108aa2922fed8bad89d7fcc2b9f8cb18f632898ac4a37f9" +checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ "bitflags", "errno", @@ -1595,29 +1596,29 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ - "proc-macro2 1.0.54", - "quote 1.0.26", - "syn 2.0.11", + "proc-macro2 1.0.63", + "quote 1.0.29", + "syn 2.0.22", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", @@ -1635,9 +1636,9 @@ dependencies = [ [[package]] name = "shlex" -version = "0.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook-registry" @@ -1698,12 +1699,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" [[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] name = "syn" version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1720,19 +1715,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.54", - "quote 1.0.26", + "proc-macro2 1.0.63", + "quote 1.0.29", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.11" +version = "2.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" dependencies = [ - "proc-macro2 1.0.54", - "quote 1.0.26", + "proc-macro2 1.0.63", + "quote 1.0.29", "unicode-ident", ] @@ -1758,15 +1753,6 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" @@ -1791,9 +1777,9 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2 1.0.54", - "quote 1.0.26", - "syn 2.0.11", + "proc-macro2 1.0.63", + "quote 1.0.29", + "syn 2.0.22", ] [[package]] @@ -1813,11 +1799,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "374442f06ee49c3a28a8fc9f01a2596fed7559c6b99b31279c3261778e77d84f" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -1831,13 +1818,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.54", - "quote 1.0.26", - "syn 2.0.11", + "proc-macro2 1.0.63", + "quote 1.0.29", + "syn 2.0.22", ] [[package]] @@ -1854,9 +1841,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -1865,9 +1852,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -1896,9 +1883,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -1927,9 +1914,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-linebreak" @@ -1970,9 +1957,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -1992,12 +1979,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2015,11 +1996,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -2031,9 +2011,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2041,55 +2021,57 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.54", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.63", + "quote 1.0.29", + "syn 2.0.22", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.26", + "quote 1.0.29", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.54", - "quote 1.0.26", - "syn 1.0.109", + "proc-macro2 1.0.63", + "quote 1.0.29", + "syn 2.0.22", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "which" -version = "3.1.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ + "either", "libc", + "once_cell", ] [[package]] @@ -2125,18 +2107,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -2149,45 +2131,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "xattr" @@ -2200,27 +2182,27 @@ dependencies = [ [[package]] name = "xdg" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" +checksum = "688597db5a750e9cad4511cb94729a078e274308099a0382b5b8203bbc767fee" dependencies = [ - "dirs", + "home", ] [[package]] name = "zstd" -version = "0.6.1+zstd.1.4.9" +version = "0.12.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3" +checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "3.0.1+zstd.1.4.9" +version = "6.0.5+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" dependencies = [ "libc", "zstd-sys", @@ -2228,23 +2210,24 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.20+zstd.1.4.9" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "bindgen", "cc", "libc", + "pkg-config", ] [[patch.unused]] name = "proxmox-rest-server" -version = "0.3.0" +version = "0.4.1" [[patch.unused]] name = "proxmox-subscription" -version = "0.3.1" +version = "0.4.0" [[patch.unused]] name = "proxmox-tfa" -version = "3.0.0" +version = "4.0.3" diff --git a/pkgs/applications/backup/proxmox-backup-client/default.nix b/pkgs/applications/backup/proxmox-backup-client/default.nix index 48d4c626eafaa..ad8f6f0f99755 100644 --- a/pkgs/applications/backup/proxmox-backup-client/default.nix +++ b/pkgs/applications/backup/proxmox-backup-client/default.nix @@ -1,24 +1,37 @@ -{ - lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl, - libxcrypt, git, installShellFiles, sphinx, stdenv, +{ lib, + fetchgit, + rustPlatform, + pkg-config, + openssl, + fuse3, + libuuid, + acl, + libxcrypt, + git, + installShellFiles, + sphinx, + stdenv, + fetchpatch, + testers, + proxmox-backup-client, }: rustPlatform.buildRustPackage rec { pname = "proxmox-backup-client"; - version = "2.4.1"; + version = "3.0.1"; srcs = [ (fetchgit { url = "git://git.proxmox.com/git/proxmox-backup.git"; rev = "v${version}"; name = "proxmox-backup"; - hash = "sha256-DWzNRi675ZP9HGc/uPvnV/FBTJUNZ4K5RtU9NFRQCcA="; + hash = "sha256-a6dPBZBBh//iANXoPmOdgxYO0qNszOYI3QtrjQr4Cxc="; }) (fetchgit { url = "git://git.proxmox.com/git/proxmox.git"; - rev = "5df815f660e4f3793e974eb8130224538350bb12"; + rev = "2a070da0651677411a245f1714895235b1caf584"; name = "proxmox"; - hash = "sha256-Vn1poqkIWcR2rNiAr+ENLNthgk3pMCivzXnUX9hvZBw="; + hash = "sha256-WH6oW2MB2yN1Y2zqOuXewI9jHqev/xLcJtb7D1J4aUE="; }) (fetchgit { url = "git://git.proxmox.com/git/proxmox-fuse.git"; @@ -36,10 +49,28 @@ rustPlatform.buildRustPackage rec { sourceRoot = "proxmox-backup"; + # These patches are essentially un-upstreamable, due to being "workarounds" related to the + # project structure. cargoPatches = [ - ./0001-re-route-dependencies-not-available-on-crates.io-to-.patch - ./0002-docs-drop-all-but-client-man-pages.patch - ./0003-docs-Add-target-path-fixup-variable.patch + # A lot of Rust crates `proxmox-backup-client` depends on are only available through git (or + # Debian packages). This patch redirects all these dependencies to a local, relative path, which + # works in combination with the other three repos being checked out. + (fetchpatch { + name = "0001-re-route-dependencies-not-available-on-crates.io-to-.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-re-route-dependencies-not-available-on-crates.io-to-.patch?h=proxmox-backup-client&id=83a1f4dfcb04bd181b11954b1d9f5ddfcb72b3d0"; + hash = "sha256-2YZtjbpYSbRk6rmpjKJeIO+V0YN5PrKsISONXMj4RG0="; + }) + # This patch prevents the generation of the man-pages for other components inside the repo, + # which would require them too be built too. Thus avoid wasting resources and just skip them. + (fetchpatch { + name = "0002-docs-drop-all-but-client-man-pages.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-docs-drop-all-but-client-man-pages.patch?h=proxmox-backup-client&id=83a1f4dfcb04bd181b11954b1d9f5ddfcb72b3d0"; + hash = "sha256-oJKQs4SwJvX5Zd0/l/vVr66aPO7Y4AC8byJHg9t1IhY="; + }) + # `make docs` assumes that the binaries are located under `target/{debug,release}`, but due + # to how `buildRustPackage` works, they get put under `target/$RUSTC_TARGET/{debug,release}`. + # This patch simply fixes that up. + ./0001-docs-Add-target-path-fixup-variable.patch ]; postPatch = '' @@ -84,9 +115,15 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ git pkg-config rustPlatform.bindgenHook installShellFiles sphinx ]; buildInputs = [ openssl fuse3 libuuid acl libxcrypt ]; + passthru.tests.version = testers.testVersion { + package = proxmox-backup-client; + command = "${pname} version"; + }; + meta = with lib; { description = "The command line client for Proxmox Backup Server"; homepage = "https://pbs.proxmox.com/docs/backup-client.html"; + changelog = "https://git.proxmox.com/?p=proxmox-backup.git;a=blob;f=debian/changelog;hb=refs/tags/v${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ cofob christoph-heiss ]; platforms = platforms.linux; |