From f3188c601b0dd09249402a146a263b03d901c36c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 10 Feb 2023 07:08:32 +0000 Subject: [PATCH 1/4] rust-std-snapshot: update to 1.67.1 --- packages/rust/rust-std-snapshot/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rust/rust-std-snapshot/package.mk b/packages/rust/rust-std-snapshot/package.mk index cad9c3cf1f..1ba9f90ca5 100644 --- a/packages/rust/rust-std-snapshot/package.mk +++ b/packages/rust/rust-std-snapshot/package.mk @@ -3,7 +3,7 @@ PKG_NAME="rust-std-snapshot" PKG_VERSION="$(get_pkg_version rust)" -PKG_SHA256="8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa" +PKG_SHA256="f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" From 9a3135e010f6e4696ee7d5bae981269190951966 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 10 Feb 2023 07:08:32 +0000 Subject: [PATCH 2/4] cargo-snapshot: update to 1.67.1 --- packages/rust/cargo-snapshot/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rust/cargo-snapshot/package.mk b/packages/rust/cargo-snapshot/package.mk index 4faefed3aa..ece75fc1e9 100644 --- a/packages/rust/cargo-snapshot/package.mk +++ b/packages/rust/cargo-snapshot/package.mk @@ -3,7 +3,7 @@ PKG_NAME="cargo-snapshot" PKG_VERSION="$(get_pkg_version rust)" -PKG_SHA256="7ddc4f7027653b4366037206ef438c704513c1565ce6eb2422d9d47146782c3b" +PKG_SHA256="e744dad75de8419e7fea530c29bd56cf931b4d4de62eb4bd442bfac7b54e61ed" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" From 6115fc9fd9c41fe4a52c1a1efbe7592370eaf396 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 10 Feb 2023 07:08:32 +0000 Subject: [PATCH 3/4] rustc-snapshot: update to 1.67.1 --- packages/rust/rustc-snapshot/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rust/rustc-snapshot/package.mk b/packages/rust/rustc-snapshot/package.mk index f198c1aeeb..018de9e049 100644 --- a/packages/rust/rustc-snapshot/package.mk +++ b/packages/rust/rustc-snapshot/package.mk @@ -3,7 +3,7 @@ PKG_NAME="rustc-snapshot" PKG_VERSION="$(get_pkg_version rust)" -PKG_SHA256="7a9c5890f8b573cd0c584b590b86eb02c38c00b9c3ba74b21917ba97d1fa3d12" +PKG_SHA256="e27ec0c6d1a2b2b38e5258904c3741ddb246bff5715aa95e595f818aa77f7bee" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" From 75c3e6bb39617a94e2f92075f6911f6a3b476f50 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 10 Feb 2023 07:08:32 +0000 Subject: [PATCH 4/4] rust: update to 1.67.1 ann: - https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html log: - https://github.com/rust-lang/rust/compare/1.67.0...1.67.1 --- packages/rust/rust/package.mk | 4 +- .../rust/rust/patches/rust-0001-105624.patch | 38 ------------------- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 packages/rust/rust/patches/rust-0001-105624.patch diff --git a/packages/rust/rust/package.mk b/packages/rust/rust/package.mk index 9d442ec3fb..423c980191 100644 --- a/packages/rust/rust/package.mk +++ b/packages/rust/rust/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rust" -PKG_VERSION="1.67.0" -PKG_SHA256="d029f14fce45a2ec7a9a605d2a0a40aae4739cb2fdae29ee9f7a6e9025a7fde4" +PKG_VERSION="1.67.1" +PKG_SHA256="46483d3e5de85a3bd46f8e7a3ae1837496391067dbe713a25d3cf051b3d9ff6e" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-src.tar.gz" diff --git a/packages/rust/rust/patches/rust-0001-105624.patch b/packages/rust/rust/patches/rust-0001-105624.patch deleted file mode 100644 index eb160661a2..0000000000 --- a/packages/rust/rust/patches/rust-0001-105624.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 675fa0b3dd5fe14b43ad5b7862f4528df7322468 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -Date: Mon, 12 Dec 2022 18:29:33 +0000 -Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= - =?UTF-8?q?ap=20cache=20code?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - src/bootstrap/cache.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs -index be5c9bb078808..05f25af68ea8f 100644 ---- a/src/bootstrap/cache.rs -+++ b/src/bootstrap/cache.rs -@@ -89,16 +89,16 @@ impl Hash for Interned { - - impl Deref for Interned { - type Target = T::Target; -- fn deref(&self) -> &'static Self::Target { -+ fn deref(&self) -> &Self::Target { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } -+ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } - } - } - - impl, U: ?Sized> AsRef for Interned { -- fn as_ref(&self) -> &'static U { -+ fn as_ref(&self) -> &U { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } -+ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } - } - } -