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

diff --combined .ssh/Makefile
index fcd46f6b539bab7836fb4961df6db813f5e3f188,1dad8a91829fbcb16581809ad715a23d70283ca2..6de2f3044572f074797bf17b5329dd9e741b5b50
--- 1/.ssh/Makefile
--- 2/.ssh/Makefile
+++ b/.ssh/Makefile
@@@ -8,7 -8,7 +8,7 @@@ known_hosts: $(wildcard known_hosts.d/*
          echo; \
          echo "### from $$f:"; \
          cat $$f; \
 -      done >> $@
 +      done > $@
  
  authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
@@@ -16,7 -16,7 +16,7 @@@
          echo; \
          echo "### from $$f:"; \
          cat $$f; \
 -      done >> $@
 +      done > $@
  
  SSH_VERSION = $(shell ssh -V 2>&1)
  config: config.in
@@@ -28,4 -28,11 +28,11 @@@
                    -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