diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 11:56:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 12:16:26 +0200 |
| commit | 5b3f807597c2eead700a1b4cac7b83434ff92ddc (patch) | |
| tree | de95e856ceb926286e9a6b4b8af5c005195ce205 | |
| parent | 3124f5ab22cfa48e7681e02afd7e599e72cf636d (diff) | |
| parent | 769b991be6c44292c09cc2a6a3f5d882b6110ec0 (diff) | |
| download | nixlib-5b3f807597c2eead700a1b4cac7b83434ff92ddc.tar nixlib-5b3f807597c2eead700a1b4cac7b83434ff92ddc.tar.gz nixlib-5b3f807597c2eead700a1b4cac7b83434ff92ddc.tar.bz2 nixlib-5b3f807597c2eead700a1b4cac7b83434ff92ddc.tar.lz nixlib-5b3f807597c2eead700a1b4cac7b83434ff92ddc.tar.xz nixlib-5b3f807597c2eead700a1b4cac7b83434ff92ddc.tar.zst nixlib-5b3f807597c2eead700a1b4cac7b83434ff92ddc.zip | |
Merge #24179: openssh: 7.4p1 -> 7.5p1
| -rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 42b50d0426a9..bebf4e145ca8 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -316,8 +316,6 @@ in UsePAM yes - UsePrivilegeSeparation sandbox - AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} ${concatMapStrings (port: '' Port ${toString port} diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1c66900c06b7..79cdac874891 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -21,8 +21,8 @@ let gssapiSrc = fetchpatch { name = "openssh-gssapi.patch"; url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian" - + "/patches/gssapi.patch?id=255b8554a50b5c75fca63f76b1ac837c0d4fb7aa"; - sha256 = "0yg9iq7vb2fkvy36ar0jxk29pkw0h3dhv5vn8qncc3pgwx3617n2"; + + "/patches/gssapi.patch?id=a18d56bd84f04292ec9178b4b17ef6d56a0c7aef"; + sha256 = "1sb929lfc3s45km2vpylmlbb6mpqcbr74xl6gx2s4cgnsrfd9kp3"; }; in @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { # Please ensure that openssh_with_kerberos still builds when # bumping the version here! name = "openssh-${version}"; - version = "7.4p1"; + version = "7.5p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv"; + sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"; }; prePatch = optionalString hpnSupport |