# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1384154564 0
# Node ID d038b033c32148a691c8262588892cc96d631233
# Parent  9a64a856eee1010afa20832769b8877a0d8fe645
libzip: race condition

diff -r 9a64a856eee1 -r d038b033c321 ipxe/stuff/lkrnprefix.S
--- a/ipxe/stuff/lkrnprefix.S	Sun Nov 10 17:35:50 2013 +0000
+++ b/ipxe/stuff/lkrnprefix.S	Mon Nov 11 07:22:44 2013 +0000
@@ -203,9 +203,8 @@
 	pushfw			// = 286 : flags[12..15] are forced 0
 	popw	%cx		// > 286 : only flags[15] is forced 0
 	popfw			// restore flags
-	addb	%ah, %ch	// test F0 and 00 cases
-	cmpb	%ah, %ch
-	jbe	puts		// C=8086/80186, Z=80286
+	cmpb	%ah, %ch	// test Fx and 0x cases
+	js	puts		// S= not 386+
 //	smsww	%ax
 //	andb	$1, %al
 //	jne	puts
diff -r 9a64a856eee1 -r d038b033c321 libzip/receipt
--- a/libzip/receipt	Sun Nov 10 17:35:50 2013 +0000
+++ b/libzip/receipt	Mon Nov 11 07:22:44 2013 +0000
@@ -18,7 +18,7 @@
 {
 	cd $src
 	./configure --prefix=/usr &&
-	make && make install
+	make && make -j 1 install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 9a64a856eee1 -r d038b033c321 memtest/stuff/bootloader.S
--- a/memtest/stuff/bootloader.S	Sun Nov 10 17:35:50 2013 +0000
+++ b/memtest/stuff/bootloader.S	Mon Nov 11 07:22:44 2013 +0000
@@ -69,11 +69,11 @@
 # ifdef HELP
 # define PUTS
 	movw	$EXEADRS(helpmsg), %si
-	cmpb	$'/', %al
+	cmpb	$'/'+1, %al
 #  ifdef CHECK_REALMODE
-	je	jeputs
+	js	jsputs
 #  else
-	je	puts
+	js	puts
 #  endif
 # endif
 nocmdline:
@@ -91,10 +91,9 @@
 	pushfw			// = 286 : flags[12..15] are forced 0
 	popw	%dx		// > 286 : only flags[15] is forced 0
 	popfw			// restore flags
-	addb	%ah, %dh	// test F0 and 00 cases
-	cmpb	%ah, %dh
-jeputs:
-	jbe	puts		// C=8086/80186, Z=80286
+	cmpb	%ah, %dh	// test Fx and 0x cases
+jsputs:
+	js	puts		// S= not 386+
 	smsww	%dx
 	shrw	$1, %dx
 	jc	puts