X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/9d4b628328aa275e7631465e4e548d921df75f4f..10ea56e4561fde4b9805d343093993ab52350f7a:/.ssh/Makefile diff --git a/.ssh/Makefile b/.ssh/Makefile index 6e83244..fcd46f6 100644 --- a/.ssh/Makefile +++ b/.ssh/Makefile @@ -1,16 +1,31 @@ -all: known_hosts authorized_keys +all: known_hosts authorized_keys config + @chmod -R og= . .PHONY: all known_hosts: $(wildcard known_hosts.d/*) touch $@ for f in $^; do \ - echo "# from $$f:"; \ + echo; \ + echo "### from $$f:"; \ cat $$f; \ - done >> $@ + done > $@ authorized_keys: $(wildcard authorized_keys.d/*) touch $@ for f in $^; do \ - echo "# from $$f:"; \ + echo; \ + echo "### from $$f:"; \ cat $$f; \ - done >> $@ + done > $@ + +SSH_VERSION = $(shell ssh -V 2>&1) +config: config.in + cp $< $@ + case "$(SSH_VERSION)" in \ + (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,' \ + $@ \ + ;; \ + esac