X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/9d4b628328aa275e7631465e4e548d921df75f4f..81deaea015bcc812e1b3225c033142d3d450f3d3:/.ssh/Makefile?ds=inline

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