From 971d326768b962dc4acdea181ae58b72c609e119 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Sun, 16 Jul 2023 01:18:58 +0800
Subject: [PATCH] rust: Update to 1.71.0

Refreshed patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 lang/rust/Makefile                            |  6 ++--
 .../0001-Update-xz2-and-use-it-static.patch   | 32 ++-----------------
 .../patches/0002-Bumped-libc-version.patch    | 10 +++---
 3 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 3b44e5a4dc..f77bbc7802 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 include ./rust-values.mk
 
 PKG_NAME:=rust
-PKG_VERSION:=1.70.0
-PKG_RELEASE:=3
+PKG_VERSION:=1.71.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
-PKG_HASH:=b2bfae000b7a5040e4ec4bbc50a09f21548190cb7570b0ed77358368413bd27c
+PKG_HASH:=a667e4abdc5588ebfea35c381e319d840ffbf8d2dbfb79771730573642034c96
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/rust-$(RUSTC_TARGET_ARCH)/rustc-$(PKG_VERSION)-src
 
 PKG_MAINTAINER:=Luca Barbato <lu_zero@luminem.org>
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 4e4d8b9d4d..8d0c4b042a 100644
--- 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,35 +9,9 @@ Subject: [PATCH] Update xz2 and use it static
  src/bootstrap/Cargo.toml | 2 +-
  3 files changed, 9 insertions(+), 9 deletions(-)
 
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -3085,9 +3085,9 @@ dependencies = [
- 
- [[package]]
- name = "lzma-sys"
--version = "0.1.16"
-+version = "0.1.20"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f24f76ec44a8ac23a31915d6e326bca17ce88da03096f1ff194925dc714dac99"
-+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
- dependencies = [
-  "cc",
-  "libc",
-@@ -7116,9 +7116,9 @@ dependencies = [
- 
- [[package]]
- name = "xz2"
--version = "0.1.6"
-+version = "0.1.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c179869f34fc7c01830d3ce7ea2086bc3a07e0d35289b667d0a8bf910258926c"
-+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
- dependencies = [
-  "lzma-sys",
- ]
 --- a/src/bootstrap/Cargo.lock
 +++ b/src/bootstrap/Cargo.lock
-@@ -389,9 +389,9 @@ dependencies = [
+@@ -443,9 +443,9 @@ dependencies = [
  
  [[package]]
  name = "lzma-sys"
@@ -49,7 +23,7 @@ Subject: [PATCH] Update xz2 and use it static
  dependencies = [
   "cc",
   "libc",
-@@ -847,9 +847,9 @@ dependencies = [
+@@ -912,9 +912,9 @@ dependencies = [
  
  [[package]]
  name = "xz2"
@@ -63,7 +37,7 @@ Subject: [PATCH] Update xz2 and use it static
  ]
 --- a/src/bootstrap/Cargo.toml
 +++ b/src/bootstrap/Cargo.toml
-@@ -51,7 +51,7 @@ toml = "0.5"
+@@ -50,7 +50,7 @@ toml = "0.5"
  ignore = "0.4.10"
  opener = "0.5"
  once_cell = "1.7.2"
diff --git a/lang/rust/patches/0002-Bumped-libc-version.patch b/lang/rust/patches/0002-Bumped-libc-version.patch
index ae27a126fd..52c8a245c3 100644
--- a/lang/rust/patches/0002-Bumped-libc-version.patch
+++ b/lang/rust/patches/0002-Bumped-libc-version.patch
@@ -10,14 +10,14 @@ Subject: [PATCH] Bumped libc version
 
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -2933,9 +2933,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0e
+@@ -1988,9 +1988,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0e
  
  [[package]]
  name = "libc"
--version = "0.2.140"
+-version = "0.2.143"
 +version = "0.2.146"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+-checksum = "edc207893e85c5d6be840e969b496b53d94cec8be2d501b214f50daa97fa8024"
 +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
  dependencies = [
   "rustc-std-workspace-core",
@@ -28,8 +28,8 @@ Subject: [PATCH] Bumped libc version
  panic_unwind = { path = "../panic_unwind", optional = true }
  panic_abort = { path = "../panic_abort" }
  core = { path = "../core" }
--libc = { version = "0.2.140", default-features = false, features = ['rustc-dep-of-std'] }
+-libc = { version = "0.2.143", default-features = false, features = ['rustc-dep-of-std'] }
 +libc = { version = "0.2.146", default-features = false, features = ['rustc-dep-of-std'] }
- compiler_builtins = { version = "0.1.91" }
+ compiler_builtins = { version = "0.1.92" }
  profiler_builtins = { path = "../profiler_builtins", optional = true }
  unwind = { path = "../unwind" }
-- 
2.30.2