diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-10-08 11:53:08 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-10-08 12:00:38 +0200 |
commit | c2e6ca501e3eb2d9ee24367f4ba5dda81699649c (patch) | |
tree | 160ec0bd5cbee2c03ba5b8fdd97014d117962599 /pkgs | |
parent | c606de191f8c83976c80c2092cb4fb620e3a0cff (diff) | |
download | nixlib-c2e6ca501e3eb2d9ee24367f4ba5dda81699649c.tar nixlib-c2e6ca501e3eb2d9ee24367f4ba5dda81699649c.tar.gz nixlib-c2e6ca501e3eb2d9ee24367f4ba5dda81699649c.tar.bz2 nixlib-c2e6ca501e3eb2d9ee24367f4ba5dda81699649c.tar.lz nixlib-c2e6ca501e3eb2d9ee24367f4ba5dda81699649c.tar.xz nixlib-c2e6ca501e3eb2d9ee24367f4ba5dda81699649c.tar.zst nixlib-c2e6ca501e3eb2d9ee24367f4ba5dda81699649c.zip |
openssh: fix tunnel forwarding (upstream patch)
Close #48031, fixes #48016. I didn't use the PR commit because I think it's better to fetch the patch.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 04a77176682d..96bc2c56ece8 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { patches = [ + # Remove on update! + (fetchpatch { + name = "fix-tunnel-forwarding.diff"; + url = "https://github.com/openssh/openssh-portable/commit/cfb1d9bc767.diff"; + sha256 = "1mszj7f1kj6bazr7asbi1bi4238lfpilpp98f6c1dn3py4fbsdg8"; + }) + ./locale_archive.patch ./fix-host-key-algorithms-plus.patch |