X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/a61267164a76fc0faab5508a81127c67917617f3..6e8a62ff9f2166db66b5fa39dd0d0da28255c852:/.ssh/Makefile?ds=sidebyside

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 2e751c2..56a0aa4 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -5,18 +5,18 @@ all: known_hosts authorized_keys config
 known_hosts: $(wildcard known_hosts.d/*)
 	touch $@
 	for f in $^; do \
-	  echo; \
 	  echo "### from $$f:"; \
+	  echo; \
 	  cat $$f; \
-	done >> $@
+	done > $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
 	touch $@
 	for f in $^; do \
-	  echo; \
 	  echo "### from $$f:"; \
+	  echo; \
 	  cat $$f; \
-	done >> $@
+	done > $@
 
 SSH_VERSION = $(shell ssh -V 2>&1)
 config: config.in
@@ -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