rust: update to 1.85.0

Fixes podman build breakage which was caused by podman depending on
netavark, which in turn depends on rust-iptables.

rust-iptables requires rust 1.85.0 since commit 75825cd
https://github.com/yaa110/rust-iptables/commit/75825cd9c13db91f697461e6fa91f78c5e927008

Signed-off-by: Jonathan McCrohan <[email protected]>
(cherry picked from commit c67502852851366baff7868ea53b9e8c70bc1fe0)
[refresh patches]
Signed-off-by: Tianling Shen <[email protected]>

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index bc54879305382a8cf96cfed7e67531af7de3bbef..a9466f6f812dec1815f27939205f3251e2811c4e 100644 (file)
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rust
-PKG_VERSION:=1.84.0
+PKG_VERSION:=1.85.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
-PKG_HASH:=15cee7395b07ffde022060455b3140366ec3a12cbbea8f1ef2ff371a9cca51bf
+PKG_HASH:=2f4f3142ffb7c8402139cfa0796e24baaac8b9fd3f96b2deec3b94b4045c6a8a
 HOST_BUILD_DIR:=$(BUILD_DIR)/host/rustc-$(PKG_VERSION)-src
 
 PKG_MAINTAINER:=Luca Barbato <[email protected]>

diff --git a/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch b/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch
index c9bc0fdddc1b9d357618fa78cda4087e2d278017..336eacb015e28cdf8850b0652999dab28005948b 100644 (file)
--- a/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch
+++ b/lang/rust/patches/0001-Update-xz2-and-use-it-static.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Update xz2 and use it static
 
 --- a/src/bootstrap/Cargo.toml
 +++ b/src/bootstrap/Cargo.toml
-@@ -60,7 +60,7 @@ tar = "0.4"
+@@ -59,7 +59,7 @@ tar = "0.4"
  termcolor = "1.4"
  toml = "0.5"
  walkdir = "2.4"
@@ -17,4 +17,4 @@ Subject: [PATCH] Update xz2 and use it static
 +xz2 = { version = "0.1", features = ["static"] }
  
  # Dependencies needed by the build-metrics feature
- sysinfo = { version = "0.30", default-features = false, optional = true }
+ sysinfo = { version = "0.33.0", default-features = false, optional = true, features = ["system"] }