X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/386b9065901672b114df6a7e6087f5dea39958a5..0caca36057b796df2d0b0d43139347c59de861bd:/.ssh/Makefile

diff --git a/.ssh/Makefile b/.ssh/Makefile
index cff1a8f..1569b26 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -18,19 +18,31 @@ authorized_keys: $(wildcard authorized_keys.d/*)
 	  echo; \
 	done > $@
 
+ifeq ($(strip $(wildcard config.local)),)
+LOCAL_CONFIG=/dev/null
+else
+LOCAL_CONFIG=config.local
+endif
+
 SSH_VERSION = $(shell ssh -V 2>&1)
-config: config.in
-	cp $< $@
+config: $(LOCAL_CONFIG) config.in
+	cat $^ > $@
 	case "$(SSH_VERSION)" in \
+	  (OpenSSH_6.[0123]*) \
+	    sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
+	            $@ \
+	    ;; \
 	  (OpenSSH_5.[012345]*) \
 	    sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
 	            $@ \
 	    ;; \
 	  (OpenSSH_4.7*) \
 	    sed -ri -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
 	            $@ \
 	    ;; \
 	  (OpenSSH_4.3*) \
@@ -40,6 +52,7 @@ config: config.in
 	            -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
 	            $@ \
 	    ;; \
 	  (3.9*) \
@@ -48,6 +61,11 @@ config: config.in
 	            -e 's,^.+\bHashKnownHosts\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bControl(Master|Path|Persist)\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
 	            $@ \
 	    ;; \
+	esac; \
+	case "$$HOSTNAME" in \
+	  (fishbowl) \
+	    sed -i -re '/^Host fishbowl/,/^[[:space:]]*ProxyCommand/s/ProxyCommand.*/Host localhost/' $@; \
 	esac