diff --git a/rust.spec b/rust.spec index c8a206f..d435691 100644 --- a/rust.spec +++ b/rust.spec @@ -75,7 +75,7 @@ Patch1: rust-pr71782-Use-a-non-existent-test-path.patch # libcurl on EL7 doesn't have http2, but since cargo requests it, curl-sys # will try to build it statically -- instead we turn off the feature. -Patch10: rustc-1.43.0-disable-http2.patch +Patch10: rustc-1.44.0-disable-http2.patch # Get the Rust triple for any arch. %{lua: function rust_triple(arch) diff --git a/rustc-1.43.0-disable-http2.patch b/rustc-1.44.0-disable-http2.patch similarity index 72% rename from rustc-1.43.0-disable-http2.patch rename to rustc-1.44.0-disable-http2.patch index ebc563f..d1fec13 100644 --- a/rustc-1.43.0-disable-http2.patch +++ b/rustc-1.44.0-disable-http2.patch @@ -1,6 +1,6 @@ ---- rustc-1.43.0-src/Cargo.lock.orig 2020-04-20 15:17:56.000000000 -0700 -+++ rustc-1.43.0-src/Cargo.lock 2020-04-23 13:27:41.781857941 -0700 -@@ -798,7 +798,6 @@ +--- rustc-1.44.0-src/Cargo.lock.orig 2020-06-01 08:44:15.000000000 -0700 ++++ rustc-1.44.0-src/Cargo.lock 2020-06-04 15:54:08.234883383 -0700 +@@ -817,7 +817,6 @@ dependencies = [ "cc", "libc", @@ -8,7 +8,7 @@ "libz-sys", "openssl-sys", "pkg-config", -@@ -1782,16 +1781,6 @@ +@@ -1808,16 +1807,6 @@ ] [[package]] @@ -25,10 +25,10 @@ name = "libssh2-sys" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" ---- rustc-1.43.0-src/src/tools/cargo/Cargo.toml.orig 2020-04-23 13:27:41.781857941 -0700 -+++ rustc-1.43.0-src/src/tools/cargo/Cargo.toml 2020-04-23 13:29:31.355523076 -0700 -@@ -26,7 +26,7 @@ - crossbeam-channel = "0.4" +--- rustc-1.44.0-src/src/tools/cargo/Cargo.toml.orig 2020-06-01 08:44:43.000000000 -0700 ++++ rustc-1.44.0-src/src/tools/cargo/Cargo.toml 2020-06-04 15:54:08.234883383 -0700 +@@ -25,7 +25,7 @@ + crates-io = { path = "crates/crates-io", version = "0.31" } crossbeam-utils = "0.7" crypto-hash = "0.3.1" -curl = { version = "0.4.23", features = ["http2"] } @@ -36,9 +36,9 @@ curl-sys = "0.4.22" env_logger = "0.7.0" pretty_env_logger = { version = "0.4", optional = true } ---- rustc-1.43.0-src/src/tools/cargo/src/cargo/core/package.rs.orig 2020-04-20 15:19:12.000000000 -0700 -+++ rustc-1.43.0-src/src/tools/cargo/src/cargo/core/package.rs 2020-04-23 13:27:41.782857920 -0700 -@@ -378,14 +378,8 @@ +--- rustc-1.44.0-src/src/tools/cargo/src/cargo/core/package.rs.orig 2020-06-01 08:44:43.000000000 -0700 ++++ rustc-1.44.0-src/src/tools/cargo/src/cargo/core/package.rs 2020-06-04 15:54:08.234883383 -0700 +@@ -385,14 +385,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 // proxies. @@ -55,7 +55,7 @@ Ok(PackageSet { packages: package_ids -@@ -483,7 +477,7 @@ +@@ -562,7 +556,7 @@ macro_rules! try_old_curl { ($e:expr, $msg:expr) => { let result = $e;