wok diff mosh/receipt @ rev 21707

prosody: modified VERSION
author Hans-G?nter Theisgen
date Fri Jun 07 13:37:06 2019 +0100 (2019-06-07)
parents adf9182b6536
children 8710e9c81dd7
line diff
     1.1 --- a/mosh/receipt	Wed May 01 15:49:51 2019 +0200
     1.2 +++ b/mosh/receipt	Fri Jun 07 13:37:06 2019 +0100
     1.3 @@ -19,6 +19,22 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 +	# Add dropbear support
     1.8 +	patch -p0 <<EOT || return 1
     1.9 +--- scripts/mosh.pl
    1.10 ++++ scripts/mosh.pl
    1.11 +@@ -397,2 +397,10 @@
    1.12 +     my \$quoted_proxy_command = shell_quote( \$0, "--family=\$family" );
    1.13 ++    my \$ssh = join ' ', @ssh;
    1.14 ++    if (\`\$ssh -V 2>&1\` =~ m{Dropbear}) {
    1.15 ++      my \$host = \$userhost; \$host = \$1 if (\$userhost =~ m{@(.*)});
    1.16 ++      my \$port = 22; \$port = \$1 if (\$ssh =~ m{-p *(\d+)});
    1.17 ++      exec "\$ssh " . shell_quote( '-J', 
    1.18 ++	"\$quoted_proxy_command --fake-proxy -- \$host \$port",
    1.19 ++	'-t', \$userhost, "\$server " . shell_quote( @server ) );
    1.20 ++    }
    1.21 +     push @sshopts, ( '-S', 'none', '-o', "ProxyCommand=\$quoted_proxy_command --fake-proxy -- %h %p" );
    1.22 +EOT
    1.23  	./autogen.sh
    1.24  	./configure			\
    1.25  		--prefix=/usr		\
    1.26 @@ -33,28 +49,6 @@
    1.27  {
    1.28  	mkdir -p $fs/usr
    1.29  	cp -a $install/usr/bin $fs/usr
    1.30 - 
    1.31 -	cd $fs/usr/bin
    1.32 -	patch -p0 <<EOT
    1.33 ---- mosh
    1.34 -+++ mosh
    1.35 -@@ -395,6 +395,14 @@
    1.36 -     # proxy to break mysteriously.
    1.37 -     $ENV{ 'SHELL' } = '/bin/sh';
    1.38 -     my $quoted_proxy_command = shell_quote( $0, "--family=$family" );
    1.39 -+    my $ssh = 'ssh';
    1.40 -+    if (`$ssh -V 2>&1` =~ m{Dropbear}) {
    1.41 -+      my $host = $userhost; $host = $1 if ($userhost =~ m{@(.*)});
    1.42 -+      my $port = 22; $port = $1 if ($ssh =~ m{-p *(\d+)});
    1.43 -+      my $quoted_self = shell_quote( $0, "--family=$family" );
    1.44 -+      exec "$ssh " . shell_quote( '-J', "$quoted_self --fake-proxy -- $host $port",
    1.45 -+	'-t', $userhost, "$server " .  shell_quote( @server ) );
    1.46 -+    }
    1.47 -     push @sshopts, ( '-S', 'none', '-o', "ProxyCommand=$quoted_proxy_command --fake-proxy -- %h %p" );
    1.48 -   }
    1.49 -   my @exec_argv = ( @ssh, @sshopts, $userhost, '--', $ssh_connection . "$server " . shell_quote( @server ) );
    1.50 -EOT
    1.51 -	cd - > /dev/null
    1.52  }
    1.53  
    1.54  post_install()