add ControlPersist option to defaults for supporting versions

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

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 6de2f3044572f074797bf17b5329dd9e741b5b50..58391e72e7e0f2d489dd4093c404d916c4f4272c 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -5,34 +5,45 @@ all: known_hosts authorized_keys config
 known_hosts: $(wildcard known_hosts.d/*)
        touch $@
        for f in $^; do \
 known_hosts: $(wildcard known_hosts.d/*)
        touch $@
        for f in $^; do \

-         echo; \

          echo "### from $$f:"; \
          cat $$f; \
          echo "### from $$f:"; \
          cat $$f; \

+         echo; \

        done > $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
        for f in $^; do \
        done > $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
        for f in $^; do \

-         echo; \

          echo "### from $$f:"; \
          cat $$f; \
          echo "### from $$f:"; \
          cat $$f; \

+         echo; \

        done > $@
 
 SSH_VERSION = $(shell ssh -V 2>&1)
 config: config.in
        cp $< $@
        case "$(SSH_VERSION)" in \
        done > $@
 
 SSH_VERSION = $(shell ssh -V 2>&1)
 config: config.in
        cp $< $@
        case "$(SSH_VERSION)" in \

+         (OpenSSH_5.[012345]*) \
+           sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
+                   $@ \
+           ;; \
+         (OpenSSH_4.7*) \
+           sed -ri -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bControlPersist\b.+$$,##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,' \
          (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##&,' \

                    $@ \
            ;; \
          (3.9*) \
            sed -ri -e 's,^.+\bExitOnForwardFailure\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bHashKnownHosts\b.+$$,##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##&,' \

                    $@ \
            ;; \
        esac
                    $@ \
            ;; \
        esac