update proxmox-backup-3.2.7-1

build.sh

@@ -190,6 +190,7 @@ do
 			export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig/
 			export CC=/usr/bin/aarch64-linux-gnu-gcc
 			export DEB_HOST_MULTIARCH=aarch64-linux-gnu
+			export DEB_HOST_RUST_TYPE=aarch64-unknown-linux-gnu
 		;;
 		download*)
 			if [[ "$1" =~ download=[0-9.-]+ ]]; then
@@ -273,9 +274,9 @@ EOF
 
 cd "${SOURCES}"
 
-PROXMOX_BACKUP_VER="3.2.6-1"
+PROXMOX_BACKUP_VER="3.2.7-1"
-PROXMOX_BACKUP_GIT="472b52f54c4db176eb408ebd0de209323879eb5e"
+PROXMOX_BACKUP_GIT="cb3d41e838dec0e1002aaf5ee4c0e6cd28284c74"
-PROXMOX_GIT="aae8a03dc4e119b5930ef36a68fb7e50f446eeca"
+PROXMOX_GIT="0652d81977a3a35a6f1b046faf0768246a71a8bf"
 PATHPATTERNS_GIT="281894a5b66099e919d167cd5f0644fff6aca234" # 0.3.0-1
 PXAR_GIT="ebe402c01c736eb6b822d984cda48538c0b7bf87" # 0.12.0-1
 PROMXOX_FUSE_GIT="8d57fb64f044ea3dcfdef77ed5f1888efdab0708" # 0.1.4

patches/proxmox-backup-build.patch

@@ -1,8 +1,8 @@
-diff --git a/.cargo/config b/.cargo/config
+diff --git a/.cargo/config.toml b/.cargo/config.toml
-index 3b5b6e48..50908c05 100644
+index a439c97b..a95ae483 100644
---- a/.cargo/config
+--- a/.cargo/config.toml
-+++ b/.cargo/config
++++ b/.cargo/config.toml
-@@ -1,5 +1,17 @@
+@@ -1,8 +1,20 @@
 -[source]
 -[source.debian-packages]
 -directory = "/usr/share/cargo/registry"
@@ -24,8 +24,11 @@ index 3b5b6e48..50908c05 100644
 +
 +[source.vendored-sources]
 +directory = "vendor"
+ 
+ [profile.release]
+ debug=true
 diff --git a/Cargo.toml b/Cargo.toml
-index 1a82e975..b73aa13c 100644
+index 7013a468..632f3b80 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -247,37 +247,37 @@ proxmox-rrd.workspace = true
@@ -97,7 +100,7 @@ index 1a82e975..b73aa13c 100644
  [features]
  default = []
 diff --git a/debian/rules b/debian/rules
-index 54a3c22b..79c1ad76 100755
+index a82c3e12..79c1ad76 100755
 --- a/debian/rules
 +++ b/debian/rules
 @@ -4,12 +4,9 @@
@@ -108,7 +111,7 @@ index 54a3c22b..79c1ad76 100755
  
  export BUILD_MODE=release
  
--CARGO=/usr/share/cargo/bin/cargo
+-export CARGO=/usr/share/cargo/bin/cargo
 -
  export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
  export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE

patches/proxmox-backup-client.patch

@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 03e93876..aab32c74 100644
+index dfbaacab..dc21b0b0 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -4,32 +4,21 @@ include defines.mk
@@ -40,7 +40,7 @@ index 03e93876..aab32c74 100644
  
  SUBCRATES != cargo metadata --no-deps --format-version=1 \
  	| jq -r .workspace_members'[]' \
-@@ -61,8 +50,7 @@ RESTORE_DEB=proxmox-backup-file-restore_$(DEB_VERSION)_$(ARCH).deb
+@@ -62,8 +51,7 @@ RESTORE_DEB=proxmox-backup-file-restore_$(DEB_VERSION)_$(ARCH).deb
  RESTORE_DBG_DEB=proxmox-backup-file-restore-dbgsym_$(DEB_VERSION)_$(ARCH).deb
  DOC_DEB=$(PACKAGE)-docs_$(DEB_VERSION)_all.deb
  
@@ -50,7 +50,7 @@ index 03e93876..aab32c74 100644
  
  DSC = rust-$(PACKAGE)_$(DEB_VERSION).dsc
  
-@@ -159,30 +147,11 @@ cargo-build:
+@@ -163,31 +151,11 @@ cargo-build:
  $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
  .do-cargo-build:
  	$(CARGO) build $(CARGO_BUILD_ARGS) \
@@ -71,6 +71,7 @@ index 03e93876..aab32c74 100644
 -	    --bin proxmox-restore-daemon \
 -	    --package proxmox-backup \
 -	    --bin docgen \
+-	    --bin pbs2to3 \
 -	    --bin proxmox-backup-api \
 -	    --bin proxmox-backup-manager \
 -	    --bin proxmox-backup-proxy \
@@ -82,7 +83,7 @@ index 03e93876..aab32c74 100644
  	touch "$@"
  
  
-@@ -191,27 +160,28 @@ lint:
+@@ -196,27 +164,28 @@ lint:
  	cargo clippy -- -A clippy::all -D clippy::correctness
  
  install: $(COMPILED_BINS)
@@ -117,7 +118,7 @@ index 03e93876..aab32c74 100644
  .PHONY: upload
  upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 diff --git a/debian/control b/debian/control
