[rpms/rust] f43: Update to Rust 1.98.0

[Josh Stone <jistone@redhat.com>]

A new commit has been pushed.

Repo   : rpms/rust
Branch : f43
Commit : 9fd8074fe8c02097318fbc8eedae4e1d36edaeb4
Author : Josh Stone <jistone@redhat.com>
Date   : 2026-08-20T18:07:55-07:00
Stats  : +165/-157 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/rust/c/9fd8074fe8c02097318fbc8eedae4e1d36edaeb4?branch=f43

Log:
Update to Rust 1.98.0

---
diff --git a/.gitignore b/.gitignore
index 3e694a0..307a164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -482,3 +482,6 @@
 /rustc-1.97.0-src.tar.xz.asc
 /rustc-1.97.1-src.tar.xz
 /rustc-1.97.1-src.tar.xz.asc
+/rustc-1.98.0-src.tar.xz
+/rustc-1.98.0-src.tar.xz.asc
+/wasi-libc-wasi-sdk-33.tar.gz

diff --git a/0001-Enable-SHSTK-by-default-on-x86_64-unknown-linux-gnu.patch b/0001-Enable-SHSTK-by-default-on-x86_64-unknown-linux-gnu.patch
index acc8ebc..4ae9290 100644
--- a/0001-Enable-SHSTK-by-default-on-x86_64-unknown-linux-gnu.patch
+++ b/0001-Enable-SHSTK-by-default-on-x86_64-unknown-linux-gnu.patch
@@ -1,38 +1,41 @@
-From b719e2d72779dd0493e38c8c71a5916dfd0d99c6 Mon Sep 17 00:00:00 2001
+From c9d8b6663ac62ce52f8e893207b56a02a0585533 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Thu, 30 Apr 2026 13:21:13 -0700
 Subject: [PATCH] Enable SHSTK by default on x86_64-unknown-linux-gnu
 
-(cherry picked from commit ab9f08d9ae374144bd78524a9edec007abcf9a35)
+(cherry picked from commit 1d7707c6d8102e2a0777a3595ac267885f5a5880)
 ---
- compiler/rustc_codegen_llvm/src/context.rs    |  9 ++---
+ compiler/rustc_codegen_llvm/src/context.rs    | 11 +++---
  compiler/rustc_session/src/config.rs          | 24 +++----------
  compiler/rustc_session/src/options.rs         | 35 +++++++++----------
  compiler/rustc_session/src/session.rs         | 10 ++++--
+ compiler/rustc_target/src/spec/json.rs        |  5 ++-
  compiler/rustc_target/src/spec/mod.rs         | 24 +++++++++++++
  .../spec/targets/x86_64_unknown_linux_gnu.rs  |  7 +++-
- 6 files changed, 63 insertions(+), 46 deletions(-)
+ tests/codegen-llvm/cf-protection.rs           |  2 +-
+ 8 files changed, 69 insertions(+), 49 deletions(-)
 
 diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
-index 3e575f969afa..f4f08ef2a517 100644
+index 621f2cd3f9fc..30a98ac3e1c3 100644
 --- a/compiler/rustc_codegen_llvm/src/context.rs
 +++ b/compiler/rustc_codegen_llvm/src/context.rs
-@@ -23,12 +23,12 @@
+@@ -22,12 +22,12 @@
  use rustc_middle::{bug, span_bug};
  use rustc_session::Session;
  use rustc_session::config::{
 -    BranchProtection, CFGuard, CFProtection, CrateType, DebugInfo, FunctionReturn, PAuthKey, PacRet,
 +    BranchProtection, CFGuard, CrateType, DebugInfo, FunctionReturn, PAuthKey, PacRet,
  };
- use rustc_span::{DUMMY_SP, Span, Spanned, Symbol};
- use rustc_symbol_mangling::mangle_internal_symbol;
+ use rustc_span::{DUMMY_SP, Span, Spanned, Symbol, sym};
  use rustc_target::spec::{
--    Arch, CfgAbi, Env, HasTargetSpec, Os, RelocModel, SmallDataThresholdSupport, Target, TlsModel,
-+    Arch, CFProtection, CfgAbi, Env, HasTargetSpec, Os, RelocModel, SmallDataThresholdSupport, Target, TlsModel,
+-    Arch, CfgAbi, Env, FramePointer, HasTargetSpec, Os, RelocModel, SmallDataThresholdSupport,
+-    Target, TlsModel,
++    Arch, CFProtection, CfgAbi, Env, FramePointer, HasTargetSpec, Os, RelocModel,
++    SmallDataThresholdSupport, Target, TlsModel,
  };
  use smallvec::SmallVec;
  
