diff --git a/build.sh b/build.sh index 2763988..2636f94 100755 --- a/build.sh +++ b/build.sh @@ -101,14 +101,14 @@ else echo "proxmox-widget-toolkit up-to-date" fi -PROXMOX_BACKUP_VER="2.2.1-1" -PROXMOX_BACKUP_GIT="0f8fd71093569c664ae50104392baeb82d1d6e4e" +PROXMOX_BACKUP_VER="2.2.3-2" +PROXMOX_BACKUP_GIT="b80d7f95db9cd3842ab88d9613554fcab19aac0d" PATHPATTERNS_GIT="916e41c50e75a718ab7b1b95dc770eed9cd7a403" PROXMOX_ACME_RS_GIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05" PROXMOX_APT_GIT="c7b17de1b5fec5807921efc9565917c3d6b09417" PROMXOX_FUSE_GIT="c27f3c3114fd49f232400fd6c512abdfd32bbc64" -PROXMOX_GIT="42dd95aa6fab73ed75943b4db86f9633864650e1" -PROXMOX_OPENID_GIT="0afe853119bfa74b15c21f25888b6adfb35342ef" +PROXMOX_GIT="7667e549a539edff6f33cbf35d0f880383ebec61" +PROXMOX_OPENID_GIT="0ec392e425a946b018c64e98a4181a22e0e25a2c" 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 6715c41..1aa9d3e 100644 --- a/patches/proxmox-backup-arm.patch +++ b/patches/proxmox-backup-arm.patch @@ -25,13 +25,15 @@ index 3b5b6e48..50908c05 100644 +[source.vendored-sources] +directory = "vendor" diff --git a/Cargo.toml b/Cargo.toml -index 1790c726..c0684bde 100644 +index 234f2bee..5b8f34b2 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -126,23 +126,26 @@ pbs-tape = { path = "pbs-tape" } +@@ -126,26 +126,26 @@ pbs-tape = { path = "pbs-tape" } # Local path overrides # NOTE: You must run `cargo update` after changing this for it to take effect! [patch.crates-io] +-#proxmox-acme-rs = { path = "../proxmox-acme-rs" } +-#proxmox-apt = { path = "../proxmox-apt" } -#proxmox-async = { path = "../proxmox/proxmox-async" } -#proxmox-compression = { path = "../proxmox/proxmox-compression" } -#proxmox-borrow = { path = "../proxmox/proxmox-borrow" } @@ -39,6 +41,7 @@ index 1790c726..c0684bde 100644 -#proxmox-http = { path = "../proxmox/proxmox-http" } -#proxmox-io = { path = "../proxmox/proxmox-io" } -#proxmox-lang = { path = "../proxmox/proxmox-lang" } +-#proxmox-openid = { path = "../proxmox-openid-rs" } -#proxmox-router = { path = "../proxmox/proxmox-router" } -#proxmox-schema = { path = "../proxmox/proxmox-schema" } -#proxmox-section-config = { path = "../proxmox/proxmox-section-config" } @@ -49,13 +52,16 @@ index 1790c726..c0684bde 100644 -#proxmox-time = { path = "../proxmox/proxmox-time" } -#proxmox-uuid = { path = "../proxmox/proxmox-uuid" } -#pxar = { path = "../pxar" } ++proxmox-acme-rs = { path = "../proxmox-acme-rs" } ++proxmox-apt = { path = "../proxmox-apt" } +proxmox-async = { path = "../proxmox/proxmox-async" } -+proxmox-borrow = { path = "../proxmox/proxmox-borrow" } +proxmox-compression = { path = "../proxmox/proxmox-compression" } ++proxmox-borrow = { path = "../proxmox/proxmox-borrow" } +proxmox-fuse = { path = "../proxmox-fuse" } +proxmox-http = { path = "../proxmox/proxmox-http" } +proxmox-io = { path = "../proxmox/proxmox-io" } +proxmox-lang = { path = "../proxmox/proxmox-lang" } ++proxmox-openid = { path = "../proxmox-openid-rs" } +proxmox-router = { path = "../proxmox/proxmox-router" } +proxmox-schema = { path = "../proxmox/proxmox-schema" } +proxmox-section-config = { path = "../proxmox/proxmox-section-config" } @@ -66,17 +72,14 @@ index 1790c726..c0684bde 100644 +proxmox-time = { path = "../proxmox/proxmox-time" } +proxmox-uuid = { path = "../proxmox/proxmox-uuid" } +pxar = { path = "../pxar" } -+proxmox-acme-rs = { path = "../proxmox-acme-rs" } -+proxmox-apt = { path = "../proxmox-apt" } -+proxmox-openid = { path = "../proxmox-openid-rs" } [features] default = [] diff --git a/debian/control b/debian/control -index c0cda274..f3298cbe 100644 +index dbd3d14a..f3298cbe 100644 --- a/debian/control +++ b/debian/control -@@ -6,107 +6,6 @@ Build-Depends: debhelper (>= 12), +@@ -6,108 +6,6 @@ Build-Depends: debhelper (>= 12), cargo:native, rustc:native, libstd-rust-dev, @@ -105,7 +108,7 @@ index c0cda274..f3298cbe 100644 - librust-lazy-static-1+default-dev (>= 1.4-~~), - librust-libc-0.2+default-dev, - librust-log-0.4+default-dev (>= 0.4.17-~~) , -- librust-nix-0.19+default-dev (>= 0.19.1-~~), +- librust-nix-0.24+default-dev, - librust-nom-5+default-dev (>= 5.1-~~), - librust-num-traits-0.2+default-dev, - librust-once-cell-1+default-dev (>= 1.3.1-~~), @@ -121,10 +124,10 @@ index c0cda274..f3298cbe 100644 - 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.1+client-dev, -- librust-proxmox-http-0.6.1+default-dev, -- librust-proxmox-http-0.6.1+http-helpers-dev, -- librust-proxmox-http-0.6.1+websocket-dev, +- librust-proxmox-http-0.6+client-dev (>= 0.6.1-~~), +- librust-proxmox-http-0.6+default-dev (>= 0.6.1-~~), +- librust-proxmox-http-0.6+http-helpers-dev (>= 0.6.1-~~), +- librust-proxmox-http-0.6+websocket-dev (>= 0.6.1-~~), - librust-proxmox-io-1+default-dev (>= 1.0.1-~~), - librust-proxmox-io-1+tokio-dev (>= 1.0.1-~~), - librust-proxmox-lang-1+default-dev (>= 1.1-~~), @@ -137,8 +140,9 @@ index c0cda274..f3298cbe 100644 - librust-proxmox-section-config-1+default-dev, - librust-proxmox-serde-0.1+default-dev, - librust-proxmox-shared-memory-0.2+default-dev, -- librust-proxmox-sys-0.2+default-dev (>= 0.2.1-~~), -- librust-proxmox-sys-0.2+sortable-macro-dev (>= 0.2.1-~~), +- librust-proxmox-sys-0.3+default-dev, +- librust-proxmox-sys-0.3+logrotate-dev, +- librust-proxmox-sys-0.3+sortable-macro-dev, - librust-proxmox-tfa-2+api-dev, - librust-proxmox-tfa-2+api-types-dev, - librust-proxmox-tfa-2+default-dev, @@ -148,7 +152,7 @@ index c0cda274..f3298cbe 100644 - 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.5-~~), -- librust-rustyline-7+default-dev, +- librust-rustyline-9+default-dev, - librust-serde-1+default-dev, - librust-serde-1+derive-dev, - librust-serde-cbor-0.11+default-dev (>= 0.11.1-~~), @@ -171,9 +175,9 @@ index c0cda274..f3298cbe 100644 - librust-tokio-1+time-dev (>= 1.6-~~), - librust-tokio-openssl-0.6+default-dev (>= 0.6.1-~~), - librust-tokio-stream-0.1+default-dev, -- librust-tokio-util-0.6+codec-dev, -- librust-tokio-util-0.6+default-dev, -- librust-tokio-util-0.6+io-dev, +- librust-tokio-util-0.7+codec-dev, +- librust-tokio-util-0.7+default-dev, +- librust-tokio-util-0.7+io-dev, - librust-tower-service-0.3+default-dev, - librust-udev-0.4+default-dev, - librust-url-2+default-dev (>= 2.1-~~),