summary refs log tree commit diff
path: root/pkgs/tools/networking/openssh/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-10-08 11:53:08 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-10-08 12:00:38 +0200
commitc2e6ca501e3eb2d9ee24367f4ba5dda81699649c (patch)
tree160ec0bd5cbee2c03ba5b8fdd97014d117962599 /pkgs/tools/networking/openssh/default.nix
parentc606de191f8c83976c80c2092cb4fb620e3a0cff (diff)
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/tools/networking/openssh/default.nix')
-rw-r--r--pkgs/tools/networking/openssh/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 04a77176682d7..96bc2c56ece8e 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