wok rev 25505
Up bzip3 (1.2.2)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon Feb 06 16:45:49 2023 +0000 (15 months ago) |
| parents | 7f7bd3c9775e |
| children | 4e9ceb6fdd28 |
| files | bzip3/receipt grub4dos/receipt memtest/stuff/pack memtest/stuff/unlzsa1.S memtest/stuff/unlzsa2.S plop/stuff/pack plop/stuff/unlzsa1.S plop/stuff/unlzsa2.S |
line diff
1.1 --- a/bzip3/receipt Sun Feb 05 09:28:51 2023 +0000 1.2 +++ b/bzip3/receipt Mon Feb 06 16:45:49 2023 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="bzip3" 1.7 -VERSION="1.1.4" 1.8 +VERSION="1.2.2" 1.9 CATEGORY="utilities" 1.10 TAGS="compression archive" 1.11 SHORT_DESC="High-quality data compressor."
2.1 --- a/grub4dos/receipt Sun Feb 05 09:28:51 2023 +0000 2.2 +++ b/grub4dos/receipt Mon Feb 06 16:45:49 2023 +0000 2.3 @@ -31,7 +31,7 @@ 2.4 sed -i 's/\[ .grub-probe.*\]/mount | grep $grubdir | grep -q xfs/' \ 2.5 util/grub-install.in 2.6 sed -i 's|-O binary conftest|--only-section=.text &|' acinclude.m4 configure 2.7 - sed -i 's|-O binary|--only-section=.text &|' stage?/Makefile* 2.8 + sed -i 's|-O binary |&-R .note -R .comment -R .note.gnu.build-id |' stage?/Makefile* 2.9 sed -i 's|-Wl,-Ttext|-Wl,--section-start=.note.gnu.property=1000 &|' stage2/Makefile* 2.10 sh ./configure CC=gcc-3 \ 2.11 --enable-preset-menu=$stuff/menu.lst \
3.1 --- a/memtest/stuff/pack Sun Feb 05 09:28:51 2023 +0000 3.2 +++ b/memtest/stuff/pack Mon Feb 06 16:45:49 2023 +0000 3.3 @@ -26,6 +26,8 @@ 3.4 [ -n "$x" ] && sed -i "s/| compress /&& 2 /" $0 3.5 x=$(grep -s update_code32_start$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') 3.6 [ -n "$x" ] && sed -i '/XXXU2/d; s| XXXU1||' $0 || sed -i '/XXXU1/d; s| XXXU2||' $0 3.7 + x=$(grep -s lzsa.block$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') 3.8 + [ -n "$x" ] && sed -i 's| XXXR||' $0 || sed -i 's| XXXR| -r|;s|tail -c +4|cat|' $0 3.9 grep -q BFF401 ${2/.bin/.lst} && sed -i 's/512 skip/500 skip/;s/1000 -/&32 - /' $0 3.10 grep -q 83C60D ${2/.bin/.lst} && sed -i 's/ | dd bs=1 skip=13//' $0 3.11 helpmsg=$(grep -s helpmsg$ ${1/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') 3.12 @@ -62,8 +64,8 @@ 3.13 { 3.14 case "$PACKER" in 3.15 lz4) lz4 -l --best | tail -c +5 ;; 3.16 - lzsa1) cat > /tmp/in$$$1 ; lzsa -f1 /tmp/in$$$1 /tmp/out$$$1 ; tail -c +4 /tmp/out$$$1 ; rm -f /tmp/in$$$1 /tmp/out$$$1 ;; 3.17 - lzsa2) cat > /tmp/in$$$1 ; lzsa -f2 /tmp/in$$$1 /tmp/out$$$1 ; tail -c +4 /tmp/out$$$1 ; rm -f /tmp/in$$$1 /tmp/out$$$1 ;; 3.18 + lzsa1) cat > /tmp/in$$$1 ; lzsa XXXR -f1 /tmp/in$$$1 /tmp/out$$$1 ; tail -c +4 /tmp/out$$$1 ; rm -f /tmp/in$$$1 /tmp/out$$$1 ;; 3.19 + lzsa2) cat > /tmp/in$$$1 ; lzsa XXXR -f2 /tmp/in$$$1 /tmp/out$$$1 ; tail -c +4 /tmp/out$$$1 ; rm -f /tmp/in$$$1 /tmp/out$$$1 ;; 3.20 *) xz -z -e --format=raw --lzma1=lc=$(bits LC),lp=$(bits LP),pb=$(bits PB) --stdout 3.21 esac 3.22 }
4.1 --- a/memtest/stuff/unlzsa1.S Sun Feb 05 09:28:51 2023 +0000 4.2 +++ b/memtest/stuff/unlzsa1.S Mon Feb 06 16:45:49 2023 +0000 4.3 @@ -29,6 +29,9 @@ 4.4 #ifdef PARANOIA 4.5 cld 4.6 #endif 4.7 +#ifdef FLAT16OUT 4.8 +#define RAW_FORMAT 4.9 +#endif 4.10 #ifndef RAW_FORMAT 4.11 # if defined(PARANOIA) && !defined(FLAT32) && !defined(FLAT16) 4.12 xorw %cx, %cx 4.13 @@ -64,7 +67,7 @@ 4.14 movsb // copy block 4.15 loop copylp // handle 64K case 4.16 # endif 4.17 - jmp lzsa1block 4.18 + jmp lzsa1block // end of block 4.19 lzsa1compressed: 4.20 jne lzsa1chunk // 64Kb block 4.21 # endif 4.22 @@ -104,13 +107,12 @@ 4.23 .byte 0x3C // mask lodsb with cmpb $0xAC, %al 4.24 lzsa1ShortOfs: 4.25 lodsb 4.26 -#ifdef RAW_FORMAT 4.27 - orw %ax, %ax 4.28 - jz lzsa1quit // bail if we hit EOD 4.29 -#endif 4.30 xchg AX, BX // %bx: match offset %ax: original token 4.31 movw $MATCH_RUN_LEN*256+MIN_MATCH_SIZE, %cx 4.32 call lzsa1len 4.33 +#ifdef RAW_FORMAT 4.34 + jcxz lzsa1quit // bail if we hit EOD 4.35 +#endif 4.36 #if !defined(FLAT32) && !defined(FLAT16OUT) 4.37 pushw %ds 4.38 pushw %si
5.1 --- a/memtest/stuff/unlzsa2.S Sun Feb 05 09:28:51 2023 +0000 5.2 +++ b/memtest/stuff/unlzsa2.S Mon Feb 06 16:45:49 2023 +0000 5.3 @@ -31,6 +31,9 @@ 5.4 #ifdef PARANOIA 5.5 cld 5.6 #endif 5.7 +#ifdef FLAT16OUT 5.8 +#define RAW_FORMAT 5.9 +#endif 5.10 #ifndef RAW_FORMAT 5.11 # if defined(PARANOIA) && !defined(FLAT32) && !defined(FLAT16) 5.12 xorw %cx, %cx 5.13 @@ -70,7 +73,7 @@ 5.14 movsb // copy block 5.15 loop copylp // handle 64K case 5.16 # endif 5.17 - jmp lzsa2block 5.18 + jmp lzsa2block // end of block 5.19 lzsa2compressed: 5.20 jne lzsa2chunk // 64Kb block 5.21 # endif 5.22 @@ -169,7 +172,7 @@ 5.23 movw $MATCH_RUN_LEN+256*MIN_MATCH_SIZE, %cx 5.24 call lzsa2len 5.25 #ifdef RAW_FORMAT 5.26 - jz lzsa2quit // bail if we hit EOD 5.27 + jcxz lzsa2quit // bail if we hit EOD 5.28 #endif 5.29 #if !defined(FLAT32) && !defined(FLAT16OUT) 5.30 pushw %ds
6.1 --- a/plop/stuff/pack Sun Feb 05 09:28:51 2023 +0000 6.2 +++ b/plop/stuff/pack Mon Feb 06 16:45:49 2023 +0000 6.3 @@ -26,6 +26,8 @@ 6.4 [ -n "$x" ] && sed -i "s/| compress /&& 2 /" $0 6.5 x=$(grep -s update_code32_start$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') 6.6 [ -n "$x" ] && sed -i '/XXXU2/d; s| XXXU1||' $0 || sed -i '/XXXU1/d; s| XXXU2||' $0 6.7 + x=$(grep -s lzsa.block$ ${2/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') 6.8 + [ -n "$x" ] && sed -i 's| XXXR||' $0 || sed -i 's| XXXR| -r|;s|tail -c +4|cat|' $0 6.9 grep -q BFF401 ${2/.bin/.lst} && sed -i 's/512 skip/500 skip/;s/1000 -/&32 - /' $0 6.10 grep -q 83C60D ${2/.bin/.lst} && sed -i 's/ | dd bs=1 skip=13//' $0 6.11 helpmsg=$(grep -s helpmsg$ ${1/.bin/.lst}|sed '$!d;s/.*t:\([^ ]*\).*/\1/') 6.12 @@ -62,8 +64,8 @@ 6.13 { 6.14 case "$PACKER" in 6.15 lz4) lz4 -l --best | tail -c +5 ;; 6.16 - lzsa1) cat > /tmp/in$$$1 ; lzsa -f1 /tmp/in$$$1 /tmp/out$$$1 ; tail -c +4 /tmp/out$$$1 ; rm -f /tmp/in$$$1 /tmp/out$$$1 ;; 6.17 - lzsa2) cat > /tmp/in$$$1 ; lzsa -f2 /tmp/in$$$1 /tmp/out$$$1 ; tail -c +4 /tmp/out$$$1 ; rm -f /tmp/in$$$1 /tmp/out$$$1 ;; 6.18 + lzsa1) cat > /tmp/in$$$1 ; lzsa XXXR -f1 /tmp/in$$$1 /tmp/out$$$1 ; tail -c +4 /tmp/out$$$1 ; rm -f /tmp/in$$$1 /tmp/out$$$1 ;; 6.19 + lzsa2) cat > /tmp/in$$$1 ; lzsa XXXR -f2 /tmp/in$$$1 /tmp/out$$$1 ; tail -c +4 /tmp/out$$$1 ; rm -f /tmp/in$$$1 /tmp/out$$$1 ;; 6.20 *) xz -z -e --format=raw --lzma1=lc=$(bits LC),lp=$(bits LP),pb=$(bits PB) --stdout 6.21 esac 6.22 }
7.1 --- a/plop/stuff/unlzsa1.S Sun Feb 05 09:28:51 2023 +0000 7.2 +++ b/plop/stuff/unlzsa1.S Mon Feb 06 16:45:49 2023 +0000 7.3 @@ -29,6 +29,9 @@ 7.4 #ifdef PARANOIA 7.5 cld 7.6 #endif 7.7 +#ifdef FLAT16OUT 7.8 +#define RAW_FORMAT 7.9 +#endif 7.10 #ifndef RAW_FORMAT 7.11 # if defined(PARANOIA) && !defined(FLAT32) && !defined(FLAT16) 7.12 xorw %cx, %cx 7.13 @@ -64,7 +67,7 @@ 7.14 movsb // copy block 7.15 loop copylp // handle 64K case 7.16 # endif 7.17 - jmp lzsa1block 7.18 + jmp lzsa1block // end of block 7.19 lzsa1compressed: 7.20 jne lzsa1chunk // 64Kb block 7.21 # endif 7.22 @@ -104,13 +107,12 @@ 7.23 .byte 0x3C // mask lodsb with cmpb $0xAC, %al 7.24 lzsa1ShortOfs: 7.25 lodsb 7.26 -#ifdef RAW_FORMAT 7.27 - orw %ax, %ax 7.28 - jz lzsa1quit // bail if we hit EOD 7.29 -#endif 7.30 xchg AX, BX // %bx: match offset %ax: original token 7.31 movw $MATCH_RUN_LEN*256+MIN_MATCH_SIZE, %cx 7.32 call lzsa1len 7.33 +#ifdef RAW_FORMAT 7.34 + jcxz lzsa1quit // bail if we hit EOD 7.35 +#endif 7.36 #if !defined(FLAT32) && !defined(FLAT16OUT) 7.37 pushw %ds 7.38 pushw %si
8.1 --- a/plop/stuff/unlzsa2.S Sun Feb 05 09:28:51 2023 +0000 8.2 +++ b/plop/stuff/unlzsa2.S Mon Feb 06 16:45:49 2023 +0000 8.3 @@ -31,6 +31,9 @@ 8.4 #ifdef PARANOIA 8.5 cld 8.6 #endif 8.7 +#ifdef FLAT16OUT 8.8 +#define RAW_FORMAT 8.9 +#endif 8.10 #ifndef RAW_FORMAT 8.11 # if defined(PARANOIA) && !defined(FLAT32) && !defined(FLAT16) 8.12 xorw %cx, %cx 8.13 @@ -70,7 +73,7 @@ 8.14 movsb // copy block 8.15 loop copylp // handle 64K case 8.16 # endif 8.17 - jmp lzsa2block 8.18 + jmp lzsa2block // end of block 8.19 lzsa2compressed: 8.20 jne lzsa2chunk // 64Kb block 8.21 # endif 8.22 @@ -169,7 +172,7 @@ 8.23 movw $MATCH_RUN_LEN+256*MIN_MATCH_SIZE, %cx 8.24 call lzsa2len 8.25 #ifdef RAW_FORMAT 8.26 - jz lzsa2quit // bail if we hit EOD 8.27 + jcxz lzsa2quit // bail if we hit EOD 8.28 #endif 8.29 #if !defined(FLAT32) && !defined(FLAT16OUT) 8.30 pushw %ds