]> git.madduck.net Git - etc/ssh.git/blobdiff - .ssh/Makefile

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

amend config for ssh 3.9
[etc/ssh.git] / .ssh / Makefile
index 6e83244e7090057c9c76bfd5b878278b7356db24..1dad8a91829fbcb16581809ad715a23d70283ca2 100644 (file)
@@ -1,16 +1,38 @@
-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 >> $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
        for f in $^; do \
-         echo "# from $$f:"; \
+         echo; \
+         echo "### from $$f:"; \
          cat $$f; \
        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,' \
+                   $@ \
+           ;; \
+         (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