public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/rustup] rawhide: Upgrade to rustls-platform-verifier 0.7
Date: Mon, 10 Aug 2026 05:54:51 GMT [thread overview]
Message-ID: <178634129112.1.5057511652168126021.rpms-rustup-c5df7c05d810@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rustup
Branch : rawhide
Commit : c5df7c05d810341606ce174429e72f61e91e18c6
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-08-09T07:58:07+01:00
Stats : +107/-76 in 10 file(s)
URL : https://src.fedoraproject.org/rpms/rustup/c/c5df7c05d810341606ce174429e72f61e91e18c6?branch=rawhide
Log:
Upgrade to rustls-platform-verifier 0.7
---
diff --git a/0001-Drop-Windows-specific-dependencies.patch b/0001-Drop-Windows-specific-dependencies.patch
index 28ef4ce..9cad2b7 100644
--- a/0001-Drop-Windows-specific-dependencies.patch
+++ b/0001-Drop-Windows-specific-dependencies.patch
@@ -1,14 +1,14 @@
-From cbdaa7ae58434ed64587c426fb478f32d334189a Mon Sep 17 00:00:00 2001
+From 9641c87e36f660f19896e76c23f094faf2b675bf Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 23 May 2024 17:52:19 +0200
-Subject: [PATCH 1/6] Drop Windows-specific dependencies
+Subject: [PATCH 1/8] Drop Windows-specific dependencies
---
Cargo.toml | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index 6994070866cb..ac9f46007652 100644
+index 69940708..ac9f4600 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,33 +112,6 @@ zstd = { version = "0.13", default-features = false }
@@ -46,5 +46,5 @@ index 6994070866cb..ac9f46007652 100644
enum-map = "2.5.0"
http-body-util = "0.1.0"
--
-2.53.0
+2.55.0
diff --git a/0001-Unpin-tracing-subcriber.patch b/0001-Unpin-tracing-subcriber.patch
deleted file mode 100644
index 3f6f9df..0000000
--- a/0001-Unpin-tracing-subcriber.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6e5061a5b3257515ede1a9f91d8c9f288ed4db23 Mon Sep 17 00:00:00 2001
-From: Dirkjan Ochtman <dirkjan@ochtman.nl>
-Date: Fri, 13 Mar 2026 11:10:49 +0100
-Subject: [PATCH] Unpin tracing-subcriber
-
----
- Cargo.toml | 4 +---
- src/cli/log.rs | 3 ++-
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 6994070866cb..13f1f8e3c675 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -100,9 +100,7 @@ toml = "1.0"
- tracing = "0.1"
- tracing-log = "0.2"
- tracing-opentelemetry = { version = "0.32", optional = true }
--# Newer versions render ANSI escape codes, causing CLI errors to be ugly
--# See also https://github.com/tokio-rs/tracing/issues/3369
--tracing-subscriber = { version = "=0.3.19", features = ["env-filter"] }
-+tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
- url = "2.4"
- wait-timeout = "0.2"
- xz2 = "0.1.3"
-diff --git a/src/cli/log.rs b/src/cli/log.rs
-index 17f1e874265e..ab20922aa61c 100644
---- a/src/cli/log.rs
-+++ b/src/cli/log.rs
-@@ -50,7 +50,8 @@ where
- let process = process.clone();
- let logger = tracing_subscriber::fmt::layer()
- .with_writer(process.stderr())
-- .with_ansi(true); // `process.stderr()` will translate ANSI escape codes
-+ .with_ansi(true)
-+ .with_ansi_sanitization(false); // `process.stderr()` will translate ANSI escape codes
- if let Ok(directives) = maybe_rustup_log_directives {
- let (env_filter, handle) = reload::Layer::new(
- EnvFilter::builder()
---
-2.53.0
-
diff --git a/0002-Drop-feature-for-statically-linking-against-vendored.patch b/0002-Drop-feature-for-statically-linking-against-vendored.patch
index b518bd8..830d90b 100644
--- a/0002-Drop-feature-for-statically-linking-against-vendored.patch
+++ b/0002-Drop-feature-for-statically-linking-against-vendored.patch
@@ -1,7 +1,7 @@
-From 2d2eae80acf74bc63d5055b3b102ee4d5453d4d7 Mon Sep 17 00:00:00 2001
+From aeed26593b69de03b7f52ffbe1229e3d31f4ec81 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Wed, 8 Nov 2023 17:53:44 +0100
-Subject: [PATCH 2/6] Drop feature for statically linking against vendored
+Subject: [PATCH 2/8] Drop feature for statically linking against vendored
OpenSSL
---
@@ -9,7 +9,7 @@ Subject: [PATCH 2/6] Drop feature for statically linking against vendored
1 file changed, 2 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index ac9f46007652..9369ae86d8d6 100644
+index ac9f4600..9369ae86 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,8 +14,6 @@ build = "build.rs"
@@ -22,5 +22,5 @@ index ac9f46007652..9369ae86d8d6 100644
reqwest-rustls-tls = [
"reqwest/rustls-no-provider",
--
-2.53.0
+2.55.0
diff --git a/0003-Remove-unused-tracing-support.patch b/0003-Remove-unused-tracing-support.patch
index 8455880..918fef5 100644
--- a/0003-Remove-unused-tracing-support.patch
+++ b/0003-Remove-unused-tracing-support.patch
@@ -1,7 +1,7 @@
-From 9f2796040ecc803da9f941f51b4dcb8e735b0e59 Mon Sep 17 00:00:00 2001
+From 8c386a72139a5d8684ad0fd27f77173186b9a922 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 23 May 2024 18:01:37 +0200
-Subject: [PATCH 3/6] Remove unused tracing support
+Subject: [PATCH 3/8] Remove unused tracing support
---
Cargo.toml | 1 -
@@ -12,7 +12,7 @@ Subject: [PATCH 3/6] Remove unused tracing support
5 files changed, 25 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index 9369ae86d8d6..0793cb7fb1a4 100644
+index 9369ae86..0793cb7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,7 +78,6 @@ regex = "1"
@@ -24,7 +24,7 @@ index 9369ae86d8d6..0793cb7fb1a4 100644
rustls-platform-verifier = { version = "0.6", optional = true }
same-file = "1"
diff --git a/src/bin/rustup-init.rs b/src/bin/rustup-init.rs
-index e844ddc19edf..62f50abfacdc 100644
+index e844ddc1..62f50abf 100644
--- a/src/bin/rustup-init.rs
+++ b/src/bin/rustup-init.rs
@@ -17,10 +17,6 @@ use std::process::ExitCode;
@@ -53,7 +53,7 @@ index e844ddc19edf..62f50abfacdc 100644
}
diff --git a/src/diskio/immediate.rs b/src/diskio/immediate.rs
-index 2c7dd518a442..bfa7de4fd29f 100644
+index 2c7dd518..bfa7de4f 100644
--- a/src/diskio/immediate.rs
+++ b/src/diskio/immediate.rs
@@ -166,7 +166,6 @@ impl IncrementalFileWriter {
@@ -77,7 +77,7 @@ index 2c7dd518a442..bfa7de4fd29f 100644
state.completed_chunks.push(chunk.len());
diff --git a/src/diskio/mod.rs b/src/diskio/mod.rs
-index f2400ed118e0..5b307ffa80e2 100644
+index f2400ed1..5b307ffa 100644
--- a/src/diskio/mod.rs
+++ b/src/diskio/mod.rs
@@ -372,17 +372,14 @@ pub(crate) fn write_file<P: AsRef<Path>, C: AsRef<[u8]>>(
@@ -136,7 +136,7 @@ index f2400ed118e0..5b307ffa80e2 100644
}
diff --git a/src/lib.rs b/src/lib.rs
-index 7192d9eafc3b..8ec4f534b30d 100644
+index 7192d9ea..8ec4f534 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -14,9 +14,6 @@ use anyhow::{Result, anyhow};
@@ -150,5 +150,5 @@ index 7192d9eafc3b..8ec4f534b30d 100644
pub static TOOLS: &[&str] = &[
"rustc",
--
-2.53.0
+2.55.0
diff --git a/0004-Remove-unused-git-based-versioning.patch b/0004-Remove-unused-git-based-versioning.patch
index a5f22b2..07597d5 100644
--- a/0004-Remove-unused-git-based-versioning.patch
+++ b/0004-Remove-unused-git-based-versioning.patch
@@ -1,7 +1,7 @@
-From c65293ea63b578a4f67acc6fea5051710e31d26e Mon Sep 17 00:00:00 2001
+From 2d10ad1049e31aa7be1a69d3b69a964a888f1618 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 23 May 2024 18:05:00 +0200
-Subject: [PATCH 4/6] Remove unused git-based versioning
+Subject: [PATCH 4/8] Remove unused git-based versioning
---
Cargo.toml | 1 -
@@ -11,7 +11,7 @@ Subject: [PATCH 4/6] Remove unused git-based versioning
4 files changed, 2 insertions(+), 73 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index 0793cb7fb1a4..7aaf6ea53d82 100644
+index 0793cb7f..7aaf6ea5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,7 +55,6 @@ env_proxy = { version = "0.4.1", optional = true }
@@ -23,7 +23,7 @@ index 0793cb7fb1a4..7aaf6ea53d82 100644
indicatif = "0.18"
itertools = "0.14"
diff --git a/src/cli/common.rs b/src/cli/common.rs
-index 1db6bd80e81f..472a4dab1783 100644
+index 1db6bd80..472a4dab 100644
--- a/src/cli/common.rs
+++ b/src/cli/common.rs
@@ -4,13 +4,11 @@ use std::fmt::Display;
@@ -110,7 +110,7 @@ index 1db6bd80e81f..472a4dab1783 100644
fn show_backtrace(process: &Process) -> bool {
diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
-index d1b438820cd7..493438156ae2 100644
+index d1b43882..49343815 100644
--- a/src/cli/rustup_mode.rs
+++ b/src/cli/rustup_mode.rs
@@ -637,7 +637,7 @@ pub async fn main(
@@ -123,7 +123,7 @@ index d1b438820cd7..493438156ae2 100644
RustupSubcmd::Uninstall { opts } => toolchain_remove(cfg, opts).await,
RustupSubcmd::Show { verbose, subcmd } => handle_epipe(match subcmd {
diff --git a/src/cli/setup_mode.rs b/src/cli/setup_mode.rs
-index c4ec420e5c10..cd0099f1ca00 100644
+index c4ec420e..cd0099f1 100644
--- a/src/cli/setup_mode.rs
+++ b/src/cli/setup_mode.rs
@@ -69,10 +69,6 @@ struct RustupInit {
@@ -157,5 +157,5 @@ index c4ec420e5c10..cd0099f1ca00 100644
warn!("{}", common::WARN_COMPLETE_PROFILE);
}
--
-2.53.0
+2.55.0
diff --git a/0005-Revert-back-to-rustls-ring-instead-of-aws_lc_rs.patch b/0005-Revert-back-to-rustls-ring-instead-of-aws_lc_rs.patch
index 09e2cf9..d60a119 100644
--- a/0005-Revert-back-to-rustls-ring-instead-of-aws_lc_rs.patch
+++ b/0005-Revert-back-to-rustls-ring-instead-of-aws_lc_rs.patch
@@ -1,7 +1,7 @@
-From ee6551bde510285d77f4bfc1e4f720011b6e9cbd Mon Sep 17 00:00:00 2001
+From 1036467f5829dd3237e28e77678dbcc6201afa1e Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Fri, 30 May 2025 15:34:12 -0700
-Subject: [PATCH 5/6] Revert back to rustls/ring instead of aws_lc_rs
+Subject: [PATCH 5/8] Revert back to rustls/ring instead of aws_lc_rs
---
Cargo.toml | 2 +-
@@ -9,7 +9,7 @@ Subject: [PATCH 5/6] Revert back to rustls/ring instead of aws_lc_rs
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index 7aaf6ea53d82..643096c31126 100644
+index 7aaf6ea5..643096c3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,7 +77,7 @@ regex = "1"
@@ -22,7 +22,7 @@ index 7aaf6ea53d82..643096c31126 100644
same-file = "1"
semver = "1.0"
diff --git a/src/download/mod.rs b/src/download/mod.rs
-index 31f7c83624c0..93be2e85c32c 100644
+index 31f7c836..93be2e85 100644
--- a/src/download/mod.rs
+++ b/src/download/mod.rs
@@ -565,7 +565,7 @@ mod reqwest_be {
@@ -44,5 +44,5 @@ index 31f7c83624c0..93be2e85c32c 100644
let result =
Verifier::new_with_extra_roots(RUSTUP_TRUST_ANCHORS.iter().cloned(), provider.clone());
--
-2.53.0
+2.55.0
diff --git a/0006-Disable-tests-suite-static_roots.patch b/0006-Disable-tests-suite-static_roots.patch
index 623b98b..9d525ed 100644
--- a/0006-Disable-tests-suite-static_roots.patch
+++ b/0006-Disable-tests-suite-static_roots.patch
@@ -1,7 +1,7 @@
-From 0518d7c858804c5cabcb210f4cdf15973dfcdf82 Mon Sep 17 00:00:00 2001
+From bfbac381857182bb948bd3f67e0c9653b219c9ca Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Sat, 14 Mar 2026 15:30:36 -0700
-Subject: [PATCH 6/6] Disable tests/suite/static_roots
+Subject: [PATCH 6/8] Disable tests/suite/static_roots
This test only exists to make sure `src/anchors.rs` is up to date, but
we can't access that in package builds anyway. We could just skip it,
@@ -12,7 +12,7 @@ but removing it from the build entirely lets us drop a few dependencies.
2 files changed, 4 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index 643096c31126..e1556329bf11 100644
+index 643096c3..e1556329 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -114,9 +114,6 @@ http-body-util = "0.1.0"
@@ -26,7 +26,7 @@ index 643096c31126..e1556329bf11 100644
[build-dependencies]
platforms = "3.4"
diff --git a/tests/suite/mod.rs b/tests/suite/mod.rs
-index 296102d67ac7..240e1042c7c1 100644
+index 296102d6..240e1042 100644
--- a/tests/suite/mod.rs
+++ b/tests/suite/mod.rs
@@ -10,4 +10,3 @@ mod cli_v1;
@@ -35,5 +35,5 @@ index 296102d67ac7..240e1042c7c1 100644
mod known_tuples;
-mod static_roots;
--
-2.53.0
+2.55.0
diff --git a/0007-Unpin-tracing-subcriber.patch b/0007-Unpin-tracing-subcriber.patch
new file mode 100644
index 0000000..3a597b6
--- /dev/null
+++ b/0007-Unpin-tracing-subcriber.patch
@@ -0,0 +1,42 @@
+From 0791ba212ef8241e8982b9ecbda2740fc901d534 Mon Sep 17 00:00:00 2001
+From: Dirkjan Ochtman <dirkjan@ochtman.nl>
+Date: Fri, 13 Mar 2026 11:10:49 +0100
+Subject: [PATCH 7/8] Unpin tracing-subcriber
+
+---
+ Cargo.toml | 4 +---
+ src/cli/log.rs | 3 ++-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index e1556329..2334b86c 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -96,9 +96,7 @@ toml = "1.0"
+ tracing = "0.1"
+ tracing-log = "0.2"
+ tracing-opentelemetry = { version = "0.32", optional = true }
+-# Newer versions render ANSI escape codes, causing CLI errors to be ugly
+-# See also https://github.com/tokio-rs/tracing/issues/3369
+-tracing-subscriber = { version = "=0.3.19", features = ["env-filter"] }
++tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
+ url = "2.4"
+ wait-timeout = "0.2"
+ xz2 = "0.1.3"
+diff --git a/src/cli/log.rs b/src/cli/log.rs
+index 17f1e874..ab20922a 100644
+--- a/src/cli/log.rs
++++ b/src/cli/log.rs
+@@ -50,7 +50,8 @@ where
+ let process = process.clone();
+ let logger = tracing_subscriber::fmt::layer()
+ .with_writer(process.stderr())
+- .with_ansi(true); // `process.stderr()` will translate ANSI escape codes
++ .with_ansi(true)
++ .with_ansi_sanitization(false); // `process.stderr()` will translate ANSI escape codes
+ if let Ok(directives) = maybe_rustup_log_directives {
+ let (env_filter, handle) = reload::Layer::new(
+ EnvFilter::builder()
+--
+2.55.0
+
diff --git a/0008-Upgrade-to-rustls-platform-verifier-0.7.patch b/0008-Upgrade-to-rustls-platform-verifier-0.7.patch
new file mode 100644
index 0000000..88a409c
--- /dev/null
+++ b/0008-Upgrade-to-rustls-platform-verifier-0.7.patch
@@ -0,0 +1,26 @@
+From c39bd8047ff9249109b8cdbe3c3a89f10a0674e2 Mon Sep 17 00:00:00 2001
+From: Dirkjan Ochtman <dirkjan@ochtman.nl>
+Date: Sun, 12 Apr 2026 12:19:32 +0200
+Subject: [PATCH 8/8] Upgrade to rustls-platform-verifier 0.7
+
+(without changes to Cargo.lock)
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 2334b86c..e37cddf6 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -78,7 +78,7 @@ remove_dir_all = { version = "1.0.0", features = ["parallel"] }
+ reqwest = { version = "0.13", default-features = false, features = ["blocking", "gzip", "http2", "socks", "stream"], optional = true }
+ retry = { version = "2", default-features = false, features = ["random"] }
+ rustls = { version = "0.23", optional = true, default-features = false, features = ["logging", "ring", "tls12"] }
+-rustls-platform-verifier = { version = "0.6", optional = true }
++rustls-platform-verifier = { version = "0.7", optional = true }
+ same-file = "1"
+ semver = "1.0"
+ serde = { version = "1.0", features = ["derive"] }
+--
+2.55.0
+
diff --git a/rustup.spec b/rustup.spec
index 02dd6c4..2d36338 100644
--- a/rustup.spec
+++ b/rustup.spec
@@ -48,7 +48,12 @@ Patch: 0006-Disable-tests-suite-static_roots.patch
# * Unpin tracing-subscriber
# https://github.com/rust-lang/rustup/pull/4745
# https://github.com/tokio-rs/tracing/issues/3369
-Patch: 0001-Unpin-tracing-subcriber.patch
+Patch: 0007-Unpin-tracing-subcriber.patch
+
+# Upgrade to rustls-platform-verifier 0.7
+# (without changes to Cargo.lock)
+# https://github.com/rust-lang/rustup/commit/4d7b4b68b9736aa1dccf43c4b6df0976e88b3c8a
+Patch: 0008-Upgrade-to-rustls-platform-verifier-0.7.patch
ExcludeArch: %{ix86}
reply other threads:[~2026-08-10 5:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178634129112.1.5057511652168126021.rpms-rustup-c5df7c05d810@fedoraproject.org \
--to=code@musicinmybrain.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox