openssh{,_hpn,_gssapi}: 10.0p1 -> 10.0p2

See: https://www.openwall.com/lists/oss-security/2025/04/09/6
10.0p1 was accidentally released as 10.0p2, with 10.0p1 in the URL.

Add a `urlFor` function to sort this out. It can be removed at a
later date.

+20 -6
+20 -6
pkgs/tools/networking/openssh/default.nix
··· 7 }: 8 let 9 common = opts: callPackage (import ./common.nix opts) { }; 10 in 11 { 12 openssh = common rec { 13 pname = "openssh"; 14 - version = "10.0p1"; 15 16 src = fetchurl { 17 - url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; 18 hash = "sha256-AhoucJoO30JQsSVr1anlAEEakN3avqgw7VnO+Q652Fw="; 19 }; 20 ··· 24 25 openssh_hpn = common rec { 26 pname = "openssh-with-hpn"; 27 - version = "10.0p1"; 28 extraDesc = " with high performance networking patches"; 29 30 src = fetchurl { 31 - url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; 32 hash = "sha256-AhoucJoO30JQsSVr1anlAEEakN3avqgw7VnO+Q652Fw="; 33 }; 34 ··· 67 68 openssh_gssapi = common rec { 69 pname = "openssh-with-gssapi"; 70 - version = "10.0p1"; 71 extraDesc = " with GSSAPI support"; 72 73 src = fetchurl { 74 - url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; 75 hash = "sha256-AhoucJoO30JQsSVr1anlAEEakN3avqgw7VnO+Q652Fw="; 76 }; 77
··· 7 }: 8 let 9 common = opts: callPackage (import ./common.nix opts) { }; 10 + 11 + # Gets the correct OpenSSH URL for a given version. 12 + urlFor = 13 + version: 14 + let 15 + urlVersion = 16 + { 17 + # 10.0p1 was accidentally released as 10.0p2: 18 + # https://www.openwall.com/lists/oss-security/2025/04/09/6 19 + "10.0p2" = "10.0p1"; 20 + } 21 + .${version} or version; 22 + in 23 + "mirror://openbsd/OpenSSH/portable/openssh-${urlVersion}.tar.gz"; 24 in 25 { 26 openssh = common rec { 27 pname = "openssh"; 28 + version = "10.0p2"; 29 30 src = fetchurl { 31 + url = urlFor version; 32 hash = "sha256-AhoucJoO30JQsSVr1anlAEEakN3avqgw7VnO+Q652Fw="; 33 }; 34 ··· 38 39 openssh_hpn = common rec { 40 pname = "openssh-with-hpn"; 41 + version = "10.0p2"; 42 extraDesc = " with high performance networking patches"; 43 44 src = fetchurl { 45 + url = urlFor version; 46 hash = "sha256-AhoucJoO30JQsSVr1anlAEEakN3avqgw7VnO+Q652Fw="; 47 }; 48 ··· 81 82 openssh_gssapi = common rec { 83 pname = "openssh-with-gssapi"; 84 + version = "10.0p2"; 85 extraDesc = " with GSSAPI support"; 86 87 src = fetchurl { 88 + url = urlFor version; 89 hash = "sha256-AhoucJoO30JQsSVr1anlAEEakN3avqgw7VnO+Q652Fw="; 90 }; 91