Skip to content

package/{rust, rust-bin}: bump to 1.97.1 - #1215

Open
MastaG wants to merge 4 commits into
batocera-linux:br2-externalfrom
MastaG:rust-1.97.1
Open

MastaG wants to merge 4 commits into
batocera-linux:br2-externalfrom
MastaG:rust-1.97.1

Conversation

@MastaG

@MastaG MastaG commented Nov 6, 2026

Copy link
Copy Markdown

Summary

Bump rust / rust-bin from 1.95.0 to 1.97.1 by cherry-picking the upstream Buildroot commits, in order:

  • c0b3d919a1 security bump to 1.96.0
  • 6021eda8a7 security bump to 1.96.1
  • e8c8bd9bc5 bump to 1.97.0
  • 34d7758626 bump to 1.97.1

Fork-specific adjustments

Upstream 1.97.0 changes the Cargo vendor suffix from -cargo5 to -cargo6 (Cargo now adds a $comment to .cargo-checksum.json), so every Cargo package hash changes. Our fork pins older versions of some packages, so upstream's hashes don't apply and the cherry-pick conflicted:

  • python-cryptography (47.0.0), broot (1.56.2), netavark (1.17.0), aardvark-dns (1.17.0): kept the fork's versions and regenerated the -cargo6 hashes with the 1.97.1 toolchain. These are not an upstream bump.
  • dtui: not present in this fork, so upstream's hash change was dropped.

Testing

  • Clean build completed on rk3326.
  • python-cryptography hash verified by that build.
  • broot, netavark and aardvark-dns hashes verified by fetching each package with the 1.97.1 rust-bin toolchain (make <pkg>-source) in a scratch config. They are not part of the board config.

https://claude.ai/code/session_012SzrKCG5QK38mhxCGtiGQR

https://blog.rust-lang.org/2026/06/30/Rust-1.96.1/

Fixes CVE-2025-15661, CVE-2026-55199 & CVE-2026-55200.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
https://blog.rust-lang.org/2026/07/09/Rust-1.97.0/

Rust received a change in Cargo's vendoring logic which produces
different vendor directory contents:

  Add $comment to .cargo-checksum.json to clarify this file is not
  a security mechanism.
  rust-lang/cargo#16967

Therefore the hashes of all Cargo-fetched packages need to be
updated. This commit changes the suffix of Cargo packages from
-cargo5 to -cargo6, and updates all hashes.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
https://blog.rust-lang.org/2026/07/16/Rust-1.97.1/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
@dmanlfc

dmanlfc commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

Buildroot will be updated for v45. So no need to bump individual packages. I understand you may not have the older rust image like we do for v44.hence suggesting the update.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants