From: martin f. krafft <madduck@madduck.net>
Date: Fri, 23 Jun 2017 14:39:37 +0000 (+0200)
Subject: SSH version hacks
X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/5ad825b512eebf0c7d47bab9d82d68be3445692a?ds=sidebyside;hp=08ba907de12778598e223173526eb09adc5162fe

SSH version hacks
---

diff --git a/.ssh/Makefile b/.ssh/Makefile
index e57eeec..493898e 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -28,19 +28,14 @@ SSH_VERSION = $(shell ssh -V 2>&1)
 config: $(LOCAL_CONFIG) config.in
 	cat $^ > $@
 	case "$(SSH_VERSION)" in \
-	  (OpenSSH_6.[012345678]*) \
+	  (OpenSSH_6.*) \
 	    sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bIgnoreUnknown\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bUpdateHostKeys\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^Match host ,Host ,' \
 	            $@ \
 	    ;; \
-	  (OpenSSH_6.[0123]*) \
-	    sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
-	            -e 's,^.+\bIgnoreUnknown\b.+$$,##UNSUPPORTED##&,' \
-	            $@ \
-	    ;; \
-	  (OpenSSH_5.[012345]*) \
+	  (OpenSSH_5.*) \
 	    sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
 	            -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \