Regenerate disable-libssh2.patch

[skip changelog]
This commit is contained in:
Josh Stone 2024-06-13 16:41:06 -07:00
parent 2e8923ba1c
commit c9bf5b6c12

View File

@ -1,7 +1,7 @@
diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig rustc-1.79.0-src/src/tools/cargo/Cargo.lock
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-05-06 14:24:30.239408711 +0900 --- rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig 2024-06-13 16:37:16.640599290 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-05-06 14:25:22.869989833 +0900 +++ rustc-1.79.0-src/src/tools/cargo/Cargo.lock 2024-06-13 16:37:16.646599231 -0700
@@ -2153,7 +2153,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c @@ -2150,7 +2150,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@ -9,7 +9,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
"libz-sys", "libz-sys",
"openssl-sys", "openssl-sys",
"pkg-config", "pkg-config",
@@ -2194,20 +2193,6 @@ dependencies = [ @@ -2191,20 +2190,6 @@ dependencies = [
"pkg-config", "pkg-config",
"vcpkg", "vcpkg",
] ]
@ -30,9 +30,9 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
[[package]] [[package]]
name = "libz-sys" name = "libz-sys"
diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig rustc-1.79.0-src/src/tools/cargo/Cargo.toml
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-05-06 14:25:22.869989833 +0900 --- rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig 2024-06-13 16:37:16.646599231 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-05-06 14:25:57.625377462 +0900 +++ rustc-1.79.0-src/src/tools/cargo/Cargo.toml 2024-06-13 16:39:06.040526596 -0700
@@ -44,7 +44,7 @@ curl = "0.4.46" @@ -44,7 +44,7 @@ curl = "0.4.46"
curl-sys = "0.4.72" curl-sys = "0.4.72"
filetime = "0.2.23" filetime = "0.2.23"
@ -40,5 +40,5 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools
-git2 = "0.18.3" -git2 = "0.18.3"
+git2 = { version = "0.18.3", default-features = false, features = ["https"] } +git2 = { version = "0.18.3", default-features = false, features = ["https"] }
git2-curl = "0.19.0" git2-curl = "0.19.0"
gix = { version = "0.62.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] } gix = { version = "0.63.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] }
glob = "0.3.1" glob = "0.3.1"