# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1668529254 0
# Node ID ed5f25d05ff6cec31260a6c66dc3adee8819b707
# Parent  f7324cde07d7fcea944631fedd9d46e69f3aa16e
Up exiftool (12.50), foomatic-db (4.0-20221111), lzsa (1.4.0), zlib (1.2.13)

diff -r f7324cde07d7 -r ed5f25d05ff6 exiftool/receipt
--- a/exiftool/receipt	Fri Nov 04 08:52:47 2022 +0000
+++ b/exiftool/receipt	Tue Nov 15 16:20:54 2022 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="exiftool"
-VERSION="12.40"
+VERSION="12.50"
 CATEGORY="system-tools"
 SHORT_DESC="Application for reading, writing and editing meta information in a wide variety of files."
 MAINTAINER="gokhlayeh@slitaz.org"
diff -r f7324cde07d7 -r ed5f25d05ff6 foomatic-db/receipt
--- a/foomatic-db/receipt	Fri Nov 04 08:52:47 2022 +0000
+++ b/foomatic-db/receipt	Tue Nov 15 16:20:54 2022 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="foomatic-db"
-VERSION="4.0-20220223" 
+VERSION="4.0-20221111" 
 CATEGORY="system-tools"
 SHORT_DESC="Database used by foomatic-db-engine to generate PPD files"
 MAINTAINER="jozee@slitaz.org"
diff -r f7324cde07d7 -r ed5f25d05ff6 lzsa/receipt
--- a/lzsa/receipt	Fri Nov 04 08:52:47 2022 +0000
+++ b/lzsa/receipt	Tue Nov 15 16:20:54 2022 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="lzsa"
-VERSION="1.3.12"
+VERSION="1.4.0"
 CATEGORY="system-tools"
 SHORT_DESC="Efficient packer optimized for fast decompression on 8-bit cpu."
 MAINTAINER="pascal.bellard@slitaz.org"
diff -r f7324cde07d7 -r ed5f25d05ff6 memtest/receipt
--- a/memtest/receipt	Fri Nov 04 08:52:47 2022 +0000
+++ b/memtest/receipt	Tue Nov 15 16:20:54 2022 +0000
@@ -11,7 +11,7 @@
 WEB_SITE="https://www.memtest.org/"
 WGET_URL="${WEB_SITE}download/archives/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xz"
+BUILD_DEPENDS="xz lz4 lzsa"
 
 # What is the latest version available today?
 current_version()
@@ -20,19 +20,38 @@
 	sed '/tar.gz"/!d;s|.*memtest86.-||;s|.tar.*||;q'
 }
 
+asm()
+{
+	cc -o $1.o -Wa,-a=$1.lst -c $1.S
+	objcopy --only-section=.text -O binary $1.o $1.bin
+}
+
 tune_lzma()
 {
-	cp $stuff/*.S $stuff/pack .
-	sed "s/VERSION/$VERSION/;s|lzma1=|&nice=$1,|" -i pack
-	while [ -n "$2" ]; do
-		sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S
-		shift 2
+	file=$1
+	shift
+	for i in lzma lz4 lzsa1 ; do
+		cp $stuff/*.S $stuff/packx .
+		sed "s/VERSION/$VERSION/;s|lzma1=|&nice=${1:-64},|" -i packx
+		while [ -n "$2" ]; do
+			sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S
+			shift 2
+		done
+		sed -i "s|uncompress|un$i|" unpackx.S
+		asm bootloader
+		asm unpackx
+		cp packx packx.bak
+		./packx --build bootloader.bin unpackx.bin
+		PACKER=$i ./packx $file $file.$i
+		if [ $(stat -c %s $file.$i) -ge $((0x101F0)) ]; then
+			rm $file.$i
+			cp packx.bak packx
+			sed -e "s|^#define FLAT16.*// lzma case|#define FLAT16 0 // $i|" -i unpackx.S
+			asm unpackx
+			./packx --build bootloader.bin unpackx.bin
+			PACKER=$i ./packx $file $file.$i
+		fi
 	done
-	for i in bootloader unpack ; do
-		cc -o $i.o -Wa,-a=$i.lst -c $i.S
-		objcopy --only-section=.text -O binary $i.o $i.bin
-	done
-	./pack --build bootloader.bin unpack.bin
 }
 
 # Rules to configure and make the package.
