Unverified Commit 249e1f97 authored by Alois Wohlschlager's avatar Alois Wohlschlager
Browse files

openssh_10_2: init at 10.2p1 

OpenSSH 10.1 contains a bug that makes it totally unusable with ControlPersist,
which is fixed in 10.2. Temporarily make the latter available as an option
while the rebuilds go through staging.
parent 6a08e6bb

pkgs/tools/networking/openssh/default.nix

+25 −0
Original line number Diff line number Diff line
@@ -48,6 +48,31 @@ in 
    };

  };



  openssh_10_2 = common rec {

    pname = "openssh";

    version = "10.2p1";



    src = fetchurl {

      url = urlFor version;

      hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";

    };



    extraPatches = [

      # Use ssh-keysign from PATH

      # ssh-keysign is used for host-based authentication, and is designed to be used

      # as SUID-root program. OpenSSH defaults to referencing it from libexec, which

      # cannot be made SUID in Nix.

      ./ssh-keysign-8.5.patch

    ];

    extraMeta = {

      maintainers = with lib.maintainers; [

        philiptaron

        numinit

      ];

      teams = [ lib.teams.helsinki-systems ];

    };

  };



  openssh_hpn = common rec {

    pname = "openssh-with-hpn";

    version = "10.2p1";

pkgs/top-level/all-packages.nix

+4 −0
Original line number Diff line number Diff line
@@ -3612,6 +3612,10 @@ with pkgs; 
    etcDir = "/etc/ssh";

  };



  openssh_10_2 = opensshPackages.openssh_10_2.override {

    etcDir = "/etc/ssh";

  };



  opensshTest = openssh.tests.openssh;



  opensshWithKerberos = openssh.override {