remove old fishbowl handling

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

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 1569b26f5a61dbf043094934f45a228192329394..4ed94fad355ea0ed44f6fd54f17304d9876e7a15 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -28,11 +28,18 @@ SSH_VERSION = $(shell ssh -V 2>&1)
 config: $(LOCAL_CONFIG) config.in
        cat $^ > $@
        case "$(SSH_VERSION)" in \
-         (OpenSSH_6.[0123]*) \
+         (OpenSSH_7.[12]*) \
+                   sed -ri -e 's,ProxyJump ([-.[:alnum:]]+),ProxyCommand ssh \1 nc -q0 %h %p,' $@ \
+           ;; \
+         (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,ProxyJump ([-.[:alnum:]]+),ProxyCommand ssh \1 nc -q0 %h %p,' $@ \
            ;; \
-         (OpenSSH_5.[012345]*) \
+         (OpenSSH_5.*) \
            sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
@@ -64,8 +71,4 @@ config: $(LOCAL_CONFIG) config.in
                    -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
                    $@ \
            ;; \
-       esac; \
-       case "$$HOSTNAME" in \
-         (fishbowl) \
-           sed -i -re '/^Host fishbowl/,/^[[:space:]]*ProxyCommand/s/ProxyCommand.*/Host localhost/' $@; \
        esac