]> git.madduck.net Git - etc/ssh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

handle proxyjump absent from v7.2
authormartin f. krafft <madduck@madduck.net>
Wed, 12 Jul 2017 17:29:03 +0000 (13:29 -0400)
committermartin f. krafft <madduck@madduck.net>
Wed, 12 Jul 2017 17:29:03 +0000 (13:29 -0400)
.ssh/Makefile

index 1a3a37fb278eeb311e0bee4f75ac54f10980bcb9..2ba6e4a9d0c9bffea14824251bf8be85cf55e84c 100644 (file)
@@ -28,6 +28,9 @@ 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_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##&,' \
          (OpenSSH_6.*) \
            sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
                    -e 's,^.+\bIgnoreUnknown\b.+$$,##UNSUPPORTED##&,' \