Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh

[etc/ssh.git] / .ssh / Makefile

diff --git a/.ssh/Makefile b/.ssh/Makefile
index fcd46f6b539bab7836fb4961df6db813f5e3f188..6de2f3044572f074797bf17b5329dd9e741b5b50 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -28,4 +28,11 @@ config: config.in
                    -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \
                    $@ \
            ;; \
+         (3.9*) \
+           sed -ri -e 's,^.+\bExitOnForwardFailure\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bHashKnownHosts\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bControl(Master|Path)\b.+$$,##UNSUPPORTED##&,' \
+                   $@ \
+           ;; \
        esac