X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/6e8a62ff9f2166db66b5fa39dd0d0da28255c852..a4fa81967fccf40c28854817ee10d3560b033037:/.ssh/Makefile?ds=sidebyside diff --git a/.ssh/Makefile b/.ssh/Makefile index 56a0aa4..cfb923b 100644 --- a/.ssh/Makefile +++ b/.ssh/Makefile @@ -6,33 +6,62 @@ known_hosts: $(wildcard known_hosts.d/*) touch $@ for f in $^; do \ echo "### from $$f:"; \ - echo; \ cat $$f; \ + echo; \ done > $@ authorized_keys: $(wildcard authorized_keys.d/*) touch $@ for f in $^; do \ echo "### from $$f:"; \ - echo; \ cat $$f; \ + 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*) \ sed -ri -e 's,^.+\bExitOnForwardFailure\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \ -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*) \ sed -ri -e 's,^.+\bExitOnForwardFailure\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bMACs\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bHashKnownHosts\b.+$$,##UNSUPPORTED##&,' \ - -e 's,^.+\bControl(Master|Path)\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bControl(Master|Path|Persist)\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ $@ \ ;; \ esac