X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/3a9cfa3f693f89f678313b9208df32b4c8c9658e..672fb6d86c1747f6e03bdb72e6f92fb106d7d4ba:/.ssh/Makefile?pf=etc diff --git a/.ssh/Makefile b/.ssh/Makefile index 58391e7..1569b26 100644 --- a/.ssh/Makefile +++ b/.ssh/Makefile @@ -18,17 +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*) \ @@ -37,6 +51,8 @@ config: config.in -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \ -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ $@ \ ;; \ (3.9*) \ @@ -44,6 +60,12 @@ config: config.in -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \ -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