diff --git a/rust.spec b/rust.spec index 1b6532bb919573c525ec3be81e44d88a3f6fee6e..62c87791d40e80cd0d6e62992a70666e2be6a9ce 100644 --- a/rust.spec +++ b/rust.spec @@ -1,9 +1,9 @@ %global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x %{!?channel: %global channel stable} -%global bootstrap_rust 1.53.0 -%global bootstrap_cargo 1.53.0 -%global bootstrap_channel 1.53.0 -%global bootstrap_date 2021-10-14 +%global bootstrap_rust 1.54.0 +%global bootstrap_cargo 1.54.0 +%global bootstrap_channel 1.54.0 +%global bootstrap_date 2021-12-15 %bcond_with llvm_static %bcond_with bundled_llvm %bcond_without bundled_libgit2 @@ -11,7 +11,7 @@ %bcond_without curl_http2 %bcond_without lldb Name: rust -Version: 1.54.0 +Version: 1.55.0 Release: 1 Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) @@ -465,6 +465,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Wed Dec 15 2021 sdlzx - 1.55.0-1 +- Update to 1.55.0 + * Thu Oct 14 2021 sdlzx - 1.54.0-1 - Update to 1.54.0 diff --git a/rustc-1.51.0-disable-http2.patch b/rustc-1.51.0-disable-http2.patch index 91986213da3faae9d92cd24f27d8ee9a1f8a9f28..460c21ff05a8b89afab6da41369bd0921653ce06 100644 --- a/rustc-1.51.0-disable-http2.patch +++ b/rustc-1.51.0-disable-http2.patch @@ -28,13 +28,13 @@ --- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2021-03-05 08:34:15.000000000 -0800 +++ rustc-beta-src/src/tools/cargo/Cargo.toml 2021-03-09 10:32:38.096207704 -0800 @@ -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" - crypto-hash = "0.3.1" --curl = { version = "0.4.23", features = ["http2"] } -+curl = { version = "0.4.23", features = [] } - curl-sys = "0.4.22" - env_logger = "0.8.1" +-curl = { version = "0.4.38", features = ["http2"] } ++curl = { version = "0.4.38", features = [] } + curl-sys = "0.4.45" + env_logger = "0.9.0" pretty_env_logger = { version = "0.4", optional = true } --- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2021-03-05 08:34:15.000000000 -0800 +++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2021-03-09 10:32:38.096207704 -0800 @@ -46,7 +46,7 @@ - let multiplexing = config.http_config()?.multiplexing.unwrap_or(true); - multi - .pipelining(false, multiplexing) -- .chain_err(|| "failed to enable multiplexing/pipelining in curl")?; +- .with_context(|| "failed to enable multiplexing/pipelining in curl")?; - - // let's not flood crates.io with connections - multi.set_max_host_connections(2)?; diff --git a/rustc-1.54.0-src.tar.gz b/rustc-1.55.0-src.tar.gz similarity index 88% rename from rustc-1.54.0-src.tar.gz rename to rustc-1.55.0-src.tar.gz index 0fd963bbdf4e59e3f2aa7a5a9a8a156b43f06dfd..b38aeec8f1792be7bbce00de23325e1ad7fb1f75 100644 Binary files a/rustc-1.54.0-src.tar.gz and b/rustc-1.55.0-src.tar.gz differ