From c215c2e28c2d42fc85e0141d0dbfed0763fa8233 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Mon, 24 Aug 2020 06:43:14 +0000 Subject: [PATCH] lang/rust-nightly: Update to 1.47.0.20200824 Changes: https://github.com/rust-lang/rust/compare/792c645ca7...5180f3da5f --- lang/rust-nightly/Makefile | 2 +- lang/rust-nightly/distinfo | 6 +++--- .../patch-vendor_openssl-sys_build_main.rs | 21 ------------------- 3 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 lang/rust-nightly/files/patch-vendor_openssl-sys_build_main.rs diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index bace0f872e12..a8f29a46d519 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -20,7 +20,7 @@ OPTIONS_EXCLUDE= DOCS # Get latest from top level 'date' key in # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2020-08-18 +NIGHTLY_DATE= 2020-08-24 # See WRKSRC/src/stage0.txt for this date BOOTSTRAPS_DATE= 2020-07-16 diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index bda248a219b0..7984048074fd 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1597719932 -SHA256 (rust/2020-08-18/rustc-nightly-src.tar.xz) = 98b4565b58e04d89dea52b48606fd06c9eaf50c3eed34dbbeaccd665d0d65f04 -SIZE (rust/2020-08-18/rustc-nightly-src.tar.xz) = 102196456 +TIMESTAMP = 1598251375 +SHA256 (rust/2020-08-24/rustc-nightly-src.tar.xz) = ea8819dfcc6ac38bad11ea89da093c11ccd214ea54cac5ec3ffb1c66711e342a +SIZE (rust/2020-08-24/rustc-nightly-src.tar.xz) = 104120996 SHA256 (rust/2020-07-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 423e43d67a25133ddfaa1874c9bd06d690fbfb127e76cbf4323a9564dfd92c26 SIZE (rust/2020-07-16/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 42656972 SHA256 (rust/2020-07-16/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = ef2c4ef506cb44b6344c7892d9c89beffb2cff81841321a329a3a88299d4bb34 diff --git a/lang/rust-nightly/files/patch-vendor_openssl-sys_build_main.rs b/lang/rust-nightly/files/patch-vendor_openssl-sys_build_main.rs deleted file mode 100644 index c5cd7fbb1fc7..000000000000 --- a/lang/rust-nightly/files/patch-vendor_openssl-sys_build_main.rs +++ /dev/null @@ -1,21 +0,0 @@ ---- vendor/openssl-sys/build/main.rs.orig 2020-06-01 17:45:25 UTC -+++ vendor/openssl-sys/build/main.rs -@@ -204,6 +204,9 @@ See rust-openssl README for more information: - (3, 0, 0) => ('3', '0', '0'), - (3, 0, 1) => ('3', '0', '1'), - (3, 0, _) => ('3', '0', 'x'), -+ (3, 1, 0) => ('3', '1', '0'), -+ (3, 1, _) => ('3', '1', 'x'), -+ (3, 2, 0) => ('3', '2', '0'), - _ => version_error(), - }; - -@@ -244,7 +247,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 --through 3.0.x, but a different version of OpenSSL was found. The build is now aborting -+through 3.2.0, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - "