Simplify Makefile by removing ancient versions, duck typing

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

diff --git a/.ssh/Makefile b/.ssh/Makefile
index 58391e72e7e0f2d489dd4093c404d916c4f4272c..168f1b62764e5bc8992c3cfbdc1c542da007147c 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -18,32 +18,15 @@ authorized_keys: $(wildcard authorized_keys.d/*)
          echo; \
        done > $@
 
          echo; \
        done > $@
 

+ifeq ($(strip $(wildcard config.local)),)
+LOCAL_CONFIG=/dev/null
+else
+LOCAL_CONFIG=config.local
+endif
+

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

-config: config.in
-       cp $< $@
-       case "$(SSH_VERSION)" in \
-         (OpenSSH_5.[012345]*) \
-           sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
-                   $@ \
-           ;; \
-         (OpenSSH_4.7*) \
-           sed -ri -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
-                   -e 's,^.+\bControlPersist\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,' \
-                   -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
-                   -e 's,^.+\bControlPersist\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|Persist)\b.+$$,##UNSUPPORTED##&,' \
-                   $@ \
-           ;; \
-       esac
+config: $(LOCAL_CONFIG) config.in
+       cat $^ > $@
+       if ! ssh -P 2>&1 | grep -q 'option requires an argument'; then \
+               sed -i -e '/^Match tagged/,/^$$/d' $@; \
+       fi