From 7df36e5addf6b20df1ba4fc0fa778457576f4c27 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sat, 18 Feb 2023 11:24:44 +0000 Subject: [PATCH] openssh_hpn: 9.1p1 -> 9.2p1 The latest patch has diffs with mixed strip prefixes counts (i.e. patch -pX) so it needs to be split into two diffs, one that can be applied with -p1 and one that needs to be fixed up --- pkgs/tools/networking/openssh/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index b7e1e879b060..13e41d0e6fd0 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -19,12 +19,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "9.1p1"; + version = "9.2p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-GfhQCcfj4jeH8CNvuxV4OSq01L+fjsX+a8HNfov90og="; + hash = "sha256-P2bb8WVftF9Q4cVtpiqwEhjCKIB7ITONY068351xz0Y="; }; extraPatches = [ @@ -32,17 +32,19 @@ in # HPN Patch from FreeBSD ports (fetchpatch { - name = "ssh-hpn.patch"; - url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/ae66cffc19f357cbd51d5841c9b110a9ffd63e32/security/openssh-portable/files/extra-patch-hpn"; + name = "ssh-hpn-wo-channels.patch"; + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/10491773d88012fe81d9c039cbbba647bde9ebc9/security/openssh-portable/files/extra-patch-hpn"; stripLen = 1; - sha256 = "sha256-p3CmMqTgrqFZUo4ZuqaPLczAhjmPufkCvptVW5dI+MI="; + excludes = [ "channels.c" ]; + sha256 = "sha256-kSj0oE7gNHfIciy0/ErhdfrbmfjQmd8hduyiRXFnVZA="; }) (fetchpatch { - name = "CVE-2023-25136.patch"; - url = "https://ftp.openbsd.org/pub/OpenBSD/patches/7.2/common/017_sshd.patch.sig"; - stripLen = 1; - hash = "sha256-ol/YXXb2gJNBfvg9JKmIEdwGK8RaDfW53aKKT6HU++M="; + name = "ssh-hpn-channels.patch"; + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/10491773d88012fe81d9c039cbbba647bde9ebc9/security/openssh-portable/files/extra-patch-hpn"; + extraPrefix = ""; + includes = [ "channels.c" ]; + sha256 = "sha256-pDLUbjv5XIyByEbiRAXC3WMUPKmn15af1stVmcvr7fE="; }) ];