diff --git a/build.sh b/build.sh index 0665a6d..c623881 100755 --- a/build.sh +++ b/build.sh @@ -139,15 +139,15 @@ else echo "proxmox-widget-toolkit up-to-date" fi -PROXMOX_BACKUP_VER="2.2.7-1" -PROXMOX_BACKUP_GIT="7c1029d76008f64164403cfe7c5d79096d15933d" -PATHPATTERNS_GIT="fda9f89ee0f2229f2863f6e9cfb4fed3b9ce0614" +PROXMOX_BACKUP_VER="2.3.1-1" +PROXMOX_BACKUP_GIT="2abb984b58aca4169fbf9a22ebf302d186f3e062" +PATHPATTERNS_GIT="916e41c50e75a718ab7b1b95dc770eed9cd7a403" PROXMOX_ACME_RS_GIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05" -PROXMOX_APT_GIT="6c0c48b97a29cac1519402e4a1c77010e8a5d216" -PROMXOX_FUSE_GIT="6dcf34d2fd516aeca57a62ee4657526552ab4630" -PROXMOX_GIT="2ae95b5f4e9870113dab8fea1df631299559d4a4" +PROXMOX_APT_GIT="8a7a719aec23ad98a00bb452f0ced4cbf88ba591" +PROMXOX_FUSE_GIT="8d57fb64f044ea3dcfdef77ed5f1888efdab0708" +PROXMOX_GIT="d513ef78361cbdb505b4e0e6dbf74b1a10ee987e" PROXMOX_OPENID_GIT="ce6def219262b5c1f6dbe5440f9f90038bafb3d8" -PXAR_GIT="b203d38bcd399f852f898d24403f3d592e5f75f8" +PXAR_GIT="29cbeed3e1b52f5eef455cdfa8b5e93f4e3e88f5" if [ ! -e "${PACKAGES}/proxmox-backup-server_${PROXMOX_BACKUP_VER}_arm64.deb" ]; then git_clone_or_fetch https://git.proxmox.com/git/proxmox.git git_clean_and_checkout ${PROXMOX_GIT} proxmox diff --git a/patches/proxmox-backup-arm.patch b/patches/proxmox-backup-arm.patch index 78167b1..6c2b2e9 100644 --- a/patches/proxmox-backup-arm.patch +++ b/patches/proxmox-backup-arm.patch @@ -25,10 +25,10 @@ index 3b5b6e48..50908c05 100644 +[source.vendored-sources] +directory = "vendor" diff --git a/Cargo.toml b/Cargo.toml -index 628fdd1a..ab1fe720 100644 +index 38e9c1f2..7ac2ed4c 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -128,26 +128,28 @@ pbs-tape = { path = "pbs-tape" } +@@ -127,27 +127,29 @@ 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] @@ -42,6 +42,7 @@ index 628fdd1a..ab1fe720 100644 -#proxmox-io = { path = "../proxmox/proxmox-io" } -#proxmox-lang = { path = "../proxmox/proxmox-lang" } -#proxmox-openid = { path = "../proxmox-openid-rs" } +-#proxmox-router = { path = "../proxmox/proxmox-rest-server" } -#proxmox-router = { path = "../proxmox/proxmox-router" } -#proxmox-schema = { path = "../proxmox/proxmox-schema" } -#proxmox-section-config = { path = "../proxmox/proxmox-section-config" } @@ -63,6 +64,7 @@ index 628fdd1a..ab1fe720 100644 +proxmox-lang = { path = "../proxmox/proxmox-lang" } +proxmox-metrics = { path = "../proxmox/proxmox-metrics" } +proxmox-openid = { path = "../proxmox-openid-rs" } ++proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" } +proxmox-router = { path = "../proxmox/proxmox-router" } +proxmox-schema = { path = "../proxmox/proxmox-schema" } +proxmox-section-config = { path = "../proxmox/proxmox-section-config" } @@ -78,7 +80,7 @@ index 628fdd1a..ab1fe720 100644 [features] default = [] diff --git a/debian/control b/debian/control -index 6456f007..dcafaf1e 100644 +index 6207d85e..114e1a7a 100644 --- a/debian/control +++ b/debian/control @@ -2,124 +2,7 @@ Source: rust-proxmox-backup @@ -109,8 +111,8 @@ index 6456f007..dcafaf1e 100644 - librust-hex-0.4+default-dev (>= 0.4.3-~~), - librust-hex-0.4+serde-dev (>= 0.4.3-~~), - librust-http-0.2+default-dev, -- librust-hyper-0.14+default-dev (>= 0.14.5-~~), -- librust-hyper-0.14+full-dev (>= 0.14.5-~~), +- librust-hyper-0.14+default-dev, +- librust-hyper-0.14+full-dev, - librust-lazy-static-1+default-dev (>= 1.4-~~), - librust-libc-0.2+default-dev, - librust-log-0.4+default-dev (>= 0.4.17-~~), @@ -141,32 +143,32 @@ index 6456f007..dcafaf1e 100644 - librust-proxmox-lang-1+default-dev (>= 1.1-~~), - librust-proxmox-metrics-0.2+default-dev, - librust-proxmox-openid-0.9+default-dev, -- librust-proxmox-router-1+cli-dev (>= 1.3.0-~~), -- librust-proxmox-router-1+default-dev (>= 1.3.0-~~), -- librust-proxmox-router-1+server-dev (>= 1.3.0-~~), +- librust-proxmox-rest-server-0.2+default-dev, +- librust-proxmox-router-1+cli-dev (>= 1.3-~~), +- librust-proxmox-router-1+default-dev (>= 1.3-~~), +- librust-proxmox-router-1+server-dev (>= 1.3-~~), - 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 (>= 0.1.1-~~), - librust-proxmox-serde-0.1+serde-json-dev (>= 0.1.1-~~), - librust-proxmox-shared-memory-0.2+default-dev, - librust-proxmox-subscription-0.3+api-types-dev, - librust-proxmox-subscription-0.3+default-dev, -- librust-proxmox-sys-0.4+acl-dev, -- librust-proxmox-sys-0.4+crypt-dev, -- librust-proxmox-sys-0.4+default-dev, -- librust-proxmox-sys-0.4+logrotate-dev, -- librust-proxmox-sys-0.4+sortable-macro-dev, -- librust-proxmox-sys-0.4+timer-dev, +- librust-proxmox-sys-0.4+acl-dev (>= 0.4.1-~~), +- librust-proxmox-sys-0.4+crypt-dev (>= 0.4.1-~~), +- librust-proxmox-sys-0.4+default-dev (>= 0.4.1-~~), +- librust-proxmox-sys-0.4+logrotate-dev (>= 0.4.1-~~), +- librust-proxmox-sys-0.4+sortable-macro-dev (>= 0.4.1-~~), +- librust-proxmox-sys-0.4+timer-dev (>= 0.4.1-~~), - librust-proxmox-tfa-2+api-dev (>= 2.1-~~), - librust-proxmox-tfa-2+api-types-dev (>= 2.1-~~), - librust-proxmox-tfa-2+default-dev (>= 2.1-~~), - librust-proxmox-time-1+default-dev (>= 1.1.2-~~), - librust-proxmox-uuid-1+default-dev, - 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-pxar-0.10+default-dev (>= 0.10.2-~~), +- librust-pxar-0.10+tokio-io-dev (>= 0.10.2-~~), - librust-regex-1+default-dev (>= 1.5.5-~~), - librust-rustyline-9+default-dev, - librust-serde-1+default-dev,