@@ -46,16 +65,15 @@
 		patch -p1 < $i
 	done
 	make
-	tune_lzma 218,mf=bt2 LC 2
-	./pack memtest.bin memtest.packed
 	mv memtest.bin memtest.bin.console
+	tune_lzma memtest.bin.console 218,mf=bt2 LC 2
 	sed -i  -e 's/SERIAL_CONSOLE_DEFAULT 0/SERIAL_CONSOLE_DEFAULT 1/' \
 		-e 's/SERIAL_BAUD_RATE 9600/SERIAL_BAUD_RATE 115200/' config.h
 	make clean
 	make
-	tune_lzma 179,mf=bt3 LC 2
-	./pack memtest.bin memtest.packed-115200
 	mv memtest.bin memtest.bin.serial
+	tune_lzma memtest.bin.serial 179,mf=bt3 LC 2
+	cp memtest.bin.serial.lzma memtest.packed-115200
 } 
 
 
@@ -65,7 +83,7 @@
 	mkdir -p $fs/boot $install/usr/share/doc
 	cp $src/README* $install/usr/share/doc
 	cp $src/FAQ $install/usr/share/doc
-	cp $src/memtest.packed $fs/boot/memtest.exe
+	cp $src/memtest.bin.console.lzma $fs/boot/memtest.exe
 }
 
 # Pre and post install commands for Tazpkg.
diff -r f7324cde07d7 -r ed5f25d05ff6 memtest/stuff/unlz4.S
--- a/memtest/stuff/unlz4.S	Fri Nov 04 08:52:47 2022 +0000
+++ b/memtest/stuff/unlz4.S	Tue Nov 15 16:20:54 2022 +0000
@@ -1,20 +1,36 @@
-/*
- * Lz4Decode:
+// Lz4Decode:
 #ifndef FLAT32
- *   input   ds:si=inStream, es:di=outStream
- *   output  outStream[], ds:si, es:di
+//   input   ds:si=inStream, es:di=outStream
+//   output  outStream[], ds:si, es:di
 	.code16
+#define AX	%ax
+#define BX	%bx
+#define CX	%cx
+#define SI	%si
+#define DI	%di
 #else
- *   input   esi=inStream, edi=outStream
- *   output  outStream[], esi, edi
+//   input   esi=inStream, edi=outStream
+//   output  outStream[], ds:esi, es:edi
 	.code32
+#define AX	%eax
+#define BX	%ebx
+#define CX	%ecx
+#define SI	%esi
+#define DI	%edi
 #endif
- */
  
 #define ARCHIVE_MAGICNUMBER 0x184C2102
 
+//#define PARANOIA			// cover rare cases, optional
+
 lz4main:
+#ifdef PARANOIA
 	cld
+# if !defined(FLAT32) && !defined(FLAT16OUT)
+	xorl	%cx, %cx
+	call	lz4mov
+# endif
+#endif
 	lodsl			// get chunkSize
 	cmpl	$ARCHIVE_MAGICNUMBER, %eax
 	je	lz4main
@@ -23,48 +39,75 @@
 	xchgl	%eax, %edx
 lz4chunk:			// uncompress chunk
 	lodsb			// get token
-	decl	%edx
-	movzbl	%al, %ebx
+	movb	%al, %bl
 	shrb	$4, %al
 	call	lz4len		// get literal length, %eax < 255
-	incl	%ecx
-	stc
-	sbbl	%ecx, %edx
-	pushf	
+	subl	%ecx, %edx	// count literal
+	subl	$1+2, %edx	// count token & string address
+#if !defined(FLAT32) && !defined(FLAT16OUT)
+	pushf
 	call	lz4mov		// copy literals
 	popf
-	js	lz4main
+#else
+	rep movsb
+#endif
+	jle	lz4main
 	lodsw			// get string address
-#ifndef FLAT32
-	pushw	%bx
-	movw	%di, %bx
-	subl	%eax, %ebx
-	popw	%ax
+	xchgw	%ax, %bx
 	call	lz4len		// get string length
