diff --git a/build.sh b/build.sh index 4dd84f9..66b7a41 100755 --- a/build.sh +++ b/build.sh @@ -20,14 +20,14 @@ function download_package() { if [ -z "${url}" ]; then echo "Error package ${package} in version " "${version_test[@]}" " not found" - return + return 1 fi file="${dest}/${url##*/}" if [ -e "${file}" ]; then echo "${package} up-to-date" >&2 echo "${file}" - return + return 0 fi echo "${package} downloading..." >&2 @@ -78,7 +78,7 @@ function select_package() { packages_target=${PACKAGES_DEVEL} else echo "Unknown repo ${repo}" >&2 - return + return 1 fi version_target=0.0 @@ -99,7 +99,7 @@ function select_package() { done <<<"${packages_target}" if [ -z "${file_target}" ]; then - return + return 1 fi url=${url_base}/${file_target} echo "${url}" @@ -148,13 +148,13 @@ ${SUDO} apt install -y "${packages_install[@]}" cd "${SOURCES}" -PROXMOX_BACKUP_VER="2.3.1-1" -PROXMOX_BACKUP_GIT="2abb984b58aca4169fbf9a22ebf302d186f3e062" +PROXMOX_BACKUP_VER="2.3.2-1" +PROXMOX_BACKUP_GIT="e6120a8f6ff36f627a4da3a1a51a1e47231f5cc8" PATHPATTERNS_GIT="916e41c50e75a718ab7b1b95dc770eed9cd7a403" PROXMOX_ACME_RS_GIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05" PROXMOX_APT_GIT="8a7a719aec23ad98a00bb452f0ced4cbf88ba591" PROMXOX_FUSE_GIT="8d57fb64f044ea3dcfdef77ed5f1888efdab0708" -PROXMOX_GIT="d513ef78361cbdb505b4e0e6dbf74b1a10ee987e" +PROXMOX_GIT="7bc85c05c97ba3f2ecbdcf43ee83e8f24355311a" PROXMOX_OPENID_GIT="ce6def219262b5c1f6dbe5440f9f90038bafb3d8" PXAR_GIT="29cbeed3e1b52f5eef455cdfa8b5e93f4e3e88f5" if [ ! -e "${PACKAGES}/proxmox-backup-server_${PROXMOX_BACKUP_VER}_arm64.deb" ]; then diff --git a/patches/proxmox-backup-arm.patch b/patches/proxmox-backup-arm.patch index 6c2b2e9..b14067f 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 38e9c1f2..7ac2ed4c 100644 +index 78ded46d..15580808 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -127,27 +127,29 @@ pbs-tape = { path = "pbs-tape" } +@@ -238,27 +238,29 @@ proxmox-rrd.workspace = true # Local path overrides # NOTE: You must run `cargo update` after changing this for it to take effect! [patch.crates-io] @@ -80,7 +80,7 @@ index 38e9c1f2..7ac2ed4c 100644 [features] default = [] diff --git a/debian/control b/debian/control -index 6207d85e..114e1a7a 100644 +index 6878aba3..13d713ff 100644 --- a/debian/control +++ b/debian/control @@ -2,124 +2,7 @@ Source: rust-proxmox-backup @@ -88,7 +88,7 @@ index 6207d85e..114e1a7a 100644 Priority: optional Build-Depends: debhelper (>= 12), - dh-cargo (>= 24), -- cargo:native, +- cargo:native (>= 0.65.0-1), - rustc:native, libstd-rust-dev, - librust-anyhow-1+default-dev, @@ -120,7 +120,7 @@ index 6207d85e..114e1a7a 100644 - librust-nom-7+default-dev, - librust-num-traits-0.2+default-dev, - librust-once-cell-1+default-dev (>= 1.3.1-~~), -- librust-openssl-0.10+default-dev (>= 0.10.38-~~), +- librust-openssl-0.10+default-dev (>= 0.10.40-~~), - librust-pam-0.7+default-dev, - librust-pam-sys-0.5+default-dev, - librust-pathpatterns-0.1+default-dev (>= 0.1.2-~~), @@ -168,7 +168,6 @@ index 6207d85e..114e1a7a 100644 - librust-proxmox-uuid-1+default-dev, - librust-proxmox-uuid-1+serde-dev, - 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, @@ -179,6 +178,7 @@ index 6207d85e..114e1a7a 100644 - librust-siphasher-0.3+default-dev, - librust-syslog-4+default-dev, - librust-tar-0.4+default-dev, +- librust-termcolor-1+default-dev (>= 1.1.2-~~), - librust-thiserror-1+default-dev, - librust-tokio-1+default-dev (>= 1.6-~~), - librust-tokio-1+fs-dev (>= 1.6-~~),