SSH version hacks

diff --git a/.ssh/Makefile b/.ssh/Makefile
index e57eeec8c5b4700bc802f5b00e75ccabe739f218..493898efd60a784f2d9134afef9fa4bce828682b 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -28,19 +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.[012345678]*) \
+         (OpenSSH_6.*) \

            sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bIgnoreUnknown\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bUpdateHostKeys\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^Match host ,Host ,' \
                    $@ \
            ;; \
            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]*) \
+         (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##&,' \