+	add	$4, CX
+#if !defined(FLAT32) && !defined(FLAT16OUT)
 	pushw	%ds
 	pushw	%si
-	pushw	%es
-	popw	%ds
-	movw	$0xF, %si
-	andw	%bx, %si
-	shrl	$4, %ebx
-	addl	$4+1, %ecx
-	movw	%bx, %bp
-	call	lz4mov2		// copy string
+	movw	%di, %si
+	subw	%bx, %si
+	movw	%es, %ax
+	jnc	axok
+	subb	$0x10, %ah
+axok:
+	movw	%ax, %ds
+	call	lz4mov		// copy string
 	popw	%si
 	popw	%ds
 #else
-	negl	%eax
-	xchgl	%eax, %ebx
-	addl	%edi, %ebx
-	call	lz4len		// get string length
-	pushl	%esi
-	xchgl	%ebx, %esi
-	call	lz4mov		// copy string
-	popl	%esi
+	xchg	AX, SI
+	mov	DI, SI
+	sub	BX, SI
+	rep movsb %es(SI), %es(DI)
+	xchg	AX, SI
 #endif
 	jmp	lz4chunk
 
+#if !defined(FLAT32) && !defined(FLAT16OUT)
+# if defined(PARANOIA)
+lz4movlp:
+	xchgw	%ax, %cx
+	movw	$0x3C00, %cx
+	rep movsl
+	xchgw	%ax, %cx
+	sub	$0xF0, %ch
+# endif
+lz4mov:
+	movw	%di, %ax
+	andw	$0xF, %di
+	shrw	$4, %ax
+	movw	%es, %bp
+	addw	%ax, %bp
+	movw	%bp, %es
+	movw	%si, %ax
+	andw	$0xF, %si
+	shrw	$4, %ax
+	movw	%ds, %bp
+	addw	%ax, %bp
+	movw	%bp, %ds
+# if defined(PARANOIA)
+	cmp	$0xFF, %ch	// catch FFFX case
+	jz	lz4movlp
+# endif
+	rep movsb
+	ret
+#endif
+
 lz4len:				// get length in %ecx
 	andl	$0xF, %eax
 	movl	%eax, %ecx
@@ -73,33 +116,9 @@
 lz4len2:
 	lodsb
 	decl	%edx		// remaining chunk size
-	addl	%eax, %ecx
+	addw	%ax, %cx
 	cmpb	$0xFF, %al
 	je	lz4len2
 lz4quit:
 	ret
 
