# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1556894824 -7200
# Node ID daaaf5face8aee4b5ec0f7537ceb880dabcac52e
# Parent  0bae549e10508b6ceea5c4c1ca7e7f5d76b3fb1d
mosh: update patch

diff -r 0bae549e1050 -r daaaf5face8a mosh/receipt
--- a/mosh/receipt	Fri May 03 15:42:51 2019 +0100
+++ b/mosh/receipt	Fri May 03 16:47:04 2019 +0200
@@ -19,6 +19,22 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	# Add dropbear support
+	patch -p0 <<EOT || return 1
+--- scripts/mosh.pl
++++ scripts/mosh.pl
+@@ -397,2 +397,10 @@
+     my \$quoted_proxy_command = shell_quote( \$0, "--family=\$family" );
++    my \$ssh = join ' ', @ssh;
++    if (\`\$ssh -V 2>&1\` =~ m{Dropbear}) {
++      my \$host = \$userhost; \$host = \$1 if (\$userhost =~ m{@(.*)});
++      my \$port = 22; \$port = \$1 if (\$ssh =~ m{-p *(\d+)});
++      exec "\$ssh " . shell_quote( '-J', 
++	"\$quoted_proxy_command --fake-proxy -- \$host \$port",
++	'-t', \$userhost, "\$server " . shell_quote( @server ) );
++    }
+     push @sshopts, ( '-S', 'none', '-o', "ProxyCommand=\$quoted_proxy_command --fake-proxy -- %h %p" );
+EOT
 	./autogen.sh
 	./configure			\
 		--prefix=/usr		\
@@ -33,28 +49,6 @@
 {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
- 
-	cd $fs/usr/bin
-	patch -p0 <<EOT
---- mosh
-+++ mosh
-@@ -395,6 +395,14 @@
-     # proxy to break mysteriously.
-     $ENV{ 'SHELL' } = '/bin/sh';
-     my $quoted_proxy_command = shell_quote( $0, "--family=$family" );
-+    my $ssh = 'ssh';
-+    if (`$ssh -V 2>&1` =~ m{Dropbear}) {
-+      my $host = $userhost; $host = $1 if ($userhost =~ m{@(.*)});
-+      my $port = 22; $port = $1 if ($ssh =~ m{-p *(\d+)});
-+      my $quoted_self = shell_quote( $0, "--family=$family" );
-+      exec "$ssh " . shell_quote( '-J', "$quoted_self --fake-proxy -- $host $port",
-+	'-t', $userhost, "$server " .  shell_quote( @server ) );
-+    }
-     push @sshopts, ( '-S', 'none', '-o', "ProxyCommand=$quoted_proxy_command --fake-proxy -- %h %p" );
-   }
-   my @exec_argv = ( @ssh, @sshopts, $userhost, '--', $ssh_connection . "$server " . shell_quote( @server ) );
-EOT
-	cd - > /dev/null
 }
 
 post_install()
diff -r 0bae549e1050 -r daaaf5face8a sbxkb/receipt
--- a/sbxkb/receipt	Fri May 03 15:42:51 2019 +0100
+++ b/sbxkb/receipt	Fri May 03 16:47:04 2019 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Simple tray XKB indicator"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="https://sourceforge.net/projects/staybox/"
+WEB_SITE="https://web.archive.org/web/20110515003801/https://sourceforge.net/projects/staybox/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/staybox/$TARBALL"
 
diff -r 0bae549e1050 -r daaaf5face8a sshfs-fuse/receipt
--- a/sshfs-fuse/receipt	Fri May 03 15:42:51 2019 +0100
+++ b/sshfs-fuse/receipt	Fri May 03 16:47:04 2019 +0200
@@ -13,7 +13,7 @@
 PROVIDE="rsshfs sshfs"
 TAGS="ssh"
 
-DEPENDS="fuse openssh sftp-server glib"
+DEPENDS="fuse ssh sftp-server glib"
 SUGGESTED="afuse"
 BUILD_DEPENDS="fuse-dev gettext glib-dev pkg-config autoconf automake libtool"
 
diff -r 0bae549e1050 -r daaaf5face8a syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Fri May 03 15:42:51 2019 +0100
+++ b/syslinux/stuff/iso2exe/init	Fri May 03 16:47:04 2019 +0200
@@ -191,12 +191,7 @@
 	PAD=$(($(stat -c %s $1) % 4))
 	[ $PAD -ne 0 ] && ddq if=/dev/zero bs=1 count=$((4 - $PAD)) >> $1
 	mkdir -p /tmp/fs/etc /tmp/fs/lib /tmp/fs/home
-	cp -a /etc/locale.conf /tmp/fs/etc 2> /dev/null
-	cp -a /etc/keymap.conf /tmp/fs/etc 2> /dev/null
-	sed 's/ .*//' /proc/modules | while read mod ; do
-		find /lib/modules/ | grep $mod.ko | \
-			sed 's|.*|cp & /tmp/fs/lib|' | sh
-	done
+	cp /etc/keymap.conf /etc/locale.conf /tmp/fs/etc 2> /dev/null
 	cat > /tmp/fs/init1 <<EOT
 #!/bin/sh
 sed -i 's|sbin/init|init2|' /init
@@ -206,7 +201,7 @@
 #!/bin/sh
 
 mount -t proc /proc /proc
-for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2
+for i in /lib/modules/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2
 v=\$(sed '/\\/home=/!d;s|.*/home=\\([^ ]*\\).*|\\1|' /proc/cmdline /cmdline 2> /dev/null)
 mount / -o remount,rw
 mkdir /mnt/dos
@@ -224,6 +219,7 @@
 EOT
 	chmod 755 /tmp/fs/init?
 	cp -a /tmp/fs/* /
+	ln -s /sqfs/bin/gzip /bin 2> /dev/null
 	( cd /tmp/fs ; find * | cpio -o -H newc ) | gzip -9 >> $1
 }
 
@@ -242,6 +238,7 @@
 		sed 's|.*=> \(.*/lib/l[^ ]*\).*|\1|;/^\//!d') /tmp/fs/lib
 		cp $i /tmp/fs/bin
 	done
+	cp -a /sqfs/lib/ld-* /tmp/fs/lib 2> /dev/null ||
 	cp -a /lib/ld-* /tmp/fs/lib
 	for i in $(busybox | sed '/Current/,$!d'); do
 		[ -e /tmp/fs/bin/${i%,} ] || ln -s busybox /tmp/fs/bin/${i%,}
@@ -410,7 +407,7 @@
 			uncpio $i
 		done
 	fi
-	cp /tmp/fs/etc/* /etc
+	cp /tmp/fs/etc/* /etc 2> /dev/null
 	echo "/home=$(getuuid)/slitaz" > /cmdline
 	rm -f /tmp/wait
 	[ -x /init1 ] || return