From d6ea029d9c304642bdb56547f33c55081e7a02f1 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 13 Aug 2026 00:03:31 -0700 Subject: [PATCH 1/2] openssh: 10.4p1 -> 10.5p1 (cherry picked from commit b350ef752a8d12dd34a24923265f4758b23c5833) --- pkgs/tools/networking/openssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f128f5e7b700..16bd0cddddf3 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -14,11 +14,11 @@ in { openssh = common rec { pname = "openssh"; - version = "10.4p1"; + version = "10.5p1"; src = fetchurl { url = urlFor version; - hash = "sha256-72Am3SrqjVYFljjV0yYpAsiSzrqfiDlYNeDQbT+2Mjg="; + hash = "sha256-1E0oqDnqna+WnMaRUP3lmRCys5Nh2tgaO9bL0ZIY2xE="; }; extraPatches = [ From b9a38e5a049135ee6b8ba0f695e645515bbddd1c Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 13 Aug 2026 00:23:00 -0700 Subject: [PATCH 2/2] openssh_hpn: 10.3p1 -> 10.5p1 (cherry picked from commit 270ca476883da5aaabd7a195773cccd207b4b2ae) --- pkgs/tools/networking/openssh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 16bd0cddddf3..e713f86a8963 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -40,17 +40,17 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "10.3p1"; + version = "10.5p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = urlFor version; - hash = "sha256-VmgqNruS3PS08Bb9jsjnQFm3mo3iXBXWcNcx59GORfQ="; + hash = "sha256-1E0oqDnqna+WnMaRUP3lmRCys5Nh2tgaO9bL0ZIY2xE="; }; extraPatches = let - urlBase = "https://raw.githubusercontent.com/freebsd/freebsd-ports/294be7ad9ef5106b696d830e06b9f322bd79d6f5/security/openssh-portable/files"; + urlBase = "https://raw.githubusercontent.com/freebsd/freebsd-ports/b6e1767f0a502a384a7b9270a89123775a4bdc21/security/openssh-portable/files"; noBlocklistdHpnGluePatch = "${urlBase}/extra-patch-no-blocklistd-hpn-glue"; hpnPatch = "${urlBase}/extra-patch-hpn"; in @@ -72,7 +72,7 @@ in url = hpnPatch; stripLen = 1; excludes = [ "channels.c" ]; - hash = "sha256-dEYCSBcUXbSBzoMV/6QwLl5tj0c0/DPTtArchfRRQvM="; + hash = "sha256-Hq30DZ5i32aHalliyjdELe91aMDTT7/vAANY8RVn6B4="; }) (fetchpatch {