diff --git a/build.sh b/build.sh index eb76370..376faed 100755 --- a/build.sh +++ b/build.sh @@ -326,9 +326,9 @@ if [ "${BUILD_PACKAGE}" != "client" ]; then fi fi -PROXMOX_BACKUP_VER="4.0.9-1" -PROXMOX_BACKUP_GIT="0f2d199ca77c396177d131494d46d45542c14f91" -PROXMOX_GIT="a02d890f01f212663ab75989a79c7fc36d479ba3" +PROXMOX_BACKUP_VER="4.0.10-1" +PROXMOX_BACKUP_GIT="95a52db15c31bcd1b5d9bcb3168928febc819c41" +PROXMOX_GIT="b30155c819940df64a28a7e9eb521ef8314d5389" PATHPATTERNS_GIT="42e5e96e30297da878a4d4b3a7fa52b65c1be0ab" # 1.0.0-1 PXAR_GIT="993c66fcb8819770f279cb9fb4d13f58f367606c" # 1.0.0-1 PROXMOX_FUSE_GIT="87dbf9bfef9169286263bccffaae3206635ca108" # 1.0.0-1 @@ -349,6 +349,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-s3-client in 4.0.3-1 sed -i '/patch.crates-io/aproxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }' proxmox-backup/Cargo.toml + # Add missing proxmox-product-config in 4.0.10-1 + sed -i '/patch.crates-io/aproxmox-product-config = { path = "../proxmox/proxmox-product-config" }' 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 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 b2f7f0e..625e4e7 100644 --- a/patches/proxmox-backup-client.patch +++ b/patches/proxmox-backup-client.patch @@ -105,7 +105,7 @@ index 51fbd408..d1546dd4 100644 .PHONY: upload upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION) diff --git a/debian/control b/debian/control -index f9d70b25..e63d9d12 100644 +index 46789349..e63d9d12 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: bash-completion, @@ -117,7 +117,7 @@ index f9d70b25..e63d9d12 100644 rsync, texlive-fonts-extra , texlive-fonts-recommended , -@@ -33,35 +33,6 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary +@@ -33,36 +33,6 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary Homepage: https://www.proxmox.com Rules-Requires-Root: binary-targets @@ -144,6 +144,7 @@ index f9d70b25..e63d9d12 100644 - ${shlibs:Depends}, -Recommends: ifupdown2, - proxmox-mail-forward, +- proxmox-network-interface-pinning, - proxmox-offline-mirror-helper, - zfsutils-linux, -Description: Proxmox Backup Server daemon with tools and GUI @@ -153,7 +154,7 @@ index f9d70b25..e63d9d12 100644 Package: proxmox-backup-client Architecture: any Depends: qrencode, ${misc:Depends}, ${shlibs:Depends}, -@@ -76,21 +47,3 @@ Conflicts: proxmox-backup-client, +@@ -77,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.