diff --git a/rust.spec b/rust.spec index fb3f4dd43371213340c2bcf77984d71cd38cbb47..376d0e2b3a1360c1670eeeb4f8d8083f9fd5b81a 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.58.1 -%global bootstrap_cargo 1.58.1 -%global bootstrap_channel 1.58.1 -%global bootstrap_date 2022-02-28 +%global bootstrap_rust 1.59.0 +%global bootstrap_cargo 1.59.0 +%global bootstrap_channel 1.59.0 +%global bootstrap_date 2022-04-19 %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.59.0 +Version: 1.60.0 Release: 1 Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) @@ -24,8 +24,8 @@ ExclusiveArch: %{rust_arches} %endif Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.gz -Patch0000: rustc-1.58.1-disable-libssh2.patch -Patch0001: rustc-1.58.1-disable-http2.patch +Patch0000: rustc-1.60.0-disable-libssh2.patch +Patch0001: rustc-1.60.0-disable-http2.patch Patch0002: clippy-driver-usage-should-user-friendly.patch Patch0003: cargo-help-clippy-should-have-description-to-user.patch Patch0004: fix-a-println-wrong-format.patch @@ -465,6 +465,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Tue Apr 19 2022 Liu Zixian - 1.60.0-1 +- Update to 1.60.0 + * Mon Feb 28 2022 Liu Zixian - 1.59.0-1 - Update to 1.59.0 diff --git a/rustc-1.58.1-disable-http2.patch b/rustc-1.60.0-disable-http2.patch similarity index 82% rename from rustc-1.58.1-disable-http2.patch rename to rustc-1.60.0-disable-http2.patch index 4f3c87342bee3f2c57985d47869f535ee8b51d6f..d8234a0043728d92c9a2435c2703b2a26e1ff219 100644 --- a/rustc-1.58.1-disable-http2.patch +++ b/rustc-1.60.0-disable-http2.patch @@ -1,6 +1,6 @@ -From 39b90a6ca3134982d3eadf96ea2067cc7cfc6d8d Mon Sep 17 00:00:00 2001 +From 9669318f57818f7ae497ef2bdedcd635298e2ce4 Mon Sep 17 00:00:00 2001 From: Liu Zixian -Date: Sat, 22 Jan 2022 00:37:26 +0800 +Date: Tue, 19 Apr 2022 22:28:00 +0800 Subject: [PATCH] disable http2 --- @@ -10,10 +10,10 @@ Subject: [PATCH] disable http2 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 2dbf34d87..908eb2c0b 100644 +index 8baf4fbd9..79740b777 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -909,7 +909,6 @@ checksum = "d130987e6a6a34fe0889e1083022fa48cd90e6709a84be3fb8dd95801de5af20" +@@ -958,7 +958,6 @@ checksum = "d130987e6a6a34fe0889e1083022fa48cd90e6709a84be3fb8dd95801de5af20" dependencies = [ "cc", "libc", @@ -21,7 +21,7 @@ index 2dbf34d87..908eb2c0b 100644 "libz-sys", "openssl-sys", "pkg-config", -@@ -1926,16 +1925,6 @@ version = "0.1.4" +@@ -2008,16 +2007,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" @@ -39,12 +39,12 @@ index 2dbf34d87..908eb2c0b 100644 name = "libz-sys" version = "1.1.3" diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml -index e23f4ec06..4e615767e 100644 +index fba5257a8..9fe466d6d 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml @@ -22,7 +22,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" } - cargo-util = { path = "crates/cargo-util", version = "0.1.1" } - crates-io = { path = "crates/crates-io", version = "0.33.0" } + cargo-util = { path = "crates/cargo-util", version = "0.1.2" } + crates-io = { path = "crates/crates-io", version = "0.34.0" } crossbeam-utils = "0.8" -curl = { version = "0.4.41", features = ["http2"] } +curl = { version = "0.4.41", features = [] } @@ -52,10 +52,10 @@ index e23f4ec06..4e615767e 100644 env_logger = "0.9.0" pretty_env_logger = { version = "0.4", optional = true } diff --git a/src/tools/cargo/src/cargo/core/package.rs b/src/tools/cargo/src/cargo/core/package.rs -index dd73ea25c..e1ed94321 100644 +index 0ebe0277e..1b3fc1ee1 100644 --- a/src/tools/cargo/src/cargo/core/package.rs +++ b/src/tools/cargo/src/cargo/core/package.rs -@@ -419,14 +419,8 @@ impl<'cfg> PackageSet<'cfg> { +@@ -412,14 +412,8 @@ impl<'cfg> PackageSet<'cfg> { // 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 // proxies. @@ -72,7 +72,7 @@ index dd73ea25c..e1ed94321 100644 Ok(PackageSet { packages: package_ids -@@ -655,7 +649,7 @@ impl<'cfg> PackageSet<'cfg> { +@@ -648,7 +642,7 @@ impl<'cfg> PackageSet<'cfg> { macro_rules! try_old_curl { ($e:expr, $msg:expr) => { let result = $e; @@ -82,5 +82,5 @@ index dd73ea25c..e1ed94321 100644 warn!("ignoring libcurl {} error: {}", $msg, e); } -- -2.34.1 +2.35.1 diff --git a/rustc-1.58.1-disable-libssh2.patch b/rustc-1.60.0-disable-libssh2.patch similarity index 76% rename from rustc-1.58.1-disable-libssh2.patch rename to rustc-1.60.0-disable-libssh2.patch index fff1e49c4e175079dec6db36def92b6f24fe51df..f578927e06e7050d258b80c6bcb1cfefab395fc9 100644 --- a/rustc-1.58.1-disable-libssh2.patch +++ b/rustc-1.60.0-disable-libssh2.patch @@ -1,6 +1,6 @@ -From ea7aff0acb25c06a76dfc99f46543937750e910e Mon Sep 17 00:00:00 2001 +From af470615d6ececcedbaf5edc4c34e18415a2cfa9 Mon Sep 17 00:00:00 2001 From: Liu Zixian -Date: Sat, 22 Jan 2022 00:36:17 +0800 +Date: Tue, 19 Apr 2022 22:26:47 +0800 Subject: [PATCH] disable libssh2 --- @@ -9,10 +9,10 @@ Subject: [PATCH] disable libssh2 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 48d9fdb3d..2dbf34d87 100644 +index e3ab987b3..8baf4fbd9 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -1915,7 +1915,6 @@ checksum = "ddbd6021eef06fb289a8f54b3c2acfdd85ff2a585dfbb24b8576325373d2152c" +@@ -1987,7 +1987,6 @@ checksum = "ddbd6021eef06fb289a8f54b3c2acfdd85ff2a585dfbb24b8576325373d2152c" dependencies = [ "cc", "libc", @@ -20,15 +20,15 @@ index 48d9fdb3d..2dbf34d87 100644 "libz-sys", "openssl-sys", "pkg-config", -@@ -1937,20 +1936,6 @@ dependencies = [ +@@ -2019,20 +2018,6 @@ dependencies = [ "libc", ] -[[package]] -name = "libssh2-sys" --version = "0.2.19" +-version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056" +-checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" -dependencies = [ - "cc", - "libc", @@ -55,5 +55,5 @@ index 299b77a8d..a05099544 100644 ssh = ["libgit2-sys/ssh"] ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"] -- -2.34.1 +2.35.1 diff --git a/rustc-1.59.0-src.tar.gz b/rustc-1.60.0-src.tar.gz similarity index 86% rename from rustc-1.59.0-src.tar.gz rename to rustc-1.60.0-src.tar.gz index 747ba34e2b679fc4b2178cadf49fbc1c8d2f5cc0..baf5ddc4fef3a7e5e6ef6a702b3310c3a25ed5d4 100644 Binary files a/rustc-1.59.0-src.tar.gz and b/rustc-1.60.0-src.tar.gz differ