From 1b783a7693f23537ee62369b8642dc4156ea2d43 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Wed, 22 Apr 2020 16:21:54 +0200 Subject: [PATCH 1/7] update openssl-src to 1.1.1g Fixes CVE-2020-1967. --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d41517cd4f6b2..ee44765eb24b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2249,9 +2249,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-src" -version = "111.6.1+1.1.1d" +version = "111.9.0+1.1.1g" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005" +checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" dependencies = [ "cc", ] From b93d500a8581f783763d381bbe4aac1c283a5945 Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Fri, 24 Apr 2020 00:38:10 +0100 Subject: [PATCH 2/7] Update stdarch submodule --- src/stdarch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stdarch b/src/stdarch index abe96ca3b87fc..d10eefc62284c 160000 --- a/src/stdarch +++ b/src/stdarch @@ -1 +1 @@ -Subproject commit abe96ca3b87fcca6aa1dfcefd40d8c8d92d2e673 +Subproject commit d10eefc62284c40c5a95a2eed19fc1f414a5364d From 9b6560d55b87e0c242e9b17121748638f60259de Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 1 May 2020 13:08:17 -0700 Subject: [PATCH 3/7] Add a shim from llvm_asm! to asm! for stdarch --- src/libcore/internal_macros.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libcore/internal_macros.rs b/src/libcore/internal_macros.rs index 4ea7dfc073554..5f578e44323ec 100644 --- a/src/libcore/internal_macros.rs +++ b/src/libcore/internal_macros.rs @@ -117,3 +117,8 @@ macro_rules! impl_fn_for_zst { )+ } } + +macro_rules! llvm_asm { + // Redirect to asm! for stdarch in stable 1.43 + ($($arg:tt)*) => { $crate::asm!($($arg)*) } +} From 5cd62853fa73ecac093f4b557e90162dc4020de4 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sun, 3 May 2020 22:05:00 -0400 Subject: [PATCH 4/7] Backport Cargo patch to fix rust-lang/cargo#8151 on stable --- src/tools/cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/cargo b/src/tools/cargo index 3532cf738db00..2cbe9048efc5c 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 3532cf738db005a56d1fe81ade514f380d411360 +Subproject commit 2cbe9048efc5c904b33191d799f97dc4698debaa From 6e40414834ee375f079c420d49670f9e9479c6d5 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 1 May 2020 13:18:15 -0700 Subject: [PATCH 5/7] 1.43.1 release --- RELEASES.md | 20 ++++++++++++++++---- src/bootstrap/channel.rs | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 36597b1864f25..8ea481f7e18cd 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,15 @@ +Version 1.43.1 (2020-05-07) +=========================== + +* [Updated openssl-src to 1.1.1g for CVE-2020-1967.][71430] +* [Fixed the stabilization of AVX-512 features.][71473] +* [Fixed `cargo package --list` not working with unpublished dependencies.][cargo/8151] + +[71430]: https://github.com/rust-lang/rust/pull/71430 +[71473]: https://github.com/rust-lang/rust/issues/71473 +[cargo/8151]: https://github.com/rust-lang/cargo/issues/8151 + + Version 1.43.0 (2020-04-23) ========================== @@ -14,7 +26,7 @@ Language - [Merge `fn` syntax + cleanup item parsing.][68728] - [`item` macro fragments can be interpolated into `trait`s, `impl`s, and `extern` blocks.][69366] For example, you may now write: - ```rust + ```rust macro_rules! mac_trait { ($i:item) => { trait T { $i } @@ -82,7 +94,7 @@ Misc - [Certain checks in the `const_err` lint were deemed unrelated to const evaluation][69185], and have been moved to the `unconditional_panic` and `arithmetic_overflow` lints. - + Compatibility Notes ------------------- @@ -173,7 +185,7 @@ Language (e.g. `type Foo: Ord;`). - `...` (the C-variadic type) may occur syntactically directly as the type of any function parameter. - + These are still rejected *semantically*, so you will likely receive an error but these changes can be seen and parsed by procedural macros and conditional compilation. @@ -465,7 +477,7 @@ Compatibility Notes - [Using `#[inline]` on function prototypes and consts now emits a warning under `unused_attribute` lint.][65294] Using `#[inline]` anywhere else inside traits or `extern` blocks now correctly emits a hard error. - + [65294]: https://github.com/rust-lang/rust/pull/65294/ [66103]: https://github.com/rust-lang/rust/pull/66103/ [65843]: https://github.com/rust-lang/rust/pull/65843/ diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index 504cba45570c1..47fec8d3ea9db 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -13,7 +13,7 @@ use build_helper::output; use crate::Build; // The version number -pub const CFG_RELEASE_NUM: &str = "1.43.0"; +pub const CFG_RELEASE_NUM: &str = "1.43.1"; pub struct GitInfo { inner: Option, From 54bc3e556624161e0d7620156c294012099855d6 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Mon, 4 May 2020 20:32:38 +0200 Subject: [PATCH 6/7] fetch cloudabi packages from our own mirror The upstream archive went down due to an expired certificate, so I mirrored the whole thing on our mirrors S3 bucket. This is safe, as the certificate just seemed to be expired and the contents of the APT archive are signed anyway. --- src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh index 3354a796c357e..9db1f6ee08325 100755 --- a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh +++ b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh @@ -33,7 +33,8 @@ ln -s ../../${target} /usr/lib/llvm-5.0/${target} # Install the C++ runtime libraries from CloudABI Ports. apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0DA51B8531344B15 -add-apt-repository -y 'deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi' +add-apt-repository -y \ + 'deb https://ci-mirrors.rust-lang.org/rustc/2020-05-04-cloudabi-apt-archive/ cloudabi cloudabi' apt-get update apt-get install -y "${target//_/-}-cxx-runtime" From 1eb1c8d1f270014d68ca8becb693a1f02f7332fc Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 4 May 2020 16:15:38 -0700 Subject: [PATCH 7/7] Allow the llvm_asm! shim to go unused on some archs --- src/libcore/internal_macros.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libcore/internal_macros.rs b/src/libcore/internal_macros.rs index 5f578e44323ec..8304a67691853 100644 --- a/src/libcore/internal_macros.rs +++ b/src/libcore/internal_macros.rs @@ -118,6 +118,7 @@ macro_rules! impl_fn_for_zst { } } +#[allow(unused_macros)] macro_rules! llvm_asm { // Redirect to asm! for stdarch in stable 1.43 ($($arg:tt)*) => { $crate::asm!($($arg)*) }