SSH version hacks

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

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 111d692ab90d68329dbb682e7357ed65cc0f7878..493898efd60a784f2d9134afef9fa4bce828682b 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -28,11 +28,14 @@ SSH_VERSION = $(shell ssh -V 2>&1)
 config: $(LOCAL_CONFIG) config.in
        cat $^ > $@
        case "$(SSH_VERSION)" in \
 config: $(LOCAL_CONFIG) config.in
        cat $^ > $@
        case "$(SSH_VERSION)" in \

-         (OpenSSH_6.[0123]*) \
+         (OpenSSH_6.*) \

            sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
            sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \

+                   -e 's,^.+\bIgnoreUnknown\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^.+\bUpdateHostKeys\b.+$$,##UNSUPPORTED##&,' \
+                   -e 's,^Match host ,Host ,' \

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

-         (OpenSSH_5.[012345]*) \
+         (OpenSSH_5.*) \

            sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
            sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \


@@ -65,4 +68,7 @@ config: $(LOCAL_CONFIG) config.in
                    $@ \
            ;; \
        esac; \
                    $@ \
            ;; \
        esac; \

-       sed -i -re '/^Host fishbowl/,/^[[:space:]]*ProxyCommand/s/ProxyCommand.*/Host localhost/' $@
+       case "$$HOSTNAME" in \
+         (fishbowl) \
+           sed -i -re '/^Host fishbowl/,/^[[:space:]]*ProxyCommand/s/ProxyCommand.*/Host localhost/' $@; \
+       esac