wok rev 25492
Up foomatic-db (4.0-20221117)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Fri Nov 18 09:54:27 2022 +0000 (2022-11-18) |
| parents | 32f22d8fdc89 |
| children | e9e2e1c1770c |
| files | foomatic-db-nonfree/receipt foomatic-db/receipt memtest/stuff/pack memtest/stuff/unlz4.S memtest/stuff/unlzsa1.S memtest/stuff/unlzsa2.S memtest/stuff/unpack.S |
line diff
1.1 --- a/foomatic-db-nonfree/receipt Thu Nov 17 12:13:24 2022 +0000 1.2 +++ b/foomatic-db-nonfree/receipt Fri Nov 18 09:54:27 2022 +0000 1.3 @@ -8,7 +8,7 @@ 1.4 LICENSE="other" 1.5 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.6 WEB_SITE="http://www.linuxprinting.org/foomatic.html" 1.7 -WGET_URL="https://www.openprinting.org/download/foomatic/$TARBALL" 1.8 +WGET_URL="https://web.archive.org/web/20221117121727/https://www.openprinting.org/download/foomatic/$TARBALL" 1.9 TAGS="printer driver printing" 1.10 1.11 DEPENDS="perl libxml2 foomatic-db" 1.12 @@ -17,7 +17,7 @@ 1.13 # What is the latest version available today? 1.14 current_version() 1.15 { 1.16 - wget -O - ${WGET_URL%/*} 2>/dev/null | \ 1.17 + wget -O - https://www.openprinting.org/download/foomatic/ 2>/dev/null | \ 1.18 sed "/latest/d;/$PACKAGE-[0-9]/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q 1.19 } 1.20
2.1 --- a/foomatic-db/receipt Thu Nov 17 12:13:24 2022 +0000 2.2 +++ b/foomatic-db/receipt Fri Nov 18 09:54:27 2022 +0000 2.3 @@ -1,14 +1,14 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="foomatic-db" 2.7 -VERSION="4.0-20221114" 2.8 +VERSION="4.0-20221117" 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" 2.12 LICENSE="GPL2" 2.13 TARBALL="$PACKAGE-$VERSION.tar.xz" 2.14 WEB_SITE="http://www.linuxprinting.org/foomatic.html" 2.15 -WGET_URL="https://www.openprinting.org/download/foomatic/$TARBALL" 2.16 +WGET_URL="https://web.archive.org/web/20221118084846/https://www.openprinting.org/download/foomatic/$TARBALL" 2.17 TAGS="printer driver printing" 2.18 2.19 DEPENDS="ghostscript perl libxml2" 2.20 @@ -17,7 +17,7 @@ 2.21 # What is the latest version available today? 2.22 current_version() 2.23 { 2.24 - wget -O - ${WGET_URL%/*} 2>/dev/null | \ 2.25 + wget -O - https://www.openprinting.org/download/foomatic/ 2>/dev/null | \ 2.26 sed "/current/d;/latest/d;/$PACKAGE-[0-9]/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*|\\1|" | sort -Vr | sed q 2.27 } 2.28
3.1 --- a/memtest/stuff/pack Thu Nov 17 12:13:24 2022 +0000 3.2 +++ b/memtest/stuff/pack Fri Nov 18 09:54:27 2022 +0000 3.3 @@ -46,9 +46,9 @@ 3.4 compress() 3.5 { 3.6 case "$PACKER" in 3.7 - lz4) lz4 -l --best ;; 3.8 - lzsa1) cat > /tmp/in$$ ; lzsa -f1 /tmp/in$$ /tmp/out$$ ; cat /tmp/out$$ ; rm -f /tmp/in$$ /tmp/out$$ ;; 3.9 - lzsa2) cat > /tmp/in$$ ; lzsa -f2 /tmp/in$$ /tmp/out$$ ; cat /tmp/out$$ ; rm -f /tmp/in$$ /tmp/out$$ ;; 3.10 + lz4) lz4 -l --best | tail -c +5 ;; 3.11 + lzsa1) cat > /tmp/in$$ ; lzsa -f1 /tmp/in$$ /tmp/out$$ ; tail -c +4 /tmp/out$$ ; rm -f /tmp/in$$ /tmp/out$$ ;; 3.12 + lzsa2) cat > /tmp/in$$ ; lzsa -f2 /tmp/in$$ /tmp/out$$ ; tail -c +4 /tmp/out$$ ; rm -f /tmp/in$$ /tmp/out$$ ;; 3.13 *) xz -z -e --format=raw --lzma1=lc=$(bits LC),lp=$(bits LP),pb=$(bits PB) --stdout 3.14 esac 3.15 }
4.1 --- a/memtest/stuff/unlz4.S Thu Nov 17 12:13:24 2022 +0000 4.2 +++ b/memtest/stuff/unlz4.S Fri Nov 18 09:54:27 2022 +0000 4.3 @@ -32,8 +32,10 @@ 4.4 # endif 4.5 #endif 4.6 lodsl // get chunkSize 4.7 +#ifndef NO_LZ4_HEADER 4.8 cmpl $ARCHIVE_MAGICNUMBER, %eax 4.9 je lz4main 4.10 +#endif 4.11 orl %eax, %eax // end of file ? 4.12 je lz4quit 4.13 xchgl %eax, %edx
5.1 --- a/memtest/stuff/unlzsa1.S Thu Nov 17 12:13:24 2022 +0000 5.2 +++ b/memtest/stuff/unlzsa1.S Fri Nov 18 09:54:27 2022 +0000 5.3 @@ -34,12 +34,14 @@ 5.4 xorw %cx, %cx 5.5 call normalize 5.6 # endif 5.7 +# ifndef NO_LZSA1_HEADER 5.8 lodsw 5.9 cmpw $0x9E7B, %ax // magic 5.10 jne lzsa1main 5.11 lodsb 5.12 cmpb $0, %al // lzsa1 5.13 jne lzsa1main 5.14 +# endif 5.15 lzsa1block: // uncompress chunk 5.16 lodsw // block size 5.17 xchgw %ax, %cx
6.1 --- a/memtest/stuff/unlzsa2.S Thu Nov 17 12:13:24 2022 +0000 6.2 +++ b/memtest/stuff/unlzsa2.S Fri Nov 18 09:54:27 2022 +0000 6.3 @@ -36,12 +36,14 @@ 6.4 xorw %cx, %cx 6.5 call normalize 6.6 # endif 6.7 +# ifndef NO_LZSA2_HEADER 6.8 lodsw 6.9 cmpw $0x9E7B, %ax // magic 6.10 jne lzsa2main 6.11 lodsb 6.12 testb $0x20, %al // lzsa2 6.13 je lzsa2main 6.14 +# endif 6.15 lzsa2block: // uncompress chunk 6.16 # if !defined(FLAT32) && !defined(FLAT16) 6.17 xorw %cx, %cx 6.18 @@ -78,15 +80,11 @@ 6.19 xorw %cx, %cx 6.20 call normalize 6.21 addw %si, %dx 6.22 - xchgw %ax, %dx 6.23 # else 6.24 - movw %si, %ax 6.25 - addw %cx, %ax 6.26 + movw %si, %dx 6.27 + addw %cx, %dx 6.28 # endif 6.29 - call nothing 6.30 -nothing: 6.31 - popw %bx 6.32 - movw %ax, %cs:maxsi+2-nothing(%bx) 6.33 + shll $16, %edx 6.34 #else 6.35 # if !defined(FLAT16) 6.36 xorw %cx, %cx 6.37 @@ -112,7 +110,8 @@ 6.38 #endif 6.39 #ifndef RAW_FORMAT 6.40 maxsi: 6.41 - cmpw $0x1234, %si 6.42 + shld $16, %edx, %eax 6.43 + cmpw %ax, %si 6.44 jae lzsa2block // bail if we hit EOD 6.45 #endif 6.46 #ifdef FLAT32 6.47 @@ -121,20 +120,18 @@ 6.48 movb $-1, %ah // set offset bits 15-8 to 1 6.49 #endif 6.50 // XYZ 6.51 - movb %bl, %al 6.52 - testb $0xC0, %al // check match offset mode in token (X bit) 6.53 + testb $0xC0, %bl // check match offset mode in token (X bit) 6.54 + bt $5, %bx // move bit 5 to carry 6.55 js rep_match_or_large_offset 6.56 jne offset_9_bit 6.57 // 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. 6.58 // set bits 5-15 of the offset to 1. 6.59 - cmpb $0x20, %al // test bit 5 6.60 call getByteFromNibble 6.61 jmp get_match_length 6.62 offset_9_bit: 6.63 // 01Z 9-bit offset: read a byte for offset bits 0-7 and use the inverted bit Z for bit 8 of the offset. 6.64 // set bits 9-15 of the offset to 1. 6.65 - cmpb $0x60, %al // test bit 5 (knowing that bit 6 is also set) 6.66 - adcb %ah, %ah // clear bit 8 if Z bit is clear 6.67 + sbbb %cl, %ah // clear bit 8 if Z bit is clear 6.68 jmp get_match_length_0 6.69 6.70 getNibble: 6.71 @@ -154,13 +151,11 @@ 6.72 //10Z 13-bit offset: read a nibble for offset bits 9-12 and use the inverted bit Z for bit 8 of the offset, 6.73 // then read a byte for offset bits 0-7. set bits 13-15 of the offset to 1. 6.74 // substract 512 from the offset to get the final value. 6.75 - cmpb $0xA0, %al // test bit 5 (knowing that bit 7 is also set) 6.76 call getByteFromNibble 6.77 subb $2, %al // substract 512 6.78 jmp get_match_length_1 6.79 rep_match_or_16_bit: 6.80 - testb $0x20, %al // test bit Z (offset bit 8) 6.81 - jne repeat_match // rep-match 6.82 + jc repeat_match // rep-match 6.83 //110 16-bit offset: read a byte for offset bits 8-15, then another byte for offset bits 0-7. 6.84 lodsb // Get 2-byte match offset 6.85 get_match_length_1: 6.86 @@ -204,7 +199,7 @@ 6.87 call getNibble // get nibble for offset bits 0-3 6.88 popfw 6.89 rclb $1, %al 6.90 - orb $0xE0, %al // set offset bits 7-5 to 1 6.91 + xorb $0xE1, %al // set offset bits 7-5 to 1 6.92 ret 6.93 6.94 lzsa2len: // get length in %ecx 6.95 @@ -224,8 +219,7 @@ 6.96 jnc lzsa2gotNumber // 0-255 6.97 #if 0 6.98 je lzsa2BigNumber 6.99 - movb $-1, %ah 6.100 - subb %al, %ah // S=-256-767, L=-256-1791 6.101 + movb %al, %ah // S=256-767, L=256-1791 6.102 lodsb 6.103 .byte 0xB1 // mask lodsb with movb $0xAD, %cl 6.104 lzsa2BigNumber:
7.1 --- a/memtest/stuff/unpack.S Thu Nov 17 12:13:24 2022 +0000 7.2 +++ b/memtest/stuff/unpack.S Fri Nov 18 09:54:27 2022 +0000 7.3 @@ -271,6 +271,9 @@ 7.4 7.5 unpack: 7.6 #define NO_LZMA_HEADER 7.7 +#define NO_LZSA2_HEADER 7.8 +#define NO_LZSA1_HEADER 7.9 +#define NO_LZ4_HEADER 7.10 #if ELKS 7.11 #define ONLY8086 1 7.12 #endif