From 68564034b3beea73b9a2682884a9826d3f51294d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 4 Sep 2024 10:13:13 +0200 Subject: [PATCH] update to current PBS master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- Cargo.toml | 3 ++- debian/control | 20 +++++++++++--------- submodules/proxmox-backup-qemu | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0522902..cd13426 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" anyhow = "1.0" bincode = "1.3" hyper = "0.14.5" -pico-args = "0.4" +pico-args = "0.5" md5 = "0.7.0" scopeguard = "1.1.0" serde = "1.0" @@ -22,6 +22,7 @@ proxmox-time = "2" pbs-api-types = { path = "submodules/proxmox-backup-qemu/submodules/proxmox-backup/pbs-api-types" } pbs-client = { path = "submodules/proxmox-backup-qemu/submodules/proxmox-backup/pbs-client" } +pbs-config = { path = "submodules/proxmox-backup-qemu/submodules/proxmox-backup/pbs-config" } pbs-datastore = { path = "submodules/proxmox-backup-qemu/submodules/proxmox-backup/pbs-datastore" } pbs-key-config = { path = "submodules/proxmox-backup-qemu/submodules/proxmox-backup/pbs-key-config" } pbs-tools = { path = "submodules/proxmox-backup-qemu/submodules/proxmox-backup/pbs-tools" } diff --git a/debian/control b/debian/control index 49f2575..5bbd379 100644 --- a/debian/control +++ b/debian/control @@ -8,23 +8,22 @@ Build-Depends: cargo:native (>= 0.65.0~), librust-anyhow-1+default-dev, librust-base64-0.13+default-dev, librust-bincode-1+default-dev (>= 1.3-~~), - librust-bitflags-1+default-dev (>= 1.2.1-~~), + librust-bitflags-2+default-dev (>= 2.4-~~), librust-bytes-1+default-dev, librust-cbindgen-0.26+default-dev, librust-const-format-0.2+default-dev, librust-crc32fast-1+default-dev, librust-endian-trait-0.6+arrays-dev, librust-endian-trait-0.6+default-dev, - librust-flate2-1+default-dev, librust-foreign-types-0.3+default-dev, librust-futures-0.3+default-dev, - librust-h2-0.3+default-dev, - librust-h2-0.3+stream-dev, + librust-h2-0.4+default-dev, + librust-h2-0.4+stream-dev, librust-hex-0.4+default-dev (>= 0.4.3-~~), librust-hex-0.4+serde-dev (>= 0.4.3-~~), librust-http-0.2+default-dev, - librust-hyper-0.14+default-dev, - librust-hyper-0.14+full-dev, + librust-hyper-0.14+default-dev (>= 0.14.5-~~), + librust-hyper-0.14+full-dev (>= 0.14.5-~~), librust-lazy-static-1+default-dev (>= 1.4-~~), librust-libc-0.2+default-dev, librust-log-0.4+default-dev (>= 0.4.17-~~), @@ -35,8 +34,9 @@ Build-Depends: cargo:native (>= 0.65.0~), librust-openssl-0.10+default-dev (>= 0.10.40-~~), librust-pathpatterns-0.3+default-dev, librust-percent-encoding-2+default-dev (>= 2.1-~~), - librust-pico-args-0.4+default-dev, + librust-pico-args-0.5+default-dev, librust-pin-project-lite-0.2+default-dev, + librust-proxmox-apt-api-types-1+default-dev (>= 1.0.1-~~), librust-proxmox-async-0.4+default-dev, librust-proxmox-auth-api-0.4+api-types-dev, librust-proxmox-auth-api-0.4+default-dev, @@ -51,8 +51,8 @@ Build-Depends: cargo:native (>= 0.65.0~), librust-proxmox-io-1+default-dev (>= 1.0.1-~~), librust-proxmox-io-1+tokio-dev (>= 1.0.1-~~), librust-proxmox-lang-1+default-dev (>= 1.1-~~), + librust-proxmox-notify-0.4+default-dev, librust-proxmox-router-2+cli-dev, - librust-proxmox-router-2+default-dev, librust-proxmox-router-2+server-dev, librust-proxmox-schema-3+api-macro-dev, librust-proxmox-schema-3+default-dev, @@ -68,6 +68,7 @@ Build-Depends: cargo:native (>= 0.65.0~), librust-proxmox-time-2+default-dev, librust-proxmox-uuid-1+default-dev, librust-proxmox-uuid-1+serde-dev, + librust-proxmox-worker-task-0.1+default-dev, librust-pxar-0.12+default-dev, librust-regex-1+default-dev (>= 1.5.5-~~), librust-rustyline-9+default-dev, @@ -90,11 +91,12 @@ Build-Depends: cargo:native (>= 0.65.0~), librust-tokio-1+time-dev (>= 1.6-~~), librust-tokio-stream-0.1+default-dev (>= 0.1.1-~~), librust-tower-service-0.3+default-dev, - librust-url-2+default-dev (>= 2.1-~~), + librust-tracing-0.1+default-dev, librust-walkdir-2+default-dev, librust-xdg-2+default-dev (>= 2.2-~~), librust-zstd-0.12+bindgen-dev, librust-zstd-0.12+default-dev, + librust-zstd-safe-6+default-dev, libstd-rust-dev, rustc:native, Maintainer: Proxmox Support Team diff --git a/submodules/proxmox-backup-qemu b/submodules/proxmox-backup-qemu index 50ecd20..0088d34 160000 --- a/submodules/proxmox-backup-qemu +++ b/submodules/proxmox-backup-qemu @@ -1 +1 @@ -Subproject commit 50ecd20e81354170c24c69bb8d1a936b443dbcca +Subproject commit 0088d34542f9254d3a88d4d6cd277ba783864e15