]> git.madduck.net Git - etc/ssh.git/blobdiff - .ssh/Makefile

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:

SSH version hacks
[etc/ssh.git] / .ssh / Makefile
index cfb923b6b7f18cc34de7cf96824794aeb1f7c044..493898efd60a784f2d9134afef9fa4bce828682b 100644 (file)
@@ -28,11 +28,14 @@ SSH_VERSION = $(shell ssh -V 2>&1)
 config: $(LOCAL_CONFIG) config.in
        cat $^ > $@
        case "$(SSH_VERSION)" in \
-         (OpenSSH_6.[0123]*) \
+         (OpenSSH_6.*) \
            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##&,' \
@@ -64,4 +67,8 @@ 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