diff --git a/README.md b/README.md index b27a41a..16e6607 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ With the script you can also download all files of the latest **Debian/Trixie** **Download and install** - ```./build.sh install``` or a specific version ```./build.sh install=4.0.19-1``` + ```./build.sh install``` or a specific version ```./build.sh install=4.0.20-1``` **Download only** -```./build.sh download``` or a specific verision ```./build.sh download=4.0.19-1``` +```./build.sh download``` or a specific verision ```./build.sh download=4.0.20-1``` ## Build manually ### Install build essentials and dependencies diff --git a/build.sh b/build.sh index 2bb7d30..62d67f8 100755 --- a/build.sh +++ b/build.sh @@ -326,9 +326,9 @@ if [ "${BUILD_PACKAGE}" != "client" ]; then fi fi -PROXMOX_BACKUP_VER="4.0.19-1" -PROXMOX_BACKUP_GIT="967883c2c280fedb88e0eb4ec43431594da098c3" -PROXMOX_GIT="07aad061ee24502b2bdb4695c1e594b00818d90f" +PROXMOX_BACKUP_VER="4.0.20-1" +PROXMOX_BACKUP_GIT="a17276fea051861dcbefd64cb149a067788f4774" +PROXMOX_GIT="1ca670858e0494f932c38e34caaca9acfdff4e31" PATHPATTERNS_GIT="42e5e96e30297da878a4d4b3a7fa52b65c1be0ab" # 1.0.0-1 PXAR_GIT="993c66fcb8819770f279cb9fb4d13f58f367606c" # 1.0.0-1 PROXMOX_FUSE_GIT="87dbf9bfef9169286263bccffaae3206635ca108" # 1.0.0-1 diff --git a/patches/proxmox-backup-client.patch b/patches/proxmox-backup-client.patch index 625e4e7..969f462 100644 --- a/patches/proxmox-backup-client.patch +++ b/patches/proxmox-backup-client.patch @@ -105,10 +105,10 @@ index 51fbd408..d1546dd4 100644 .PHONY: upload upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION) diff --git a/debian/control b/debian/control -index 46789349..e63d9d12 100644 +index e9c6cbd7..f57ac84c 100644 --- a/debian/control +++ b/debian/control -@@ -19,7 +19,7 @@ Build-Depends: bash-completion, +@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 12~), proxmox-widget-toolkit-dev:all , python3-docutils, python3-pygments, @@ -117,7 +117,7 @@ index 46789349..e63d9d12 100644 rsync, texlive-fonts-extra , texlive-fonts-recommended , -@@ -33,36 +33,6 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary +@@ -33,37 +33,6 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary Homepage: https://www.proxmox.com Rules-Requires-Root: binary-targets @@ -136,6 +136,7 @@ index 46789349..e63d9d12 100644 - postfix | mail-transport-agent, - proxmox-backup-docs, - proxmox-mini-journalreader, +- proxmox-termproxy (>= 2.0.3), - proxmox-widget-toolkit (>= 4.3.3), - pve-xtermjs (>= 4.7.0-1), - sg3-utils, @@ -154,7 +155,7 @@ index 46789349..e63d9d12 100644 Package: proxmox-backup-client Architecture: any Depends: qrencode, ${misc:Depends}, ${shlibs:Depends}, -@@ -77,21 +47,3 @@ Conflicts: proxmox-backup-client, +@@ -78,21 +47,3 @@ Conflicts: proxmox-backup-client, Description: Proxmox Backup Client tools (statically linked) This package contains the Proxmox Backup client, which provides a simple command line tool to create and restore backups. diff --git a/patches/proxmox-backup-cross.patch b/patches/proxmox-backup-cross.patch index 0a37ebb..1289bd8 100644 --- a/patches/proxmox-backup-cross.patch +++ b/patches/proxmox-backup-cross.patch @@ -1,8 +1,8 @@ diff --git a/docs/Makefile b/docs/Makefile -index d98302ff..72af586d 100644 +index 9aac52e8..24282e83 100644 --- a/docs/Makefile +++ b/docs/Makefile -@@ -107,16 +107,16 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) . +@@ -67,16 +67,16 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) . all: ${MAN1_PAGES} ${MAN5_PAGES} config/%/config.rst: ${COMPILEDIR}/docgen @@ -23,7 +23,7 @@ index d98302ff..72af586d 100644 ${MAN1_PAGES} ${MAN5_PAGES}: man-pages -@@ -131,7 +131,7 @@ onlinehelpinfo: +@@ -91,7 +91,7 @@ onlinehelpinfo: @echo "Build finished. OnlineHelpInfo.js is in $(BUILDDIR)/scanrefs." api-viewer/apidata.js: ${COMPILEDIR}/docgen @@ -33,12 +33,12 @@ index d98302ff..72af586d 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 2da02990..0d54716d 100644 +index 2da5884a..29851db8 100644 --- a/pxar-bin/tests/pxar.rs +++ b/pxar-bin/tests/pxar.rs @@ -17,7 +17,8 @@ fn pxar_create_and_extract() { - println!("run '{} create archive.pxar {}'", exec_path, src_dir); + println!("run '{exec_path} create archive.pxar {src_dir}'"); - Command::new(&exec_path) + Command::new("qemu-aarch64") @@ -48,7 +48,7 @@ index 2da02990..0d54716d 100644 .arg(src_dir) @@ -26,7 +27,8 @@ fn pxar_create_and_extract() { - println!("run '{} extract archive.pxar {}'", exec_path, dest_dir); + println!("run '{exec_path} extract archive.pxar {dest_dir}'"); - Command::new(&exec_path) + Command::new("qemu-aarch64") @@ -56,7 +56,7 @@ index 2da02990..0d54716d 100644 .arg("extract") .arg("./tests/archive.pxar") .arg("--target") -@@ -96,7 +98,8 @@ fn pxar_split_archive_test() { +@@ -93,7 +95,8 @@ fn pxar_split_archive_test() { println!("run '{exec_path} create archive.mpxar {src_dir} --payload-output archive.ppxar'"); @@ -66,7 +66,7 @@ index 2da02990..0d54716d 100644 .arg("create") .arg("./tests/archive.mpxar") .arg(src_dir) -@@ -104,7 +107,8 @@ fn pxar_split_archive_test() { +@@ -101,7 +104,8 @@ fn pxar_split_archive_test() { .status() .unwrap_or_else(|err| panic!("Failed to invoke '{exec_path}': {err}")); @@ -76,7 +76,7 @@ index 2da02990..0d54716d 100644 .arg("list") .arg("./tests/archive.mpxar") .arg("--payload-input=./tests/archive.ppxar") -@@ -125,7 +129,8 @@ fn pxar_split_archive_test() { +@@ -122,7 +126,8 @@ fn pxar_split_archive_test() { println!("run '{exec_path} extract archive.mpxar {dest_dir} --payload-input archive.ppxar'");