-index 51cd9899..57cf3c25 100644
+index c38d55bc..57cf3c25 100644
 --- a/debian/control
 +++ b/debian/control
 @@ -20,7 +20,7 @@ Build-Depends: bash-completion,
@@ -209,7 +210,7 @@ index 79c1ad76..95b1b1bf 100755
  override_dh_fixperms:
  	dh_fixperms --exclude sg-tape-cmd
 diff --git a/docs/Makefile b/docs/Makefile
-index d6c61c86..245badbd 100644
+index d23796b7..950cd644 100644
 --- a/docs/Makefile
 +++ b/docs/Makefile
 @@ -1,53 +1,15 @@

patches/proxmox-backup-cross.patch

@@ -1,30 +1,8 @@
-diff --git a/Makefile b/Makefile
-index b307009d..45b2ac3c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,7 +37,7 @@ SUBCRATES != cargo metadata --no-deps --format-version=1 \
- 
- ifeq ($(BUILD_MODE), release)
- CARGO_BUILD_ARGS += --release
--COMPILEDIR := target/release
-+COMPILEDIR := target/aarch64-unknown-linux-gnu/release
- else
- COMPILEDIR := target/debug
- endif
 diff --git a/docs/Makefile b/docs/Makefile
-index b06badff..a5eb4ce2 100644
+index 950cd644..1ba51c00 100644
 --- a/docs/Makefile
 +++ b/docs/Makefile
-@@ -85,7 +85,7 @@ SPHINXBUILD   = sphinx-build
+@@ -65,16 +65,16 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) .
- BUILDDIR      = output
- 
- ifeq ($(BUILD_MODE), release)
--COMPILEDIR := ../target/release
-+COMPILEDIR := ../target/aarch64-unknown-linux-gnu/release
- SPHINXOPTS    += -t release
- else
- COMPILEDIR := ../target/debug
-@@ -98,16 +98,16 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) .
  all: ${MAN1_PAGES} ${MAN5_PAGES}
  
  config/%/config.rst: ${COMPILEDIR}/docgen
@@ -45,7 +23,7 @@ index b06badff..a5eb4ce2 100644
  
  ${MAN1_PAGES} ${MAN5_PAGES}: man-pages
  
-@@ -122,7 +122,7 @@ onlinehelpinfo:
+@@ -89,7 +89,7 @@ onlinehelpinfo:
  	@echo "Build finished. OnlineHelpInfo.js is in $(BUILDDIR)/scanrefs."
  
  api-viewer/apidata.js: ${COMPILEDIR}/docgen
@@ -55,52 +33,36 @@ index b06badff..a5eb4ce2 100644
  api-viewer/apidoc.js: ${API_VIEWER_FILES}
  	cat ${API_VIEWER_FILES} >$@.tmp
 diff --git a/pxar-bin/tests/pxar.rs b/pxar-bin/tests/pxar.rs
-index 321f24c3..d69d4c7b 100644
+index 23559bad..2b6f9a4a 100644
 --- a/pxar-bin/tests/pxar.rs
 +++ b/pxar-bin/tests/pxar.rs
-@@ -8,14 +8,15 @@ fn pxar_create_and_extract() {
+@@ -17,7 +17,8 @@ fn pxar_create_and_extract() {
-     let dest_dir = "../tests/catar_data/test_xattrs_dest/";
- 
-     let exec_path = if cfg!(debug_assertions) {
--        "../target/debug/pxar"
-+        "../target/aarch64-unknown-linux-gnu/debug/pxar"
-     } else {
--        "../target/release/pxar"
-+        "../target/aarch64-unknown-linux-gnu/release/pxar"
-     };
  
      println!("run '{} create archive.pxar {}'", exec_path, src_dir);
  
--    Command::new(exec_path)
+-    Command::new(&exec_path)
 +    Command::new("qemu-aarch64")
-+        .arg(exec_path)
++        .arg(&exec_path)
          .arg("create")
          .arg("./tests/archive.pxar")
          .arg(src_dir)
-@@ -24,7 +25,8 @@ fn pxar_create_and_extract() {
+@@ -26,7 +27,8 @@ fn pxar_create_and_extract() {
  
      println!("run '{} extract archive.pxar {}'", exec_path, dest_dir);
  
--    Command::new(exec_path)
+-    Command::new(&exec_path)
 +    Command::new("qemu-aarch64")
-+        .arg(exec_path)
++        .arg(&exec_path)
          .arg("extract")
          .arg("./tests/archive.pxar")
          .arg("--target")
-@@ -82,12 +84,13 @@ fn pxar_create_and_extract() {
+@@ -91,7 +93,8 @@ fn pxar_list_with_payload_input() {
- #[test]
+         format!("../target/{target_subdir}/release/pxar")
- fn pxar_list_with_payload_input() {
-     let exec_path = if cfg!(debug_assertions) {
--        "../target/debug/pxar"
-+        "../target/aarch64-unknown-linux-gnu/debug/pxar"
-     } else {
--        "../target/release/pxar"
-+        "../target/aarch64-unknown-linux-gnu/release/pxar"
      };
  
 -    let output = Command::new(exec_path)
 +    let output = Command::new("qemu-aarch64")
-+        .arg(exec_path)
++        .arg(&exec_path)
          .args([
              "list",
              "../tests/pxar/backup-client-pxar-expected.mpxar",