X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/d6f6bb76ce73a2ccc180176deb7ceeffd9476c5f..1ee9c4705863e36b1e3fbe9e7525fdcf2b14cb40:/.ssh/Makefile?ds=inline

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 1dad8a9..0e26cbb 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -5,34 +5,57 @@ all: known_hosts authorized_keys config
 known_hosts: $(wildcard known_hosts.d/*)
 	touch $@
 	for f in $^; do \
-	  echo; \
 	  echo "### from $$f:"; \
 	  cat $$f; \
-	done >> $@
+	  echo; \
+	done > $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
 	touch $@
 	for f in $^; do \
-	  echo; \
 	  echo "### from $$f:"; \
 	  cat $$f; \
-	done >> $@
+	  echo; \
+	done > $@
 
 SSH_VERSION = $(shell ssh -V 2>&1)
 config: config.in
 	cp $< $@
 	case "$(SSH_VERSION)" in \
+	  (OpenSSH_6.[0123]*) \
+	    sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
+	            $@ \
+	    ;; \
+	  (OpenSSH_5.[012345]*) \
+	    sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
+	            $@ \
+	    ;; \
+	  (OpenSSH_4.7*) \
+	    sed -ri -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
+	            $@ \
+	    ;; \
 	  (OpenSSH_4.3*) \
 	    sed -ri -e 's,^.+\bExitOnForwardFailure\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \
+	            -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
 	            $@ \
 	    ;; \
 	  (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##&,' \
+	            -e 's,^.+\bControl(Master|Path|Persist)\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
 	            $@ \
 	    ;; \
 	esac