diff --git a/build.sh b/build.sh index 3d7e6c5..4a97b92 100755 --- a/build.sh +++ b/build.sh @@ -285,10 +285,11 @@ EOF cd "${SOURCES}" if [ "${PBSVERSION}" = "pbs3" ]; then - PROXMOX_BACKUP_VER="3.2.4-1" - PROXMOX_BACKUP_GIT="4940514b0f05d6cd6a5f711edfdd47c1fa41b537" + PROXMOX_BACKUP_VER="3.2.5-1" + PROXMOX_BACKUP_GIT="3a76fdc9e73bbdc33d4a12f5f17a0a5a13de3283" PROXMOX_GIT="aae8a03dc4e119b5930ef36a68fb7e50f446eeca" PATHPATTERNS_GIT="281894a5b66099e919d167cd5f0644fff6aca234" # 0.3.0-1 + PXAR_GIT="5d232d72820ceb20b07bda36f805dc4305d064c4" # 0.11.1-1 else PROXMOX_BACKUP_VER="2.4.6-1" PROXMOX_BACKUP_GIT="6751d3787e3f45d1692d2a245ebb099288f65afc" @@ -296,9 +297,9 @@ else PROXMOX_OPENID_GIT="ecf59cbb74278ea0e9710466508158ed6a6828c4" # 0.9.9-1 PROXMOX_ACME_RS_GIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05" # 0.4.0 PATHPATTERNS_GIT="13145f729d0a703c33d560367843f555cc799272" # 0.2.0-1 + PXAR_GIT="29cbeed3e1b52f5eef455cdfa8b5e93f4e3e88f5" # 0.10.2-1 fi PROMXOX_FUSE_GIT="8d57fb64f044ea3dcfdef77ed5f1888efdab0708" # 0.1.4 -PXAR_GIT="29cbeed3e1b52f5eef455cdfa8b5e93f4e3e88f5" # 0.10.2-1 if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${PACKAGE_ARCH}.deb" ]; then git_clone_or_fetch https://git.proxmox.com/git/proxmox.git git_clean_and_checkout ${PROXMOX_GIT} proxmox diff --git a/patches/pbs3/proxmox-backup-cross.patch b/patches/pbs3/proxmox-backup-cross.patch index 95c6825..4dae4a4 100644 --- a/patches/pbs3/proxmox-backup-cross.patch +++ b/patches/pbs3/proxmox-backup-cross.patch @@ -55,7 +55,7 @@ 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 f2748598..0c31ee4f 100644 +index 321f24c3..d69d4c7b 100644 --- a/pxar-bin/tests/pxar.rs +++ b/pxar-bin/tests/pxar.rs @@ -8,14 +8,15 @@ fn pxar_create_and_extract() { @@ -87,3 +87,20 @@ index f2748598..0c31ee4f 100644 .arg("extract") .arg("./tests/archive.pxar") .arg("--target") +@@ -82,12 +84,13 @@ fn pxar_create_and_extract() { + #[test] + 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) + .args([ + "list", + "../tests/pxar/backup-client-pxar-expected.mpxar",