public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust] f44: Update to Rust 1.96.1
@ 2026-07-01 15:55 Paul Murphy
  0 siblings, 0 replies; only message in thread
From: Paul Murphy @ 2026-07-01 15:55 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust
Branch : f44
Commit : 045fc99692a6653c1bd092c0be866a1770dc06da
Author : Paul Murphy <murp@redhat.com>
Date   : 2026-06-30T12:08:30-05:00
Stats  : +56/-48 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/rust/c/045fc99692a6653c1bd092c0be866a1770dc06da?branch=f44

Log:
Update to Rust 1.96.1

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

diff --git a/rust.spec b/rust.spec
index 81be359..001eff4 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,5 +1,5 @@
 Name:           rust
-Version:        1.96.0
+Version:        1.96.1
 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)
@@ -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.96.0-disable-libssh2.patch
+Patch100:       rustc-1.96.1-disable-libssh2.patch
 
 # Get the Rust triple for any architecture and ABI.
 %{lua: function rust_triple(arch, abi)
@@ -760,8 +760,11 @@ rm -rf src/tools/rustc-perf/collector/*-benchmarks/
 %clear_dir vendor/libsqlite3-sys*/sqlite3/
 %endif
 
+%clear_dir src/tools/cargo/third-party/libssh2-sys/libssh2/
+
 %if %with disabled_libssh2
 rm -rf vendor/libssh2-sys*/
+rm -rf src/tools/cargo/third-party/libssh2-sys
 %endif
 
 # This only affects the transient rust-installer, but let it use our dynamic xz-libs

diff --git a/rustc-1.96.0-disable-libssh2.patch b/rustc-1.96.0-disable-libssh2.patch
deleted file mode 100644
index 32e13bd..0000000
--- a/rustc-1.96.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-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.1-disable-libssh2.patch b/rustc-1.96.1-disable-libssh2.patch
new file mode 100644
index 0000000..81fdba3
--- /dev/null
+++ b/rustc-1.96.1-disable-libssh2.patch
@@ -0,0 +1,47 @@
+--- rustc-1.96.1-src/src/tools/cargo/Cargo.lock.orig	2026-06-29 10:12:21.978285655 -0500
++++ rustc-1.96.1-src/src/tools/cargo/Cargo.lock	2026-06-29 10:13:45.744985498 -0500
+@@ -3110,7 +3110,6 @@ checksum = "c9b3acc4b91781bb0b3386669d32
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -3158,18 +3157,6 @@ dependencies = [
+  "pkg-config",
+  "vcpkg",
+ ]
+-
+-[[package]]
+-name = "libssh2-sys"
+-version = "0.3.1"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+ 
+ [[package]]
+ name = "libz-sys"
+--- rustc-1.96.1-src/src/tools/cargo/Cargo.toml.orig	2026-06-29 10:12:33.712458043 -0500
++++ rustc-1.96.1-src/src/tools/cargo/Cargo.toml	2026-06-30 11:25:16.694756549 -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"]}
+ 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"] }
+@@ -300,6 +300,3 @@ http-transport-reqwest = ["gix/blocking-
+ 
+ [lints]
+ workspace = true
+-
+-[patch.crates-io]
+-libssh2-sys = { path = "third-party/libssh2-sys" }

diff --git a/sources b/sources
index faa93ce..3e23821 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (rustc-1.96.0-src.tar.xz) = 4f93df2c8ab5f4c7eb374b96a2dc4be4b134fbe8cf3db777118bd1aad12d3bb0b382c26864fa5d7d7959384701259edc7794a885d710565a91491bbaa337f789
-SHA512 (rustc-1.96.0-src.tar.xz.asc) = dc655238ea83bcf7c390c398dfce3925b0d13febbbe6a9a15f5f55ba51cbcb22c0e390fc63aadd9173930b9eaee94d2bb607c19f472efdf07b58cafe63376419
+SHA512 (rustc-1.96.1-src.tar.xz) = fa835f26e1969cababc3c32eeb064548fcb4f05cd1a25fd1b5f6f12660170225b389ca3442da1ef23f999e34ca8ec348810c498d1fff0bee140ec372a37009b1
+SHA512 (rustc-1.96.1-src.tar.xz.asc) = 1765666d2509d93cbbad5f47507ba7510fc07cf650689238a8d39d33be0d85a06c4cd67281d78a1b5e29258002d7dd6da912c9015a8d0e942ee01fc46fa0dca3
 SHA512 (wasi-libc-wasi-sdk-32.tar.gz) = 5a07d2d21789c7ad8669d87a33bd0d397b2c64ebb11de81ee3c1c027754a9a88e06c524526b4b7170fa4dfd7e1bfec0a5f58757103a6fe1a8ab136abc7e8a190

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-01 15:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-01 15:55 [rpms/rust] f44: Update to Rust 1.96.1 Paul Murphy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox