Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh

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

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 2e751c2390d5ce4c419e02f86fccf6b6585529e7..6de2f3044572f074797bf17b5329dd9e741b5b50 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -8,7 +8,7 @@ known_hosts: $(wildcard known_hosts.d/*)
          echo; \
          echo "### from $$f:"; \
          cat $$f; \
          echo; \
          echo "### from $$f:"; \
          cat $$f; \

-       done >> $@
+       done > $@

 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@


@@ -16,7 +16,7 @@ authorized_keys: $(wildcard authorized_keys.d/*)
          echo; \
          echo "### from $$f:"; \
          cat $$f; \
          echo; \
          echo "### from $$f:"; \
          cat $$f; \

-       done >> $@
+       done > $@

 
 SSH_VERSION = $(shell ssh -V 2>&1)
 config: config.in
 
 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,' \
                    $@ \
            ;; \
                    -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
        esac