From df1ee5c29f9184ec657b6ce529bc12491f951e15 Mon Sep 17 00:00:00 2001 From: Matthias Freund Date: Wed, 18 May 2022 09:31:49 +0000 Subject: [PATCH] update proxmox-backup to 2.2.1-1 with dependencies - update proxmox-backup to 2.2.1-1 - update proxmox-i18n to 2.7-2 - update proxmox-widget-toolkit to 3.5.1 --- build.sh | 14 +++++++------- patches/proxmox-backup-arm.patch | 22 ++++++++++++---------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.sh b/build.sh index ea4907a..2763988 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-10" -PROXMOX_WIDGETTOOLKIT_GIT="081b26ed59f18a062379e4fcec0ed4fabc42d23a" +PROXMOX_WIDGETTOOLKIT_VER="3.5.1" +PROXMOX_WIDGETTOOLKIT_GIT="3e83971bca2abc2b2921cce7ab597466ce8ce005" 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,13 +101,13 @@ else echo "proxmox-widget-toolkit up-to-date" fi -PROXMOX_BACKUP_VER="2.1.8-1" -PROXMOX_BACKUP_GIT="60ed7aeae6f1c9004a98ebdbfd0b5852ea22dc39" +PROXMOX_BACKUP_VER="2.2.1-1" +PROXMOX_BACKUP_GIT="0f8fd71093569c664ae50104392baeb82d1d6e4e" PATHPATTERNS_GIT="916e41c50e75a718ab7b1b95dc770eed9cd7a403" PROXMOX_ACME_RS_GIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05" PROXMOX_APT_GIT="c7b17de1b5fec5807921efc9565917c3d6b09417" PROMXOX_FUSE_GIT="c27f3c3114fd49f232400fd6c512abdfd32bbc64" -PROXMOX_GIT="16daad64c7ddc3cec53da5c87ecab370894c7f4c" +PROXMOX_GIT="42dd95aa6fab73ed75943b4db86f9633864650e1" PROXMOX_OPENID_GIT="0afe853119bfa74b15c21f25888b6adfb35342ef" PXAR_GIT="b203d38bcd399f852f898d24403f3d592e5f75f8" if [ ! -e "${PACKAGES}/proxmox-backup-server_${PROXMOX_BACKUP_VER}_arm64.deb" ]; then @@ -178,8 +178,8 @@ else fi -PBS_I18N_VER="2.7-1" -PBS_I18N_GIT="234c18267e15605dbc8b23f8cd263dc7551c4693" +PBS_I18N_VER="2.7-2" +PBS_I18N_GIT="bd8a9ba2cc34872d3dd9579e412a19a3b5a05f21" if [ ! -e "${PACKAGES}/pbs-i18n_${PBS_I18N_VER}_all.deb" ]; then git_clone_or_fetch https://git.proxmox.com/git/proxmox-i18n.git git_clean_and_checkout ${PBS_I18N_GIT} proxmox-i18n diff --git a/patches/proxmox-backup-arm.patch b/patches/proxmox-backup-arm.patch index bad7480..6715c41 100644 --- a/patches/proxmox-backup-arm.patch +++ b/patches/proxmox-backup-arm.patch @@ -25,14 +25,15 @@ index 3b5b6e48..50908c05 100644 +[source.vendored-sources] +directory = "vendor" diff --git a/Cargo.toml b/Cargo.toml -index f86c01f5..c8729b91 100644 +index 1790c726..c0684bde 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -127,21 +127,26 @@ pbs-tape = { path = "pbs-tape" } +@@ -126,23 +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 = { path = "../proxmox/proxmox" } -#proxmox-async = { path = "../proxmox/proxmox-async" } +-#proxmox-compression = { path = "../proxmox/proxmox-compression" } -#proxmox-borrow = { path = "../proxmox/proxmox-borrow" } -#proxmox-fuse = { path = "../proxmox-fuse" } -#proxmox-http = { path = "../proxmox/proxmox-http" } @@ -43,6 +44,7 @@ index f86c01f5..c8729b91 100644 -#proxmox-section-config = { path = "../proxmox/proxmox-section-config" } -#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" } -#proxmox-sys = { path = "../proxmox/proxmox-sys" } +-#proxmox-serde = { path = "../proxmox/proxmox-serde" } -#proxmox-tfa = { path = "../proxmox/proxmox-tfa" } -#proxmox-time = { path = "../proxmox/proxmox-time" } -#proxmox-uuid = { path = "../proxmox/proxmox-uuid" } @@ -71,7 +73,7 @@ index f86c01f5..c8729b91 100644 [features] default = [] diff --git a/debian/control b/debian/control -index 90421d80..f3298cbe 100644 +index c0cda274..f3298cbe 100644 --- a/debian/control +++ b/debian/control @@ -6,107 +6,6 @@ Build-Depends: debhelper (>= 12), @@ -102,7 +104,7 @@ index 90421d80..f3298cbe 100644 - librust-hyper-0.14+full-dev (>= 0.14.5-~~), - librust-lazy-static-1+default-dev (>= 1.4-~~), - librust-libc-0.2+default-dev, -- librust-log-0.4+default-dev, +- librust-log-0.4+default-dev (>= 0.4.17-~~) , - librust-nix-0.19+default-dev (>= 0.19.1-~~), - librust-nom-5+default-dev (>= 5.1-~~), - librust-num-traits-0.2+default-dev, @@ -119,16 +121,16 @@ index 90421d80..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+client-dev, -- librust-proxmox-http-0.6+default-dev, -- librust-proxmox-http-0.6+http-helpers-dev, -- librust-proxmox-http-0.6+websocket-dev, +- 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-io-1+default-dev (>= 1.0.1-~~), - librust-proxmox-io-1+tokio-dev (>= 1.0.1-~~), - librust-proxmox-lang-1+default-dev (>= 1.1-~~), - librust-proxmox-openid-0.9+default-dev, - librust-proxmox-router-1+cli-dev (>= 1.2-~~), -- librust-proxmox-router-1+default-dev (>= 1.2-~~), +- librust-proxmox-router-1+default-dev (>= 1.2.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-~~),