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

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 017a6bb..56a0aa4 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -1,27 +1,38 @@
 all: known_hosts authorized_keys config
+	@chmod -R og= .
 .PHONY: all
 
 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
 	cp $< $@
-	case "$(ssh -V)" in \
-	  OpenSSH_4.3*) \
-	    sed -ri -e 's,^.+\<ExitOnForwardFailure\>.+$$,##UNSUPPORTED##&,' \
-	            -e 's,^.+\<MACs\>.+$$,##UNSUPPORTED##&,' $@ \
+	case "$(SSH_VERSION)" in \
+	  (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,' \
+	            $@ \
+	    ;; \
+	  (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