# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1612545372 0
# Node ID 5b0e64c0628a9ea0b38e218155f4660db0652604
# Parent  c58748aa5abf90e114bc3c0a8e945048dd4ed67a
mosh: create /usr/share/terminfo/x/xterm-256color link

diff -r c58748aa5abf -r 5b0e64c0628a cookutils/stuff/check-wok
--- a/cookutils/stuff/check-wok	Sat Jan 30 17:26:17 2021 +0100
+++ b/cookutils/stuff/check-wok	Fri Feb 05 17:16:12 2021 +0000
@@ -4,6 +4,10 @@
 WOK=${1:-/home/slitaz/wok}
 
 for i in $WOK/*/receipt ; do
+	if [ ! -e $i ]; then
+		echo "$WOK is not a wok."
+		exit
+	fi
 	pkg=$(basename ${i%/receipt})
 	echo -en "\r$pkg                  \r" 1>&2
 	unset PACKAGE WANTED SHORT_DESC DEPENDS BUILD_DEPENDS SUGGESTED
diff -r c58748aa5abf -r 5b0e64c0628a mosh/receipt
--- a/mosh/receipt	Sat Jan 30 17:26:17 2021 +0100
+++ b/mosh/receipt	Fri Feb 05 17:16:12 2021 +0000
@@ -70,5 +70,8 @@
 		sed -i 's/^DROPBEAR_OPTIONS="/&-a /' "$1/etc/daemons.conf" &&
 		[ -z "$1" ] && /etc/init.d/dropbear restart
 	fi
+	[ ! -e $1/usr/share/terminfo/x/xterm-256color ] &&
+		[ -e $1/usr/share/terminfo/x/xterm-color ] &&
+		ln -s xterm-color $1/usr/share/terminfo/x/xterm-256color
 	true
 }
diff -r c58748aa5abf -r 5b0e64c0628a syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Sat Jan 30 17:26:17 2021 +0100
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Fri Feb 05 17:16:12 2021 +0000
@@ -41,13 +41,17 @@
 add_rootfs()
 {
 	TMP=/tmp/iso2exe$$
-	mkdir -p $TMP
-	$0 --get rootfs.gz > $TMP/rootfs.gz
-	SIZE=$(wc -c < $TMP/rootfs.gz)
-	store 24 $SIZE $1
-	OFS=$(( 0x7FF0 - $SIZE ))
-	printf "Adding rootfs.gz file at %04X (%d bytes) ...\n" $OFS $SIZE
-	ddn if=$TMP/rootfs.gz of=$1 bs=1 seek=$OFS
+	mkdir -p $TMP/mnt
+	mount -o loop,ro $1 $TMP/mnt
+	if grep -qs rootfs $TMP/mnt/boot/isolinux/isolinux.cfg ; then
+		$0 --get rootfs.gz > $TMP/rootfs.gz
+		SIZE=$(wc -c < $TMP/rootfs.gz)
+		store 24 $SIZE $1
+		OFS=$(( 0x7FF0 - $SIZE ))
+		printf "Adding rootfs.gz file at %04X (%d bytes) ...\n" $OFS $SIZE
+		ddn if=$TMP/rootfs.gz of=$1 bs=1 seek=$OFS
+	fi
+	umount $TMP/mnt
 	rm -rf $TMP
 }
 
@@ -109,8 +113,11 @@
 		store $(($i-2)) $(stat -c %s /tmp/mnt$$/boot/linld.com) $1
 		r="$(sed '/rootfs[0-9]/!d;s|.* initrd=||;s|/boot/||g;s| .*||' \
 			/tmp/mnt$$/boot/isolinux/isolinux.cfg | tail -n1)"
-		echo -n "image=/boot/bzImage initrd=${r:-rootfs.gz},! autologin rdinit=/init.exe" | \
-		ddn bs=1 of=$1 conv=notrunc seek=$(($i-134))
+		if grep -qs rootfs /tmp/mnt$$/boot/isolinux/isolinux.cfg ; then
+			echo -n "image=/boot/bzImage initrd=${r:-rootfs.gz},! autologin rdinit=/init.exe"
+		else
+			echo -n "$(sed '/KERNEL/!d;s|.*KERNEL *|image=|;q' /tmp/mnt$$/boot/isolinux/isolinux.cfg)"
+		fi | ddn bs=1 of=$1 conv=notrunc seek=$(($i-134))
 	fi
 	umount /tmp/mnt$$	
 	rmdir /tmp/mnt$$	
diff -r c58748aa5abf -r 5b0e64c0628a syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Sat Jan 30 17:26:17 2021 +0100
+++ b/syslinux/stuff/iso2exe/taziso	Fri Feb 05 17:16:12 2021 +0000
@@ -289,7 +289,7 @@
 	fi
 	echo -en "\nInstall boot files..."
 	for i in $media/boot/bzImage* $media/boot/*pxe* \
-		$media/boot/plop.exe \
+		$media/boot/plop* \
 		$media/boot/isolinux/he* $media/boot/isolinux/opt* \
 		$media/README $media/boot/memtest* ; do
 		[ -s $i ] && cp $i $mnt/slitaz/boot
@@ -843,7 +843,7 @@
 
 plop()
 {
-	gotcdfile 'plop.exe'
+	gotcdfile 'plop*'
 	if [ -z "$1" ]; then
 		$DIALOG --clear --title " Create $(basename $file .exe).exe ? " \
 			--yes-label "Install" --yesno \
@@ -863,7 +863,7 @@
 Please insert a blank disk in floppy drive.\n" 0 0
 		[ $? -eq 0 ] || return
 	fi
-	gotcdfile 'plop.exe' && mkfloppy $file
+	gotcdfile 'plop*' && mkfloppy $file
 }
 
 menuitem()
@@ -1666,8 +1666,8 @@
 $(cdfilef 'memtest*'	"fdmemtest"	"Create a Memtest86 boot floppy") \
 $(cdexe '?pxe*'		"pxe"		"Get SliTaz Web boot DOS/EXE utility") \
 $(cdfilef '?pxe*'	"fdpxe"		"Create a SliTaz Web boot floppy") \
-$(cdexe 'plop.exe'	"plop"		"Get USB boot DOS/EXE utility") \
-$(cdfilef 'plop.exe'	"fdplop"	"Create a USB boot floppy") \
+$(cdexe 'plop*'		"plop"		"Get USB boot DOS/EXE utility") \
+$(cdfilef 'plop*'	"fdplop"	"Create a USB boot floppy") \
 $(initxfile reboot	"restart"	"Restart the computer") \
 $(initxfile poweroff	"stop"		"Power off") \
 $(initx			"bootlog"       "Linux boot messages") \
diff -r c58748aa5abf -r 5b0e64c0628a zerobin/stuff/purge.sh
--- a/zerobin/stuff/purge.sh	Sat Jan 30 17:26:17 2021 +0100
+++ b/zerobin/stuff/purge.sh	Fri Feb 05 17:16:12 2021 +0000
@@ -9,7 +9,7 @@
 			[ $(sed 's/.*"expire_date":\([0-9]*\).*/\1/' $k) -lt \
 			  $(date +%s) ] && rm -rf $k*
 		done
-		rmdir $j 2> /dev/null
+		rmdir $j
 	done
-	rmdir $i 2> /dev/null
-done
+	rmdir $i
+done 2>/dev/null
diff -r c58748aa5abf -r 5b0e64c0628a zerobin/stuff/zerobin.u
--- a/zerobin/stuff/zerobin.u	Sat Jan 30 17:26:17 2021 +0100
+++ b/zerobin/stuff/zerobin.u	Fri Feb 05 17:16:12 2021 +0000
@@ -6,8 +6,8 @@
  
 +function remote_address()
 +{
-+	// if (isset($_SERVER["HTTP_X_FORWARDED_FOR"]))
-+	//	return $_SERVER["HTTP_X_FORWARDED_FOR"];
++	if (isset($_SERVER["HTTP_X_FORWARDED_FOR"]))
++		return $_SERVER["HTTP_X_FORWARDED_FOR"];
 +	return $_SERVER["REMOTE_ADDR"];
 +}
 +