X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/5ad825b512eebf0c7d47bab9d82d68be3445692a..f985d2d64092affec3210231eae55230d7f44c81:/.ssh/Makefile?ds=inline diff --git a/.ssh/Makefile b/.ssh/Makefile index 493898e..2ba6e4a 100644 --- a/.ssh/Makefile +++ b/.ssh/Makefile @@ -28,12 +28,16 @@ SSH_VERSION = $(shell ssh -V 2>&1) config: $(LOCAL_CONFIG) config.in cat $^ > $@ case "$(SSH_VERSION)" in \ + (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.*) \ sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \