diff --git a/VERSION b/VERSION index 69a56c3..0204305 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v4.0.13 +v4.0.18 diff --git a/dockerfiles/Dockerfile.build b/dockerfiles/Dockerfile.build index 299740b..7bc309c 100644 --- a/dockerfiles/Dockerfile.build +++ b/dockerfiles/Dockerfile.build @@ -26,7 +26,7 @@ ADD packages/ /src/packages/ RUN cargo deb --manifest-path /src/packages/xtr/Cargo.toml --install # Specify default rust toolchain -ENV RUSTUP_TOOLCHAIN=1.87 +ENV RUSTUP_TOOLCHAIN=1.88 # Link /cargo/bin to /usr/local/bin RUN ln -s /cargo/bin/* /usr/local/bin/ @@ -52,7 +52,7 @@ RUN ./scripts/build/make.bash proxmox-mini-journalreader make_deb RUN ./scripts/build/make.bash libjs-qrcodejs make_deb RUN ./scripts/build/make.bash proxmox-acme make_deb RUN ./scripts/build/make.bash pve-xtermjs "make_deb termproxy" "make_deb xterm.js" -RUN ./scripts/build/make.bash proxmox-backup --rust 1.85 make_deb +RUN ./scripts/build/make.bash proxmox-backup --rust 1.88 make_deb #================================= diff --git a/dockerfiles/Dockerfile.client b/dockerfiles/Dockerfile.client index 6f27e23..754e48b 100644 --- a/dockerfiles/Dockerfile.client +++ b/dockerfiles/Dockerfile.client @@ -25,7 +25,7 @@ RUN wget https://static.rust-lang.org/rustup/rustup-init.sh && \ for tool in /root/.cargo/bin/*; do ln -vsf $tool /usr/bin/; done; # Specify default rust toolchain -ENV RUSTUP_TOOLCHAIN=1.85 +ENV RUSTUP_TOOLCHAIN=1.88 # Apply all patches ADD /scripts/build /src/scripts/build diff --git a/repos/deps b/repos/deps index 5f5e99c..7a4b656 100644 --- a/repos/deps +++ b/repos/deps @@ -1,13 +1,13 @@ -proxmox-backup de92e3f6a26bfbcc9f8b860e983a85a434a8e3c6 # Mon Aug 11 15:05:27 2025 +0200 +proxmox-backup 2586548f25af89b6bce80a2886bd0e7748000ea2 # Wed Oct 22 13:23:35 2025 +0200 proxmox-mini-journalreader b09ee543344fb7082a27346ecb0008f38af6367d # Tue Jun 3 20:58:30 2025 +0200 -proxmox-widget-toolkit 230fb4d0d15b348253aa53cfe169d0066e4f1647 # Wed Aug 6 12:01:37 2025 +0200 +proxmox-widget-toolkit d9b4bf9e77dabc8bba022d18d1f4d6cf6a0b5ac9 # Fri Oct 3 14:27:07 2025 +0200 extjs 18909118c3d316f0bb48846920b8c94a4efc31f5 # Thu Nov 14 17:31:34 2024 +0100 -proxmox-i18n 542c9515ca4617facbb7e0e7debe08203fdda40e # Mon Aug 11 14:04:18 2025 +0200 +proxmox-i18n e4c5b31a4042e84751c53e42052f48a8089ac40b # Wed Oct 15 10:40:56 2025 +0200 pve-xtermjs c69379f49db91429eb01ea56b47f2a2832fec8e7 # Wed Jun 25 15:29:14 2025 +0200 libjs-qrcodejs a9906bd488b5c2045ea4aa8b014d97fdccad63b9 # Thu May 25 14:25:53 2023 +0200 proxmox-acme 6dc96d5a468d1553991589f4197f9ec6eab554c1 # Sun Jun 1 16:51:41 2025 +0200 pve-eslint bc248701f19280d5a5d39131687dd357da057d8b # Wed Aug 30 11:42:24 2023 +0200 -pve-common 6f7de20bb9eb2485c57a66ef87f65462cb3152be # Fri Aug 8 11:58:26 2025 +0200 -proxmox-perl-rs f2fbed015ec15d204193bcb751388d8acd3bf6ef # Thu Aug 7 10:21:08 2025 +0200 -perlmod cd32f4813577ef73c7a5316c15ec96d643250cf8 # Thu Aug 7 16:10:15 2025 +0200 +pve-common dcf1836b6844976d60b71d0655b926cc1bdf2fe9 # Wed Oct 8 21:41:25 2025 +0200 +proxmox-perl-rs 71f6001f13f87c376eda475ba0960c03166b15bb # Mon Sep 22 10:24:32 2025 +0200 +perlmod c1078ed251704b6c79225e1a788d93fcd57d748e # Thu Oct 9 11:52:12 2025 +0200 proxmox-biome c23fa7b8027b344325a65a0ae9a071180a8e800c # Thu Jul 24 18:44:47 2025 +0200 diff --git a/repos/proxmox-backup.deps b/repos/proxmox-backup.deps index 550099a..215d60b 100644 --- a/repos/proxmox-backup.deps +++ b/repos/proxmox-backup.deps @@ -1,5 +1,5 @@ -proxmox-backup de92e3f6a26bfbcc9f8b860e983a85a434a8e3c6 # Mon Aug 11 15:05:27 2025 +0200 -proxmox 84a58afe23a35454a1abbeb6c436ee49d2888d18 # Mon Aug 11 14:34:44 2025 +0200 +proxmox-backup 2586548f25af89b6bce80a2886bd0e7748000ea2 # Wed Oct 22 13:23:35 2025 +0200 +proxmox 4eb5517830ae58ca522bfe9f90abac1753579889 # Tue Oct 21 20:36:31 2025 +0200 proxmox-fuse 87dbf9bfef9169286263bccffaae3206635ca108 # Wed Jun 11 15:32:59 2025 +0200 pathpatterns 5323cbe49ae5d592eb8a3fa2e215550e83dd7fba # Thu Jul 31 14:09:48 2025 +0200 -pxar 993c66fcb8819770f279cb9fb4d13f58f367606c # Wed Jun 11 14:41:16 2025 +0200 +pxar 957acc8917294a62d829d51e06cff9dc88845fb3 # Mon Sep 8 11:24:54 2025 +0200 diff --git a/repos/proxmox-perl-rs.deps b/repos/proxmox-perl-rs.deps index 86cdca8..e78cbba 100644 --- a/repos/proxmox-perl-rs.deps +++ b/repos/proxmox-perl-rs.deps @@ -1,5 +1,5 @@ -proxmox-perl-rs f2fbed015ec15d204193bcb751388d8acd3bf6ef # Thu Aug 7 10:21:08 2025 +0200 -proxmox 7de539b26cbca1bdc2a24f3591e59469d95746e1 # Thu Aug 7 10:18:21 2025 +0200 +proxmox-perl-rs 71f6001f13f87c376eda475ba0960c03166b15bb # Mon Sep 22 10:24:32 2025 +0200 +proxmox 46da97402c2fbc9582bace50250343c0e8affffb # Mon Sep 15 21:17:23 2025 +0200 proxmox-resource-scheduling ee5fedf98b7e110c5a11bb11cc8e657122065606 # Sat May 31 16:09:19 2025 +0200 -perlmod 3544b62fc1b74a4bc036fc2ba19a54b71452f8e4 # Thu Jul 31 14:10:34 2025 +0200 -proxmox-ve-rs ac7285715b37f6304a2e60ba1d3d98f95eb422dd # Tue Aug 5 12:22:46 2025 +0200 +perlmod 244d547be4df2b697c3d3f76273ff5cbeed7531c # Fri Sep 12 13:57:39 2025 +0200 +proxmox-ve-rs 1519c03b35eeaa5942ee2ce868a6d15cfcbba741 # Thu Sep 4 15:20:56 2025 +0200 diff --git a/scripts/build/resolve-dependencies.bash b/scripts/build/resolve-dependencies.bash index 334dbc1..6f968a5 100755 --- a/scripts/build/resolve-dependencies.bash +++ b/scripts/build/resolve-dependencies.bash @@ -16,11 +16,15 @@ echo "Resolving dependencies in $search_dir" while read cargo_path; do cargo_path=$(dirname "$cargo_path") + cargo_toml="$cargo_path/Cargo.toml" + if ! grep -Eq '^[[:space:]]*\[package\]' "$cargo_toml"; then + continue + fi cargo_dep=$(basename "$cargo_path") git_repo=$(git -C "$cargo_path" rev-parse --show-toplevel) found_deps[$cargo_dep]="$cargo_path" git_deps[$cargo_dep]="$git_repo" - got_deps[$(realpath "$cargo_path/Cargo.toml")]="$(get_deps "$cargo_path/Cargo.toml" | sort -u)" + got_deps[$(realpath "$cargo_toml")]="$(get_deps "$cargo_toml" | sort -u)" done < <(find "$PWD" -wholename "*/Cargo.toml" -not -path "*/vendor/*" -not -path "*/.build/*") echo "Found dependencies:"