Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh

[etc/ssh.git] / .ssh / Makefile

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 017a6bb73ecbda3a6dc82f905928d54a88629c27..6de2f3044572f074797bf17b5329dd9e741b5b50 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -1,4 +1,5 @@
 all: known_hosts authorized_keys config
 all: known_hosts authorized_keys config

+       @chmod -R og= .

 .PHONY: all
 
 known_hosts: $(wildcard known_hosts.d/*)
 .PHONY: all
 
 known_hosts: $(wildcard known_hosts.d/*)


@@ -7,7 +8,7 @@ known_hosts: $(wildcard known_hosts.d/*)
          echo; \
          echo "### from $$f:"; \
          cat $$f; \
          echo; \
          echo "### from $$f:"; \
          cat $$f; \

-       done >> $@
+       done > $@

 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@


@@ -15,13 +16,23 @@ authorized_keys: $(wildcard authorized_keys.d/*)
          echo; \
          echo "### from $$f:"; \
          cat $$f; \
          echo; \
          echo "### from $$f:"; \
          cat $$f; \

-       done >> $@
+       done > $@

 
 

+SSH_VERSION = $(shell ssh -V 2>&1)

 config: config.in
        cp $< $@
 config: config.in
        cp $< $@

-       case "$(ssh -V)" in \
-         OpenSSH_4.3*) \
-           sed -ri -e 's,^.+\<ExitOnForwardFailure\>.+$$,##UNSUPPORTED##&,' \
-                   -e 's,^.+\<MACs\>.+$$,##UNSUPPORTED##&,' $@ \
+       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
            ;; \
        esac