[pbs-devel] [PATCH proxmox-backup-qemu 0/6] update to current PBS/dependencies

[pbs-devel] [PATCH proxmox-backup-qemu 0/6] update to current PBS/dependencies

[Fabian Grünbichler]

did some rudimentary testing that didn't show any issues, the patch
concerning the Box dropping might warrant some closer look in case I
missed some side-effect..

Fabian Grünbichler (6):
  update dependencies
  clippy fixes
  clippy fix: shorten bool->i32 conversion
  lint fix: explicitly drop Box
  update edition to 2021
  bump version to 1.3.2-1 and update symbols file

 Cargo.toml                             | 18 ++++++------
 debian/changelog                       |  7 +++++
 debian/control                         | 40 ++++++++++++++------------
 debian/libproxmox-backup-qemu0.symbols |  2 +-
 src/commands.rs                        |  8 +++---
 src/lib.rs                             | 10 ++-----
 src/upload_queue.rs                    |  2 +-
 7 files changed, 46 insertions(+), 41 deletions(-)

-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup-qemu 1/6] update dependencies

[Fabian Grünbichler]

to the currently packaged/released ones.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

Notes:
    pbs-config now pulls in pbs-config, we could also move pbs_config::key_config
    somewhere else since that is the only thing we are using from pbs-config in the
    qemu lib..
    
    d/control updated with
    
     cargo-fairy d-control Cargo.toml ../proxmox-backup/{pbs-api-types,pbs-client,pbs-config,pbs-datastore,pbs-tools}/Cargo.toml
    
    (the generated warnings are benign, since it doesn't know these git
    dependencies are okay to not export as package dependencies)

 Cargo.toml     | 14 +++++++-------
 debian/control | 40 ++++++++++++++++++++++------------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d047eb5..f6841be 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 = "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" }
 
 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..3627ea9 100644
--- a/debian/control
+++ b/debian/control
@@ -24,41 +24,45 @@ 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-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,
+ 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.2+default-dev,
- librust-proxmox-sys-0.2+sortable-macro-dev,
- librust-proxmox-time-1+default-dev (>= 1.1.1-~~),
+ 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,
- 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,
-- 
2.30.2

[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@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

[pbs-devel] [PATCH proxmox-backup-qemu 2/6] clippy fixes

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/commands.rs     | 8 ++++----
 src/upload_queue.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/commands.rs b/src/commands.rs
index 27d958c..37d653c 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -74,7 +74,7 @@ async fn register_zero_chunk(
 
     let param = json!({
         "wid": wid,
-        "digest": hex::encode(&zero_chunk_digest),
+        "digest": hex::encode(zero_chunk_digest),
         "size": chunk_size,
         "encoded-size": chunk_data.len(),
     });
@@ -212,7 +212,7 @@ pub(crate) async fn register_image(
         let csum = PREVIOUS_CSUMS.lock().unwrap().get(&device_name).copied();
 
         if let Some(csum) = csum {
-            param["reuse-csum"] = hex::encode(&csum).into();
+            param["reuse-csum"] = hex::encode(csum).into();
 
             match index {
                 Some(index) => {
@@ -308,7 +308,7 @@ pub(crate) async fn close_image(
         }
     };
 
-    let csum = hex::encode(&upload_result.csum);
+    let csum = hex::encode(upload_result.csum);
 
     let param = json!({
         "wid": wid ,
@@ -399,7 +399,7 @@ pub(crate) async fn write_data(
                 Box::new(futures::future::ok(upload_info))
             } else {
                 let (chunk, digest) = chunk_builder.build()?;
-                let digest_str = hex::encode(&digest);
+                let digest_str = hex::encode(digest);
                 let chunk_data = chunk.into_inner();
 
                 let param = json!({
diff --git a/src/upload_queue.rs b/src/upload_queue.rs
index 941734b..261886c 100644
--- a/src/upload_queue.rs
+++ b/src/upload_queue.rs
@@ -111,7 +111,7 @@ async fn upload_handler(
                 size,
                 chunk_is_known,
             }) => {
-                let digest_str = hex::encode(&digest);
+                let digest_str = hex::encode(digest);
 
                 //println!("upload_handler {:?} {}", digest, offset);
                 let pos = (offset / chunk_size) as usize;
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup-qemu 3/6] clippy fix: shorten bool->i32 conversion

[Fabian Grünbichler]

i32 implements From<bool> with the desired semantics, this still makes it
obvious that the conversion happens, although a plain `.into()` would also
work.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/lib.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index ee842ce..bdd162b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -417,13 +417,7 @@ pub extern "C" fn proxmox_backup_check_incremental(
 
     match tools::utf8_c_string_lossy(device_name) {
         None => 0,
-        Some(device_name) => {
-            if task.check_incremental(device_name, size) {
-                1
-            } else {
-                0
-            }
-        }
+        Some(device_name) => i32::from(task.check_incremental(device_name, size)),
     }
 }
 
-- 
2.30.2

[pbs-devel] [RFC proxmox-backup-qemu 4/6] lint fix: explicitly drop Box

[Fabian Grünbichler]

else this complains about a missing usage of the return value..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

Notes:
    this is kinda stupid since Box' drop is empty anyway..

 src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index bdd162b..b3c7b85 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1193,7 +1193,7 @@ pub extern "C" fn proxmox_import_state(buf: *const u8, buf_size: usize) {
 pub extern "C" fn proxmox_free_state_buf(buf: *mut u8) {
     if !buf.is_null() {
         unsafe {
-            Box::from_raw(buf);
+            drop(Box::from_raw(buf));
         }
     }
 }
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup-qemu 5/6] update edition to 2021

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f6841be..dd8bf48 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ authors = [
     "Thomas Lamprecht <t.lamprecht@proxmox.com>",
     "Wolfgang Bumiller <w.bumiller@proxmox.com>",
 ]
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 
 [lib]
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup-qemu 6/6] bump version to 1.3.2-1 and update symbols file

[Fabian Grünbichler]

this optional symbol having disappeared doesn't stop the library from being loaded by old Qemu.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 Cargo.toml                             | 2 +-
 debian/changelog                       | 7 +++++++
 debian/libproxmox-backup-qemu0.symbols | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index dd8bf48..ed7be6f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proxmox-backup-qemu"
-version = "1.3.1"
+version = "1.3.2"
 authors = [
     "Dietmar Maurer <dietmar@proxmox.com>",
     "Dominik Csapak <d.csapak@proxmox.com>",
diff --git a/debian/changelog b/debian/changelog
index cb5d9cf..50bc6e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+proxmox-backup-qemu (1.3.2-1) bullseye; urgency=medium
+
+  * update dependencies
+  * switch to edition 2021
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 12 Dec 2022 12:23:16 +0100
+
 proxmox-backup-qemu (1.3.1-1) bullseye; urgency=medium
 
   * re-build with updated dependencies for the API parameter switch from
diff --git a/debian/libproxmox-backup-qemu0.symbols b/debian/libproxmox-backup-qemu0.symbols
index be625cb..695f94e 100644
--- a/debian/libproxmox-backup-qemu0.symbols
+++ b/debian/libproxmox-backup-qemu0.symbols
@@ -33,5 +33,5 @@ libproxmox_backup_qemu.so.0 libproxmox-backup-qemu0 #MINVER#
  proxmox_restore_open_image_async@Base 1.0.0
  proxmox_restore_read_image_at@Base 1.0.0
  proxmox_restore_read_image_at_async@Base 1.0.0
- (optional)rust_eh_personality@Base 1.0.0
+#MISSING: 1.3.2-1# (optional)rust_eh_personality@Base 1.0.0
  wakeup_callback@Base 1.3.0
-- 
2.30.2

[pbs-devel] applied-series: [PATCH proxmox-backup-qemu 0/6] update to current PBS/dependencies

[Wolfgang Bumiller]

applied series with fixup squashed in, thanks

On Mon, Dec 12, 2022 at 01:05:35PM +0100, Fabian Grünbichler wrote:
> did some rudimentary testing that didn't show any issues, the patch
> concerning the Box dropping might warrant some closer look in case I
> missed some side-effect..
> 
> Fabian Grünbichler (6):
>   update dependencies
>   clippy fixes
>   clippy fix: shorten bool->i32 conversion
>   lint fix: explicitly drop Box
>   update edition to 2021
>   bump version to 1.3.2-1 and update symbols file
> 
>  Cargo.toml                             | 18 ++++++------
>  debian/changelog                       |  7 +++++
>  debian/control                         | 40 ++++++++++++++------------
>  debian/libproxmox-backup-qemu0.symbols |  2 +-
>  src/commands.rs                        |  8 +++---
>  src/lib.rs                             | 10 ++-----
>  src/upload_queue.rs                    |  2 +-
>  7 files changed, 46 insertions(+), 41 deletions(-)
> 
> -- 
> 2.30.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel