nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 10:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

openssh, openssh_hpn, openssh_gssapi: 9.8p1 -> 9.9p1 (#350699)

Browse Source 
* openssh: 9.8p1 -> 9.9p1

Changes: https://www.openssh.com/releasenotes.html#9.9p1

* openssh_hpn: 9.8p1 -> 9.9p1

Changes: https://www.openssh.com/releasenotes.html#9.9p1

* openssh_gssapi: 9.8p1 -> 9.9p1

Changes:
https://www.openssh.com/releasenotes.html#9.9p1

---------

Co-authored-by: Ashish SHUKLA <ashish.is@lostca.se>
This commit is contained in:
Thomas Gerbet 2024-10-25 18:06:31 +02:00 committed by GitHub
parent 2386d26f95
commit f108380db7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/networking/openssh/common.nix
View File

@ -47,13 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://git.alpinelinux.org/aports/plain/main/openssh/gss-serv.c.patch?id=a7509603971ce2f3282486a43bb773b1b522af83";
sha256 = "sha256-eFFOd4B2nccRZAQWwdBPBoKWjfEdKEVGJvKZAzLu3HU=";
})
(fetchpatch {
name = "musl.patch";
url = "https://anongit.mindrot.org/openssh.git/patch/?id=8b664df75966e5aed8dabea00b8838303d3488b8";
hash = "sha256-siVg1mnGiZ2aP3IIY4y1WAp3nkOk0XKSBDqYfw6lrQg=";
})
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966
./dont_create_privsep_path.patch
] ++ extraPatches;

16
pkgs/tools/networking/openssh/default.nix
View File

@ -5,11 +5,11 @@ in
{
openssh = common rec {
pname = "openssh";
version = "9.8p1";
version = "9.9p1";
src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM=";
hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI=";
};
extraPatches = [ ./ssh-keysign-8.5.patch ];
@ -18,12 +18,12 @@ in
openssh_hpn = common rec {
pname = "openssh-with-hpn";
version = "9.8p1";
version = "9.9p1";
extraDesc = " with high performance networking patches";
src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM=";
hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI=";
};
extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/7ba88c964b6e5724eec462021d984da3989e6a08/security/openssh-portable/files/extra-patch-hpn"; in
@ -58,12 +58,12 @@ in
openssh_gssapi = common rec {
pname = "openssh-with-gssapi";
version = "9.8p1";
version = "9.9p1";
extraDesc = " with GSSAPI support";
src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM=";
hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI=";
};
extraPatches = [
@ -71,8 +71,8 @@ in
(fetchpatch {
name = "openssh-gssapi.patch";
url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-3/debian/patches/gssapi.patch";
hash = "sha256-BnmEZ5pMIbbysesMSm54ykdweH4JudM9D4Pn5uWf3EY=";
url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch";
hash = "sha256-cQF5psMZpLWwVqK9CNi+Q8wHn6w6ffQUJRNI5jKGgD0=";
})
];