X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/d928112c0b82e9e35a0eec48efd5b433e08b7dde..4079aa0c3659b213d65aaed17cbf6c87227b22ea:/.ssh/Makefile?ds=sidebyside

diff --git a/.ssh/Makefile b/.ssh/Makefile
index c4c1d4c..cff1a8f 100644
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -22,18 +22,32 @@ 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##&,' \
+	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
+	            $@ \
+	    ;; \
+	  (OpenSSH_4.7*) \
+	    sed -ri -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bIPQoS\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##&,' \
+	            -e 's,^.+\bIPQoS\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)\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bControl(Master|Path|Persist)\b.+$$,##UNSUPPORTED##&,' \
+	            -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \
 	            $@ \
 	    ;; \
 	esac