[rpms/rust] rawhide: Update to Rust 1.96.0

[Josh Stone <jistone@redhat.com>]

A new commit has been pushed.

Repo   : rpms/rust
Branch : rawhide
Commit : 8ee77dc7eb5e5abb21840c72d7cd38078c07c61d
Author : Josh Stone <jistone@redhat.com>
Date   : 2026-06-01T09:12:43-07:00
Stats  : +123/-124 in 10 file(s)
URL    : https://src.fedoraproject.org/rpms/rust/c/8ee77dc7eb5e5abb21840c72d7cd38078c07c61d?branch=rawhide

Log:
Update to Rust 1.96.0

---
diff --git a/.gitignore b/.gitignore
index aa2f1a3..45a318d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -474,3 +474,5 @@
 /rustc-1.95.0-src.tar.xz
 /rustc-1.95.0-src.tar.xz.asc
 /wasi-libc-wasi-sdk-32.tar.gz
+/rustc-1.96.0-src.tar.xz
+/rustc-1.96.0-src.tar.xz.asc

diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch
index c3c36a4..bbcf631 100644
--- a/0001-Use-lld-provided-by-system.patch
+++ b/0001-Use-lld-provided-by-system.patch
@@ -1,4 +1,4 @@
-From d8b00ced0429722016cd35c2c5f392cd2b19d440 Mon Sep 17 00:00:00 2001
+From 2f68bbbaa31cef21b912ec4856e3187528ed9679 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 16 Aug 2024 10:12:58 -0700
 Subject: [PATCH] Use lld provided by system
@@ -12,10 +12,10 @@ Subject: [PATCH] Use lld provided by system
  5 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
-index 7ede45766ea..b22362227bb 100644
+index 1f0f564a7790..9173337a1a69 100644
 --- a/compiler/rustc_target/src/spec/base/wasm.rs
 +++ b/compiler/rustc_target/src/spec/base/wasm.rs
