wok-6.x rev 25487
Up exiftool (12.50), foomatic-db (4.0-20221111), lzsa (1.4.0), zlib (1.2.13)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Tue Nov 15 16:20:54 2022 +0000 (2022-11-15) |
| parents | f7324cde07d7 |
| children | 608a017317a8 |
| files | exiftool/receipt foomatic-db/receipt lzsa/receipt memtest/receipt memtest/stuff/unlz4.S memtest/stuff/unlzsa1.S splix/receipt xerces-c/receipt zlib-dev/receipt zlib/receipt |
line diff
1.1 --- a/exiftool/receipt Fri Nov 04 08:52:47 2022 +0000 1.2 +++ b/exiftool/receipt Tue Nov 15 16:20:54 2022 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="exiftool" 1.7 -VERSION="12.40" 1.8 +VERSION="12.50" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="Application for reading, writing and editing meta information in a wide variety of files." 1.11 MAINTAINER="gokhlayeh@slitaz.org"
2.1 --- a/foomatic-db/receipt Fri Nov 04 08:52:47 2022 +0000 2.2 +++ b/foomatic-db/receipt Tue Nov 15 16:20:54 2022 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="foomatic-db" 2.7 -VERSION="4.0-20220223" 2.8 +VERSION="4.0-20221111" 2.9 CATEGORY="system-tools" 2.10 SHORT_DESC="Database used by foomatic-db-engine to generate PPD files" 2.11 MAINTAINER="jozee@slitaz.org"
3.1 --- a/lzsa/receipt Fri Nov 04 08:52:47 2022 +0000 3.2 +++ b/lzsa/receipt Tue Nov 15 16:20:54 2022 +0000 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="lzsa" 3.7 -VERSION="1.3.12" 3.8 +VERSION="1.4.0" 3.9 CATEGORY="system-tools" 3.10 SHORT_DESC="Efficient packer optimized for fast decompression on 8-bit cpu." 3.11 MAINTAINER="pascal.bellard@slitaz.org"
4.1 --- a/memtest/receipt Fri Nov 04 08:52:47 2022 +0000 4.2 +++ b/memtest/receipt Tue Nov 15 16:20:54 2022 +0000 4.3 @@ -11,7 +11,7 @@ 4.4 WEB_SITE="https://www.memtest.org/" 4.5 WGET_URL="${WEB_SITE}download/archives/$VERSION/$TARBALL" 4.6 4.7 -BUILD_DEPENDS="xz" 4.8 +BUILD_DEPENDS="xz lz4 lzsa" 4.9 4.10 # What is the latest version available today? 4.11 current_version() 4.12 @@ -20,19 +20,38 @@ 4.13 sed '/tar.gz"/!d;s|.*memtest86.-||;s|.tar.*||;q' 4.14 } 4.15 4.16 +asm() 4.17 +{ 4.18 + cc -o $1.o -Wa,-a=$1.lst -c $1.S 4.19 + objcopy --only-section=.text -O binary $1.o $1.bin 4.20 +} 4.21 + 4.22 tune_lzma() 4.23 { 4.24 - cp $stuff/*.S $stuff/pack . 4.25 - sed "s/VERSION/$VERSION/;s|lzma1=|&nice=$1,|" -i pack 4.26 - while [ -n "$2" ]; do 4.27 - sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S 4.28 - shift 2 4.29 + file=$1 4.30 + shift 4.31 + for i in lzma lz4 lzsa1 ; do 4.32 + cp $stuff/*.S $stuff/packx . 4.33 + sed "s/VERSION/$VERSION/;s|lzma1=|&nice=${1:-64},|" -i packx 4.34 + while [ -n "$2" ]; do 4.35 + sed "s|^#define PROP_$2 .*|#define PROP_$2 $3|" -i unlzma.S 4.36 + shift 2 4.37 + done 4.38 + sed -i "s|uncompress|un$i|" unpackx.S 4.39 + asm bootloader 4.40 + asm unpackx 4.41 + cp packx packx.bak 4.42 + ./packx --build bootloader.bin unpackx.bin 4.43 + PACKER=$i ./packx $file $file.$i 4.44 + if [ $(stat -c %s $file.$i) -ge $((0x101F0)) ]; then 4.45 + rm $file.$i 4.46 + cp packx.bak packx 4.47 + sed -e "s|^#define FLAT16.*// lzma case|#define FLAT16 0 // $i|" -i unpackx.S 4.48 + asm unpackx 4.49 + ./packx --build bootloader.bin unpackx.bin 4.50 + PACKER=$i ./packx $file $file.$i 4.51 + fi 4.52 done 4.53 - for i in bootloader unpack ; do 4.54 - cc -o $i.o -Wa,-a=$i.lst -c $i.S 4.55 - objcopy --only-section=.text -O binary $i.o $i.bin 4.56 - done 4.57 - ./pack --build bootloader.bin unpack.bin 4.58 } 4.59 4.60 # Rules to configure and make the package. 4.61 @@ -46,16 +65,15 @@ 4.62 patch -p1 < $i 4.63 done 4.64 make 4.65 - tune_lzma 218,mf=bt2 LC 2 4.66 - ./pack memtest.bin memtest.packed 4.67 mv memtest.bin memtest.bin.console 4.68 + tune_lzma memtest.bin.console 218,mf=bt2 LC 2 4.69 sed -i -e 's/SERIAL_CONSOLE_DEFAULT 0/SERIAL_CONSOLE_DEFAULT 1/' \ 4.70 -e 's/SERIAL_BAUD_RATE 9600/SERIAL_BAUD_RATE 115200/' config.h 4.71 make clean 4.72 make 4.73 - tune_lzma 179,mf=bt3 LC 2 4.74 - ./pack memtest.bin memtest.packed-115200 4.75 mv memtest.bin memtest.bin.serial 4.76 + tune_lzma memtest.bin.serial 179,mf=bt3 LC 2 4.77 + cp memtest.bin.serial.lzma memtest.packed-115200 4.78 } 4.79 4.80 4.81 @@ -65,7 +83,7 @@ 4.82 mkdir -p $fs/boot $install/usr/share/doc 4.83 cp $src/README* $install/usr/share/doc 4.84 cp $src/FAQ $install/usr/share/doc 4.85 - cp $src/memtest.packed $fs/boot/memtest.exe 4.86 + cp $src/memtest.bin.console.lzma $fs/boot/memtest.exe 4.87 } 4.88 4.89 # Pre and post install commands for Tazpkg.
5.1 --- a/memtest/stuff/unlz4.S Fri Nov 04 08:52:47 2022 +0000 5.2 +++ b/memtest/stuff/unlz4.S Tue Nov 15 16:20:54 2022 +0000 5.3 @@ -1,20 +1,36 @@ 5.4 -/* 5.5 - * Lz4Decode: 5.6 +// Lz4Decode: 5.7 #ifndef FLAT32 5.8 - * input ds:si=inStream, es:di=outStream 5.9 - * output outStream[], ds:si, es:di 5.10 +// input ds:si=inStream, es:di=outStream 5.11 +// output outStream[], ds:si, es:di 5.12 .code16 5.13 +#define AX %ax 5.14 +#define BX %bx 5.15 +#define CX %cx 5.16 +#define SI %si 5.17 +#define DI %di 5.18 #else 5.19 - * input esi=inStream, edi=outStream 5.20 - * output outStream[], esi, edi 5.21 +// input esi=inStream, edi=outStream 5.22 +// output outStream[], ds:esi, es:edi 5.23 .code32 5.24 +#define AX %eax 5.25 +#define BX %ebx 5.26 +#define CX %ecx 5.27 +#define SI %esi 5.28 +#define DI %edi 5.29 #endif 5.30 - */ 5.31 5.32 #define ARCHIVE_MAGICNUMBER 0x184C2102 5.33 5.34 +//#define PARANOIA // cover rare cases, optional 5.35 + 5.36 lz4main: 5.37 +#ifdef PARANOIA 5.38 cld 5.39 +# if !defined(FLAT32) && !defined(FLAT16OUT) 5.40 + xorl %cx, %cx 5.41 + call lz4mov 5.42 +# endif 5.43 +#endif 5.44 lodsl // get chunkSize 5.45 cmpl $ARCHIVE_MAGICNUMBER, %eax 5.46 je lz4main 5.47 @@ -23,48 +39,75 @@ 5.48 xchgl %eax, %edx 5.49 lz4chunk: // uncompress chunk 5.50 lodsb // get token 5.51 - decl %edx 5.52 - movzbl %al, %ebx 5.53 + movb %al, %bl 5.54 shrb $4, %al 5.55 call lz4len // get literal length, %eax < 255 5.56 - incl %ecx 5.57 - stc 5.58 - sbbl %ecx, %edx 5.59 - pushf 5.60 + subl %ecx, %edx // count literal 5.61 + subl $1+2, %edx // count token & string address 5.62 +#if !defined(FLAT32) && !defined(FLAT16OUT) 5.63 + pushf 5.64 call lz4mov // copy literals 5.65 popf 5.66 - js lz4main 5.67 +#else 5.68 + rep movsb 5.69 +#endif 5.70 + jle lz4main 5.71 lodsw // get string address 5.72 -#ifndef FLAT32 5.73 - pushw %bx 5.74 - movw %di, %bx 5.75 - subl %eax, %ebx 5.76 - popw %ax 5.77 + xchgw %ax, %bx 5.78 call lz4len // get string length 5.79 + add $4, CX 5.80 +#if !defined(FLAT32) && !defined(FLAT16OUT) 5.81 pushw %ds 5.82 pushw %si 5.83 - pushw %es 5.84 - popw %ds 5.85 - movw $0xF, %si 5.86 - andw %bx, %si 5.87 - shrl $4, %ebx 5.88 - addl $4+1, %ecx 5.89 - movw %bx, %bp 5.90 - call lz4mov2 // copy string 5.91 + movw %di, %si 5.92 + subw %bx, %si 5.93 + movw %es, %ax 5.94 + jnc axok 5.95 + subb $0x10, %ah 5.96 +axok: 5.97 + movw %ax, %ds 5.98 + call lz4mov // copy string 5.99 popw %si 5.100 popw %ds 5.101 #else 5.102 - negl %eax 5.103 - xchgl %eax, %ebx 5.104 - addl %edi, %ebx 5.105 - call lz4len // get string length 5.106 - pushl %esi 5.107 - xchgl %ebx, %esi 5.108 - call lz4mov // copy string 5.109 - popl %esi 5.110 + xchg AX, SI 5.111 + mov DI, SI 5.112 + sub BX, SI 5.113 + rep movsb %es(SI), %es(DI) 5.114 + xchg AX, SI 5.115 #endif 5.116 jmp lz4chunk 5.117 5.118 +#if !defined(FLAT32) && !defined(FLAT16OUT) 5.119 +# if defined(PARANOIA) 5.120 +lz4movlp: 5.121 + xchgw %ax, %cx 5.122 + movw $0x3C00, %cx 5.123 + rep movsl 5.124 + xchgw %ax, %cx 5.125 + sub $0xF0, %ch 5.126 +# endif 5.127 +lz4mov: 5.128 + movw %di, %ax 5.129 + andw $0xF, %di 5.130 + shrw $4, %ax 5.131 + movw %es, %bp 5.132 + addw %ax, %bp 5.133 + movw %bp, %es 5.134 + movw %si, %ax 5.135 + andw $0xF, %si 5.136 + shrw $4, %ax 5.137 + movw %ds, %bp 5.138 + addw %ax, %bp 5.139 + movw %bp, %ds 5.140 +# if defined(PARANOIA) 5.141 + cmp $0xFF, %ch // catch FFFX case 5.142 + jz lz4movlp 5.143 +# endif 5.144 + rep movsb 5.145 + ret 5.146 +#endif 5.147 + 5.148 lz4len: // get length in %ecx 5.149 andl $0xF, %eax 5.150 movl %eax, %ecx 5.151 @@ -73,33 +116,9 @@ 5.152 lz4len2: 5.153 lodsb 5.154 decl %edx // remaining chunk size 5.155 - addl %eax, %ecx 5.156 + addw %ax, %cx 5.157 cmpb $0xFF, %al 5.158 je lz4len2 5.159 lz4quit: 5.160 ret 5.161 5.162 -lz4movlp: 5.163 - movsb 5.164 -#ifndef FLAT32 5.165 - movw $0x800, %bp 5.166 - orw %di, %di 5.167 - jns lz4di 5.168 - subw $0x8000, %di 5.169 - movw %es, %ax 5.170 - addw %bp, %ax 5.171 - movw %ax, %es 5.172 -lz4di: 5.173 - orw %si, %si 5.174 - jns lz4si 5.175 - subw $0x8000, %si 5.176 -lz4mov2: 5.177 - movw %ds, %ax 5.178 - addw %bp, %ax 5.179 - movw %ax, %ds 5.180 -lz4si: 5.181 -#endif 5.182 -lz4mov: 5.183 - decl %ecx 5.184 - jnz lz4movlp 5.185 - ret
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/memtest/stuff/unlzsa1.S Tue Nov 15 16:20:54 2022 +0000 6.3 @@ -0,0 +1,183 @@ 6.4 +// Lzsa1Decode: 6.5 +#ifndef FLAT32 6.6 +// input ds:si=inStream, es:di=outStream 6.7 +// output outStream[], ds:si, es:di 6.8 + .code16 6.9 +#define AX %ax 6.10 +#define BX %bx 6.11 +#define SI %si 6.12 +#define DI %di 6.13 +#else 6.14 +// input esi=inStream, edi=outStream 6.15 +// output outStream[], ds:esi, es:edi 6.16 + .code32 6.17 +#define AX %eax 6.18 +#define BX %ebx 6.19 +#define SI %esi 6.20 +#define DI %edi 6.21 +#endif 6.22 + 6.23 +MATCH_RUN_LEN = 15 6.24 +LITERALS_RUN_LEN = 7 6.25 +MIN_MATCH_SIZE = 3 6.26 +MIN_LITERALS_SIZE = 0 6.27 + 6.28 +#define PACKED_ONLY // assume no copy block, optional 6.29 +//#define PARANOIA // cover rare cases, optional 6.30 + 6.31 +lzsa1main: 6.32 +#ifdef PARANOIA 6.33 + cld 6.34 +#endif 6.35 +#ifndef RAW_FORMAT 6.36 +# if defined(PARANOIA) && !defined(FLAT32) && !defined(FLAT16) 6.37 + xorw %cx, %cx 6.38 + call normalize 6.39 +# endif 6.40 + lodsw 6.41 + cmpw $0x9E7B, %ax // magic 6.42 + jne lzsa1main 6.43 + lodsb 6.44 + cmpb $0, %al // lzsa1 6.45 + jne lzsa1main 6.46 +lzsa1block: // uncompress chunk 6.47 + lodsw // block size 6.48 + xchgw %ax, %cx 6.49 + lodsb 6.50 +# ifndef PACKED_ONLY 6.51 + orb %al, %al 6.52 + jns lzsa1compressed 6.53 +# if !defined(FLAT32) && !defined(FLAT16OUT) 6.54 + movw %cx, %dx 6.55 + andb $0x7F, %ch 6.56 + andw $0x8000, %dx 6.57 +copy32k: 6.58 + call lzsa1movStr 6.59 + xchg %dx, %cx 6.60 + incw %cx 6.61 + loop copy32k 6.62 +# else 6.63 + movsb // copy block 6.64 +copylp: 6.65 + movsb // copy block 6.66 + loop copylp // handle 64K case 6.67 +# endif 6.68 + jmp lzsa1block 6.69 +lzsa1compressed: 6.70 + jne lzsa1chunk // 64Kb block 6.71 +# endif 6.72 + jcxz lzsa1quit // bail if we hit EOD 6.73 + movw %cx, %dx 6.74 +# if !defined(FLAT32) && !defined(FLAT16) 6.75 + xorw %cx, %cx 6.76 + call normalize 6.77 +# endif 6.78 + addw %si, %dx 6.79 +#endif 6.80 +lzsa1chunk: // uncompress chunk 6.81 + lodsb // get token O|LLL|MMMM 6.82 + movb %al, %bl // keep token in bl 6.83 + shrb $4, %al // shift literals length into place 6.84 + movw $LITERALS_RUN_LEN*256+MIN_LITERALS_SIZE, %cx 6.85 + call lzsa1len // %ch = LITERALS_RUN_LEN 6.86 +#if !defined(FLAT32) && !defined(FLAT16OUT) 6.87 + call lzsa1movLit // copy %cx literals from %ds:%si to %es:%di 6.88 +#else 6.89 + rep movsb // copy %cx literals from %ds:%si to %es:%di 6.90 +#endif 6.91 +#ifndef RAW_FORMAT 6.92 + cmpw %dx, %si 6.93 + jae lzsa1block // bail if we hit EOD 6.94 +#endif 6.95 +#ifdef FLAT32 6.96 + orl $-1, %eax 6.97 +#else 6.98 + movb $-1, %ah 6.99 +#endif 6.100 + testb %bl, %bl // check match offset size in token (O bit) 6.101 + jns lzsa1ShortOfs 6.102 + lodsw 6.103 + .byte 0x3C // mask lodsb with cmpb $0xAC, %al 6.104 +lzsa1ShortOfs: 6.105 + lodsb 6.106 +#ifdef RAW_FORMAT 6.107 + orw %ax, %ax 6.108 + jz lzsa1quit // bail if we hit EOD 6.109 +#endif 6.110 + xchg AX, BX // %bx: match offset %ax: original token 6.111 + movw $MATCH_RUN_LEN*256+MIN_MATCH_SIZE, %cx 6.112 + call lzsa1len 6.113 +#if !defined(FLAT32) && !defined(FLAT16OUT) 6.114 + pushw %ds 6.115 + pushw %si 6.116 + movw %di, %si 6.117 + addw %bx, %si 6.118 + movw %es, %ax 6.119 + jc dxok 6.120 + subb $0x10, %ah 6.121 +dxok: 6.122 + movw %ax, %ds 6.123 + call lzsa1movStr // copy string 6.124 + popw %si 6.125 + popw %ds 6.126 +#else 6.127 + xchg AX, SI // save %si 6.128 + lea (BX,DI), SI 6.129 + rep movsb %es:(SI), %es:(DI) 6.130 + xchg AX, SI // restore %si 6.131 +#endif 6.132 + jmp lzsa1chunk 6.133 + 6.134 +lzsa1len: // get length in %ecx 6.135 + andb %ch, %al 6.136 + cbw // clear %ah 6.137 + cmpb %al, %ch 6.138 + jne lzsa1minNumber // S=0-6, L=0-14 6.139 + lodsb 6.140 + addb %cl, %ch 6.141 + addb %ch, %al 6.142 + jnc lzsa1gotNumber // 0-255 6.143 + movb %al, %ah // S=256-1791, L=256-3839 or S=256-511, L=256-511 6.144 + jne lzsa1midNumber 6.145 + lodsw // 0-65535 6.146 + .byte 0x3C // mask lodsb with cmpb $0xAC, %al 6.147 +lzsa1midNumber: 6.148 + lodsb 6.149 +lzsa1gotNumber: 6.150 + xchgw %ax, %cx 6.151 +lzsa1quit: 6.152 + ret 6.153 +lzsa1minNumber: 6.154 + addb %cl, %al 6.155 + xchgw %ax, %cx 6.156 + ret 6.157 + 6.158 +#if !defined(FLAT32) && !defined(FLAT16OUT) 6.159 +# if defined(PARANOIA) 6.160 +lzsa1movlp: 6.161 + decw %ch 6.162 + rep movsb 6.163 + incw %ch 6.164 +# endif 6.165 +normalize: 6.166 +lzsa1movStr: 6.167 + movw %si, %ax 6.168 + andw $0xF, %si 6.169 + shrw $4, %ax 6.170 + movw %ds, %bp 6.171 + addw %ax, %bp 6.172 + movw %bp, %ds 6.173 +lzsa1movLit: 6.174 + movw %di, %ax 6.175 + andw $0xF, %di 6.176 + shrw $4, %ax 6.177 + movw %es, %bp 6.178 + addw %ax, %bp 6.179 + movw %bp, %es 6.180 +# if defined(PARANOIA) 6.181 + cmpb $0xFF, %ch // catch FFFX case 6.182 + je lzsa1movlp 6.183 +# endif 6.184 + rep movsb 6.185 + ret 6.186 +#endif
7.1 --- a/splix/receipt Fri Nov 04 08:52:47 2022 +0000 7.2 +++ b/splix/receipt Tue Nov 15 16:20:54 2022 +0000 7.3 @@ -6,7 +6,7 @@ 7.4 MAINTAINER="jozee@slitaz.org" 7.5 LICENSE="GPL2" 7.6 SHORT_DESC="CUPS drivers for SPL (Samsung Printer Language) printers" 7.7 -WEB_SITE="http://splix.ap2c.org/" 7.8 +WEB_SITE="https://sourceforge.net/projects/splix/" 7.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 7.10 WGET_URL="$SF_MIRROR/splix/$TARBALL" 7.11 TAGS=""
8.1 --- a/xerces-c/receipt Fri Nov 04 08:52:47 2022 +0000 8.2 +++ b/xerces-c/receipt Tue Nov 15 16:20:54 2022 +0000 8.3 @@ -9,20 +9,22 @@ 8.4 WEB_SITE="https://xerces.apache.org/xerces-c/" 8.5 8.6 TARBALL="$PACKAGE-$VERSION.tar.gz" 8.7 -WGET_URL="https://apache.org/dist/xerces/c/${VERSION%%.*}/sources/$TARBALL" 8.8 +WGET_URL="https://github.com/apache/xerces-c/archive/v$VERSION.tar.gz" 8.9 8.10 DEPENDS="gcc-lib-base glibc-base icu libcrypto libcurl" 8.11 +BUILD_DEPENDS="automake" 8.12 8.13 # What is the latest version available today? 8.14 current_version() 8.15 { 8.16 - wget -O - $WEB_SITE 2>/dev/null | \ 8.17 - sed '/available/!d;s|.*sion ||;s| is .*||;q' 8.18 + wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \ 8.19 + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' 8.20 } 8.21 8.22 # Rules to configure and make the package. 8.23 compile_rules() 8.24 { 8.25 + ./reconf 8.26 ./configure $CONFIGURE_ARGS && 8.27 make $MAKEFLAGS && 8.28 make install
9.1 --- a/zlib-dev/receipt Fri Nov 04 08:52:47 2022 +0000 9.2 +++ b/zlib-dev/receipt Tue Nov 15 16:20:54 2022 +0000 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="zlib-dev" 9.7 -VERSION="1.2.12" 9.8 +VERSION="1.2.13" 9.9 CATEGORY="development" 9.10 SHORT_DESC="Zlib compression library devel files." 9.11 MAINTAINER="pankso@slitaz.org"
10.1 --- a/zlib/receipt Fri Nov 04 08:52:47 2022 +0000 10.2 +++ b/zlib/receipt Tue Nov 15 16:20:54 2022 +0000 10.3 @@ -1,7 +1,7 @@ 10.4 # SliTaz package receipt. 10.5 10.6 PACKAGE="zlib" 10.7 -VERSION="1.2.12" 10.8 +VERSION="1.2.13" 10.9 CATEGORY="base-system" 10.10 SHORT_DESC="Compression library" 10.11 MAINTAINER="pankso@slitaz.org" 10.12 @@ -15,6 +15,7 @@ 10.13 DEPENDS="glibc-base" 10.14 BUILD_DEPENDS="" 10.15 10.16 +# What is the latest version available today? 10.17 current_version() 10.18 { 10.19 wget -O - $WEB_SITE 2>/dev/null | \