# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1668765267 0
# Node ID 2ccf00d9c1cdc72f27005b8ce128905669f51a3c
# Parent  32f22d8fdc89193d7a48a2882adb09282d0211c5
Up foomatic-db (4.0-20221117)

diff -r 32f22d8fdc89 -r 2ccf00d9c1cd foomatic-db-nonfree/receipt
--- a/foomatic-db-nonfree/receipt	Thu Nov 17 12:13:24 2022 +0000
+++ b/foomatic-db-nonfree/receipt	Fri Nov 18 09:54:27 2022 +0000
@@ -8,7 +8,7 @@
 LICENSE="other"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.linuxprinting.org/foomatic.html"
-WGET_URL="https://www.openprinting.org/download/foomatic/$TARBALL"
+WGET_URL="https://web.archive.org/web/20221117121727/https://www.openprinting.org/download/foomatic/$TARBALL"
 TAGS="printer driver printing"
 
 DEPENDS="perl libxml2 foomatic-db"
@@ -17,7 +17,7 @@
 # What is the latest version available today?
 current_version()
 {
-	wget -O - ${WGET_URL%/*} 2>/dev/null | \
+	wget -O - https://www.openprinting.org/download/foomatic/ 2>/dev/null | \
 	sed "/latest/d;/$PACKAGE-[0-9]/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
 }
 
diff -r 32f22d8fdc89 -r 2ccf00d9c1cd foomatic-db/receipt
--- a/foomatic-db/receipt	Thu Nov 17 12:13:24 2022 +0000
+++ b/foomatic-db/receipt	Fri Nov 18 09:54:27 2022 +0000
@@ -1,14 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="foomatic-db"
-VERSION="4.0-20221114" 
+VERSION="4.0-20221117" 
 CATEGORY="system-tools"
 SHORT_DESC="Database used by foomatic-db-engine to generate PPD files"
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.linuxprinting.org/foomatic.html"
-WGET_URL="https://www.openprinting.org/download/foomatic/$TARBALL"
+WGET_URL="https://web.archive.org/web/20221118084846/https://www.openprinting.org/download/foomatic/$TARBALL"
 TAGS="printer driver printing"
 
 DEPENDS="ghostscript perl libxml2"
@@ -17,7 +17,7 @@
 # What is the latest version available today?
 current_version()
 {
-	wget -O - ${WGET_URL%/*} 2>/dev/null | \
+	wget -O - https://www.openprinting.org/download/foomatic/ 2>/dev/null | \
 	sed "/current/d;/latest/d;/$PACKAGE-[0-9]/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q
 }
 
diff -r 32f22d8fdc89 -r 2ccf00d9c1cd memtest/stuff/pack
--- a/memtest/stuff/pack	Thu Nov 17 12:13:24 2022 +0000
+++ b/memtest/stuff/pack	Fri Nov 18 09:54:27 2022 +0000
@@ -46,9 +46,9 @@
 compress()
 {
 	case "$PACKER" in
-	lz4) lz4 -l --best ;;
-	lzsa1) cat > /tmp/in$$ ; lzsa -f1 /tmp/in$$ /tmp/out$$ ; cat /tmp/out$$ ; rm -f /tmp/in$$ /tmp/out$$ ;;
-	lzsa2) cat > /tmp/in$$ ; lzsa -f2 /tmp/in$$ /tmp/out$$ ; cat /tmp/out$$ ; rm -f /tmp/in$$ /tmp/out$$ ;;
+	lz4) lz4 -l --best | tail -c +5 ;;
+	lzsa1) cat > /tmp/in$$ ; lzsa -f1 /tmp/in$$ /tmp/out$$ ; tail -c +4 /tmp/out$$ ; rm -f /tmp/in$$ /tmp/out$$ ;;
+	lzsa2) cat > /tmp/in$$ ; lzsa -f2 /tmp/in$$ /tmp/out$$ ; tail -c +4 /tmp/out$$ ; rm -f /tmp/in$$ /tmp/out$$ ;;
 	*) xz -z -e --format=raw --lzma1=lc=$(bits LC),lp=$(bits LP),pb=$(bits PB) --stdout 
 	esac
 }
diff -r 32f22d8fdc89 -r 2ccf00d9c1cd memtest/stuff/unlz4.S
--- a/memtest/stuff/unlz4.S	Thu Nov 17 12:13:24 2022 +0000
+++ b/memtest/stuff/unlz4.S	Fri Nov 18 09:54:27 2022 +0000
@@ -32,8 +32,10 @@
 # endif
 #endif
 	lodsl			// get chunkSize
+#ifndef NO_LZ4_HEADER
 	cmpl	$ARCHIVE_MAGICNUMBER, %eax
 	je	lz4main
+#endif
 	orl	%eax, %eax	// end of file ?
 	je	lz4quit
 	xchgl	%eax, %edx
diff -r 32f22d8fdc89 -r 2ccf00d9c1cd memtest/stuff/unlzsa1.S
--- a/memtest/stuff/unlzsa1.S	Thu Nov 17 12:13:24 2022 +0000
+++ b/memtest/stuff/unlzsa1.S	Fri Nov 18 09:54:27 2022 +0000
@@ -34,12 +34,14 @@
 	xorw	%cx, %cx
 	call	normalize
 # endif
+# ifndef NO_LZSA1_HEADER
 	lodsw
 	cmpw	$0x9E7B, %ax	// magic
 	jne	lzsa1main
 	lodsb
 	cmpb	$0, %al		// lzsa1
 	jne	lzsa1main
+# endif
 lzsa1block:			// uncompress chunk
 	lodsw			// block size
 	xchgw	%ax, %cx
diff -r 32f22d8fdc89 -r 2ccf00d9c1cd memtest/stuff/unlzsa2.S
--- a/memtest/stuff/unlzsa2.S	Thu Nov 17 12:13:24 2022 +0000
+++ b/memtest/stuff/unlzsa2.S	Fri Nov 18 09:54:27 2022 +0000
@@ -36,12 +36,14 @@
 	xorw	%cx, %cx
 	call	normalize
 # endif
+# ifndef NO_LZSA2_HEADER
 	lodsw
 	cmpw	$0x9E7B, %ax	// magic
 	jne	lzsa2main
 	lodsb
 	testb	$0x20, %al	// lzsa2
 	je	lzsa2main
+# endif
 lzsa2block:			// uncompress chunk
 # if !defined(FLAT32) && !defined(FLAT16)
 	xorw	%cx, %cx
@@ -78,15 +80,11 @@
 	xorw	%cx, %cx
 	call	normalize
 	addw	%si, %dx
-	xchgw	%ax, %dx
 # else
-	movw	%si, %ax
-	addw	%cx, %ax
+	movw	%si, %dx
+	addw	%cx, %dx
 # endif
-	call	nothing
-nothing:
-	popw	%bx
-	movw	%ax, %cs:maxsi+2-nothing(%bx)
+	shll	$16, %edx
 #else
 # if !defined(FLAT16)
 	xorw	%cx, %cx
@@ -112,7 +110,8 @@
 #endif
 #ifndef RAW_FORMAT
 maxsi:
-	cmpw	$0x1234, %si
+	shld	$16, %edx, %eax
+	cmpw	%ax, %si
 	jae	lzsa2block	// bail if we hit EOD
 #endif
 #ifdef FLAT32
@@ -121,20 +120,18 @@
 	movb	$-1, %ah	// set offset bits 15-8 to 1
 #endif
 // XYZ
-	movb	%bl, %al
-	testb	$0xC0, %al	//  check match offset mode in token (X bit)
+	testb	$0xC0, %bl	// check match offset mode in token (X bit)
+	bt	$5, %bx		// move bit 5 to carry
 	js	rep_match_or_large_offset
 	jne	offset_9_bit
 // 00Z 5-bit offset: read a nibble for offset bits 1-4 and use the inverted bit Z of the token as bit 0 of the offset.
 //                   set bits 5-15 of the offset to 1.
-	cmpb	$0x20, %al	// test bit 5
 	call	getByteFromNibble
 	jmp	get_match_length
 offset_9_bit:
 // 01Z 9-bit offset: read a byte for offset bits 0-7 and use the inverted bit Z for bit 8 of the offset.
 //                   set bits 9-15 of the offset to 1.
-	cmpb	$0x60, %al      // test bit 5 (knowing that bit 6 is also set)
-	adcb	%ah, %ah	// clear bit 8 if Z bit is clear
+	sbbb	%cl, %ah	// clear bit 8 if Z bit is clear
 	jmp	get_match_length_0
 
 getNibble:
@@ -154,13 +151,11 @@
 //10Z 13-bit offset: read a nibble for offset bits 9-12 and use the inverted bit Z for bit 8 of the offset,
 //                   then read a byte for offset bits 0-7. set bits 13-15 of the offset to 1.
 //                   substract 512 from the offset to get the final value.
-	cmpb	$0xA0, %al	// test bit 5 (knowing that bit 7 is also set)
 	call	getByteFromNibble
 	subb	$2, %al		// substract 512
 	jmp	get_match_length_1
 rep_match_or_16_bit:
-	testb	$0x20, %al	// test bit Z (offset bit 8)
-	jne	repeat_match	// rep-match
+	jc	repeat_match	// rep-match
 //110 16-bit offset: read a byte for offset bits 8-15, then another byte for offset bits 0-7.
 	lodsb			// Get 2-byte match offset
 get_match_length_1:
@@ -204,7 +199,7 @@
 	call	getNibble	// get nibble for offset bits 0-3
 	popfw
 	rclb	$1, %al
-	orb	$0xE0, %al	// set offset bits 7-5 to 1
+	xorb	$0xE1, %al	// set offset bits 7-5 to 1
 	ret
 
 lzsa2len:			// get length in %ecx
@@ -224,8 +219,7 @@
 	jnc	lzsa2gotNumber  // 0-255
 #if 0
 	je	lzsa2BigNumber
-	movb	$-1, %ah
-	subb	%al, %ah	// S=-256-767, L=-256-1791
+	movb	%al, %ah	// S=256-767, L=256-1791
 	lodsb	
 	.byte	0xB1		// mask lodsb with movb $0xAD, %cl
 lzsa2BigNumber:
diff -r 32f22d8fdc89 -r 2ccf00d9c1cd memtest/stuff/unpack.S
--- a/memtest/stuff/unpack.S	Thu Nov 17 12:13:24 2022 +0000
+++ b/memtest/stuff/unpack.S	Fri Nov 18 09:54:27 2022 +0000
@@ -271,6 +271,9 @@
 
 unpack:
 #define NO_LZMA_HEADER
+#define NO_LZSA2_HEADER
+#define NO_LZSA1_HEADER
+#define NO_LZ4_HEADER
 #if ELKS
 #define ONLY8086	1
 #endif