-@@ -81,8 +81,7 @@ macro_rules! args {
+@@ -71,8 +71,7 @@ macro_rules! args {
          // threaded model which will legalize atomics to normal operations.
          singlethread: true,
  
@@ -26,19 +26,19 @@ index 7ede45766ea..b22362227bb 100644
  
          pre_link_args,
 diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
-index ad444c139bf..f5f8f18f8b8 100644
+index 05876891ebd7..9f389f9abec7 100644
 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
 +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
-@@ -15,7 +15,6 @@ pub(crate) fn target() -> Target {
-     let opts = TargetOptions {
-         abi: Abi::SoftFloat,
+@@ -16,7 +16,6 @@ pub(crate) fn target() -> Target {
+         cfg_abi: CfgAbi::SoftFloat,
+         rustc_abi: Some(RustcAbi::Softfloat),
          linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
 -        linker: Some("rust-lld".into()),
          features: "+v8a,+strict-align,-neon".into(),
          relocation_model: RelocModel::Static,
          disable_redzone: true,
 diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
-index e2c1888e408..4869f85d1e6 100644
+index e2c1888e4084..4869f85d1e6e 100644
 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
 +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
 @@ -9,6 +9,7 @@ pub(crate) fn target() -> Target {
@@ -50,7 +50,7 @@ index e2c1888e408..4869f85d1e6 100644
      Target {
          llvm_target: "aarch64-unknown-windows".into(),
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-index 0afe7a0b68b..4671032a437 100644
+index 0afe7a0b68b0..4671032a437c 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
 @@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
@@ -63,7 +63,7 @@ index 0afe7a0b68b..4671032a437 100644
          features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(),
          supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-index 333e20bd0ac..16bea38887b 100644
+index 333e20bd0ac1..16bea38887be 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
 @@ -15,6 +15,7 @@ pub(crate) fn target() -> Target {

diff --git a/0001-openssl-4-support-2591.patch b/0001-openssl-4-support-2591.patch
index 1066c67..97b2b41 100644
--- a/0001-openssl-4-support-2591.patch
+++ b/0001-openssl-4-support-2591.patch
@@ -1,4 +1,4 @@
-From 994e98cb28ecb757b494785b5fd2114727edcd12 Mon Sep 17 00:00:00 2001
+From 23e891745313547c7dd86fa3f276ba607f7857cb Mon Sep 17 00:00:00 2001
 From: Paul Kehrer <paul.l.kehrer@gmail.com>
 Date: Wed, 15 Apr 2026 19:07:23 -0500
 Subject: [PATCH] openssl 4 support (#2591)
@@ -55,15 +55,15 @@ Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
 ---
  openssl-sys/build/cfgs.rs           |  3 +++
  openssl-sys/build/main.rs           | 14 ++++++++++----
- openssl-sys/src/handwritten/x509.rs | 14 ++++++++++----
+ openssl-sys/src/handwritten/x509.rs | 12 +++++++++---
  openssl-sys/src/ssl.rs              |  2 ++
- 4 files changed, 25 insertions(+), 8 deletions(-)
+ 4 files changed, 24 insertions(+), 7 deletions(-)
 
 diff --git a/openssl-sys/build/cfgs.rs b/openssl-sys/build/cfgs.rs
-index 14118b06b84b..7d3f975ad574 100644
+index b5527929d8e6..a544a8b533c9 100644
 --- a/openssl-sys/build/cfgs.rs
 +++ b/openssl-sys/build/cfgs.rs
-@@ -97,6 +97,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
+@@ -93,6 +93,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
          if openssl_version >= 0x3_05_00_00_0 {
              cfgs.push("ossl350");
          }
@@ -74,7 +74,7 @@ index 14118b06b84b..7d3f975ad574 100644
  
      cfgs
 diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
-index cbbeb961da50..c3907064d0bb 100644
+index 3f9eae069d5b..44c8fad04970 100644
 --- a/openssl-sys/build/main.rs
 +++ b/openssl-sys/build/main.rs
 @@ -19,6 +19,7 @@ mod run_bindgen;
@@ -84,8 +84,8 @@ index cbbeb961da50..c3907064d0bb 100644
 +    Openssl4xx,
      Openssl3xx,
      Openssl11x,
-     Openssl10x,
-@@ -179,6 +180,7 @@ fn main() {
+     Libressl,
+@@ -180,6 +181,7 @@ fn main() {
      println!("cargo:rustc-check-cfg=cfg(ossl320)");
      println!("cargo:rustc-check-cfg=cfg(ossl330)");
      println!("cargo:rustc-check-cfg=cfg(ossl340)");
@@ -94,9 +94,9 @@ index cbbeb961da50..c3907064d0bb 100644
      check_ssl_kind();
  
 @@ -226,7 +228,9 @@ fn main() {
+             }
          }
          None => match version {
-             Version::Openssl10x if target.contains("windows") => vec!["ssleay32", "libeay32"],
 -            Version::Openssl3xx | Version::Openssl11x if target.contains("windows-msvc") => {
 +            Version::Openssl4xx | Version::Openssl3xx | Version::Openssl11x
 +                if target.contains("windows-msvc") =>
@@ -113,7 +113,7 @@ index cbbeb961da50..c3907064d0bb 100644
          && kind == "static"
          && (env::var("CARGO_CFG_TARGET_OS").unwrap() == "linux"
              || env::var("CARGO_CFG_TARGET_OS").unwrap() == "android")
-@@ -445,8 +449,10 @@ See rust-openssl documentation for more information:
+@@ -436,8 +440,10 @@ See rust-openssl documentation for more information:
          let openssl_version = openssl_version.unwrap();
          println!("cargo:version_number={openssl_version:x}");
  
@@ -125,29 +125,27 @@ index cbbeb961da50..c3907064d0bb 100644
          } else if openssl_version >= 0x3_00_00_00_0 {
              Version::Openssl3xx
          } else if openssl_version >= 0x1_01_01_00_0 {
-@@ -472,7 +478,7 @@ fn version_error() -> ! {
+@@ -460,7 +466,7 @@ fn version_error() -> ! {
      panic!(
          "
  
--This crate is only compatible with OpenSSL (version 1.0.2 through 1.1.1, or 3), or LibreSSL 3.5
-+This crate is only compatible with OpenSSL (version 1.0.2 through 1.1.1, 3.x, or 4.x), or LibreSSL 3.5
+-This crate is only compatible with OpenSSL (version 1.1.0, 1.1.1, or 3.x), or LibreSSL 3.5.0
++This crate is only compatible with OpenSSL (version 1.1.0, 1.1.1, 3.x, or 4.x), or LibreSSL 3.5.0
  through 4.2.x, but a different version of OpenSSL was found. The build is now aborting
  due to this version mismatch.
  
 diff --git a/openssl-sys/src/handwritten/x509.rs b/openssl-sys/src/handwritten/x509.rs
-index de7d5dacbdfd..0c682230d50a 100644
+index b103030f6ea9..bd3e38dd0031 100644
 --- a/openssl-sys/src/handwritten/x509.rs
 +++ b/openssl-sys/src/handwritten/x509.rs
-@@ -456,8 +456,14 @@ extern "C" {
+@@ -332,7 +332,13 @@ extern "C" {
+     pub fn X509_CRL_get_REVOKED(crl: *mut X509_CRL) -> *mut stack_st_X509_REVOKED;
      pub fn X509_CRL_get0_nextUpdate(x: *const X509_CRL) -> *const ASN1_TIME;
-     #[cfg(any(ossl110, libressl))]
      pub fn X509_CRL_get0_lastUpdate(x: *const X509_CRL) -> *const ASN1_TIME;
--    #[cfg(any(ossl110, libressl))]
 -    pub fn X509_CRL_get_issuer(x: *const X509_CRL) -> *mut X509_NAME;
 +}
 +const_ptr_api! {
 +    extern "C" {
-+        #[cfg(any(ossl110, libressl))]
 +        pub fn X509_CRL_get_issuer(x: *const X509_CRL) -> #[const_ptr_if(ossl400)] X509_NAME;
 +    }
 +}
@@ -155,24 +153,24 @@ index de7d5dacbdfd..0c682230d50a 100644
  
      #[cfg(ossl110)]
      pub fn X509_get0_extensions(req: *const X509) -> *const stack_st_X509_EXTENSION;
-@@ -506,8 +512,8 @@ const_ptr_api! {
+@@ -370,8 +376,8 @@ const_ptr_api! {
              set: c_int,
          ) -> c_int;
          pub fn i2d_X509_NAME(n: #[const_ptr_if(ossl300)] X509_NAME, buf: *mut *mut u8) -> c_int;
--        pub fn X509_NAME_ENTRY_get_object(ne: #[const_ptr_if(any(ossl110, libressl))] X509_NAME_ENTRY) -> *mut ASN1_OBJECT;
--        pub fn X509_NAME_ENTRY_get_data(ne: #[const_ptr_if(any(ossl110, libressl))] X509_NAME_ENTRY) -> *mut ASN1_STRING;
-+        pub fn X509_NAME_ENTRY_get_object(ne: #[const_ptr_if(any(ossl110, libressl))] X509_NAME_ENTRY) -> #[const_ptr_if(ossl400)] ASN1_OBJECT;
-+        pub fn X509_NAME_ENTRY_get_data(ne: #[const_ptr_if(any(ossl110, libressl))] X509_NAME_ENTRY) -> #[const_ptr_if(ossl400)] ASN1_STRING;
+-        pub fn X509_NAME_ENTRY_get_object(ne: *const X509_NAME_ENTRY) -> *mut ASN1_OBJECT;
+-        pub fn X509_NAME_ENTRY_get_data(ne: *const X509_NAME_ENTRY) -> *mut ASN1_STRING;
++        pub fn X509_NAME_ENTRY_get_object(ne: *const X509_NAME_ENTRY) -> #[const_ptr_if(ossl400)] ASN1_OBJECT;
++        pub fn X509_NAME_ENTRY_get_data(ne: *const X509_NAME_ENTRY) -> #[const_ptr_if(ossl400)] ASN1_STRING;
      }
  }
  extern "C" {
 diff --git a/openssl-sys/src/ssl.rs b/openssl-sys/src/ssl.rs
-index 058ce7dc16dd..e268672dfe45 100644
+index 596fd1e53050..769f1f9ea10f 100644
 --- a/openssl-sys/src/ssl.rs
 +++ b/openssl-sys/src/ssl.rs
 @@ -82,6 +82,8 @@ cfg_if! {
  }
- #[cfg(ossl102)]
+ #[cfg(ossl110)]
  pub const SSL_OP_SAFARI_ECDHE_ECDSA_BUG: ssl_op_type!() = 0x00000040;
 +#[cfg(ossl300)]
 +pub const SSL_OP_IGNORE_UNEXPECTED_EOF: ssl_op_type!() = 0x00000080;

diff --git a/rpminspect.yaml b/rpminspect.yaml
index 4c9cfd3..ae867f2 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -14,6 +14,7 @@ unicode:
         # they are tests for those.
         - rustc-*-src/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
         - rustc-*-src/tests/ui/parser/unicode-control-codepoints.rs
+        - rustc-*-src/tests/ui/parser/unicode-control-doc-comment-issue-153096.rs
         - rustc-*-src/tests/ui/parser/macro/unicode-control-codepoints-macros.rs
         - rustc-*-src/tests/ui/parser/macro/auxiliary/unicode-control.rs
         - rustc-*-src/compiler/rustc_lint/src/hidden_unicode_codepoints.rs

diff --git a/rust.spec b/rust.spec
index 10348c8..eb388ff 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,5 +1,5 @@
 Name:           rust
-Version:        1.95.0
+Version:        1.96.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)
@@ -14,9 +14,9 @@ ExclusiveArch:  %{rust_arches}
 # 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.94.0
-%global bootstrap_channel 1.94.0
-%global bootstrap_date 2026-03-05
+%global bootstrap_version 1.95.0
+%global bootstrap_channel 1.95.0
+%global bootstrap_date 2026-04-16
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -42,12 +42,12 @@ ExclusiveArch:  %{rust_arches}
 %bcond_with llvm_static
 
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
-# is insufficient. Rust currently requires LLVM 19.0+.
+# is insufficient. Rust currently requires LLVM 21.0+.
 # 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 20.0.0
-%global bundled_llvm_version 21.1.8
-#global llvm_compat_version 19
+%global min_llvm_version 21.0.0
+%global bundled_llvm_version 22.1.2
+#global llvm_compat_version 21
 %global llvm llvm%{?llvm_compat_version}
 %bcond_with bundled_llvm
 
@@ -64,7 +64,7 @@ ExclusiveArch:  %{rust_arches}
 
 # Cargo uses UPSERTs with omitted conflict targets
 %global min_sqlite3_version 3.35
-%global bundled_sqlite3_version 3.51.1
+%global bundled_sqlite3_version 3.51.3
 %if 0%{?rhel} && 0%{?rhel} < 10
 %bcond_without bundled_sqlite3
 %else
@@ -134,13 +134,13 @@ 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.95.0-unbundle-sqlite.patch
+Patch6:         rustc-1.96.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
 
 # https://github.com/rust-openssl/rust-openssl/pull/2591/
-# (only the openssl-sys changes, backported for 0.9.111)
+# (only the openssl-sys changes, backported for 0.9.112)
 Patch8:         0001-openssl-4-support-2591.patch
 
 ### RHEL-specific patches below ###
@@ -152,7 +152,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.95.0-disable-libssh2.patch
+Patch100:       rustc-1.96.0-disable-libssh2.patch
 
 # Get the Rust triple for any architecture and ABI.
 %{lua: function rust_triple(arch, abi)
@@ -263,7 +263,7 @@ BuildRequires:  curl-devel
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(liblzma)
 
-# Only specific versions of openssl are supported. They are 1.0.2 - 1.1.1, 3, or 4
+# Only specific versions of openssl are supported: 1.1.0, 1.1.1, 3.x, or 4.x
 # The openssl-sys crate will also verify the release is supported.
 BuildRequires:  pkgconfig(openssl) < 5~
 
@@ -702,6 +702,10 @@ truncate --no-create --size=0 %{wasi_libc_dir}/dlmalloc/src/*.c
 
 %setup -q -n %{rustc_package}
 
+# Sanity check that the source version is what we expect,
+# especially for betas where the tarball is unversioned.
+test "$(cut -d' ' -f1 ./version)" = "%{lua: print((rpm.expand('%version'):gsub('~', '-'))) }"
+
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P3 -p1
@@ -713,7 +717,7 @@ truncate --no-create --size=0 %{wasi_libc_dir}/dlmalloc/src/*.c
 %patch -P6 -p1
 %endif
 %patch -P7 -p1
-%patch -P8 -p2 -d vendor/openssl-sys-0.9.111
+%patch -P8 -p2 -d vendor/openssl-sys-0.9.112
 
 %if %with disabled_libssh2
 %patch -P100 -p1
@@ -877,14 +881,8 @@ env -u CFLAGS %__cmake \
 %define profiler %{clang_lib}/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
 test -r "%{profiler}"
 
-# llvm < 21 does not provide a builtins library for s390x.
-%if "%{_arch}" != "s390x" || 0%{?clang_major_version} >= 21
 %define optimized_builtins %{clang_lib}/%{_arch}-redhat-linux-gnu/libclang_rt.builtins.a
 test -r "%{optimized_builtins}"
-%else
-%define optimized_builtins false
-%endif
-
 
 %configure --disable-option-checking \
   --docdir=%{_pkgdocdir} \

diff --git a/rustc-1.95.0-disable-libssh2.patch b/rustc-1.95.0-disable-libssh2.patch
deleted file mode 100644
index 2c9d1c4..0000000
--- a/rustc-1.95.0-disable-libssh2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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-01-27 13:27:00.716308204 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2026-01-27 13:27:00.718429578 -0800
-@@ -2764,7 +2764,6 @@ checksum = "c9b3acc4b91781bb0b3386669d32
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2828,20 +2828,6 @@ dependencies = [
- ]
- 
- [[package]]
--name = "libssh2-sys"
--version = "0.3.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
--dependencies = [
-- "cc",
-- "libc",
-- "libz-sys",
-- "openssl-sys",
-- "pkg-config",
-- "vcpkg",
--]
--
--[[package]]
- name = "libz-sys"
- version = "1.1.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-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-01-27 13:27:00.716725971 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2026-01-27 13:29:24.709692974 -0800
-@@ -48,7 +48,7 @@ curl = "0.4.49"
- curl-sys = "=0.4.83"
- filetime = "0.2.26"
- flate2 = { version = "1.1.9", default-features = false, features = ["zlib-rs"] }
--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.79.0", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] }

diff --git a/rustc-1.95.0-unbundle-sqlite.patch b/rustc-1.95.0-unbundle-sqlite.patch
deleted file mode 100644
index 53750f4..0000000
--- a/rustc-1.95.0-unbundle-sqlite.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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-03-25 08:58:07.789728719 -0500
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2026-03-24 17:34:11.025842497 -0500
-@@ -2824,7 +2824,6 @@ version = "0.36.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "95b4103cffefa72eb8428cb6b47d6627161e51c2739fc5e3b734584157bc642a"
- 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-03-25 08:54:36.103702972 -0500
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2026-03-25 08:56:07.916420965 -0500
-@@ -83,7 +83,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", features = [] }
- rustc-hash = "2.1.1"
- rustc-stable-hash = "0.1.2"
- rustfix = { version = "0.9.5", path = "crates/rustfix" }

diff --git a/rustc-1.96.0-disable-libssh2.patch b/rustc-1.96.0-disable-libssh2.patch
new file mode 100644
index 0000000..32e13bd
--- /dev/null
+++ b/rustc-1.96.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-04-23 13:22:07.239952036 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2026-04-23 13:23:43.576653041 -0700
+@@ -3108,7 +3108,6 @@ checksum = "c9b3acc4b91781bb0b3386669d32
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -3155,20 +3154,6 @@ dependencies = [
+  "pkg-config",
+  "vcpkg",
+ ]
+-
+-[[package]]
+-name = "libssh2-sys"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
+-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-04-23 13:22:07.240372063 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2026-04-23 13:23:37.142696088 -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"]}
+ 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.81.0", default-features = false, features = ["sha1", "progress-tree", "parallel", "dirwalk", "status"] }

diff --git a/rustc-1.96.0-unbundle-sqlite.patch b/rustc-1.96.0-unbundle-sqlite.patch
new file mode 100644
index 0000000..27c4129
--- /dev/null
+++ b/rustc-1.96.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-04-19 23:11:26.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2026-04-23 13:19:24.942383499 -0700
+@@ -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",
+ ]
+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-04-19 23:11:26.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2026-04-23 13:19:13.141462455 -0700
+@@ -89,7 +89,7 @@ proptest = "1.11.0"
+ pulldown-cmark = { version = "0.13.3", default-features = false, features = ["html"] }
+ rand = "0.10.0"
+ 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.6", path = "crates/rustfix" }

diff --git a/sources b/sources
index b4b6a68..faa93ce 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (rustc-1.95.0-src.tar.xz) = 685912ffff97063e55c85b2d15d06ba734980cef4b6e104caae1ea433958b12a8d651b757eef7b9f5b06dad3c246d819a5ee5574a26e05007ecdd378f0f041d0
-SHA512 (rustc-1.95.0-src.tar.xz.asc) = f70ed8071eff3470d4c288b83951e05f2ced52052a2f796113eb18db2c1f4bf81796f61434c322772dda879146d63569fd545d94d17e478a9588a333159c389c
+SHA512 (rustc-1.96.0-src.tar.xz) = 4f93df2c8ab5f4c7eb374b96a2dc4be4b134fbe8cf3db777118bd1aad12d3bb0b382c26864fa5d7d7959384701259edc7794a885d710565a91491bbaa337f789
+SHA512 (rustc-1.96.0-src.tar.xz.asc) = dc655238ea83bcf7c390c398dfce3925b0d13febbbe6a9a15f5f55ba51cbcb22c0e390fc63aadd9173930b9eaee94d2bb607c19f472efdf07b58cafe63376419
 SHA512 (wasi-libc-wasi-sdk-32.tar.gz) = 5a07d2d21789c7ad8669d87a33bd0d397b2c64ebb11de81ee3c1c027754a9a88e06c524526b4b7170fa4dfd7e1bfec0a5f58757103a6fe1a8ab136abc7e8a190