public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #24179: openssh: 7.4p1 -> 7.5p1

Browse Source
This commit is contained in:
Vladimír Čunát 2017-04-14 11:56:56 +02:00
commit 5b3f807597
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -316,8 +316,6 @@ in
UsePAM yes UsePAM yes
UsePrivilegeSeparation sandbox
AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
${concatMapStrings (port: '' ${concatMapStrings (port: ''
Port ${toString port} Port ${toString port}

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

@ -21,8 +21,8 @@ let
gssapiSrc = fetchpatch { gssapiSrc = fetchpatch {
name = "openssh-gssapi.patch"; name = "openssh-gssapi.patch";
url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian"
+ "/patches/gssapi.patch?id=255b8554a50b5c75fca63f76b1ac837c0d4fb7aa"; + "/patches/gssapi.patch?id=a18d56bd84f04292ec9178b4b17ef6d56a0c7aef";
sha256 = "0yg9iq7vb2fkvy36ar0jxk29pkw0h3dhv5vn8qncc3pgwx3617n2"; sha256 = "1sb929lfc3s45km2vpylmlbb6mpqcbr74xl6gx2s4cgnsrfd9kp3";
}; };
in in
@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
# Please ensure that openssh_with_kerberos still builds when # Please ensure that openssh_with_kerberos still builds when
# bumping the version here! # bumping the version here!
name = "openssh-${version}"; name = "openssh-${version}";
version = "7.4p1"; version = "7.5p1";
src = fetchurl { src = fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv"; sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq";
}; };
prePatch = optionalString hpnSupport prePatch = optionalString hpnSupport