-@@ -427,7 +427,8 @@ pub(crate) unsafe fn create_module<'ll>(
+@@ -451,7 +451,8 @@ pub(crate) unsafe fn create_module<'ll>(
      }
  
      // Pass on the control-flow protection flags to LLVM (equivalent to `-fcf-protection` in Clang).
@@ -42,7 +45,7 @@ index 3e575f969afa..f4f08ef2a517 100644
          llvm::add_module_flag_u32(
              llmod,
              llvm::ModuleFlagMergeBehavior::Override,
-@@ -435,7 +436,7 @@ pub(crate) unsafe fn create_module<'ll>(
+@@ -459,7 +460,7 @@ pub(crate) unsafe fn create_module<'ll>(
              1,
          );
      }
@@ -52,7 +55,7 @@ index 3e575f969afa..f4f08ef2a517 100644
              llmod,
              llvm::ModuleFlagMergeBehavior::Override,
 diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
-index 2040cd48ec44..4229645f9216 100644
+index 4492cdf2d2f8..51828f4e824b 100644
 --- a/compiler/rustc_session/src/config.rs
 +++ b/compiler/rustc_session/src/config.rs
 @@ -72,22 +72,6 @@ pub enum CFGuard {
@@ -78,7 +81,7 @@ index 2040cd48ec44..4229645f9216 100644
  #[derive(Clone, Copy, Debug, PartialEq, Hash, StableHash, Encodable, Decodable)]
  pub enum OptLevel {
      /// `-Copt-level=0`
-@@ -3042,13 +3026,13 @@ pub(crate) mod dep_tracking {
+@@ -3088,13 +3072,13 @@ pub(crate) mod dep_tracking {
      use rustc_span::edition::Edition;
      use rustc_span::{RealFileName, RemapPathScopeComponents};
      use rustc_target::spec::{
@@ -91,16 +94,16 @@ index 2040cd48ec44..4229645f9216 100644
      };
  
      use super::{
--        AnnotateMoves, AutoDiff, BranchProtection, CFGuard, CFProtection, CoverageOptions,
-+        AnnotateMoves, AutoDiff, BranchProtection, CFGuard, CoverageOptions,
-         CrateType, DebugInfo, DebugInfoCompression, ErrorOutputType, FmtDebug, FunctionReturn,
-         InliningThreshold, InstrumentCoverage, InstrumentXRay, LinkerPluginLto, LocationDetail,
-         LtoCli, MirStripDebugInfo, NextSolverConfig, Offload, OptLevel, OutFileName, OutputType,
+-        AnnotateMoves, AutoDiff, BranchProtection, CFGuard, CFProtection, CodegenRetagOptions,
++        AnnotateMoves, AutoDiff, BranchProtection, CFGuard, CodegenRetagOptions,
+         CoverageOptions, CrateType, DebugInfo, DebugInfoCompression, ErrorOutputType, FmtDebug,
+         FunctionReturn, InliningThreshold, InstrumentCoverage, InstrumentMcount, InstrumentXRay,
+         LinkerPluginLto, LocationDetail, LtoCli, MirStripDebugInfo, NextSolverConfig, Offload,
 diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs
-index aa9331ee8f65..e1e772e1265d 100644
+index e8e405f4a3df..412722cab01a 100644
 --- a/compiler/rustc_session/src/options.rs
 +++ b/compiler/rustc_session/src/options.rs
-@@ -15,9 +15,9 @@
+@@ -16,9 +16,9 @@
  use rustc_span::edition::Edition;
  use rustc_span::{RealFileName, RemapPathScopeComponents, SourceFileHashAlgorithm};
  use rustc_target::spec::{
@@ -113,7 +116,7 @@ index aa9331ee8f65..e1e772e1265d 100644
  };
  
  use crate::config::*;
-@@ -1286,22 +1286,20 @@ pub(crate) fn parse_cfguard(slot: &mut CFGuard, v: Option<&str>) -> bool {
+@@ -1314,22 +1314,20 @@ pub(crate) fn parse_cfguard(slot: &mut CFGuard, v: Option<&str>) -> bool {
          true
      }
  
@@ -148,7 +151,7 @@ index aa9331ee8f65..e1e772e1265d 100644
          true
      }
  
-@@ -2234,7 +2232,8 @@ pub(crate) fn parse_assert_incr_state(
+@@ -2310,7 +2308,8 @@ pub(crate) fn parse_rust_version(slot: &mut Option<RustcVersion>, v: Option<&str
          "whether the stable interface is being built"),
      cache_proc_macros: bool = (false, parse_bool, [TRACKED],
          "cache the results of derive proc macro invocations (potentially unsound!) (default: no"),
@@ -159,23 +162,23 @@ index aa9331ee8f65..e1e772e1265d 100644
      check_cfg_all_expected: bool = (false, parse_bool, [UNTRACKED],
          "show all expected values in check-cfg diagnostics (default: no)"),
 diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
-index 003164e8f905..bd0b9ffdb6c4 100644
+index 986dababf770..7252700d0e96 100644
 --- a/compiler/rustc_session/src/session.rs
 +++ b/compiler/rustc_session/src/session.rs
 @@ -29,9 +29,9 @@
  use rustc_span::{RealFileName, Span, Symbol};
  use rustc_target::asm::InlineAsmArch;
  use rustc_target::spec::{
--    Arch, CodeModel, DebuginfoKind, Os, PanicStrategy, RelocModel, RelroLevel, SanitizerSet,
--    SmallDataThresholdSupport, SplitDebuginfo, StackProtector, SymbolVisibility, Target,
--    TargetTuple, TlsModel, apple,
-+    Arch, CFProtection, CodeModel, DebuginfoKind, Os, PanicStrategy, RelocModel, RelroLevel,
-+    SanitizerSet, SmallDataThresholdSupport, SplitDebuginfo, StackProtector, SymbolVisibility,
-+    Target, TargetTuple, TlsModel, apple,
+-    Arch, CfgAbi, CodeModel, DebuginfoKind, Os, PanicStrategy, RelocModel, RelroLevel,
+-    SanitizerSet, SmallDataThresholdSupport, SplitDebuginfo, StackProtector, SymbolVisibility,
+-    Target, TargetTuple, TlsModel, apple,
++    Arch, CFProtection, CfgAbi, CodeModel, DebuginfoKind, Os, PanicStrategy, RelocModel,
++    RelroLevel, SanitizerSet, SmallDataThresholdSupport, SplitDebuginfo, StackProtector,
++    SymbolVisibility, Target, TargetTuple, TlsModel, apple,
  };
  
  use crate::code_stats::CodeStats;
-@@ -770,6 +770,10 @@ pub fn stack_protector(&self) -> StackProtector {
+@@ -775,6 +775,10 @@ pub fn stack_protector(&self) -> StackProtector {
          }
      }
  
@@ -186,11 +189,48 @@ index 003164e8f905..bd0b9ffdb6c4 100644
      pub fn must_emit_unwind_tables(&self) -> bool {
          // This is used to control the emission of the `uwtable` attribute on
          // LLVM functions. The `uwtable` attribute according to LLVM is:
+diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs
+index 922b1fb3dff8..da14f40f9189 100644
+--- a/compiler/rustc_target/src/spec/json.rs
++++ b/compiler/rustc_target/src/spec/json.rs
+@@ -12,7 +12,7 @@
+     TargetKind, TargetOptions, TargetWarnings, TlsModel,
+ };
+ use crate::json::{Json, ToJson};
+-use crate::spec::{AbiMap, LlvmAbi};
++use crate::spec::{AbiMap, CFProtection, LlvmAbi};
+ 
+ impl Target {
+     /// Loads a target descriptor from a JSON object.
+@@ -225,6 +225,7 @@ macro_rules! forward_opt {
+         forward!(entry_name);
+         forward!(supports_fentry);
+         forward!(supports_xray);
++        forward!(cf_protection);
+ 
+         // we're going to run `update_from_cli`, but that won't change the target's AbiMap
+         // FIXME: better factor the Target definition so we enforce this on a type level
+@@ -410,6 +411,7 @@ macro_rules! target_option_val {
+         target_option_val!(entry_abi);
+         target_option_val!(supports_fentry);
+         target_option_val!(supports_xray);
++        target_option_val!(cf_protection);
+ 
+         // Serializing `-Clink-self-contained` needs a dynamic key to support the
+         // backwards-compatible variants.
+@@ -631,6 +633,7 @@ struct TargetSpecJson {
+     supports_fentry: Option<bool>,
+     supports_xray: Option<bool>,
+     entry_abi: Option<ExternAbiWrapper>,
++    cf_protection: Option<CFProtection>,
+ }
+ 
+ pub fn json_schema() -> schemars::Schema {
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index d6a9e27c4655..eee118962332 100644
+index 5c19b35e1605..87968b47d84a 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1374,6 +1374,26 @@ pub enum StackProtector {
+@@ -1357,6 +1357,26 @@ pub enum StackProtector {
  
  into_diag_arg_using_display!(StackProtector);
  
@@ -217,7 +257,7 @@ index d6a9e27c4655..eee118962332 100644
  crate::target_spec_enum! {
      pub enum BinaryFormat {
          Coff = "coff",
-@@ -2694,6 +2714,9 @@ pub struct TargetOptions {
+@@ -2691,6 +2711,9 @@ pub struct TargetOptions {
      /// since this is most common among tier 1 and tier 2 targets.
      pub supports_stack_protector: bool,
  
@@ -227,16 +267,16 @@ index d6a9e27c4655..eee118962332 100644
      /// The name of entry function.
      /// Default value is "main"
      pub entry_name: StaticCow<str>,
-@@ -2942,6 +2965,7 @@ fn default() -> TargetOptions {
+@@ -2941,6 +2964,7 @@ fn default() -> TargetOptions {
              c_enum_min_bits: None,
              generate_arange_section: true,
              supports_stack_protector: true,
 +            cf_protection: CFProtection::None,
              entry_name: "main".into(),
              entry_abi: CanonAbi::C,
-             supports_xray: false,
+             supports_fentry: false,
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-index defa9f146d79..41c4a19b5270 100644
+index 0d87a7b760c6..03a9d644e1ec 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
 @@ -1,5 +1,6 @@
@@ -247,8 +287,8 @@ index defa9f146d79..41c4a19b5270 100644
  };
  
  pub(crate) fn target() -> Target {
-@@ -21,6 +22,10 @@ pub(crate) fn target() -> Target {
-         | SanitizerSet::REALTIME;
+@@ -22,6 +23,10 @@ pub(crate) fn target() -> Target {
+     base.supports_fentry = true;
      base.supports_xray = true;
  
 +    // Shadow Stack doesn't change codegen -- this only enables the SHSTK flag in
@@ -258,9 +298,8 @@ index defa9f146d79..41c4a19b5270 100644
      Target {
          llvm_target: "x86_64-unknown-linux-gnu".into(),
          metadata: TargetMetadata {
--- 
 diff --git a/tests/codegen-llvm/cf-protection.rs b/tests/codegen-llvm/cf-protection.rs
-index a1c902755af..b233b241a01 100644
+index a1c902755afb..b233b241a01f 100644
 --- a/tests/codegen-llvm/cf-protection.rs
 +++ b/tests/codegen-llvm/cf-protection.rs
 @@ -21,7 +21,7 @@
@@ -272,44 +311,6 @@ index a1c902755af..b233b241a01 100644
  
  // none-NOT: !"cf-protection-branch"
  // none-NOT: !"cf-protection-return"
---
-diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs
-index c8a22205a5f..155dea32443 100644
---- a/compiler/rustc_target/src/spec/json.rs
-+++ b/compiler/rustc_target/src/spec/json.rs
-@@ -12,7 +12,7 @@
-     TargetKind, TargetOptions, TargetWarnings, TlsModel,
- };
- use crate::json::{Json, ToJson};
--use crate::spec::{AbiMap, LlvmAbi};
-+use crate::spec::{AbiMap, CFProtection, LlvmAbi};
- 
- impl Target {
-     /// Loads a target descriptor from a JSON object.
-@@ -224,6 +224,7 @@ macro_rules! forward_opt {
-         forward!(small_data_threshold_support);
-         forward!(entry_name);
-         forward!(supports_xray);
-+        forward!(cf_protection);
- 
-         // we're going to run `update_from_cli`, but that won't change the target's AbiMap
-         // FIXME: better factor the Target definition so we enforce this on a type level
-@@ -408,6 +409,7 @@ macro_rules! target_option_val {
-         target_option_val!(entry_name);
-         target_option_val!(entry_abi);
-         target_option_val!(supports_xray);
-+        target_option_val!(cf_protection);
- 
-         // Serializing `-Clink-self-contained` needs a dynamic key to support the
-         // backwards-compatible variants.
-@@ -630,6 +632,7 @@ struct TargetSpecJson {
-     entry_name: Option<StaticCow<str>>,
-     supports_xray: Option<bool>,
-     entry_abi: Option<ExternAbiWrapper>,
-+    cf_protection: Option<CFProtection>,
- }
- 
- pub fn json_schema() -> schemars::Schema {
---
+-- 
 2.55.0
 

diff --git a/rust.spec b/rust.spec
index a679701..663e779 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,5 +1,5 @@
 Name:           rust
-Version:        1.97.1
+Version:        1.98.0
 Release:        %autorelease
 Summary:        The Rust Programming Language
 License:        (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0)
@@ -9,9 +9,9 @@ URL:            https://www.rust-lang.org
 # To bootstrap from scratch, set the channel and date from src/stage0
 # e.g. 1.89.0 wants rustc: 1.88.0-2025-06-26
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.96.0
-%global bootstrap_channel 1.96.0
-%global bootstrap_date 2026-05-28
+%global bootstrap_version 1.97.1
+%global bootstrap_channel 1.97.1
+%global bootstrap_date 2026-07-16
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -23,7 +23,7 @@ URL:            https://www.rust-lang.org
 # We need CRT files for *-wasi targets, at least as new as the commit in
 # src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh
 %global wasi_libc_url https://github.com/WebAssembly/wasi-libc
-%global wasi_libc_ref wasi-sdk-32
+%global wasi_libc_ref wasi-sdk-33
 %global wasi_libc_name wasi-libc-%{wasi_libc_ref}
 %global wasi_libc_source %{wasi_libc_url}/archive/%{wasi_libc_ref}/%{wasi_libc_name}.tar.gz
 %global wasi_libc_dir %{_builddir}/%{wasi_libc_name}
@@ -41,16 +41,16 @@ URL:            https://www.rust-lang.org
 # See src/bootstrap/src/core/build_steps/llvm.rs, fn check_llvm_version
 # See src/llvm-project/cmake/Modules/LLVMVersion.cmake for bundled version.
 %global min_llvm_version 21.0.0
-%global bundled_llvm_version 22.1.6
+%global bundled_llvm_version 22.1.8
 #global llvm_compat_version 21
 %global llvm llvm%{?llvm_compat_version}
 %bcond_with bundled_llvm
 
 # Requires stable libgit2 1.9, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.9.2
+%global min_libgit2_version 1.9.4
 %global next_libgit2_version 1.10.0~
-%global bundled_libgit2_version 1.9.2
+%global bundled_libgit2_version 1.9.4
 %if 0%{?fedora} >= 41
 %bcond_with bundled_libgit2
 %else
@@ -59,7 +59,7 @@ URL:            https://www.rust-lang.org
 
 # Cargo uses UPSERTs with omitted conflict targets
 %global min_sqlite3_version 3.35
-%global bundled_sqlite3_version 3.51.3
+%global bundled_sqlite3_version 3.53.2
 %if 0%{?rhel} && 0%{?rhel} < 10
 %bcond_without bundled_sqlite3
 %else
@@ -129,7 +129,7 @@ Patch4:         0001-bootstrap-allow-disabling-target-self-contained.patch
 Patch5:         0002-set-an-external-library-path-for-wasm32-wasi.patch
 
 # We don't want to use the bundled library in libsqlite3-sys
-Patch6:         rustc-1.97.0-unbundle-sqlite.patch
+Patch6:         rustc-1.98.0-unbundle-sqlite.patch
 
 # stage0 tries to copy all of /usr/lib, sometimes unsuccessfully, see #143735
 Patch7:         0001-only-copy-rustlib-into-stage0-sysroot.patch
@@ -147,7 +147,7 @@ Source102:      cargo_vendor.attr
 Source103:      cargo_vendor.prov
 
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.97.0-disable-libssh2.patch
+Patch100:       rustc-1.98.0-disable-libssh2.patch
 
 # Get the Rust triple for any architecture and ABI.
 %{lua: function rust_triple(arch, abi)

diff --git a/rustc-1.97.0-disable-libssh2.patch b/rustc-1.97.0-disable-libssh2.patch
deleted file mode 100644
index 964eef1..0000000
--- a/rustc-1.97.0-disable-libssh2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2026-07-02 11:47:42.914176299 -0500
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2026-07-02 11:48:03.404372146 -0500
-@@ -3108,7 +3108,6 @@ checksum = "c9b3acc4b91781bb0b3386669d32
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -3156,20 +3155,6 @@ dependencies = [
-  "pkg-config",
-  "vcpkg",
- ]
--
--[[package]]
--name = "libssh2-sys"
--version = "0.3.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c04141a07bb0c0bc461cb657808764de571702a59bc5c726c400ac9a7625e3ab"
--dependencies = [
-- "cc",
-- "libc",
-- "libz-sys",
-- "openssl-sys",
-- "pkg-config",
-- "vcpkg",
--]
- 
- [[package]]
- name = "libz-sys"
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2026-07-02 11:47:42.916176318 -0500
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2026-07-02 11:48:12.603460071 -0500
-@@ -51,7 +51,7 @@ filetime = "0.2.27"
- flate2 = { version = "1.1.9", default-features = false, features = ["zlib-rs"] }
- futures = { version = "0.3.32", default-features = false, features = ["std", "executor", "async-await"]}
- futures-timer = "3.0.3"
--git2 = "0.20.4"
-+git2 = { version = "0.20.4", default-features = false, features = ["https"] }
- git2-curl = "0.21.0"
- # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
- gix = { version = "0.83.0", default-features = false, features = ["sha1", "progress-tree", "parallel", "dirwalk", "status"] }

diff --git a/rustc-1.97.0-unbundle-sqlite.patch b/rustc-1.97.0-unbundle-sqlite.patch
deleted file mode 100644
index 8b35a0b..0000000
--- a/rustc-1.97.0-unbundle-sqlite.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2026-06-02 15:55:01.625762200 -0500
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2026-06-02 15:56:06.143120013 -0500
-@@ -3152,7 +3152,6 @@ version = "0.37.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1"
- dependencies = [
-- "cc",
-  "pkg-config",
-  "vcpkg",
- ]
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2026-06-02 15:54:48.946691882 -0500
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2026-06-02 15:56:21.480430158 -0500
-@@ -88,7 +88,7 @@ proptest = "1.11.0"
- pulldown-cmark = { version = "0.13.3", default-features = false, features = ["html"] }
- rand = "0.10.1"
- regex = "1.12.3"
--rusqlite = { version = "0.39.0", features = ["bundled"] }
-+rusqlite = { version = "0.39.0", features = [] }
- rustc-hash = "2.1.2"
- rustc-stable-hash = "0.1.2"
- rustfix = { version = "0.9.7", path = "crates/rustfix" }

diff --git a/rustc-1.98.0-disable-libssh2.patch b/rustc-1.98.0-disable-libssh2.patch
new file mode 100644
index 0000000..0c417b0
--- /dev/null
+++ b/rustc-1.98.0-disable-libssh2.patch
@@ -0,0 +1,44 @@
+diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2026-07-14 04:11:08.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2026-07-16 16:04:08.643705052 -0700
+@@ -3016,7 +3016,6 @@ checksum = "005d6ae6eac1912906073e069f7d
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -3052,20 +3051,6 @@ dependencies = [
+  "pkg-config",
+  "vcpkg",
+ ]
+-
+-[[package]]
+-name = "libssh2-sys"
+-version = "0.3.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c04141a07bb0c0bc461cb657808764de571702a59bc5c726c400ac9a7625e3ab"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+ 
+ [[package]]
+ name = "libz-sys"
+diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2026-07-14 04:11:08.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2026-07-16 16:05:21.304734301 -0700
+@@ -51,7 +51,7 @@ filetime = "0.2.27"
+ flate2 = { version = "1.1.9", default-features = false, features = ["zlib-rs"] }
+ futures = { version = "0.3.32", default-features = false, features = ["std", "executor", "async-await"]}
+ futures-timer = "3.0.3"
+-git2 = { version = "0.21.0", features = ["https", "ssh"] }
++git2 = { version = "0.21.0", features = ["https"] }
+ git2-curl = "0.22.0"
+ # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
+ gix = { version = "0.85.0", default-features = false, features = ["sha1", "progress-tree", "parallel", "dirwalk", "status"] }

diff --git a/rustc-1.98.0-unbundle-sqlite.patch b/rustc-1.98.0-unbundle-sqlite.patch
new file mode 100644
index 0000000..7f251a1
--- /dev/null
+++ b/rustc-1.98.0-unbundle-sqlite.patch
@@ -0,0 +1,23 @@
+diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2026-07-14 04:11:08.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2026-07-16 15:59:08.915377705 -0700
+@@ -3048,7 +3048,6 @@ version = "0.38.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f6c19a05435c21ac299d71b6a9c13db3e3f47c520517d58990a462a1397a61db"
+ dependencies = [
+- "cc",
+  "pkg-config",
+  "vcpkg",
+ ]
+diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2026-07-14 04:11:08.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2026-07-16 15:59:06.072443578 -0700
+@@ -88,7 +88,7 @@ proptest = "1.11.0"
+ pulldown-cmark = { version = "0.13.3", default-features = false, features = ["html"] }
+ rand = "0.10.1"
+ regex = "1.12.3"
+-rusqlite = { version = "0.40.0", features = ["bundled"] }
++rusqlite = { version = "0.40.0", features = [] }
+ rustc-hash = "2.1.2"
+ rustc-stable-hash = "0.1.2"
+ rustfix = { version = "0.9.7", path = "crates/rustfix" }

diff --git a/sources b/sources
index 9d297ae..8d354f3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (rustc-1.97.1-src.tar.xz) = a04178bf0f2c43cbb503a5ea48145eebfee371766a589c0855079ae6a7f3945223850dcc6bce2a94b9f9ead1595d99de09bb00cd6180300e0da58dc247f043eb
-SHA512 (rustc-1.97.1-src.tar.xz.asc) = 9d3ca698b1a1a453cac8758622609414f10868e8890491d8cd8c0eed796b689623f91cc28377c1e4c33095f02e92af7d1230458fe4e1fd830b6139799af50f32
-SHA512 (wasi-libc-wasi-sdk-32.tar.gz) = 5a07d2d21789c7ad8669d87a33bd0d397b2c64ebb11de81ee3c1c027754a9a88e06c524526b4b7170fa4dfd7e1bfec0a5f58757103a6fe1a8ab136abc7e8a190
+SHA512 (rustc-1.98.0-src.tar.xz) = d457af66ee9107613c1e58b588ad5f616c5efdc9a2164add4d52b7d7f6d869a580187b5e4b763f1d8ca275c7666e58e6de9d9a5751363758a0ebf01a9528f437
+SHA512 (rustc-1.98.0-src.tar.xz.asc) = 938d81b0cee5ce0898c8e970a53e0c4254237e128330fb6d5c343e07386cb548b2b031051ede9292bd00ccb567c9f5047eee63c4fe6ec45b3779d3e99f95a0be
+SHA512 (wasi-libc-wasi-sdk-33.tar.gz) = 7b07509db0ce6817a9616988b8b4ea9c7a87a2318e68ed350a2d0a8f7e839bb97e1cb766a568b008654149835b430a5a090f767ed9db0ca30503c4efe864a49c