proxmox-backup-client: 4.0.14 -> 4.1.4 (#493266)
This commit is contained in:
+32
-15
@@ -1,24 +1,26 @@
|
||||
From 552fcf4c45deadbf6b51128d32dd23536af31e9c Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Heiss <c.heiss@proxmox.com>
|
||||
Date: Tue, 12 Aug 2025 13:48:48 +0200
|
||||
From 71ff7368f729289f2eb3fe5a01365411fa006751 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
|
||||
on crates.io
|
||||
|
||||
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
|
||||
---
|
||||
Cargo.toml | 83 ++++++++++++++++++++++++++++--------------------------
|
||||
1 file changed, 43 insertions(+), 40 deletions(-)
|
||||
Cargo.toml | 100 ++++++++++++++++++++++++++---------------------------
|
||||
1 file changed, 50 insertions(+), 50 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 337bb081..0aed1103 100644
|
||||
index 9bf7b79a..ced3b793 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -263,47 +263,50 @@ proxmox-rrd-api-types.workspace = true
|
||||
@@ -271,57 +271,57 @@ 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]
|
||||
-#pbs-api-types = { path = "../proxmox/pbs-api-types" }
|
||||
-#proxmox-acme = { path = "../proxmox/proxmox-acme" }
|
||||
-#proxmox-acme-api = { path = "../proxmox/proxmox-acme-api" }
|
||||
-#proxmox-api-macro = { path = "../proxmox/proxmox-api-macro" }
|
||||
-#proxmox-apt = { path = "../proxmox/proxmox-apt" }
|
||||
-#proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
|
||||
-#proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
@@ -28,24 +30,30 @@ index 337bb081..0aed1103 100644
|
||||
-#proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||
-#proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
|
||||
-#proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
|
||||
-#proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
-#proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
-#proxmox-http-error = { path = "../proxmox/proxmox-http-error" }
|
||||
-#proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
|
||||
-#proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
-#proxmox-log = { path = "../proxmox/proxmox-log" }
|
||||
-#proxmox-ldap = { path = "../proxmox/proxmox-ldap" }
|
||||
-#proxmox-log = { path = "../proxmox/proxmox-log" }
|
||||
-#proxmox-metrics = { path = "../proxmox/proxmox-metrics" }
|
||||
-#proxmox-network-api = { path = "../proxmox/proxmox-network-api" }
|
||||
-#proxmox-network-types = { path = "../proxmox/proxmox-network-types" }
|
||||
-#proxmox-notify = { path = "../proxmox/proxmox-notify" }
|
||||
-#proxmox-openid = { path = "../proxmox/proxmox-openid" }
|
||||
-#proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
|
||||
-#proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }
|
||||
-#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
|
||||
-#proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
-#proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
|
||||
-#proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }
|
||||
-#proxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }
|
||||
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
-#proxmox-sendmail = { path = "../proxmox/proxmox-sendmail" }
|
||||
-#proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||
-#proxmox-shared-cache = { path = "../proxmox/proxmox-shared-cache" }
|
||||
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
-#proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
|
||||
-#proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
|
||||
@@ -53,10 +61,13 @@ index 337bb081..0aed1103 100644
|
||||
-#proxmox-systemd = { path = "../proxmox/proxmox-systemd" }
|
||||
-#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||
-#proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
-#proxmox-upgrade-checks = { path = "../proxmox/proxmox-upgrade-checks" }
|
||||
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
-#proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
|
||||
+pbs-api-types = { path = "../proxmox/pbs-api-types" }
|
||||
+proxmox-acme = { path = "../proxmox/proxmox-acme" }
|
||||
+proxmox-acme-api = { path = "../proxmox/proxmox-acme-api" }
|
||||
+proxmox-api-macro = { path = "../proxmox/proxmox-api-macro" }
|
||||
+proxmox-apt = { path = "../proxmox/proxmox-apt" }
|
||||
+proxmox-apt-api-types = { path = "../proxmox/proxmox-apt-api-types" }
|
||||
+proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
@@ -66,24 +77,30 @@ index 337bb081..0aed1103 100644
|
||||
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||
+proxmox-config-digest = { path = "../proxmox/proxmox-config-digest" }
|
||||
+proxmox-daemon = { path = "../proxmox/proxmox-daemon" }
|
||||
+proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
+proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
+proxmox-http-error = { path = "../proxmox/proxmox-http-error" }
|
||||
+proxmox-human-byte = { path = "../proxmox/proxmox-human-byte" }
|
||||
+proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
+proxmox-log = { path = "../proxmox/proxmox-log" }
|
||||
+proxmox-ldap = { path = "../proxmox/proxmox-ldap" }
|
||||
+proxmox-log = { path = "../proxmox/proxmox-log" }
|
||||
+proxmox-metrics = { path = "../proxmox/proxmox-metrics" }
|
||||
+proxmox-network-api = { path = "../proxmox/proxmox-network-api" }
|
||||
+proxmox-network-types = { path = "../proxmox/proxmox-network-types" }
|
||||
+proxmox-notify = { path = "../proxmox/proxmox-notify" }
|
||||
+proxmox-openid = { path = "../proxmox/proxmox-openid" }
|
||||
+proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
|
||||
+proxmox-rate-limiter = { path = "../proxmox/proxmox-rate-limiter" }
|
||||
+proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
|
||||
+proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
+proxmox-rrd = { path = "../proxmox/proxmox-rrd" }
|
||||
+proxmox-rrd-api-types = { path = "../proxmox/proxmox-rrd-api-types" }
|
||||
+proxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }
|
||||
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
+proxmox-sendmail = { path = "../proxmox/proxmox-sendmail" }
|
||||
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||
+proxmox-shared-cache = { path = "../proxmox/proxmox-shared-cache" }
|
||||
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
+proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
|
||||
+proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
|
||||
@@ -91,19 +108,19 @@ index 337bb081..0aed1103 100644
|
||||
+proxmox-systemd = { path = "../proxmox/proxmox-systemd" }
|
||||
+proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||
+proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
+proxmox-upgrade-checks = { path = "../proxmox/proxmox-upgrade-checks" }
|
||||
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
+proxmox-worker-task = { path = "../proxmox/proxmox-worker-task" }
|
||||
+proxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }
|
||||
+proxmox-product-config = { path = "../proxmox/proxmox-product-config" }
|
||||
+proxmox-shared-cache = { path = "../proxmox/proxmox-shared-cache" }
|
||||
|
||||
-#proxmox-fuse = {path = "../proxmox-fuse" }
|
||||
-#pathpatterns = {path = "../pathpatterns" }
|
||||
-#pxar = { path = "../pxar" }
|
||||
+proxmox-fuse = {path = "../proxmox-fuse" }
|
||||
+pathpatterns = {path = "../pathpatterns" }
|
||||
+pxar = { path = "../pxar" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
||||
-27
@@ -1,27 +0,0 @@
|
||||
From 4d098e36df3a81799231618ce1d88ca8759a6616 Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Heiss <christoph@c8h4.io>
|
||||
Date: Thu, 4 Sep 2025 10:46:17 +0200
|
||||
Subject: [PATCH proxmox] pbs-api-types: crypto: fix autoref error in ptr to
|
||||
ref conversion
|
||||
|
||||
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
|
||||
---
|
||||
pbs-api-types/src/crypto.rs | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pbs-api-types/src/crypto.rs b/pbs-api-types/src/crypto.rs
|
||||
index cdc1ba64..7b274982 100644
|
||||
--- a/pbs-api-types/src/crypto.rs
|
||||
+++ b/pbs-api-types/src/crypto.rs
|
||||
@@ -88,7 +88,7 @@ pub mod bytes_as_fingerprint {
|
||||
let mut s = String::deserialize(deserializer)?;
|
||||
s.retain(|c| c != ':');
|
||||
let mut out = MaybeUninit::<[u8; 32]>::uninit();
|
||||
- hex::decode_to_slice(s.as_bytes(), unsafe { &mut (*out.as_mut_ptr())[..] })
|
||||
+ hex::decode_to_slice(s.as_bytes(), unsafe { &mut *out.as_mut_ptr() })
|
||||
.map_err(serde::de::Error::custom)?;
|
||||
Ok(unsafe { out.assume_init() })
|
||||
}
|
||||
--
|
||||
2.50.1
|
||||
|
||||
+922
-667
File diff suppressed because it is too large
Load Diff
@@ -14,27 +14,27 @@
|
||||
|
||||
let
|
||||
pname = "proxmox-backup-client";
|
||||
version = "4.0.14";
|
||||
version = "4.1.4";
|
||||
|
||||
proxmox-backup_src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-backup.git";
|
||||
rev = "8b1b5f8e4d8216a0c45146b426dbfaff01ac0068";
|
||||
rev = "0de679b244377f9193993698b875636bab58d678";
|
||||
name = "proxmox-backup";
|
||||
hash = "sha256-aLiGJcCsHI4QFfMwgmQsXWabRyQ829itNsIDcaVW4FA=";
|
||||
hash = "sha256-7OGmKNcg7rq0oxPMk5XFuOvueABUC6334lpH8uG4tSQ=";
|
||||
};
|
||||
|
||||
proxmox_src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox.git";
|
||||
rev = "56c4deb6309c41ff5afa5765b112be967c653857";
|
||||
rev = "407d1e05197bf0e5bec47bf8a56f69ce2a63c1ec";
|
||||
name = "proxmox";
|
||||
hash = "sha256-mkGvfWWis1W8xBLb8Da/uIauPEMKPosPdZ+UcgMrvkk=";
|
||||
hash = "sha256-E7y4au5x8HcFcABiRV1ESb9SvpjyhSBzlxIn94CMbeI=";
|
||||
};
|
||||
|
||||
proxmox-fuse_src = fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-fuse.git";
|
||||
rev = "87dbf9bfef9169286263bccffaae3206635ca108"; # 1.0.0
|
||||
rev = "506314563706b0bcd95f99ebedc9b2d1c5532cc4"; # 2.0.0
|
||||
name = "proxmox-fuse";
|
||||
hash = "sha256-/8Xy6LTql3gHfHuxT0lK5mhLGc58YAb1W+eyusmEP8Y=";
|
||||
hash = "sha256-QVr6ylGaGOpkmidq8TtEB4b/oInGIcufHMBB0XwzbPw=";
|
||||
};
|
||||
|
||||
proxmox-pxar_src = fetchgit {
|
||||
@@ -82,7 +82,6 @@ rustPlatform.buildRustPackage {
|
||||
rm .cargo/config.toml
|
||||
|
||||
(cd ../pxar && chmod -R u+w . && patch -p1 <${./0003-decoder-fix-autoref-error-in-pointer-to-reference-co.patch})
|
||||
(cd ../proxmox && chmod -R u+w . && patch -p1 <${./0004-pbs-api-types-crypto-fix-autoref-error-in-ptr-to-ref.patch})
|
||||
|
||||
# avoid some unnecessary dependencies, stemming from greedy linkage by rustc
|
||||
# see also upstream Makefile for similar workaround
|
||||
|
||||
Reference in New Issue
Block a user