d1dcdd39b0
Sync rust-toolset macros to rust-packaging v25.2 Related: RHEL-30084
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-01-07 18:12:08.000000000 -0800
|
|
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-01-09 15:25:51.519781381 -0800
|
|
@@ -2071,7 +2071,6 @@
|
|
dependencies = [
|
|
"cc",
|
|
"libc",
|
|
- "libssh2-sys",
|
|
"libz-sys",
|
|
"openssl-sys",
|
|
"pkg-config",
|
|
@@ -2113,20 +2112,6 @@
|
|
"pkg-config",
|
|
"vcpkg",
|
|
]
|
|
-
|
|
-[[package]]
|
|
-name = "libssh2-sys"
|
|
-version = "0.3.0"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
|
|
-dependencies = [
|
|
- "cc",
|
|
- "libc",
|
|
- "libz-sys",
|
|
- "openssl-sys",
|
|
- "pkg-config",
|
|
- "vcpkg",
|
|
-]
|
|
|
|
[[package]]
|
|
name = "libz-sys"
|
|
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-01-09 15:23:02.369032291 -0800
|
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-01-09 15:24:44.015679666 -0800
|
|
@@ -40,7 +40,7 @@
|
|
curl-sys = "0.4.70"
|
|
filetime = "0.2.22"
|
|
flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
|
|
-git2 = "0.18.1"
|
|
+git2 = { version = "0.18.1", default-features = false, features = ["https"] }
|
|
git2-curl = "0.19.0"
|
|
gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
|
|
gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
|