From 1ee9c4705863e36b1e3fbe9e7525fdcf2b14cb40 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 26 Dec 2014 13:40:23 +0100 Subject: [PATCH 1/1] comment out canonical options before 6.4 --- .ssh/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.ssh/Makefile b/.ssh/Makefile index cff1a8f..0e26cbb 100644 --- a/.ssh/Makefile +++ b/.ssh/Makefile @@ -22,15 +22,21 @@ SSH_VERSION = $(shell ssh -V 2>&1) config: config.in cp $< $@ case "$(SSH_VERSION)" in \ + (OpenSSH_6.[0123]*) \ + sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ + $@ \ + ;; \ (OpenSSH_5.[012345]*) \ sed -ri -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ $@ \ ;; \ (OpenSSH_4.7*) \ sed -ri -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ $@ \ ;; \ (OpenSSH_4.3*) \ @@ -40,6 +46,7 @@ config: config.in -e 's,^.+\bVisualHostKey\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bControlPersist\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ $@ \ ;; \ (3.9*) \ @@ -48,6 +55,7 @@ config: config.in -e 's,^.+\bHashKnownHosts\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bControl(Master|Path|Persist)\b.+$$,##UNSUPPORTED##&,' \ -e 's,^.+\bIPQoS\b.+$$,##UNSUPPORTED##&,' \ + -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \ $@ \ ;; \ esac -- 2.39.5