version handling <6.9

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

diff --git a/.ssh/Makefile b/.ssh/Makefile
index cff1a8f7008275b4b609d74a6beea8024866c6b9..e57eeec8c5b4700bc802f5b00e75ccabe739f218 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -18,19 +18,39 @@ authorized_keys: $(wildcard authorized_keys.d/*)
          echo; \
        done > $@
 
+ifeq ($(strip $(wildcard config.local)),)
+LOCAL_CONFIG=/dev/null
+else
+LOCAL_CONFIG=config.local
+endif
+
 SSH_VERSION = $(shell ssh -V 2>&1)
-config: config.in
-       cp $< $@
+config: $(LOCAL_CONFIG) config.in
+       cat $^ > $@
        case "$(SSH_VERSION)" in \
+         (OpenSSH_6.[012345678]*) \
+           sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bIgnoreUnknown\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bUpdateHostKeys\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^Match host ,Host ,' \
+                   $@ \
+           ;; \
+         (OpenSSH_6.[0123]*) \
+           sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bIgnoreUnknown\b.+$$,##UNSUPPORTED##&,' \
+                   $@ \
+           ;; \
          (OpenSSH_5.[012345]*) \
            sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
                    $@ \
            ;; \
          (OpenSSH_4.7*) \
            sed -ri -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
                    $@ \
            ;; \
          (OpenSSH_4.3*) \
@@ -40,6 +60,7 @@ config: config.in
                    -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
                    $@ \
            ;; \
          (3.9*) \
@@ -48,6 +69,11 @@ config: config.in
                    -e 's,^.+\bHashKnownHosts\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bControl(Master|Path|Persist)\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
                    $@ \
            ;; \
+       esac; \
+       case "$$HOSTNAME" in \
+         (fishbowl) \
+           sed -i -re '/^Host fishbowl/,/^[[:space:]]*ProxyCommand/s/ProxyCommand.*/Host localhost/' $@; \
        esac