From 73b9cce7046b2fdf3d47fa738060272157f0e476 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Feb 05 2020 16:10:23 +0000 Subject: add another patch --- diff --git a/SOURCES/rustc-1.38.0-disable-libssh2.patch b/SOURCES/rustc-1.38.0-disable-libssh2.patch new file mode 100644 index 0000000..b1437c6 --- /dev/null +++ b/SOURCES/rustc-1.38.0-disable-libssh2.patch @@ -0,0 +1,49 @@ +--- rustc-1.38.0-src/Cargo.lock.orig 2019-09-23 14:15:52.000000000 -0700 ++++ rustc-1.38.0-src/Cargo.lock 2019-11-08 09:39:38.730171371 -0800 +@@ -1466,7 +1466,6 @@ + dependencies = [ + "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +- "libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1482,19 +1481,6 @@ + ] + + [[package]] +-name = "libssh2-sys" +-version = "0.2.11" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-dependencies = [ +- "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +- "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +- "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- +-[[package]] + name = "libz-sys" + version = "1.0.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -4486,7 +4472,6 @@ + "checksum libflate 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "90c6f86f4b0caa347206f916f8b687b51d77c6ef8ff18d52dd007491fd580529" + "checksum libgit2-sys 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4c179ed6d19cd3a051e68c177fbbc214e79ac4724fac3a850ec9f3d3eb8a5578" + "checksum libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d75d7966bda4730b722d1eab8e668df445368a24394bae9fc1e8dc0ab3dbe4f4" +-"checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d" + "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" + "checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54" + "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" +--- rustc-1.38.0-src/vendor/git2/Cargo.toml.orig 2019-09-23 16:14:59.000000000 -0700 ++++ rustc-1.38.0-src/vendor/git2/Cargo.toml 2019-11-08 09:38:08.097098618 -0800 +@@ -55,7 +55,7 @@ + version = "0.1.39" + + [features] +-default = ["ssh", "https", "ssh_key_from_memory"] ++default = ["https"] + https = ["libgit2-sys/https", "openssl-sys", "openssl-probe"] + ssh = ["libgit2-sys/ssh"] + ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]