do not append, recreate files

[etc/ssh.git] / .ssh / Makefile

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 6e83244e7090057c9c76bfd5b878278b7356db24..fcd46f6b539bab7836fb4961df6db813f5e3f188 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -1,16 +1,31 @@
-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; \
+         echo "### from $$f:"; \
          cat $$f; \
-       done >> $@
+       done > $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
        for f in $^; do \
-         echo "# from $$f:"; \
+         echo; \
+         echo "### from $$f:"; \
          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,' \
+                   $@ \
+           ;; \
+       esac