# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1550834553 -3600
# Node ID 2cb24e6379d54e8e18932ed57988b385ae59c043
# Parent  fcd3d43eadad35c6a12f4455fae33f53a132b657
xlockmore: tiny patch

diff -r fcd3d43eadad -r 2cb24e6379d5 syslinux/stuff/iso2exe/bootiso.S
--- a/syslinux/stuff/iso2exe/bootiso.S	Fri Feb 22 10:45:05 2019 +0100
+++ b/syslinux/stuff/iso2exe/bootiso.S	Fri Feb 22 12:22:33 2019 +0100
@@ -178,7 +178,7 @@
 	ret
 	.org	0x7E00
 
-	.org	0x7F83
+	.org	0x7F81
 ////////////////////////////// DOS EXE code ///////////////////////////////////
 
 exestart:
@@ -199,7 +199,8 @@
 	jc	tst386
 abort:
 goputs:
-	jmp	puts
+	mov	$EXEADRS(puts), %si
+	jmp	%si
 
 tst386:
 	pushw	%sp
diff -r fcd3d43eadad -r 2cb24e6379d5 syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Fri Feb 22 10:45:05 2019 +0100
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Fri Feb 22 12:22:33 2019 +0100
@@ -152,6 +152,7 @@
 	x=$((512*(1+$(get 417 "$ISO" 1))))
 	[ $x -gt 32768 ] && x=6656
 	stub=$(($(get 20 "$ISO") - 0xC0))
+	[ $stub -gt 30000] && dosstub=$stub || dosstub=
 	c=$(custom_config_sector "$ISO")
 	SIZE=0; OFFSET=0
 	case "$1" in
@@ -169,7 +170,7 @@
 	rootfs.gz)	SIZE=$(get 24 "$ISO"); OFFSET=$(($stub - $SIZE));;
 	tazboot.com)	OFFSET=$(($(get 64 "$ISO") - 0xC0))
 			SIZE=$(($stub - $(get 24 "$ISO") - $OFFSET));;
-	dosstub)	OFFSET=$stub; SIZE=$((0x7FF0 - $OFFSET));;
+	dosstub)	[ "$dosstub" ] && OFFSET=$stub && SIZE=$((0x7FF0 - $OFFSET));;
 	boot.md5)	[ $(get 0 "$ISO") -eq 23117 ] &&
 			[ $(get 18 "$ISO") -ne 0 ] &&
 			OFFSET=$((0x7FF0)) && SIZE=16;;
@@ -307,12 +308,13 @@
 	( cd $TMP; find dev init.exe | cpio -o -H newc ) | compress rootfs.gz
 	rm -rf $TMP
 	ls -l $@ rootfs.gz
-	cat >> $0 <<EOM
+	cp $0 $0.$$
+	cat >> $0.$$ <<EOM
 $(tar cf - ${@/init/rootfs.gz} | compress | uuencode -m -)
 EOT
 EOM
-	sed -i 's|[ \t]*###.*||;/^case/,/^esac/d' $0
-	exit ;;
+	sed -i 's|[ \t]*###.*||;/^case/,/^esac/d' $0.$$
+	mv -f $0.$$ $0; exit ;;
 --get)
 	cat $2
 	exit ;;
diff -r fcd3d43eadad -r 2cb24e6379d5 xlockmore/receipt
--- a/xlockmore/receipt	Fri Feb 22 10:45:05 2019 +0100
+++ b/xlockmore/receipt	Fri Feb 22 12:22:33 2019 +0100
@@ -17,6 +17,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+    sed -i 's|__GNUC_MINOR__ >= 4|__GNUC_MINOR__ >= 7|' modes/strange.c
     ./configure --prefix=/usr \
         --infodir=/usr/share/info \
         --mandir=/usr/share/man \