diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-01 22:46:39 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-01 22:46:39 +0000 |
| commit | 33f7d0b3f690837cf57eb039a05f6133b3f1b48e (patch) | |
| tree | 5002f65a82500e0820ebaa963cc86de1057f29ce /pkgs/tools/networking/openssh | |
| parent | 2f7e9f26d84b79e9c5a0bd9e7647f10b5d02817e (diff) | |
| parent | 995475944f4213ddef3382ed09ba2fdc10687e1d (diff) | |
| download | nixlib-33f7d0b3f690837cf57eb039a05f6133b3f1b48e.tar nixlib-33f7d0b3f690837cf57eb039a05f6133b3f1b48e.tar.gz nixlib-33f7d0b3f690837cf57eb039a05f6133b3f1b48e.tar.bz2 nixlib-33f7d0b3f690837cf57eb039a05f6133b3f1b48e.tar.lz nixlib-33f7d0b3f690837cf57eb039a05f6133b3f1b48e.tar.xz nixlib-33f7d0b3f690837cf57eb039a05f6133b3f1b48e.tar.zst nixlib-33f7d0b3f690837cf57eb039a05f6133b3f1b48e.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/networking/openssh')
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 67c0f3ec89ee..7ade847b97be 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -23,11 +23,11 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "openssh-7.1p2"; + name = "openssh-7.2p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1gbbvszz74lkc7b2mqr3ccgpm65zj0k5h7a2ssh0c7pjvhjg0xfx"; + sha256 = "1hsa1f3641pdj57a55gmnvcya3wwww2fc2cvb77y95rm5xxw6g4p"; }; prePatch = optionalString hpnSupport @@ -37,15 +37,7 @@ stdenv.mkDerivation rec { ''; patches = - [ ./locale_archive.patch - - # Fix "HostKeyAlgoritms +...", which we need to enable DSA - # host key support. - (fetchurl { - url = "https://pkgs.fedoraproject.org/cgit/rpms/openssh.git/plain/openssh-7.1p1-hostkeyalgorithms.patch?id=c98f5597250d6f9a8e8d96960beb6306d150ef0f"; - sha256 = "029lzp9qv1af8wdm0wwj7qwjj1nimgsjj214jqm3amwz0857qgvp"; - }) - ] + [ ./locale_archive.patch ] ++ optional withGssapiPatches gssapiSrc; buildInputs = [ zlib openssl libedit pkgconfig pam ] |