From 917b223b5e8906148581d38ac450a446cc7624b1 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 21 Oct 2021 12:29:34 -0700 Subject: [PATCH] Update to 1.56.0. --- .gitignore | 7 ++++ rust.spec | 33 ++++++++++++------- ....patch => rustc-1.56.0-disable-http2.patch | 18 +++++----- ...atch => rustc-1.56.0-disable-libssh2.patch | 16 ++++----- sources | 2 +- sources-bootstrap | 15 ++++----- 6 files changed, 53 insertions(+), 38 deletions(-) rename rustc-1.55.0-disable-http2.patch => rustc-1.56.0-disable-http2.patch (77%) rename rustc-1.48.0-disable-libssh2.patch => rustc-1.56.0-disable-libssh2.patch (66%) diff --git a/.gitignore b/.gitignore index e1c5205..6cbd9ff 100644 --- a/.gitignore +++ b/.gitignore @@ -366,3 +366,10 @@ /rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz /rust-1.54.0-s390x-unknown-linux-gnu.tar.xz /rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.56.0-src.tar.xz +/rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.55.0-i686-unknown-linux-gnu.tar.xz +/rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.55.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz diff --git a/rust.spec b/rust.spec index cb83c2b..0b87ed0 100644 --- a/rust.spec +++ b/rust.spec @@ -9,10 +9,10 @@ # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24 # or nightly wants some beta-YYYY-MM-DD # Note that cargo matches the program version here, not its crate version. -%global bootstrap_rust 1.54.0 -%global bootstrap_cargo 1.54.0 -%global bootstrap_channel 1.54.0 -%global bootstrap_date 2021-07-29 +%global bootstrap_rust 1.55.0 +%global bootstrap_cargo 1.55.0 +%global bootstrap_channel 1.55.0 +%global bootstrap_date 2021-09-09 # Only the specified arches will use bootstrap binaries. #global bootstrap_arches %%{rust_arches} @@ -61,8 +61,8 @@ %endif Name: rust -Version: 1.55.0 -Release: 2%{?dist} +Version: 1.56.0 +Release: 1%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) # ^ written as: (rust itself) and (bundled libraries) @@ -76,7 +76,8 @@ ExclusiveArch: %{rust_arches} %endif Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz -# This internal rust-abi change broke s390x -- revert for now. +# An internal rust-abi change broke s390x, but it's fixed in LLVM 12.0.1. +# We'll revert the change on Fedora 33 that has an unpatched LLVM 11. # https://github.com/rust-lang/rust/issues/80810#issuecomment-781784032 Patch1: 0001-Revert-Auto-merge-of-79547.patch @@ -86,11 +87,11 @@ Patch2: 0001-Use-lld-provided-by-system-for-wasm.patch ### RHEL-specific patches below ### # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949) -Patch100: rustc-1.48.0-disable-libssh2.patch +Patch100: rustc-1.56.0-disable-libssh2.patch # libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys # will try to build it statically -- instead we turn off the feature. -Patch101: rustc-1.55.0-disable-http2.patch +Patch101: rustc-1.56.0-disable-http2.patch # kernel rh1410097 causes too-small stacks for PIE. # (affects RHEL6 kernels when building for RHEL7) @@ -177,14 +178,15 @@ BuildRequires: %{python} %if %with bundled_llvm BuildRequires: cmake3 >= 3.13.4 -Provides: bundled(llvm) = 12.0.1 +BuildRequires: ninja-build +Provides: bundled(llvm) = 13.0.0 %else BuildRequires: cmake >= 2.8.11 %if 0%{?epel} == 7 %global llvm llvm11 %endif -# Rust isn't ready for LLVM 13 yet -%if 0%{?fedora} >= 35 +%if 0%{?fedora} == 35 +# f35 still only has 13.0.0~rc1 %global llvm llvm12 %endif %if %defined llvm @@ -463,7 +465,11 @@ test -f '%{local_rust_root}/bin/rustc' %setup -q -n %{rustc_package} +%if 0%{?fedora} == 33 +# revert only for LLVM 11 %patch1 -p1 +%endif + %patch2 -p1 %if %with disabled_libssh2 @@ -831,6 +837,9 @@ end} %changelog +* Thu Oct 21 2021 Josh Stone - 1.56.0-1 +- Update to 1.56.0. + * Tue Sep 14 2021 Sahana Prasad - 1.55.0-2 - Rebuilt with OpenSSL 3.0.0 diff --git a/rustc-1.55.0-disable-http2.patch b/rustc-1.56.0-disable-http2.patch similarity index 77% rename from rustc-1.55.0-disable-http2.patch rename to rustc-1.56.0-disable-http2.patch index 33c6fee..3b3d0c8 100644 --- a/rustc-1.55.0-disable-http2.patch +++ b/rustc-1.56.0-disable-http2.patch @@ -1,5 +1,5 @@ ---- rustc-1.55.0-src/Cargo.lock.orig 2021-09-07 16:33:21.672163689 -0700 -+++ rustc-1.55.0-src/Cargo.lock 2021-09-07 16:33:21.673163668 -0700 +--- rustc-1.56.0-src/Cargo.lock.orig 2021-10-19 18:03:53.928187581 -0700 ++++ rustc-1.56.0-src/Cargo.lock 2021-10-19 18:05:41.443522980 -0700 @@ -877,7 +877,6 @@ dependencies = [ "cc", @@ -23,21 +23,21 @@ - -[[package]] name = "libz-sys" - version = "1.1.2" + version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" ---- rustc-1.55.0-src/src/tools/cargo/Cargo.toml.orig 2021-09-07 16:33:21.673163668 -0700 -+++ rustc-1.55.0-src/src/tools/cargo/Cargo.toml 2021-09-07 16:34:59.637068004 -0700 +--- rustc-1.56.0-src/src/tools/cargo/Cargo.toml.orig 2021-10-19 18:03:53.930187532 -0700 ++++ rustc-1.56.0-src/src/tools/cargo/Cargo.toml 2021-10-19 18:05:13.663211469 -0700 @@ -25,7 +25,7 @@ cargo-util = { path = "crates/cargo-util", version = "0.1.1" } crates-io = { path = "crates/crates-io", version = "0.33.0" } crossbeam-utils = "0.8" -curl = { version = "0.4.38", features = ["http2"] } +curl = { version = "0.4.38", features = [] } - curl-sys = "0.4.45" + curl-sys = "0.4.48" env_logger = "0.9.0" pretty_env_logger = { version = "0.4", optional = true } ---- rustc-1.55.0-src/src/tools/cargo/src/cargo/core/package.rs.orig 2021-09-06 11:42:51.000000000 -0700 -+++ rustc-1.55.0-src/src/tools/cargo/src/cargo/core/package.rs 2021-09-07 16:33:21.674163646 -0700 +--- rustc-1.56.0-src/src/tools/cargo/src/cargo/core/package.rs.orig 2021-10-18 02:52:56.000000000 -0700 ++++ rustc-1.56.0-src/src/tools/cargo/src/cargo/core/package.rs 2021-10-19 18:03:53.931187507 -0700 @@ -417,14 +417,8 @@ // Also note that pipelining is disabled as curl authors have indicated // that it's buggy, and we've empirically seen that it's buggy with HTTP @@ -55,7 +55,7 @@ Ok(PackageSet { packages: package_ids -@@ -597,7 +591,7 @@ +@@ -653,7 +647,7 @@ macro_rules! try_old_curl { ($e:expr, $msg:expr) => { let result = $e; diff --git a/rustc-1.48.0-disable-libssh2.patch b/rustc-1.56.0-disable-libssh2.patch similarity index 66% rename from rustc-1.48.0-disable-libssh2.patch rename to rustc-1.56.0-disable-libssh2.patch index 6916e74..4d9331b 100644 --- a/rustc-1.48.0-disable-libssh2.patch +++ b/rustc-1.56.0-disable-libssh2.patch @@ -1,6 +1,6 @@ ---- rustc-1.48.0-src/Cargo.lock.orig 2020-11-16 06:01:53.000000000 -0800 -+++ rustc-1.48.0-src/Cargo.lock 2020-11-16 09:27:44.425104404 -0800 -@@ -1676,7 +1676,6 @@ +--- rustc-1.56.0-src/Cargo.lock.orig 2021-10-18 02:52:36.000000000 -0700 ++++ rustc-1.56.0-src/Cargo.lock 2021-10-19 18:00:47.999793566 -0700 +@@ -1895,7 +1895,6 @@ dependencies = [ "cc", "libc", @@ -8,7 +8,7 @@ "libz-sys", "openssl-sys", "pkg-config", -@@ -1693,20 +1692,6 @@ +@@ -1918,20 +1917,6 @@ ] [[package]] @@ -27,11 +27,11 @@ - -[[package]] name = "libz-sys" - version = "1.1.2" + version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" ---- rustc-1.48.0-src/vendor/git2/Cargo.toml.orig 2020-11-16 06:27:49.000000000 -0800 -+++ rustc-1.48.0-src/vendor/git2/Cargo.toml 2020-11-16 09:27:44.425104404 -0800 -@@ -49,7 +49,7 @@ +--- rustc-1.56.0-src/vendor/git2/Cargo.toml.orig 2021-10-18 04:05:54.000000000 -0700 ++++ rustc-1.56.0-src/vendor/git2/Cargo.toml 2021-10-19 17:57:37.960500359 -0700 +@@ -52,7 +52,7 @@ version = "0.1.39" [features] diff --git a/sources b/sources index 5a05016..d87c7bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rustc-1.55.0-src.tar.xz) = 7522f2fa95d5af92472404ecc97d7d9e745e88c933196a83fa373ce1efff6db3c295e0e2afdbfa1ff00644554efa0c3c7f6c11f9119ecf9010cb440b3f27c2da +SHA512 (rustc-1.56.0-src.tar.xz) = 2daa365524b47dcc48e49a0e9c8c45988af44c0845e2695dc5053f18e768e49acf3dbdd77f808dbf260546ef608eb47c593544012dd05675cb7e6b6223900315 diff --git a/sources-bootstrap b/sources-bootstrap index 5068ed4..539ecec 100644 --- a/sources-bootstrap +++ b/sources-bootstrap @@ -1,8 +1,7 @@ -SHA512 (rustc-1.55.0-src.tar.xz) = 7522f2fa95d5af92472404ecc97d7d9e745e88c933196a83fa373ce1efff6db3c295e0e2afdbfa1ff00644554efa0c3c7f6c11f9119ecf9010cb440b3f27c2da -SHA512 (rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz) = 3e6f638a35ed391f5393be7c92ef2560ed6bb26af1ea6ebf784bfadd3e153d1effd88fe49128eb98f5ec2ced7a65f3f4a596db71b9c4eca90429e50a8f168d11 -SHA512 (rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz) = 0f4f4e075299cd369b4b53a425e9b290cd9cedca6a88878c6a4ae0487fe976b15bea0c8b92e7e376f77dc370552d95d738e99b7fa184a8e2c0e5ab94d65e7595 -SHA512 (rust-1.54.0-i686-unknown-linux-gnu.tar.xz) = 15bc0c31a306aa1e2b16fec7f97963ca291b2632664c49add4281d3244054b2e2f51b0ade86a9d63db87124071fa25bd7d5e662acf4c30cf3267eb56da4a1f1f -SHA512 (rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz) = 9d13d53a1ef106b190161096122da1bc9090dc495604c8ddbb9d6b02323e6b7c9b8bec82dfe33ae6cf1820e986811a701f7a4d4c3eb7c297c777fe3563b8e9ee -SHA512 (rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz) = 543dcaf3bab3343e796b3535a3b4e12d77227006e64e91b885f599fd94ffc9c1cc8d8c5ce3b788df0399c79dc785ff7c8dc375ae20d3b4156d1b16a7dec5a371 -SHA512 (rust-1.54.0-s390x-unknown-linux-gnu.tar.xz) = 5033e3f61af7de144c3ed441f9fdf9f0c00a837d018ec3c0d4ef67f032e7f808d2dcc586e7b85b733ff9bc2196c2e05fcd104b3daa85698cc0e4e9ab69b870bd -SHA512 (rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz) = d2aad46556b164dac54be76a2459789fc686781b157f0c7d647464db3b03cbb902c8c4de5c6ef2e0811a94bdbba2973c93698c4f3a7c6ba294c0e652994e3fdc +SHA512 (rustc-1.56.0-src.tar.xz) = 2daa365524b47dcc48e49a0e9c8c45988af44c0845e2695dc5053f18e768e49acf3dbdd77f808dbf260546ef608eb47c593544012dd05675cb7e6b6223900315 +SHA512 (rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz) = 223a024701762675adb5c7c59fc54717d23f2ae4ea5984cd1cc0568d39c5207aa07a104ddad68da057f6434eecf23415ae13be2235797897d8d0f7cb5f2fc4b5 +SHA512 (rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz) = b06b3c36b5ca35391030f3c9d2f64725263ac987002923d9263c4c27877d91453db3191e01d40c78f439a48f83da220926a2841337d815dd333591d453f2fc0e +SHA512 (rust-1.55.0-i686-unknown-linux-gnu.tar.xz) = a0222c68c63ddd67afee552dd9ed636ea02fd3f26000deb7a1dc47806a1ec0b2fafaed903d4dabb0fddeb9e4026bf0da8bb2161c14db24d2883c084932e306b6 +SHA512 (rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz) = 67c98c7cc44482082daa5daa3926dc92782b373b3173181413e68d59ea07f6eee61d46f3832a3fce18bdc44dd563e2e1f85709435e04c599b299981ecd932a9f +SHA512 (rust-1.55.0-s390x-unknown-linux-gnu.tar.xz) = 7fc83c8723493864a470f32a05db9e16ecba0ff621080d8a3a257e6f42a37bfcc8d364d71aff696991dd85635f6596ffa72efdefee1620c308984536b48d212a +SHA512 (rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz) = 4bc304727b1e9459194a9a9ad5c8e1fe63501f01047d479585de6708365b3f59e09aade64c7f4969df204f8bbcf9de9508745d2b96bc25cb74ed093f8053a4d6