Unverified Commit 4249cfba authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

proxmox-backup-client: 4.1.4 -> 4.2.0 (#515053)

parents b666e37e 4431e63f
Loading
Loading
Loading
Loading
+10 −6
Original line number Diff line number Diff line
From 71ff7368f729289f2eb3fe5a01365411fa006751 Mon Sep 17 00:00:00 2001
From 84bfd76cc75904cb722f53058b6da67f494c4bd4 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Mon, 23 Feb 2026 10:58:20 +0100
Subject: [PATCH proxmox-backup 1/2] cargo: re-route dependencies not available
@@ -6,14 +6,14 @@ Subject: [PATCH proxmox-backup 1/2] cargo: re-route dependencies not available

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 Cargo.toml | 100 ++++++++++++++++++++++++++---------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)
 Cargo.toml | 104 ++++++++++++++++++++++++++---------------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9bf7b79a..ced3b793 100644
index 3e036f54e..2d97df9fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -271,57 +271,57 @@ proxmox-rrd-api-types.workspace = true
@@ -277,59 +277,59 @@ proxmox-rrd-api-types.workspace = true
 # Local path overrides
 # NOTE: You must run `cargo update` after changing this for it to take effect!
 [patch.crates-io]
@@ -30,6 +30,7 @@ index 9bf7b79a..ced3b793 100644
-#proxmox-compression = { path = "../proxmox/proxmox-compression" }
-#proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
-#proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
-#proxmox-docgen = { path = "../proxmox/proxmox-docgen" }
-#proxmox-http = { path = "../proxmox/proxmox-http" }
-#proxmox-http-error = { path = "../proxmox/proxmox-http-error" }
-#proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
@@ -42,6 +43,7 @@ index 9bf7b79a..ced3b793 100644
-#proxmox-network-types = { path = "../proxmox/proxmox-network-types" }
-#proxmox-notify = { path = "../proxmox/proxmox-notify" }
-#proxmox-openid = { path = "../proxmox/proxmox-openid" }
-#proxmox-parallel-handler = { path = "../proxmox/proxmox-parallel-handler" }
-#proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
-#proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }
-#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
@@ -77,6 +79,7 @@ index 9bf7b79a..ced3b793 100644
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
+proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
+proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
+proxmox-docgen = { path = "../proxmox/proxmox-docgen" }
+proxmox-http = { path = "../proxmox/proxmox-http" }
+proxmox-http-error = { path = "../proxmox/proxmox-http-error" }
+proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
@@ -89,6 +92,7 @@ index 9bf7b79a..ced3b793 100644
+proxmox-network-types = { path = "../proxmox/proxmox-network-types" }
+proxmox-notify = { path = "../proxmox/proxmox-notify" }
+proxmox-openid = { path = "../proxmox/proxmox-openid" }
+proxmox-parallel-handler = { path = "../proxmox/proxmox-parallel-handler" }
+proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
+proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }
+proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
@@ -122,5 +126,5 @@ index 9bf7b79a..ced3b793 100644
 [features]
 default = []
-- 
2.52.0
2.53.0
+4 −4
Original line number Diff line number Diff line
From 732dc6b91299bda441f52c6d7decddfbfd6e5517 Mon Sep 17 00:00:00 2001
From ae84be4e56a1100583d80db03834f439833ee1f2 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <thomas@lamprecht.org>
Date: Tue, 29 Nov 2022 17:20:28 +0100
Subject: [PATCH proxmox-backup 2/2] docs: drop all but client man pages
@@ -11,7 +11,7 @@ Signed-off-by: Christoph Heiss <christoph@c8h4.io>
 2 files changed, 43 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index 5cf5fc17..85ff3b91 100644
index 5cf5fc179..85ff3b91e 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,27 +1,8 @@
@@ -43,7 +43,7 @@ index 5cf5fc17..85ff3b91 100644
 
 MAN1_PAGES := 				\
diff --git a/docs/conf.py b/docs/conf.py
index 64c4f9d4..345a0170 100644
index 64c4f9d47..345a0170d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,31 +93,7 @@ rst_epilog += f"\n..  |pbs-copyright| replace:: Copyright (C) {copyright}"
@@ -79,5 +79,5 @@ index 64c4f9d4..345a0170 100644
 
 
-- 
2.50.1
2.53.0
+0 −26
Original line number Diff line number Diff line
From d9c0d413ec38ae11cdd61bdc6b4b76d1f05a7794 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 4 Sep 2025 10:24:39 +0200
Subject: [PATCH] decoder: fix autoref error in pointer to reference conversion

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 src/decoder/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs
index eca51b6..b034d38 100644
--- a/src/decoder/mod.rs
+++ b/src/decoder/mod.rs
@@ -35,7 +35,7 @@ fn scratch_buffer() -> &'static mut [u8] {
     unsafe {
         let ptr: *mut MaybeUninit<[u8; 4096]> = &raw mut SCRATCH_BUFFER;
         let ptr: &mut MaybeUninit<[u8; 4096]> = &mut *ptr;
-        &mut (*ptr.as_mut_ptr())[..]
+        &mut *ptr.as_mut_ptr()
     }
 }
 
-- 
2.50.1
+763 −438

File changed.

Preview size limit exceeded, changes collapsed.

+9 −11
Original line number Diff line number Diff line
@@ -14,34 +14,34 @@

let
  pname = "proxmox-backup-client";
  version = "4.1.4";
  version = "4.2.0";

  proxmox-backup_src = fetchgit {
    url = "git://git.proxmox.com/git/proxmox-backup.git";
    rev = "0de679b244377f9193993698b875636bab58d678";
    rev = "035c449897fafc228c8bbf3a5b5ba38564478ac7";
    name = "proxmox-backup";
    hash = "sha256-7OGmKNcg7rq0oxPMk5XFuOvueABUC6334lpH8uG4tSQ=";
    hash = "sha256-tfZXmMWQrP0MiBC1uuSenGaghqHi4ljky6T2KtLcjhk=";
  };

  proxmox_src = fetchgit {
    url = "git://git.proxmox.com/git/proxmox.git";
    rev = "407d1e05197bf0e5bec47bf8a56f69ce2a63c1ec";
    rev = "22c4d5ecbfce6eb2fd566181e0b7d23ac2df4f0c";
    name = "proxmox";
    hash = "sha256-E7y4au5x8HcFcABiRV1ESb9SvpjyhSBzlxIn94CMbeI=";
    hash = "sha256-rYaLx6Lorry+NkEmc6/xARMY6ZgdnIaCLJqRA0Mnf8o=";
  };

  proxmox-fuse_src = fetchgit {
    url = "git://git.proxmox.com/git/proxmox-fuse.git";
    rev = "506314563706b0bcd95f99ebedc9b2d1c5532cc4"; # 2.0.0
    rev = "258788a3d66f7a77040a480170fff9890d4939aa"; # 3.0.0
    name = "proxmox-fuse";
    hash = "sha256-QVr6ylGaGOpkmidq8TtEB4b/oInGIcufHMBB0XwzbPw=";
    hash = "sha256-deEPxhg2uyswBYjgYrXcAEBByJ/4ptX7I9y0R3AAFA0=";
  };

  proxmox-pxar_src = fetchgit {
    url = "git://git.proxmox.com/git/pxar.git";
    rev = "993c66fcb8819770f279cb9fb4d13f58f367606c"; # 1.0.0
    rev = "091a8a382d0d6fc71025351fb35c51b1f3b0074d"; # 1.0.1
    name = "pxar";
    hash = "sha256-V5DkTIyPuopSILQoJt04E5G9ZEylQF1x5oXgWQJuDq8=";
    hash = "sha256-9SFlrz6nuVby6iQ2ELVaioZu2pcs90tSuyzLCWJlcrA=";
  };

  proxmox-pathpatterns_src = fetchgit {
@@ -81,8 +81,6 @@ rustPlatform.buildRustPackage {
    cp ${./Cargo.lock} Cargo.lock
    rm .cargo/config.toml

    (cd ../pxar && chmod -R u+w . && patch -p1 <${./0003-decoder-fix-autoref-error-in-pointer-to-reference-co.patch})

    # avoid some unnecessary dependencies, stemming from greedy linkage by rustc
    # see also upstream Makefile for similar workaround
    mkdir -p .dep-stubs