From e7e696fcc0ce98b1f1f282335e92f5ce8157e7ec Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Mon, 6 May 2024 10:25:32 +0200 Subject: [PATCH] d-0010-cargo-remove-vendored-c-crates Description: remove all vendoring features of crates normally shipping bundled C libs. that C code is stripped when repacking, so the features can't work anyway. Forwarded: not-needed Gbp-Pq: Topic prune Gbp-Pq: Name d-0010-cargo-remove-vendored-c-crates.patch --- src/tools/cargo/Cargo.toml | 10 ++-------- vendor/openssl-0.10.75/Cargo.toml | 4 ---- vendor/openssl-sys-0.9.111/Cargo.toml | 26 -------------------------- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml index d3c86cef70..08f6909220 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml @@ -72,9 +72,6 @@ memfd = "0.6.5" miow = "0.6.1" opener = "0.8.3" openssl = "0.10.75" -# Pinned due to ppc64 ELFv1/v2 ABI issue in 3.5.5 -# https://github.com/openssl/openssl/issues/29815 -openssl-src = "=300.5.4" os_info = { version = "3.14.0", default-features = false } pasetors = { version = "0.7.7", features = ["v3", "paserk", "std", "serde"] } pathdiff = "0.2.3" @@ -83,7 +80,7 @@ proptest = "1.9.0" pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] } rand = "0.9.2" regex = "1.12.2" -rusqlite = { version = "0.38.0", features = ["bundled"] } +rusqlite = { version = "0.38.0" } rustc-hash = "2.1.1" rustc-stable-hash = "0.1.2" rustfix = { version = "0.9.5", path = "crates/rustfix" } @@ -239,7 +236,6 @@ cargo-credential-macos-keychain.workspace = true [target.'cfg(not(windows))'.dependencies] openssl = { workspace = true, optional = true } -openssl-src = { workspace = true, optional = true } [target.'cfg(windows)'.dependencies] cargo-credential-wincred.workspace = true @@ -280,10 +276,8 @@ doc = false [features] default = ["http-transport-curl"] -vendored-openssl = ["openssl/vendored"] -vendored-libgit2 = ["libgit2-sys/vendored"] +# Debian: removed vendoring flags # This is primarily used by rust-lang/rust distributing cargo the executable. -all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx', 'vendored-libgit2'] # Exactly one of 'http-transport-curl' or 'http-transport-reqwest' must be enabled # when using Cargo as a library. By default, it is 'http-transport-curl'. http-transport-curl = ["gix/blocking-http-transport-curl"] diff --git a/vendor/openssl-0.10.75/Cargo.toml b/vendor/openssl-0.10.75/Cargo.toml index 3fa2e00241..77abe4f12d 100644 --- a/vendor/openssl-0.10.75/Cargo.toml +++ b/vendor/openssl-0.10.75/Cargo.toml @@ -37,16 +37,12 @@ license = "Apache-2.0" repository = "https://github.com/rust-openssl/rust-openssl" [features] -aws-lc = ["ffi/aws-lc"] -aws-lc-fips = ["ffi/aws-lc-fips"] bindgen = ["ffi/bindgen"] default = [] -unstable_boringssl = ["ffi/unstable_boringssl"] v101 = [] v102 = [] v110 = [] v111 = [] -vendored = ["ffi/vendored"] [lib] name = "openssl" diff --git a/vendor/openssl-sys-0.9.111/Cargo.toml b/vendor/openssl-sys-0.9.111/Cargo.toml index d761ec1a2f..96e20dd731 100644 --- a/vendor/openssl-sys-0.9.111/Cargo.toml +++ b/vendor/openssl-sys-0.9.111/Cargo.toml @@ -38,32 +38,11 @@ repository = "https://github.com/rust-openssl/rust-openssl" openssl = "1.0.1" [features] -aws-lc = ["dep:aws-lc-sys"] -aws-lc-fips = ["dep:aws-lc-fips-sys"] -unstable_boringssl = ["bssl-sys"] -vendored = ["openssl-src"] [lib] name = "openssl_sys" path = "src/lib.rs" -[dependencies.aws-lc-fips-sys] -version = "0.13" -features = [ - "ssl", - "bindgen", -] -optional = true - -[dependencies.aws-lc-sys] -version = "0.27" -features = ["ssl"] -optional = true - -[dependencies.bssl-sys] -version = "0.1.0" -optional = true - [dependencies.libc] version = "0.2" @@ -75,11 +54,6 @@ optional = true [build-dependencies.cc] version = "1.0.61" -[build-dependencies.openssl-src] -version = "300.2.0" -features = ["legacy"] -optional = true - [build-dependencies.pkg-config] version = "0.3.9" -- 2.30.2