packages/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!49 Update to 1.55.0

Browse Source 
Merge pull request !49 from sdlzx/master
This commit is contained in:
openeuler-ci-bot 2021-12-16 10:59:06 +00:00 committed by Gitee
commit 1d5c2773d6
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rust.spec
View File

@ -1,9 +1,9 @@
%global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x %global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
%{!?channel: %global channel stable} %{!?channel: %global channel stable}
%global bootstrap_rust 1.53.0 %global bootstrap_rust 1.54.0
%global bootstrap_cargo 1.53.0 %global bootstrap_cargo 1.54.0
%global bootstrap_channel 1.53.0 %global bootstrap_channel 1.54.0
%global bootstrap_date 2021-10-14 %global bootstrap_date 2021-12-15
%bcond_with llvm_static %bcond_with llvm_static
%bcond_with bundled_llvm %bcond_with bundled_llvm
%bcond_without bundled_libgit2 %bcond_without bundled_libgit2
@ -11,7 +11,7 @@
%bcond_without curl_http2 %bcond_without curl_http2
%bcond_without lldb %bcond_without lldb
Name: rust Name: rust
Version: 1.54.0 Version: 1.55.0
Release: 1 Release: 1
Summary: The Rust Programming Language Summary: The Rust Programming Language
License: (ASL 2.0 or MIT) and (BSD and MIT) License: (ASL 2.0 or MIT) and (BSD and MIT)
@ -465,6 +465,9 @@ export %{rust_env}
%{_mandir}/man1/cargo*.1* %{_mandir}/man1/cargo*.1*
%changelog %changelog
* Wed Dec 15 2021 sdlzx <hdu_sdlzx@163.com> - 1.55.0-1
- Update to 1.55.0
* Thu Oct 14 2021 sdlzx <hdu_sdlzx@163.com> - 1.54.0-1 * Thu Oct 14 2021 sdlzx <hdu_sdlzx@163.com> - 1.54.0-1
- Update to 1.54.0 - Update to 1.54.0

12
rustc-1.51.0-disable-http2.patch
View File

@ -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.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 +++ rustc-beta-src/src/tools/cargo/Cargo.toml 2021-03-09 10:32:38.096207704 -0800
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
cargo-util = { path = "crates/cargo-util", version = "0.1.1" }
crates-io = { path = "crates/crates-io", version = "0.33.0" } crates-io = { path = "crates/crates-io", version = "0.33.0" }
crossbeam-utils = "0.8" crossbeam-utils = "0.8"
crypto-hash = "0.3.1" -curl = { version = "0.4.38", features = ["http2"] }
-curl = { version = "0.4.23", features = ["http2"] } +curl = { version = "0.4.38", features = [] }
+curl = { version = "0.4.23", features = [] } curl-sys = "0.4.45"
curl-sys = "0.4.22" env_logger = "0.9.0"
env_logger = "0.8.1"
pretty_env_logger = { version = "0.4", optional = true } 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.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 +++ 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); - let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
- multi - multi
- .pipelining(false, multiplexing) - .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 - // let's not flood crates.io with connections
- multi.set_max_host_connections(2)?; - multi.set_max_host_connections(2)?;