CVS commit: pkgsrc/lang/rust

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jun 30 15:13:10 UTC 2026

Modified Files:
        pkgsrc/lang/rust: Makefile distinfo options.mk

Log Message:
rust: updated to 1.96.1

Rust 1.96.1 fixes:

Missing retries / timeouts in Cargo's HTTP client
Miscompilation in a MIR optimization

It also fixes three CVEs affecting libssh2 (which is compiled into Cargo):

CVE-2025-15661
CVE-2026-55199
CVE-2026-55200


To generate a diff of this commit:
cvs rdiff -u -r1.361 -r1.362 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.200 -r1.201 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r1.54 -r1.55 pkgsrc/lang/rust/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.361 pkgsrc/lang/rust/Makefile:1.362
--- pkgsrc/lang/rust/Makefile:1.361     Thu Jun 11 07:00:56 2026
+++ pkgsrc/lang/rust/Makefile   Tue Jun 30 15:13:10 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.361 2026/06/11 07:00:56 wiz Exp $
+# $NetBSD: Makefile,v 1.362 2026/06/30 15:13:10 adam Exp $
 
-DISTNAME=      rustc-1.96.0-src
+DISTNAME=      rustc-1.96.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
 CATEGORIES=    lang
 MASTER_SITES=  https://static.rust-lang.org/dist/

Index: pkgsrc/lang/rust/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.200 pkgsrc/lang/rust/distinfo:1.201
--- pkgsrc/lang/rust/distinfo:1.200     Thu Jun 11 07:00:56 2026
+++ pkgsrc/lang/rust/distinfo   Tue Jun 30 15:13:10 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.200 2026/06/11 07:00:56 wiz Exp $
+$NetBSD: distinfo,v 1.201 2026/06/30 15:13:10 adam Exp $
 
 BLAKE2s (rust-1.95.0-aarch64-apple-darwin.tar.gz) = a81f78cd68fd2e8002b7c81d783144fed183f115c38dd1e21ee2e5ff31e1013c
 SHA512 (rust-1.95.0-aarch64-apple-darwin.tar.gz) = 588fffe89e51dae5566fac16630fc40849e2c33e842a7e92bbe98ec0e7148d88068fdc522f7cf6d301d3d08cd094b3d24fb864d7450c23a5b126c27777800bfa
@@ -108,9 +108,9 @@ Size (rust-std-1.95.0-x86_64-unknown-lin
 BLAKE2s (rust-std-1.95.0-x86_64-unknown-netbsd.tar.xz) = 350d3caee31d727425cef73e4075ef04548ad9de1df7f47bdf44d15bc469b197
 SHA512 (rust-std-1.95.0-x86_64-unknown-netbsd.tar.xz) = b6260458fbe1c7564f93e0da2ced6f5955771598568e20a9912444792fae096518a964c64a6bb6ad6ebb2029e49544d7422d42c8a2b0866dc0e6d50dcaa6fda4
 Size (rust-std-1.95.0-x86_64-unknown-netbsd.tar.xz) = 27125360 bytes
-BLAKE2s (rustc-1.96.0-src.tar.gz) = 223102f3bf363f734c40e54a1ca47ee5205a45d38708e2681368b4007eea80d3
-SHA512 (rustc-1.96.0-src.tar.gz) = 793e159e6573f59337fb1923c623069a8efcd78192bfd1d6525237494f80eec7df6b263ae8d918033ebb50613675b5ac3b747b18caef21ad1d6faf59942d68fe
-Size (rustc-1.96.0-src.tar.gz) = 528339182 bytes
+BLAKE2s (rustc-1.96.1-src.tar.gz) = 1edec24ab7204a20a482efd83d5333de53e31de83b97abaada79ed36bd7174d8
+SHA512 (rustc-1.96.1-src.tar.gz) = fecd947a0a08795b84cf3cff711ff2e18cdc83414daadf318f662ccd6f518fbae446ccdab2ec4f3fb934164e3c5ff926c21ffbe7d609fbca14c19d8cade103e1
+Size (rustc-1.96.1-src.tar.gz) = 528742024 bytes
 SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = f6b18a54dd8c991f6304df35a59fee3d55b46ed3
 SHA1 (patch-compiler_rustc__llvm_build.rs) = 3acef995e3038a98b29b31b9bdd43286b1ac29f7
 SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = 4db00d8abecd8f343e3c22c272a8a4e1f9228532

Index: pkgsrc/lang/rust/options.mk
diff -u pkgsrc/lang/rust/options.mk:1.54 pkgsrc/lang/rust/options.mk:1.55
--- pkgsrc/lang/rust/options.mk:1.54    Thu Apr  2 19:06:34 2026
+++ pkgsrc/lang/rust/options.mk Tue Jun 30 15:13:10 2026
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.54 2026/04/02 19:06:34 wiz Exp $
+# $NetBSD: options.mk,v 1.55 2026/06/30 15:13:10 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rust
-PKG_SUPPORTED_OPTIONS+=        rust-cargo-static rust-docs
+PKG_SUPPORTED_OPTIONS+=        rust-cargo-static rust-docs rust-system-libgit2
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -76,6 +76,14 @@ CONFIGURE_ARGS+=     --llvm-root=${BUILDLINK
 CONFIGURE_ARGS+=       --set rust.lld=false
 .endif
 
+#
+# Use the external libgit2.
+#
+.if !empty(PKG_OPTIONS:Mrust-system-libgit2)
+.include "../../devel/libgit2/buildlink3.mk"
+CONFIGURE_ENV+=                LIBGIT2_NO_VENDOR=1
+.endif
+
 # Rust bumps into NetBSD's limit of 256 TLS keys per process, at least
 # on aarch64 with "fatal runtime error: out of TLS keys, aborting"
 # (for some incomprehensible reason this isn't triggered on NetBSD/amd64 10.1)