X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/c873f02f9800a94f1241370efcb1ab2b64348b39..a323cc0801748c617bb0d0b2502b881a2bfab525:/.ssh/Makefile

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 111d692..e57eeec 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -28,8 +28,16 @@ SSH_VERSION = $(shell ssh -V 2>&1)
 config: $(LOCAL_CONFIG) config.in
 	cat $^ > $@
 	case "$(SSH_VERSION)" in \
+	  (OpenSSH_6.[012345678]*) \
+	    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]*) \
@@ -65,4 +73,7 @@ config: $(LOCAL_CONFIG) config.in
 	            $@ \
 	    ;; \
 	esac; \
-	sed -i -re '/^Host fishbowl/,/^[[:space:]]*ProxyCommand/s/ProxyCommand.*/Host localhost/' $@
+	case "$$HOSTNAME" in \
+	  (fishbowl) \
+	    sed -i -re '/^Host fishbowl/,/^[[:space:]]*ProxyCommand/s/ProxyCommand.*/Host localhost/' $@; \
+	esac