From c2d09bb005a20dd5b74eace0281fe3b9c8844cd1 Mon Sep 17 00:00:00 2001 From: scx1332 Date: Mon, 8 Jul 2024 16:31:33 +0200 Subject: [PATCH] One crate accidentally enabled vendored feature in openssl, so unvendored builds were not possible --- Cargo.toml | 3 ++- exe-unit/Cargo.toml | 2 +- utils/manifest-utils/Cargo.toml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fc2651a7e9..90a06e8e9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,7 +77,7 @@ lazy_static = "1.4" log = "0.4" metrics = "0.12" num_cpus = "1" -openssl = "0.10" +openssl.workspace = true openssl-probe = { version = "0.1", optional = true } serde = "1.0" serde_json = "1.0" @@ -246,6 +246,7 @@ erc20_processor = { git = "https://github.com/golemfactory/erc20_payment_lib", r gftp = { version = "0.4.0", path = "core/gftp" } hex = "0.4.3" libsqlite3-sys = { version = "0.26.0", features = ["bundled"] } +openssl = "0.10" rand = "0.8.5" strum = { version = "0.24", features = ["derive"] } trust-dns-resolver = "0.22" diff --git a/exe-unit/Cargo.toml b/exe-unit/Cargo.toml index 9ce0bf09f8..d720f53d2c 100644 --- a/exe-unit/Cargo.toml +++ b/exe-unit/Cargo.toml @@ -65,7 +65,7 @@ hex = "0.4.2" ipnet = "2.3" lazy_static = "1.4.0" log = "0.4" -openssl = { version = "0.10", optional = true } +openssl = { workspace = true, optional = true } rand = "0.8.5" regex = "1.5" reqwest = { version = "0.11", optional = false, features = ["stream"] } diff --git a/utils/manifest-utils/Cargo.toml b/utils/manifest-utils/Cargo.toml index 4689bf157b..69cadef477 100644 --- a/utils/manifest-utils/Cargo.toml +++ b/utils/manifest-utils/Cargo.toml @@ -40,7 +40,7 @@ snailquote = { version = "0.3" } structopt = { version = "0.3" } strum = { workspace = true } url = { version = "2.2", features = ["serde"] } -openssl = { version = "0.10.62", features = ["vendored"] } +openssl = { workspace = true } md-5 = "0.10" log = "0.4" schemars = { version = "0.8", features = [ @@ -58,7 +58,7 @@ shlex = "1.1" tar = "0.4" test-case = "3.1" ya-manifest-test-utils = "0.1" -openssl = { version = "0.10", features = ["vendored"] } +openssl.workspace = true [lints] workspace = true \ No newline at end of file