-lz4movlp:
-	movsb
-#ifndef FLAT32
-	movw	$0x800, %bp
-	orw	%di, %di
-	jns	lz4di
-	subw	$0x8000, %di
-	movw	%es, %ax
-	addw	%bp, %ax
-	movw	%ax, %es
-lz4di:
-	orw	%si, %si
-	jns	lz4si
-	subw	$0x8000, %si
-lz4mov2:
-	movw	%ds, %ax
-	addw	%bp, %ax
-	movw	%ax, %ds
-lz4si:
-#endif
-lz4mov:
-	decl	%ecx
-	jnz	lz4movlp
-	ret
diff -r f7324cde07d7 -r ed5f25d05ff6 memtest/stuff/unlzsa1.S
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/memtest/stuff/unlzsa1.S	Tue Nov 15 16:20:54 2022 +0000
@@ -0,0 +1,183 @@
+// Lzsa1Decode:
+#ifndef FLAT32
+//   input   ds:si=inStream, es:di=outStream
+//   output  outStream[], ds:si, es:di
+	.code16
+#define AX	%ax
+#define BX	%bx
+#define SI	%si
+#define DI	%di
+#else
+//   input   esi=inStream, edi=outStream
+//   output  outStream[], ds:esi, es:edi
+	.code32
+#define AX	%eax
+#define BX	%ebx
+#define SI	%esi
+#define DI	%edi
+#endif
+
+MATCH_RUN_LEN		=	15
+LITERALS_RUN_LEN	=	7
+MIN_MATCH_SIZE		=	3
+MIN_LITERALS_SIZE	=	0
+
+#define PACKED_ONLY			// assume no copy block, optional
+//#define PARANOIA			// cover rare cases, optional
+ 
+lzsa1main:
+#ifdef PARANOIA
+	cld
+#endif
+#ifndef RAW_FORMAT
+# if defined(PARANOIA) && !defined(FLAT32) && !defined(FLAT16)
+	xorw	%cx, %cx
+	call	normalize
+# endif
+	lodsw
+	cmpw	$0x9E7B, %ax	// magic
+	jne	lzsa1main
+	lodsb
+	cmpb	$0, %al		// lzsa1
+	jne	lzsa1main
+lzsa1block:			// uncompress chunk
+	lodsw			// block size
+	xchgw	%ax, %cx
+	lodsb
+# ifndef PACKED_ONLY
+	orb	%al, %al
+	jns	lzsa1compressed
+#  if !defined(FLAT32) && !defined(FLAT16OUT)
+	movw	%cx, %dx
+	andb	$0x7F, %ch
+	andw	$0x8000, %dx
+copy32k:
+	call	lzsa1movStr
+	xchg	%dx, %cx
+	incw	%cx
+	loop	copy32k
+#  else
+	movsb			// copy block
+copylp:
+	movsb			// copy block
+	loop	copylp		// handle 64K case
+#  endif
+	jmp	lzsa1block
+lzsa1compressed:
+	jne	lzsa1chunk	// 64Kb block
+# endif
+	jcxz	lzsa1quit	// bail if we hit EOD
+	movw	%cx, %dx
+# if !defined(FLAT32) && !defined(FLAT16)
+	xorw	%cx, %cx
+	call	normalize
+# endif
+	addw	%si, %dx
+#endif
+lzsa1chunk:			// uncompress chunk
+	lodsb			// get token O|LLL|MMMM
+	movb	%al, %bl	// keep token in bl
+	shrb	$4, %al		// shift literals length into place
+	movw	$LITERALS_RUN_LEN*256+MIN_LITERALS_SIZE, %cx
+	call	lzsa1len	// %ch = LITERALS_RUN_LEN
+#if !defined(FLAT32) && !defined(FLAT16OUT)
+	call	lzsa1movLit	// copy %cx literals from %ds:%si to %es:%di
+#else
+	rep	movsb		// copy %cx literals from %ds:%si to %es:%di
+#endif
+#ifndef RAW_FORMAT
+	cmpw	%dx, %si
+	jae	lzsa1block	// bail if we hit EOD
+#endif
+#ifdef FLAT32
+	orl	$-1, %eax
+#else
+	movb	$-1, %ah
+#endif
+	testb	%bl, %bl	// check match offset size in token (O bit)
+	jns	lzsa1ShortOfs
+	lodsw
+	.byte	0x3C		// mask lodsb with cmpb $0xAC, %al
+lzsa1ShortOfs:
+	lodsb
+#ifdef RAW_FORMAT
+	orw	%ax, %ax
+	jz	lzsa1quit	// bail if we hit EOD
+#endif
+	xchg	AX, BX		// %bx: match offset  %ax: original token
+	movw	$MATCH_RUN_LEN*256+MIN_MATCH_SIZE, %cx
+	call	lzsa1len
+#if !defined(FLAT32) && !defined(FLAT16OUT)
+	pushw	%ds
+	pushw	%si
+	movw	%di, %si
+	addw	%bx, %si
+	movw	%es, %ax
+	jc	dxok
+	subb	$0x10, %ah
+dxok:
+	movw	%ax, %ds
+	call	lzsa1movStr	// copy string
+	popw	%si
+	popw	%ds
+#else
+	xchg	AX, SI		// save %si	
+	lea	(BX,DI), SI
+	rep movsb	%es:(SI), %es:(DI)
+	xchg	AX, SI		// restore %si	
+#endif
+	jmp	lzsa1chunk
+
+lzsa1len:			// get length in %ecx
+	andb	%ch, %al
+	cbw			// clear %ah
+	cmpb	%al, %ch
+	jne	lzsa1minNumber	// S=0-6, L=0-14
+	lodsb
+	addb	%cl, %ch
+	addb	%ch, %al
+	jnc	lzsa1gotNumber  // 0-255
+	movb	%al, %ah	// S=256-1791, L=256-3839 or S=256-511, L=256-511
+	jne	lzsa1midNumber
+	lodsw			// 0-65535
+	.byte	0x3C		// mask lodsb with cmpb $0xAC, %al
+lzsa1midNumber:
+	lodsb
+lzsa1gotNumber:
+	xchgw	%ax, %cx
+lzsa1quit:
+	ret
+lzsa1minNumber:
+	addb	%cl, %al
+	xchgw	%ax, %cx
+	ret
+
+#if !defined(FLAT32) && !defined(FLAT16OUT)
+# if defined(PARANOIA)
+lzsa1movlp:
+	decw	%ch
+	rep movsb
+	incw	%ch
+# endif
+normalize:
+lzsa1movStr:
+	movw	%si, %ax
+	andw	$0xF, %si
+	shrw	$4, %ax
+	movw	%ds, %bp
+	addw	%ax, %bp
+	movw	%bp, %ds
+lzsa1movLit:
+	movw	%di, %ax
+	andw	$0xF, %di
+	shrw	$4, %ax
+	movw	%es, %bp
+	addw	%ax, %bp
+	movw	%bp, %es
+# if defined(PARANOIA)
+	cmpb	$0xFF, %ch	// catch FFFX case
+	je	lzsa1movlp
+# endif
+	rep movsb
+	ret
+#endif
diff -r f7324cde07d7 -r ed5f25d05ff6 splix/receipt
--- a/splix/receipt	Fri Nov 04 08:52:47 2022 +0000
+++ b/splix/receipt	Tue Nov 15 16:20:54 2022 +0000
@@ -6,7 +6,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
 SHORT_DESC="CUPS drivers for SPL (Samsung Printer Language) printers"
