From bc3c476d5ef2cfad4bff5e4d86c3f0dfc59a965f Mon Sep 17 00:00:00 2001 From: Wolfgang Date: Thu, 13 Feb 2025 07:06:49 +0000 Subject: [PATCH] update proxmox-backup-3.3.3-1 Signed-off-by: Wolfgang --- build.sh | 11 +++++------ patches/proxmox-backup-client.patch | 8 +++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build.sh b/build.sh index 53b67f2..e429b10 100755 --- a/build.sh +++ b/build.sh @@ -289,18 +289,15 @@ EOF cd "${SOURCES}" -PROXMOX_BACKUP_VER="3.3.2-2" -PROXMOX_BACKUP_GIT="c312d5848879be9f3a49dc031ada49ac03654526" -PROXMOX_GIT="212249e009a2f6b4312528110aa23f70f4b09f99" +PROXMOX_BACKUP_VER="3.3.3-1" +PROXMOX_BACKUP_GIT="d986714201591c167e5e23cb1a293557679d4ec7" +PROXMOX_GIT="0f1b84e93cea47135142bd0c9b0e7f67a7ab5638" PATHPATTERNS_GIT="281894a5b66099e919d167cd5f0644fff6aca234" # 0.3.0-1 PXAR_GIT="16773abdda5eb260216e3ed021309cfa32416b38" # 0.12.1-1 PROMXOX_FUSE_GIT="8d57fb64f044ea3dcfdef77ed5f1888efdab0708" # 0.1.4 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 - if [ "${PACKAGE_ARCH}" = "arm64" ]; then - patch -p1 -d proxmox/ <"${PATCHES}/proxmox-arm64.patch" - fi git_clone_or_fetch https://git.proxmox.com/git/proxmox-fuse.git git_clean_and_checkout ${PROMXOX_FUSE_GIT} proxmox-fuse git_clone_or_fetch https://git.proxmox.com/git/pxar.git @@ -316,6 +313,8 @@ if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${P sed -i '/patch.crates-io/,/pxar/s/^#//' proxmox-backup/Cargo.toml # Add missing proxmox-shared-cache in 3.2.8-1 sed -i '/^proxmox-shared-memory.*path/aproxmox-shared-cache = { path = "../proxmox/proxmox-shared-cache" }' proxmox-backup/Cargo.toml + # Add missing pbs-api-types in 3.3.3-1 + sed -i '/^\[patch.crates-io\]/apbs-api-types = { path = "../proxmox/pbs-api-types" }' proxmox-backup/Cargo.toml # fix compile error due different http versions sed -i 's#^h2 = { version = "0.4"#h2 = { version = "0.3"#' proxmox-backup/Cargo.toml patch -p1 -d proxmox-backup/ <"${PATCHES}/proxmox-backup-build.patch" diff --git a/patches/proxmox-backup-client.patch b/patches/proxmox-backup-client.patch index d4a0e47..36b8663 100644 --- a/patches/proxmox-backup-client.patch +++ b/patches/proxmox-backup-client.patch @@ -118,7 +118,7 @@ index dfbaacab..dc21b0b0 100644 .PHONY: upload upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION) diff --git a/debian/control b/debian/control -index 10d92ddf..57cf3c25 100644 +index 10d92ddf..5c98f407 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: bash-completion, @@ -210,10 +210,10 @@ index 79c1ad76..95b1b1bf 100755 override_dh_fixperms: dh_fixperms --exclude sg-tape-cmd diff --git a/docs/Makefile b/docs/Makefile -index d98302ff..8ee7d4e9 100644 +index c57cbbc2..1631bbb8 100644 --- a/docs/Makefile +++ b/docs/Makefile -@@ -1,57 +1,18 @@ +@@ -1,59 +1,18 @@ include ../defines.mk GENERATED_SYNOPSIS := \ @@ -229,6 +229,7 @@ index d98302ff..8ee7d4e9 100644 - config/tape/config.rst \ - config/user/config.rst \ - config/verification/config.rst \ +- config/prune/config.rst \ - pmt/synopsis.rst \ - pmtx/synopsis.rst \ proxmox-backup-client/catalog-shell-synopsis.rst \ @@ -268,6 +269,7 @@ index d98302ff..8ee7d4e9 100644 - tape.cfg.5 \ - user.cfg.5 \ - verification.cfg.5 \ +- prune.cfg.5 \ PRUNE_SIMULATOR_FILES := \ prune-simulator/index.html \