diff --git a/build.sh b/build.sh index 26313b2..04b83e3 100755 --- a/build.sh +++ b/build.sh @@ -84,8 +84,8 @@ else echo "libproxmox-acme-perl up-to-date" fi -PROXMOX_WIDGETTOOLKIT_VER="3.4-7" -PROXMOX_WIDGETTOOLKIT_GIT="c39864ee29205e250f0d45a40bfc246cd287b526" +PROXMOX_WIDGETTOOLKIT_VER="3.4-9" +PROXMOX_WIDGETTOOLKIT_GIT="ad772f5bc6e10b9a172eae6f4269242036ea6e2d" if ! dpkg-query -W -f='${Version}' proxmox-widget-toolkit-dev | grep -q ${PROXMOX_WIDGETTOOLKIT_VER}; then git_clone_or_fetch https://git.proxmox.com/git/proxmox-widget-toolkit.git cd proxmox-widget-toolkit/ @@ -101,14 +101,14 @@ else echo "proxmox-widget-toolkit up-to-date" fi -PROXMOX_BACKUP_VER="2.1.5-1" -PROXMOX_BACKUP_GIT="7a524f1048c22f99dbd729e141e28397fcf81d3b" +PROXMOX_BACKUP_VER="2.1.6-1" +PROXMOX_BACKUP_GIT="fb3c007f8ac362cc475e5bf8b8912c67ce4a6812" PATHPATTERNS_GIT="916e41c50e75a718ab7b1b95dc770eed9cd7a403" -PROXMOX_ACME_RS_GIT="fb547f59352155bdc7a9738237e4df8fa0cda10d" +PROXMOX_ACME_RS_GIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05" PROXMOX_APT_GIT="c7b17de1b5fec5807921efc9565917c3d6b09417" -PROMXOX_FUSE_GIT="0e0966af8886c176d8decfe18cb7ead4db5a83a6" -PROXMOX_GIT="41862eeb95b70201c47dfd27fca37879e23be3ff" -PROXMOX_OPENID_GIT="bdcecd3214fc11f2a8b96611624c7075eb20a435" +PROMXOX_FUSE_GIT="c27f3c3114fd49f232400fd6c512abdfd32bbc64" +PROXMOX_GIT="c01b08fea980d67cc8b20ecaa0f282188b2c829c" +PROXMOX_OPENID_GIT="0afe853119bfa74b15c21f25888b6adfb35342ef" PXAR_GIT="b203d38bcd399f852f898d24403f3d592e5f75f8" if [ ! -e "${PACKAGES}/proxmox-backup-server_${PROXMOX_BACKUP_VER}_arm64.deb" ]; then git_clone_or_fetch https://git.proxmox.com/git/proxmox.git diff --git a/patches/proxmox-backup-arm.patch b/patches/proxmox-backup-arm.patch index 16f532c..8582719 100644 --- a/patches/proxmox-backup-arm.patch +++ b/patches/proxmox-backup-arm.patch @@ -28,7 +28,7 @@ diff --git a/Cargo.toml b/Cargo.toml index f86c01f5..c8729b91 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -126,21 +126,28 @@ pbs-tape = { path = "pbs-tape" } +@@ -127,21 +127,29 @@ pbs-tape = { path = "pbs-tape" } # NOTE: You must run `cargo update` after changing this for it to take effect! [patch.crates-io] #proxmox = { path = "../proxmox/proxmox" } @@ -49,6 +49,7 @@ index f86c01f5..c8729b91 100644 -#pxar = { path = "../pxar" } +proxmox-async = { path = "../proxmox/proxmox-async" } +proxmox-borrow = { path = "../proxmox/proxmox-borrow" } ++proxmox-compression = { path = "../proxmox/proxmox-compression" } +proxmox-fuse = { path = "../proxmox-fuse" } +proxmox-http = { path = "../proxmox/proxmox-http" } +proxmox-io = { path = "../proxmox/proxmox-io" } @@ -76,7 +77,7 @@ diff --git a/debian/control b/debian/control index 90421d80..f3298cbe 100644 --- a/debian/control +++ b/debian/control -@@ -6,106 +6,6 @@ Build-Depends: debhelper (>= 12), +@@ -6,107 +6,6 @@ Build-Depends: debhelper (>= 12), cargo:native, rustc:native, libstd-rust-dev, @@ -109,16 +110,17 @@ index 90421d80..f3298cbe 100644 - librust-nom-5+default-dev (>= 5.1-~~), - librust-num-traits-0.2+default-dev, - librust-once-cell-1+default-dev (>= 1.3.1-~~), -- librust-openssl-0.10+default-dev, +- librust-openssl-0.10+default-dev (>= 0.10.38-~~), - librust-pam-0.7+default-dev, - librust-pam-sys-0.5+default-dev, - librust-pathpatterns-0.1+default-dev (>= 0.1.2-~~), - librust-percent-encoding-2+default-dev (>= 2.1-~~), - librust-pin-project-lite-0.2+default-dev, -- librust-proxmox-acme-rs-0.3+default-dev, +- librust-proxmox-acme-rs-0.4+default-dev, - librust-proxmox-apt-0.8+default-dev, -- librust-proxmox-async-0.3+default-dev, +- librust-proxmox-async-0.4+default-dev, - librust-proxmox-borrow-1+default-dev, +- librust-proxmox-compression-0.1+default-dev (>= 0.1.1-~~), - librust-proxmox-fuse-0.1+default-dev (>= 0.1.1-~~), - librust-proxmox-http-0.6+client-dev, - librust-proxmox-http-0.6+default-dev, @@ -126,13 +128,13 @@ index 90421d80..f3298cbe 100644 - librust-proxmox-http-0.6+websocket-dev, - librust-proxmox-io-1+default-dev (>= 1.0.1-~~), - librust-proxmox-io-1+tokio-dev (>= 1.0.1-~~), -- librust-proxmox-lang-1+default-dev, +- librust-proxmox-lang-1+default-dev (>= 1.1-~~), - librust-proxmox-openid-0.9+default-dev, -- librust-proxmox-router-1+cli-dev (>= 1.1-~~), -- librust-proxmox-router-1+default-dev (>= 1.1-~~), -- librust-proxmox-schema-1+api-macro-dev (>= 1.1-~~), -- librust-proxmox-schema-1+default-dev (>= 1.1-~~), -- librust-proxmox-schema-1+upid-api-impl-dev (>= 1.1-~~), +- librust-proxmox-router-1+cli-dev (>= 1.2-~~), +- librust-proxmox-router-1+default-dev (>= 1.2-~~), +- librust-proxmox-schema-1+api-macro-dev (>= 1.3.1-~~), +- librust-proxmox-schema-1+default-dev (>= 1.3.1-~~), +- librust-proxmox-schema-1+upid-api-impl-dev (>= 1.3.1-~~), - librust-proxmox-section-config-1+default-dev, - librust-proxmox-serde-0.1+default-dev, - librust-proxmox-shared-memory-0.2+default-dev, @@ -146,7 +148,7 @@ index 90421d80..f3298cbe 100644 - librust-proxmox-uuid-1+serde-dev, - librust-pxar-0.10+default-dev (>= 0.10.1-~~), - librust-pxar-0.10+tokio-io-dev (>= 0.10.1-~~), -- librust-regex-1+default-dev (>= 1.5-~~), +- librust-regex-1+default-dev (>= 1.5.5-~~), - librust-rustyline-7+default-dev, - librust-serde-1+default-dev, - librust-serde-1+derive-dev, diff --git a/patches/proxmox-no-ksm.patch b/patches/proxmox-no-ksm.patch index 57707fa..e47f89b 100644 --- a/patches/proxmox-no-ksm.patch +++ b/patches/proxmox-no-ksm.patch @@ -10,7 +10,7 @@ index 30b9978..ccb14aa 100644 use std::str::FromStr; use std::sync::RwLock; use std::time::Instant; -@@ -454,8 +455,12 @@ pub fn read_meminfo() -> Result { +@@ -455,8 +456,12 @@ pub fn read_meminfo() -> Result { meminfo.swapused = meminfo.swaptotal - meminfo.swapfree;