Skip to content

Commit 45cc213

Browse files
authored
Fix build on openssl-setup feature (#648)
1 parent 3687001 commit 45cc213

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ toml = "0.9"
2323
chrono = "0.4.38"
2424
rustix = { version = "1", features = ["process", "stdio"] }
2525
libc = "0.2.159"
26-
reqwest = { version = "0.13", default-features = false }
27-
rustls-platform-verifier = { version = "0.6", optional = true }
26+
reqwest = { version = "0.13", default-features = false, features = ["http2"] }
2827
rustls = { version = "0.23", default-features = false, features = ["ring", "tls12"], optional = true }
2928
tracing = "0.1.40"
3029
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
@@ -82,7 +81,7 @@ aosc = ["dep:oma-topics", "oma-refresh/aosc", "oma-pm/aosc", "oma-contents/aosc"
8281
sequoia-openssl-backend = ["oma-refresh/sequoia-openssl-backend"]
8382
sequoia-nettle-backend = ["oma-refresh/sequoia-nettle-backend"]
8483
tokio-console = ["dep:console-subscriber"]
85-
rustls = ["reqwest/rustls-no-provider", "dep:rustls-platform-verifier", "dep:rustls", "oma-fetch/rustls", "oma-refresh/rustls", "oma-topics/rustls"]
84+
rustls = ["reqwest/rustls-no-provider", "dep:rustls", "oma-fetch/rustls", "oma-refresh/rustls", "oma-topics/rustls"]
8685
openssl = ["reqwest/native-tls", "oma-fetch/native-tls", "oma-refresh/native-tls", "oma-topics/native-tls"]
8786
nice-setup = ["sequoia-nettle-backend", "rustls", "oma-refresh/apt"]
8887
openssl-setup = ["sequoia-openssl-backend", "openssl", "oma-refresh/apt"]

oma-fetch/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "MIT"
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[dependencies]
11-
reqwest = { version = "0.13", default-features = false, features = ["stream"] }
11+
reqwest = { version = "0.13", default-features = false, features = ["http2", "stream"] }
1212
rustls = { version = "0.23", default-features = false, features = ["ring", "tls12"], optional = true }
1313
tokio = { version = "1.28", default-features = false, features = ["fs"] }
1414
serde = { version = "1.0", features = ["derive"] }

oma-topics/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "MIT"
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[dependencies]
11-
reqwest = { version = "0.13", features = ["json"], default-features = false }
11+
reqwest = { version = "0.13", features = ["json", "http2"], default-features = false }
1212
rustls = { version = "0.23", default-features = false, features = ["ring", "tls12"], optional = true }
1313
serde = { version = "1.0", features = ["derive"] }
1414
serde_json = "1.0"

src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ fn try_main(
482482
/// Initialize ring TLS config for HTTP client
483483
#[inline]
484484
fn init_tls_config() {
485+
#[cfg(feature = "rustls")]
485486
rustls::crypto::ring::default_provider()
486487
.install_default()
487488
.expect("Failed to install rustls crypto provider");

0 commit comments

Comments
 (0)