[pbs-devel] [PATCH FIXUP proxmox-backup-qemu] fixup: update to current PBS head

[Fabian Grünbichler]

to reduce transitive dependencies pulled in by pbs-config, like proxmox-metrics

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
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