From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 518F5EC33 for ; Mon, 12 Dec 2022 14:41:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3199C5349 for ; Mon, 12 Dec 2022 14:41:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 12 Dec 2022 14:41:36 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1DA2C43614 for ; Mon, 12 Dec 2022 14:41:36 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 12 Dec 2022 14:41:29 +0100 Message-Id: <20221212134129.2125759-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221212120541.1909975-2-f.gruenbichler@proxmox.com> References: <20221212120541.1909975-2-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LOTSOFHASH 0.25 Emails with lots of hash-like gibberish SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH FIXUP proxmox-backup-qemu] fixup: update to current PBS head X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2022 13:41:37 -0000 to reduce transitive dependencies pulled in by pbs-config, like proxmox-metrics Signed-off-by: Fabian Grünbichler --- turns out Wolfgang already had a WIP "split pbs-config" patch lying around, squashing this into the "update dependencies" patch allows us to get rid of the unneeded transitive dependencies and unused parts of pbs-config. Cargo.toml | 10 +++++----- debian/control | 6 ------ src/backup.rs | 2 +- src/restore.rs | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f6841be..b56f073 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,11 +34,11 @@ proxmox-lang = "1" proxmox-schema = { version = "1", features = [ "api-macro" ] } proxmox-sys = { version = "0.4", features = [ "sortable-macro"] } -pbs-api-types = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "v2.3.1" } -pbs-tools = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "v2.3.1" } -pbs-config = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "v2.3.1" } -pbs-datastore = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "v2.3.1" } -pbs-client = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "v2.3.1" } +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 3627ea9..640b592 100644 --- a/debian/control +++ b/debian/control @@ -42,21 +42,15 @@ Build-Depends: cbindgen, 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-metrics-0.2+default-dev, 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 (>= 0.1.1-~~), librust-proxmox-serde-0.1+serde-json-dev (>= 0.1.1-~~), - librust-proxmox-shared-memory-0.2+default-dev, - librust-proxmox-sys-0.4+acl-dev (>= 0.4.1-~~), - librust-proxmox-sys-0.4+crypt-dev (>= 0.4.1-~~), librust-proxmox-sys-0.4+default-dev (>= 0.4.1-~~), librust-proxmox-sys-0.4+sortable-macro-dev (>= 0.4.1-~~), - librust-proxmox-sys-0.4+timer-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, 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; -- 2.30.2