diff --git a/build.sh b/build.sh index a7615f2..f8d68ad 100755 --- a/build.sh +++ b/build.sh @@ -242,13 +242,12 @@ ${SUDO} apt install -y "${packages_install[@]}" cd "${SOURCES}" -PROXMOX_BACKUP_VER="2.4.2-2" -PROXMOX_BACKUP_GIT="891f6a6fe430e8c269e49cea0d878e96970ffc86" +PROXMOX_BACKUP_VER="2.4.3-1" +PROXMOX_BACKUP_GIT="682bb42edd01c9ebe6595f2aeef6c56dee6f91cf" PATHPATTERNS_GIT="8a0dce93d535ef04bfa9c8317edc0ef0216e9042" # 0.1.3-1 PROXMOX_ACME_RS_GIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05" # 0.4.0 -PROXMOX_APT_GIT="8a7a719aec23ad98a00bb452f0ced4cbf88ba591" # 0.9.3-1 PROMXOX_FUSE_GIT="8d57fb64f044ea3dcfdef77ed5f1888efdab0708" # 0.1.4 -PROXMOX_GIT="76ac1a3903a1f29e718fefd69a845be2f48df64b" +PROXMOX_GIT="286c55d5b493a1e76fa3e70ae1c874cf82ca39aa" PROXMOX_OPENID_GIT="ecf59cbb74278ea0e9710466508158ed6a6828c4" # 0.9.9-1 PXAR_GIT="29cbeed3e1b52f5eef455cdfa8b5e93f4e3e88f5" # 0.10.2-1 if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${PACKAGE_ARCH}.deb" ]; then @@ -262,8 +261,6 @@ if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${P git_clean_and_checkout ${PATHPATTERNS_GIT} pathpatterns git_clone_or_fetch https://git.proxmox.com/git/proxmox-acme-rs.git git_clean_and_checkout ${PROXMOX_ACME_RS_GIT} proxmox-acme-rs - git_clone_or_fetch https://git.proxmox.com/git/proxmox-apt.git - git_clean_and_checkout ${PROXMOX_APT_GIT} proxmox-apt git_clone_or_fetch https://git.proxmox.com/git/proxmox-openid-rs.git git_clean_and_checkout ${PROXMOX_OPENID_GIT} proxmox-openid-rs diff --git a/patches/proxmox-backup-build.patch b/patches/proxmox-backup-build.patch index 3ff98ef..f1d01c5 100644 --- a/patches/proxmox-backup-build.patch +++ b/patches/proxmox-backup-build.patch @@ -78,7 +78,7 @@ index 20c1e9c8..c0e13abe 100644 -#proxmox-apt = { path = "../proxmox-apt" } -#proxmox-openid = { path = "../proxmox-openid-rs" } -+proxmox-apt = { path = "../proxmox-apt" } ++proxmox-apt = { path = "../proxmox/proxmox-apt" } +proxmox-openid = { path = "../proxmox-openid-rs" } -#pxar = { path = "../pxar" } diff --git a/patches/proxmox-backup-client.patch b/patches/proxmox-backup-client.patch index 542fc36..7fe5d0d 100644 --- a/patches/proxmox-backup-client.patch +++ b/patches/proxmox-backup-client.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index b307009d..3473103a 100644 +index 06928be7..00751f1c 100644 --- a/Makefile +++ b/Makefile @@ -4,32 +4,21 @@ include defines.mk @@ -82,20 +82,14 @@ index b307009d..3473103a 100644 touch "$@" -@@ -186,10 +155,11 @@ lint: - cargo clippy -- -A clippy::all -D clippy::correctness - - install: $(COMPILED_BINS) -+ @echo "$(DESTDIR)" - install -dm755 $(DESTDIR)$(BINDIR) - install -dm755 $(DESTDIR)$(ZSH_COMPL_DEST) - $(foreach i,$(USR_BIN), \ -- install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(BINDIR)/ ; \ -+ install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)/$(BINDIR)/ ; \ - install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;) - install -dm755 $(DESTDIR)$(SBINDIR) +@@ -195,16 +164,16 @@ install: $(COMPILED_BINS) $(foreach i,$(USR_SBIN), \ -@@ -200,10 +170,10 @@ install: $(COMPILED_BINS) + install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ; \ + install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;) +- install -m755 $(COMPILEDIR)/pbs2to3 $(DESTDIR)$(SBINDIR)/ ++ #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 @@ -206,10 +200,10 @@ index 1ebd7460..c72dcd50 100755 override_dh_fixperms: dh_fixperms --exclude sg-tape-cmd diff --git a/docs/Makefile b/docs/Makefile -index b06badff..32b51556 100644 +index 0d0963f3..32b51556 100644 --- a/docs/Makefile +++ b/docs/Makefile -@@ -1,48 +1,15 @@ +@@ -1,49 +1,15 @@ include ../defines.mk GENERATED_SYNOPSIS := \ @@ -243,7 +237,8 @@ index b06badff..32b51556 100644 - proxmox-backup-client.1 \ - proxmox-backup-manager.1 \ - proxmox-file-restore.1 \ -- proxmox-backup-debug.1 +- proxmox-backup-debug.1 \ +- pbs2to3.1 \ - -MAN5_PAGES := \ - media-pool.cfg.5 \