jgaunt/proxmox-backup-arm64
1
0
Fork 0
mirror of https://github.com/wofferl/proxmox-backup-arm64 synced 2025-12-06 00:13:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update proxmox-backup-server-3.4.3-1

Browse Source 
Signed-off-by: Wolfgang <github@linux-dude.de>
This commit is contained in:
Wolfgang
2025-07-16 17:39:05 +00:00
parent aca1d0f788
commit 0a57e00fc2
3 changed files with 56 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.sh
View File

@@ -331,8 +331,8 @@ if [ "${BUILD_PACKAGE}" != "client" ]; then
fi fi
fi fi
PROXMOX_BACKUP_VER="3.4.2-1" PROXMOX_BACKUP_VER="3.4.3-1"
PROXMOX_BACKUP_GIT="37f1949335cad801f7cdaa0173cc114590a37e4e" PROXMOX_BACKUP_GIT="d84d10125d5de3653c3de2f0f31af5368bc09c35"
PROXMOX_GIT="43419da4e397aeb0f241d2fcb501cfe9ebeaed70" PROXMOX_GIT="43419da4e397aeb0f241d2fcb501cfe9ebeaed70"
PATHPATTERNS_GIT="281894a5b66099e919d167cd5f0644fff6aca234" # 0.3.0-1 PATHPATTERNS_GIT="281894a5b66099e919d167cd5f0644fff6aca234" # 0.3.0-1
PXAR_GIT="16773abdda5eb260216e3ed021309cfa32416b38" # 0.12.1-1 PXAR_GIT="16773abdda5eb260216e3ed021309cfa32416b38" # 0.12.1-1
@@ -350,7 +350,7 @@ if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${P
git_clone_or_fetch https://git.proxmox.com/git/proxmox-backup.git git_clone_or_fetch https://git.proxmox.com/git/proxmox-backup.git
git_clean_and_checkout ${PROXMOX_BACKUP_GIT} proxmox-backup git_clean_and_checkout ${PROXMOX_BACKUP_GIT} proxmox-backup
sed -i '/dh-cargo\|cargo:native\|rustc:native\|librust-/d' proxmox-backup/debian/control sed -i '/dh-cargo\|cargo:native\|rustc:native\|librust-/d' proxmox-backup/debian/control
sed -i 's/\(patchelf\|xindy\)\b/\1:native/' proxmox-backup/debian/control sed -i 's/\(patchelf\|xindy\|proxmox-biome\)\b/\1:native/' proxmox-backup/debian/control
sed -i 's/\(latexmk\|proxmox-widget-toolkit-dev\|pve-eslint\|python3-sphinx\)/\1:all/' proxmox-backup/debian/control sed -i 's/\(latexmk\|proxmox-widget-toolkit-dev\|pve-eslint\|python3-sphinx\)/\1:all/' proxmox-backup/debian/control
sed -i '/patch.crates-io/,/pxar/s/^#//' proxmox-backup/Cargo.toml sed -i '/patch.crates-io/,/pxar/s/^#//' proxmox-backup/Cargo.toml
# Add missing proxmox-shared-cache in 3.2.8-1 # Add missing proxmox-shared-cache in 3.2.8-1

36
patches/proxmox-backup-build.patch
View File

@@ -28,7 +28,7 @@ index a439c97b..a95ae483 100644
[profile.release] [profile.release]
debug=true debug=true
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index d7470146..e5fc29ca 100644 index f14b4d8c..6541fd25 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
@@ -37,33 +37,59 @@ index d7470146..e5fc29ca 100644
include defines.mk include defines.mk
PACKAGE := proxmox-backup PACKAGE := proxmox-backup
@@ -42,7 +41,7 @@ SUBCRATES != cargo metadata --no-deps --format-version=1 \
STATIC_TARGET_DIR := target/static-build
ifeq ($(BUILD_MODE), release)
CARGO_BUILD_ARGS += --release --target $(DEB_HOST_RUST_TYPE)
-CARGO_STATIC_CONFIG ?= --config debian/cargo_home/config.static.toml
+CARGO_STATIC_CONFIG ?= --config .cargo/config.static.toml
CARGO_STATIC_BUILD_ARGS += $(CARGO_STATIC_CONFIG) --release --target $(DEB_HOST_RUST_TYPE) --target-dir $(STATIC_TARGET_DIR)
COMPILEDIR := target/$(DEB_HOST_RUST_TYPE)/release
STATIC_COMPILEDIR := $(STATIC_TARGET_DIR)/$(DEB_HOST_RUST_TYPE)/release
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index be7c93c2..df9e8e27 100755 index ab48cce1..fc113a98 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -4,12 +4,9 @@ @@ -4,10 +4,9 @@
DH_VERBOSE = 1 DH_VERBOSE = 1
include /usr/share/dpkg/pkg-info.mk include /usr/share/dpkg/pkg-info.mk
-include /usr/share/rustc/architecture.mk -include /usr/share/rustc/architecture.mk
export BUILD_MODE=release export BUILD_MODE=release
-export CARGO_STATIC_CONFIG=--config debian/cargo_home/config.static.toml
+export CARGO_STATIC_CONFIG=--config .cargo/config.static.toml
# sync with Makefile!
STATIC_TARGET_DIR := target/static-build
@@ -18,11 +17,9 @@ STATIC_COMPILEDIR := $(STATIC_TARGET_DIR)/$(DEB_HOST_RUST_TYPE)/debug
endif
# end sync with Makefile!
-export CARGO=/usr/share/cargo/bin/cargo -export CARGO=/usr/share/cargo/bin/cargo
- -
export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE
export CARGO_HOME = $(CURDIR)/debian/cargo_home -export CARGO_HOME = $(CURDIR)/debian/cargo_home
@@ -27,12 +24,6 @@ endif +export CARGO_HOME = $(CURDIR)/.cargo
export DEB_CARGO_CRATE=proxmox-backup_$(DEB_VERSION_UPSTREAM)
export DEB_CARGO_PACKAGE=proxmox-backup
@@ -37,15 +34,9 @@ endif
override_dh_auto_configure: override_dh_auto_configure:
@perl -ne 'if (/^version\s*=\s*"(\d+(?:\.\d+)+)"/) { my $$v_cargo = $$1; my $$v_deb = "$(DEB_VERSION_UPSTREAM)"; \ @perl -ne 'if (/^version\s*=\s*"(\d+(?:\.\d+)+)"/) { my $$v_cargo = $$1; my $$v_deb = "$(DEB_VERSION_UPSTREAM)"; \
die "ERROR: d/changelog <-> Cargo.toml version mismatch: $$v_cargo != $$v_deb\n" if $$v_cargo ne $$v_deb; exit(0); }' Cargo.toml die "ERROR: d/changelog <-> Cargo.toml version mismatch: $$v_cargo != $$v_deb\n" if $$v_cargo ne $$v_deb; exit(0); }' Cargo.toml
- $(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system - $(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system
# add a new config for static building, sync with Makefile!
- cp debian/cargo_home/config.toml debian/cargo_home/config.static.toml
- sed -ri -e 's!^(rustflags = .*)\]$$!\1, "-C", "target-feature=+crt-static", "-L", "$(STATIC_COMPILEDIR)/deps-stubs/"\]!' debian/cargo_home/config.static.toml
- # `cargo build` and `cargo install` have different config precedence, symlink - # `cargo build` and `cargo install` have different config precedence, symlink
- # the wrapper config into a place where `build` picks it up as well.. - # the wrapper config into a place where `build` picks it up as well..
- # https://doc.rust-lang.org/cargo/commands/cargo-install.html#configuration-discovery - # https://doc.rust-lang.org/cargo/commands/cargo-install.html#configuration-discovery
- mkdir -p .cargo - mkdir -p .cargo
- ln -s $(CARGO_HOME)/config.toml $(CURDIR)/.cargo/config.toml - ln -s $(CARGO_HOME)/config.toml $(CURDIR)/.cargo/config.toml
+ cp $(CARGO_HOME)/config.toml $(CARGO_HOME)/config.static.toml
+ echo '[build]\nrustflags = ["-C", "target-feature=+crt-static"]' >> $(CARGO_HOME)/config.static.toml
dh_auto_configure dh_auto_configure
override_dh_auto_build: override_dh_auto_build:

87
patches/proxmox-backup-client.patch
View File

@@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index c0bb1920..a3a8e9ec 100644 index 569c7e79..e3c82e26 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -10,27 +10,16 @@ SUBDIRS := etc www docs templates @@ -10,27 +10,16 @@ SUBDIRS := etc www docs templates
@@ -34,7 +34,7 @@ index c0bb1920..a3a8e9ec 100644
SUBCRATES != cargo metadata --no-deps --format-version=1 \ SUBCRATES != cargo metadata --no-deps --format-version=1 \
| jq -r .workspace_members'[]' \ | jq -r .workspace_members'[]' \
@@ -75,8 +64,7 @@ STATIC_CLIENT_DEB=$(PACKAGE)-client-static_$(DEB_VERSION)_$(ARCH).deb @@ -79,8 +68,7 @@ STATIC_CLIENT_DEB=$(PACKAGE)-client-static_$(DEB_VERSION)_$(ARCH).deb
STATIC_CLIENT_DBG_DEB=$(PACKAGE)-client-static-dbgsym_$(DEB_VERSION)_$(ARCH).deb STATIC_CLIENT_DBG_DEB=$(PACKAGE)-client-static-dbgsym_$(DEB_VERSION)_$(ARCH).deb
DOC_DEB=$(PACKAGE)-docs_$(DEB_VERSION)_all.deb DOC_DEB=$(PACKAGE)-docs_$(DEB_VERSION)_all.deb
@@ -44,66 +44,12 @@ index c0bb1920..a3a8e9ec 100644
DSC = rust-$(PACKAGE)_$(DEB_VERSION).dsc DSC = rust-$(PACKAGE)_$(DEB_VERSION).dsc
@@ -176,31 +164,11 @@ cargo-build:
$(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
.do-cargo-build:
$(CARGO) build $(CARGO_BUILD_ARGS) \
- --package proxmox-backup-banner \
- --bin proxmox-backup-banner \
--package proxmox-backup-client \
--bin proxmox-backup-client \
--bin dump-catalog-shell-cli \
- --bin proxmox-backup-debug \
- --package proxmox-file-restore \
- --bin proxmox-file-restore \
--package pxar-bin \
- --bin pxar \
- --package pbs-tape \
- --bin pmt \
- --bin pmtx \
- --package proxmox-restore-daemon \
- --bin proxmox-restore-daemon \
- --package proxmox-backup \
- --bin docgen \
- --bin pbs2to3 \
- --bin proxmox-backup-api \
- --bin proxmox-backup-manager \
- --bin proxmox-backup-proxy \
- --bin proxmox-daily-update \
- --bin proxmox-file-restore \
- --bin proxmox-tape \
- --bin sg-tape-cmd
+ --bin pxar
touch "$@"
.PHONY: proxmox-backup-client-static
@@ -231,20 +199,9 @@ install: $(COMPILED_BINS) $(STATIC_BINS)
$(foreach i,$(USR_SBIN), \
install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ; \
install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;)
- install -m755 $(COMPILEDIR)/pbs2to3 $(DESTDIR)$(SBINDIR)/
- install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup
- install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore
- $(foreach i,$(RESTORE_BIN), \
- install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore/ ;)
- # install sg-tape-cmd as setuid binary
- install -m4755 -o root -g root $(COMPILEDIR)/sg-tape-cmd $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/sg-tape-cmd
- $(foreach i,$(SERVICE_BIN), \
- install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
install -m755 $(STATIC_COMPILEDIR)/proxmox-backup-client $(DESTDIR)$(BINDIR)/proxmox-backup-client-static
install -m755 $(STATIC_COMPILEDIR)/pxar $(DESTDIR)$(BINDIR)/pxar-static
- $(MAKE) -C www install
$(MAKE) -C docs install
- $(MAKE) -C templates install
.PHONY: upload
upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
diff --git a/debian/control b/debian/control diff --git a/debian/control b/debian/control
index a9040a3a..a19c33b8 100644 index bd22d453..f9b5180c 100644
--- a/debian/control --- a/debian/control
+++ b/debian/control +++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: bash-completion, @@ -20,7 +20,7 @@ Build-Depends: bash-completion,
pve-eslint:all (>= 7.18.0~), proxmox-biome:native,
python3-docutils, python3-docutils,
python3-pygments, python3-pygments,
- python3-sphinx:all <!nodoc>, - python3-sphinx:all <!nodoc>,
@@ -111,7 +57,7 @@ index a9040a3a..a19c33b8 100644
rsync, rsync,
texlive-fonts-extra <!nodoc>, texlive-fonts-extra <!nodoc>,
texlive-fonts-recommended <!nodoc>, texlive-fonts-recommended <!nodoc>,
@@ -35,35 +35,6 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary @@ -34,35 +34,6 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary
Homepage: https://www.proxmox.com Homepage: https://www.proxmox.com
Rules-Requires-Root: binary-targets Rules-Requires-Root: binary-targets
@@ -147,7 +93,7 @@ index a9040a3a..a19c33b8 100644
Package: proxmox-backup-client Package: proxmox-backup-client
Architecture: any Architecture: any
Depends: qrencode, ${misc:Depends}, ${shlibs:Depends}, Depends: qrencode, ${misc:Depends}, ${shlibs:Depends},
@@ -78,21 +49,3 @@ Conflicts: proxmox-backup-client, @@ -77,21 +48,3 @@ Conflicts: proxmox-backup-client,
Description: Proxmox Backup Client tools (statically linked) Description: Proxmox Backup Client tools (statically linked)
This package contains the Proxmox Backup client, which provides a This package contains the Proxmox Backup client, which provides a
simple command line tool to create and restore backups. simple command line tool to create and restore backups.
@@ -170,10 +116,19 @@ index a9040a3a..a19c33b8 100644
- restoring individual files and folders from both host/container and VM/block - restoring individual files and folders from both host/container and VM/block
- device backups. It includes a block device restore driver using QEMU. - device backups. It includes a block device restore driver using QEMU.
diff --git a/debian/rules b/debian/rules diff --git a/debian/rules b/debian/rules
index 176720e3..5c203bc9 100755 index 723b714f..6318e5e9 100755
--- a/debian/rules --- a/debian/rules
+++ b/debian/rules +++ b/debian/rules
@@ -42,11 +42,6 @@ override_dh_auto_install: @@ -45,7 +45,7 @@ override_dh_auto_build:
LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
override_dh_missing:
- dh_missing --fail-missing
+ #dh_missing --fail-missing
override_dh_auto_install:
dh_auto_install -- \
@@ -55,11 +55,6 @@ override_dh_auto_install:
mv debian/tmp/usr/bin/proxmox-backup-client-static debian/proxmox-backup-client-static/usr/bin/proxmox-backup-client mv debian/tmp/usr/bin/proxmox-backup-client-static debian/proxmox-backup-client-static/usr/bin/proxmox-backup-client
mv debian/tmp/usr/bin/pxar-static debian/proxmox-backup-client-static/usr/bin/pxar mv debian/tmp/usr/bin/pxar-static debian/proxmox-backup-client-static/usr/bin/pxar
@@ -186,10 +141,10 @@ index 176720e3..5c203bc9 100755
dh_fixperms --exclude sg-tape-cmd dh_fixperms --exclude sg-tape-cmd
diff --git a/docs/Makefile b/docs/Makefile diff --git a/docs/Makefile b/docs/Makefile
index c57cbbc2..1631bbb8 100644 index 2e1de4e9..bf6e8df2 100644
--- a/docs/Makefile --- a/docs/Makefile
+++ b/docs/Makefile +++ b/docs/Makefile
@@ -1,59 +1,18 @@ @@ -1,60 +1,18 @@
include ../defines.mk include ../defines.mk
GENERATED_SYNOPSIS := \ GENERATED_SYNOPSIS := \
@@ -218,14 +173,16 @@ index c57cbbc2..1631bbb8 100644
MAN1_PAGES := \ MAN1_PAGES := \
- pbs2to3.1 \ - pbs2to3.1 \
- pbs3to4.1 \
- pmt.1 \ - pmt.1 \
- pmtx.1 \ - pmtx.1 \
proxmox-backup-client.1 \ - proxmox-backup-client.1 \
- proxmox-backup-debug.1 \ - proxmox-backup-debug.1 \
- proxmox-backup-manager.1 \ - proxmox-backup-manager.1 \
- proxmox-backup-proxy.1 \ - proxmox-backup-proxy.1 \
- proxmox-file-restore.1 \ - proxmox-file-restore.1 \
- proxmox-tape.1 \ - proxmox-tape.1 \
+ proxmox-backup-client.1 \
pxar.1 \ pxar.1 \
# FIXME: prefix all man pages that are not directly relating to an existing executable with # FIXME: prefix all man pages that are not directly relating to an existing executable with