remove seamus ipv4 rule

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

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 56a0aa4f222c1dc2432ce896f02b6f481e708047..9336796e8b178f9c286f55b9c17e5ffe0401d30c 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -6,26 +6,31 @@ known_hosts: $(wildcard known_hosts.d/*)
        touch $@
        for f in $^; do \
          echo "### from $$f:"; \
        touch $@
        for f in $^; do \
          echo "### from $$f:"; \

-         echo; \

          cat $$f; \
          cat $$f; \

+         echo; \

        done > $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
        for f in $^; do \
          echo "### from $$f:"; \
        done > $@
 
 authorized_keys: $(wildcard authorized_keys.d/*)
        touch $@
        for f in $^; do \
          echo "### from $$f:"; \

-         echo; \

          cat $$f; \
          cat $$f; \

+         echo; \

        done > $@
 
 SSH_VERSION = $(shell ssh -V 2>&1)
 config: config.in
        cp $< $@
        case "$(SSH_VERSION)" in \
        done > $@
 
 SSH_VERSION = $(shell ssh -V 2>&1)
 config: config.in
        cp $< $@
        case "$(SSH_VERSION)" in \

+         (OpenSSH_4.7*) \
+           sed -ri -e 's,^.+\bVisualHostKey\b.+$$,##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,' \
          (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##&,' \

                    $@ \
            ;; \
          (3.9*) \
                    $@ \
            ;; \
          (3.9*) \