# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1474380292 -7200
# Node ID cb01d1d24314cfc0521009f298207fa62ee0fecf
# Parent  1e6252d9731734ed3f3adbfd39875585b1e0c705
openssh: add jump host ProxyCommand

diff -r 1e6252d97317 -r cb01d1d24314 openssh-pam/receipt
--- a/openssh-pam/receipt	Tue Sep 20 10:46:56 2016 +0200
+++ b/openssh-pam/receipt	Tue Sep 20 16:04:52 2016 +0200
@@ -49,8 +49,17 @@
 	sed -i 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \
 		$fs/etc/ssh/sshd_config
 
-	# client bug CVE-2016-0777 and CVE-2016-0778
-	echo -e '\nHost *\n  UseRoaming no' >> $fs/etc/ssh/ssh_config
+	cat >> $fs/etc/ssh/ssh_config <<EOT
+
+# client bug CVE-2016-0777 and CVE-2016-0778
+Host *
+  UseRoaming no
+
+# From https://wiki.gentoo.org/wiki/SSH_jump_host  
+Host *+*
+  ProxyCommand ssh $(echo %h | sed 's/+[^+]*$//;s/\([^+%%]*\)%%\([^+]*\)$/\2 -l \1/;s/:/ -p /') exec nc -w1 $(echo %h | sed 's/^.*+//;/:/!s/$/ %p/;s/:/ /')
+
+EOT
 }
 
 post_install()
diff -r 1e6252d97317 -r cb01d1d24314 openssh/receipt
--- a/openssh/receipt	Tue Sep 20 10:46:56 2016 +0200
+++ b/openssh/receipt	Tue Sep 20 16:04:52 2016 +0200
@@ -50,8 +50,17 @@
 	sed -i 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \
 		$fs/etc/ssh/sshd_config
 
-	# client bug CVE-2016-0777 and CVE-2016-0778
-	echo -e '\nHost *\n  UseRoaming no' >> $fs/etc/ssh/ssh_config
+	cat >> $fs/etc/ssh/ssh_config <<EOT
+
+# client bug CVE-2016-0777 and CVE-2016-0778
+Host *
+  UseRoaming no
+
+# From https://wiki.gentoo.org/wiki/SSH_jump_host  
+Host *+*
+  ProxyCommand ssh $(echo %h | sed 's/+[^+]*$//;s/\([^+%%]*\)%%\([^+]*\)$/\2 -l \1/;s/:/ -p /') exec nc -w1 $(echo %h | sed 's/^.*+//;/:/!s/$/ %p/;s/:/ /')
+
+EOT
 }
 
 post_install()