wok rev 21519
mosh: update patch
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri May 03 16:47:04 2019 +0200 (2019-05-03) |
parents | 0bae549e1050 |
children | 0386bb6c950b |
files | mosh/receipt sbxkb/receipt sshfs-fuse/receipt syslinux/stuff/iso2exe/init |
line diff
1.1 --- a/mosh/receipt Fri May 03 15:42:51 2019 +0100 1.2 +++ b/mosh/receipt Fri May 03 16:47:04 2019 +0200 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()
2.1 --- a/sbxkb/receipt Fri May 03 15:42:51 2019 +0100 2.2 +++ b/sbxkb/receipt Fri May 03 16:47:04 2019 +0200 2.3 @@ -6,7 +6,7 @@ 2.4 SHORT_DESC="Simple tray XKB indicator" 2.5 MAINTAINER="al.bobylev@gmail.com" 2.6 LICENSE="GPL3" 2.7 -WEB_SITE="https://sourceforge.net/projects/staybox/" 2.8 +WEB_SITE="https://web.archive.org/web/20110515003801/https://sourceforge.net/projects/staybox/" 2.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.10 WGET_URL="$SF_MIRROR/staybox/$TARBALL" 2.11
3.1 --- a/sshfs-fuse/receipt Fri May 03 15:42:51 2019 +0100 3.2 +++ b/sshfs-fuse/receipt Fri May 03 16:47:04 2019 +0200 3.3 @@ -13,7 +13,7 @@ 3.4 PROVIDE="rsshfs sshfs" 3.5 TAGS="ssh" 3.6 3.7 -DEPENDS="fuse openssh sftp-server glib" 3.8 +DEPENDS="fuse ssh sftp-server glib" 3.9 SUGGESTED="afuse" 3.10 BUILD_DEPENDS="fuse-dev gettext glib-dev pkg-config autoconf automake libtool" 3.11
4.1 --- a/syslinux/stuff/iso2exe/init Fri May 03 15:42:51 2019 +0100 4.2 +++ b/syslinux/stuff/iso2exe/init Fri May 03 16:47:04 2019 +0200 4.3 @@ -191,12 +191,7 @@ 4.4 PAD=$(($(stat -c %s $1) % 4)) 4.5 [ $PAD -ne 0 ] && ddq if=/dev/zero bs=1 count=$((4 - $PAD)) >> $1 4.6 mkdir -p /tmp/fs/etc /tmp/fs/lib /tmp/fs/home 4.7 - cp -a /etc/locale.conf /tmp/fs/etc 2> /dev/null 4.8 - cp -a /etc/keymap.conf /tmp/fs/etc 2> /dev/null 4.9 - sed 's/ .*//' /proc/modules | while read mod ; do 4.10 - find /lib/modules/ | grep $mod.ko | \ 4.11 - sed 's|.*|cp & /tmp/fs/lib|' | sh 4.12 - done 4.13 + cp /etc/keymap.conf /etc/locale.conf /tmp/fs/etc 2> /dev/null 4.14 cat > /tmp/fs/init1 <<EOT 4.15 #!/bin/sh 4.16 sed -i 's|sbin/init|init2|' /init 4.17 @@ -206,7 +201,7 @@ 4.18 #!/bin/sh 4.19 4.20 mount -t proc /proc /proc 4.21 -for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2 4.22 +for i in /lib/modules/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2 4.23 v=\$(sed '/\\/home=/!d;s|.*/home=\\([^ ]*\\).*|\\1|' /proc/cmdline /cmdline 2> /dev/null) 4.24 mount / -o remount,rw 4.25 mkdir /mnt/dos 4.26 @@ -224,6 +219,7 @@ 4.27 EOT 4.28 chmod 755 /tmp/fs/init? 4.29 cp -a /tmp/fs/* / 4.30 + ln -s /sqfs/bin/gzip /bin 2> /dev/null 4.31 ( cd /tmp/fs ; find * | cpio -o -H newc ) | gzip -9 >> $1 4.32 } 4.33 4.34 @@ -242,6 +238,7 @@ 4.35 sed 's|.*=> \(.*/lib/l[^ ]*\).*|\1|;/^\//!d') /tmp/fs/lib 4.36 cp $i /tmp/fs/bin 4.37 done 4.38 + cp -a /sqfs/lib/ld-* /tmp/fs/lib 2> /dev/null || 4.39 cp -a /lib/ld-* /tmp/fs/lib 4.40 for i in $(busybox | sed '/Current/,$!d'); do 4.41 [ -e /tmp/fs/bin/${i%,} ] || ln -s busybox /tmp/fs/bin/${i%,} 4.42 @@ -410,7 +407,7 @@ 4.43 uncpio $i 4.44 done 4.45 fi 4.46 - cp /tmp/fs/etc/* /etc 4.47 + cp /tmp/fs/etc/* /etc 2> /dev/null 4.48 echo "/home=$(getuuid)/slitaz" > /cmdline 4.49 rm -f /tmp/wait 4.50 [ -x /init1 ] || return