From 4d90c957b54185faff91419a94316712ffeb3fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 12 Dec 2022 13:05:36 +0100 Subject: [PATCH] update to current PBS head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to reduce transitive dependencies pulled in by pbs-config, like proxmox-metrics Signed-off-by: Fabian Grünbichler --- Cargo.toml | 14 +++++++------- debian/control | 38 ++++++++++++++++++-------------------- src/backup.rs | 2 +- src/restore.rs | 2 +- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d047eb5..b56f073 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ build = "build.rs" crate-type = ['lib', 'cdylib', 'staticlib'] [build-dependencies] -cbindgen = "0.20.0" +cbindgen = "0.24.0" [dependencies] anyhow = "1.0" @@ -32,13 +32,13 @@ openssl = "0.10" proxmox-async = "0.4" proxmox-lang = "1" proxmox-schema = { version = "1", features = [ "api-macro" ] } -proxmox-sys = { version = "0.2", features = [ "sortable-macro"] } +proxmox-sys = { version = "0.4", features = [ "sortable-macro"] } -pbs-api-types = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "bc21ade293fa7af096ad21fce54fda1e9814993c" } -pbs-tools = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "bc21ade293fa7af096ad21fce54fda1e9814993c" } -pbs-config = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "bc21ade293fa7af096ad21fce54fda1e9814993c" } -pbs-datastore = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "bc21ade293fa7af096ad21fce54fda1e9814993c" } -pbs-client = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "bc21ade293fa7af096ad21fce54fda1e9814993c" } +pbs-api-types = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "8ebb984fbe2756392d438cc85b31f894829db06c" } +pbs-client = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "8ebb984fbe2756392d438cc85b31f894829db06c" } +pbs-datastore = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "8ebb984fbe2756392d438cc85b31f894829db06c" } +pbs-key-config = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "8ebb984fbe2756392d438cc85b31f894829db06c" } +pbs-tools = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "8ebb984fbe2756392d438cc85b31f894829db06c" } serde_json = "1.0" tokio = { version = "1.6", features = [ "fs", "io-util", "macros", "net", "rt-multi-thread", "signal", "time" ] } diff --git a/debian/control b/debian/control index f943551..640b592 100644 --- a/debian/control +++ b/debian/control @@ -24,41 +24,39 @@ Build-Depends: cbindgen, librust-hyper-0.14+full-dev, librust-lazy-static-1+default-dev (>= 1.4-~~), librust-libc-0.2+default-dev, - librust-log-0.4+default-dev, - librust-nix-0.19+default-dev (>= 0.19.1-~~), - librust-nom-5+default-dev (>= 5.1-~~), + librust-log-0.4+default-dev (>= 0.4.17-~~), + librust-nix-0.24+default-dev, + librust-nom-7+default-dev, librust-once-cell-1+default-dev (>= 1.5-~~), - librust-openssl-0.10+default-dev, + librust-openssl-0.10+default-dev (>= 0.10.40-~~), librust-pathpatterns-0.1+default-dev (>= 0.1.2-~~), librust-percent-encoding-2+default-dev (>= 2.1-~~), librust-pin-project-lite-0.2+default-dev, librust-proxmox-async-0.4+default-dev, librust-proxmox-borrow-1+default-dev, librust-proxmox-compression-0.1+default-dev (>= 0.1.1-~~), - librust-proxmox-fuse-0.1+default-dev (>= 0.1.1-~~), - librust-proxmox-http-0.6+client-dev, - librust-proxmox-http-0.6+default-dev, - librust-proxmox-http-0.6+http-helpers-dev, - librust-proxmox-http-0.6+websocket-dev, + librust-proxmox-http-0.7+client-dev, + librust-proxmox-http-0.7+default-dev, + librust-proxmox-http-0.7+http-helpers-dev, + librust-proxmox-http-0.7+websocket-dev, 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-router-1+cli-dev (>= 1.2-~~), - librust-proxmox-router-1+default-dev (>= 1.2-~~), + librust-proxmox-router-1+cli-dev (>= 1.3-~~), + librust-proxmox-router-1+default-dev (>= 1.3-~~), + librust-proxmox-router-1+server-dev (>= 1.3-~~), librust-proxmox-schema-1+api-macro-dev (>= 1.3.1-~~), librust-proxmox-schema-1+default-dev (>= 1.3.1-~~), - librust-proxmox-section-config-1+default-dev, - librust-proxmox-serde-0.1+default-dev, - librust-proxmox-shared-memory-0.2+default-dev, - librust-proxmox-sys-0.2+default-dev, - librust-proxmox-sys-0.2+sortable-macro-dev, - librust-proxmox-time-1+default-dev (>= 1.1.1-~~), + librust-proxmox-serde-0.1+default-dev (>= 0.1.1-~~), + librust-proxmox-serde-0.1+serde-json-dev (>= 0.1.1-~~), + librust-proxmox-sys-0.4+default-dev (>= 0.4.1-~~), + librust-proxmox-sys-0.4+sortable-macro-dev (>= 0.4.1-~~), + librust-proxmox-time-1+default-dev (>= 1.1.2-~~), librust-proxmox-uuid-1+default-dev, librust-proxmox-uuid-1+serde-dev, - librust-pxar-0.10+default-dev (>= 0.10.1-~~), - librust-pxar-0.10+tokio-io-dev (>= 0.10.1-~~), + librust-pxar-0.10+default-dev (>= 0.10.2-~~), librust-regex-1+default-dev (>= 1.5.5-~~), - librust-rustyline-7+default-dev, + librust-rustyline-9+default-dev, librust-serde-1+default-dev, librust-serde-1+derive-dev, librust-serde-json-1+default-dev, diff --git a/src/backup.rs b/src/backup.rs index 89b4d93..bbe4f00 100644 --- a/src/backup.rs +++ b/src/backup.rs @@ -12,8 +12,8 @@ use proxmox_sys::fs::file_get_contents; use pbs_api_types::{BackupType, CryptMode}; use pbs_client::{BackupWriter, HttpClient, HttpClientOptions}; -use pbs_config::key_config::{load_and_decrypt_key, rsa_encrypt_key_config, KeyConfig}; use pbs_datastore::BackupManifest; +use pbs_key_config::{load_and_decrypt_key, rsa_encrypt_key_config, KeyConfig}; use pbs_tools::crypt_config::CryptConfig; use super::BackupSetup; diff --git a/src/restore.rs b/src/restore.rs index 1cb7e98..ba6f00f 100644 --- a/src/restore.rs +++ b/src/restore.rs @@ -8,13 +8,13 @@ use tokio::runtime::Runtime; use proxmox_async::runtime::get_runtime_with_builder; use pbs_client::{BackupReader, HttpClient, HttpClientOptions, RemoteChunkReader}; -use pbs_config::key_config::load_and_decrypt_key; use pbs_datastore::cached_chunk_reader::CachedChunkReader; use pbs_datastore::data_blob::DataChunkBuilder; use pbs_datastore::fixed_index::FixedIndexReader; use pbs_datastore::index::IndexFile; use pbs_datastore::read_chunk::ReadChunk; use pbs_datastore::BackupManifest; +use pbs_key_config::load_and_decrypt_key; use pbs_tools::crypt_config::CryptConfig; use super::BackupSetup;