Unverified Commit 6282564d authored by Janne Heß's avatar Janne Heß Committed by GitHub
Browse files

Merge pull request #259051 from helsinki-systems/upd/openssh 

openssh*: 9.4p1 -> 9.5p1
parents bfd2795b 6cba6142

pkgs/tools/networking/openssh/common.nix

+0 −8
Original line number Diff line number Diff line
@@ -45,14 +45,6 @@ stdenv.mkDerivation { 


    # See discussion in https://github.com/NixOS/nixpkgs/pull/16966

    ./dont_create_privsep_path.patch



    # Pull upstream zlib-1.3 support.

    # The patch changes configure.ac, uses autoreconfHook.

    (fetchpatch {

      name = "zlib-1.3.patch";

      url = "https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch";

      hash = "sha256-3Gx0/I2n9/XaWCIefVYtvk5f+VgH6MlhMBse+PMyf34=";

    })

  ] ++ extraPatches;



  postPatch =

pkgs/tools/networking/openssh/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ in 
{

  openssh = common rec {

    pname = "openssh";

    version = "9.4p1";

    version = "9.5p1";



    src = fetchurl {

      url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";

      hash = "sha256-Ngj9kIjbIWPOs+YAyFq3nQ3j0iHlkZLqGSPiMmOGaoU=";

      hash = "sha256-8Cbnt5un+1QPdRgq+W3IqPHbOV+SK7yfbKYDZyaGCGs=";

    };



    extraPatches = [ ./ssh-keysign-8.5.patch ];
@@ -18,12 +18,12 @@ in 


  openssh_hpn = common rec {

    pname = "openssh-with-hpn";

    version = "9.4p1";

    version = "9.5p1";

    extraDesc = " with high performance networking patches";



    src = fetchurl {

      url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";

      hash = "sha256-Ngj9kIjbIWPOs+YAyFq3nQ3j0iHlkZLqGSPiMmOGaoU=";

      hash = "sha256-8Cbnt5un+1QPdRgq+W3IqPHbOV+SK7yfbKYDZyaGCGs=";

    };



    extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/700625bcd86b74cf3fb9536aeea250d7f8cd1fd5/security/openssh-portable/files/extra-patch-hpn"; in
@@ -58,12 +58,12 @@ in 


  openssh_gssapi = common rec {

    pname = "openssh-with-gssapi";

    version = "9.4p1";

    version = "9.5p1";

    extraDesc = " with GSSAPI support";



    src = fetchurl {

      url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";

      sha256 = "sha256-Ngj9kIjbIWPOs+YAyFq3nQ3j0iHlkZLqGSPiMmOGaoU=";

      hash = "sha256-8Cbnt5un+1QPdRgq+W3IqPHbOV+SK7yfbKYDZyaGCGs=";

    };



    extraPatches = [