-WEB_SITE="http://splix.ap2c.org/"
+WEB_SITE="https://sourceforge.net/projects/splix/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/splix/$TARBALL"
 TAGS=""
diff -r f7324cde07d7 -r ed5f25d05ff6 xerces-c/receipt
--- a/xerces-c/receipt	Fri Nov 04 08:52:47 2022 +0000
+++ b/xerces-c/receipt	Tue Nov 15 16:20:54 2022 +0000
@@ -9,20 +9,22 @@
 WEB_SITE="https://xerces.apache.org/xerces-c/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://apache.org/dist/xerces/c/${VERSION%%.*}/sources/$TARBALL"
+WGET_URL="https://github.com/apache/xerces-c/archive/v$VERSION.tar.gz"
 
 DEPENDS="gcc-lib-base glibc-base icu libcrypto libcurl"
+BUILD_DEPENDS="automake"
 
 # What is the latest version available today?
 current_version()
 {
-	wget -O - $WEB_SITE 2>/dev/null | \
-	sed '/available/!d;s|.*sion ||;s| is .*||;q'
+	wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \
+	sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q'
 }
 
 # Rules to configure and make the package.
 compile_rules()
 {
+	./reconf
 	./configure $CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
 	make install
diff -r f7324cde07d7 -r ed5f25d05ff6 zlib-dev/receipt
--- a/zlib-dev/receipt	Fri Nov 04 08:52:47 2022 +0000
+++ b/zlib-dev/receipt	Tue Nov 15 16:20:54 2022 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="zlib-dev"
-VERSION="1.2.12"
+VERSION="1.2.13"
 CATEGORY="development"
 SHORT_DESC="Zlib compression library devel files."
 MAINTAINER="pankso@slitaz.org"
diff -r f7324cde07d7 -r ed5f25d05ff6 zlib/receipt
--- a/zlib/receipt	Fri Nov 04 08:52:47 2022 +0000
+++ b/zlib/receipt	Tue Nov 15 16:20:54 2022 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="zlib"
-VERSION="1.2.12"
+VERSION="1.2.13"
 CATEGORY="base-system"
 SHORT_DESC="Compression library"
 MAINTAINER="pankso@slitaz.org"
@@ -15,6 +15,7 @@
 DEPENDS="glibc-base"
 BUILD_DEPENDS=""
 
+# What is the latest version available today?
 current_version()
 {
 	wget -O - $WEB_SITE 2>/dev/null | \