From: martin f. krafft <madduck@madduck.net>
Date: Thu, 15 May 2008 11:56:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh
X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/9a8d342f1e31da934d02d4e16784e8aa6119093a?ds=inline;hp=-c

Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh
---

9a8d342f1e31da934d02d4e16784e8aa6119093a
diff --combined .ssh/Makefile
index fcd46f6,1dad8a9..6de2f30
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@@ -8,7 -8,7 +8,7 @@@ known_hosts: $(wildcard known_hosts.d/*
  	  echo; \
  	  echo "### from $$f:"; \
  	  cat $$f; \
 -	done >> $@
 +	done > $@
  
  authorized_keys: $(wildcard authorized_keys.d/*)
  	touch $@
@@@ -16,7 -16,7 +16,7 @@@
  	  echo; \
  	  echo "### from $$f:"; \
  	  cat $$f; \
 -	done >> $@
 +	done > $@
  
  SSH_VERSION = $(shell ssh -V 2>&1)
  config: config.in
@@@ -28,4 -28,11 +28,11 @@@
  	            -e 's,^(.+ControlPath ~/.var/ssh/ssh_control_)%l_(.+),\1\2,' \
  	            $@ \
  	    ;; \
+ 	  (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##&,' \
+ 	            $@ \
+ 	    ;; \
  	esac