X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/10ea56e4561fde4b9805d343093993ab52350f7a..d928112c0b82e9e35a0eec48efd5b433e08b7dde:/.ssh/Makefile diff --git a/.ssh/Makefile b/.ssh/Makefile index fcd46f6..c4c1d4c 100644 --- a/.ssh/Makefile +++ b/.ssh/Makefile @@ -5,17 +5,17 @@ all: known_hosts authorized_keys config known_hosts: $(wildcard known_hosts.d/*) touch $@ for f in $^; do \ - echo; \ echo "### from $$f:"; \ cat $$f; \ + echo; \ done > $@ authorized_keys: $(wildcard authorized_keys.d/*) touch $@ for f in $^; do \ - echo; \ echo "### from $$f:"; \ cat $$f; \ + echo; \ done > $@ SSH_VERSION = $(shell ssh -V 2>&1) @@ -26,6 +26,14 @@ config: config.in 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##&,' \ + $@ \ + ;; \ + (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##&,' \ $@ \ ;; \ esac