wok-current rev 25463
Up expat (2.4.9) fixes CVE-2022-40674
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Sep 29 20:05:23 2022 +0000 (2022-09-29) |
parents | 1c1cd9e8b715 |
children | f234d4e2fdbd |
files | BootProg/stuff/boot16.asm BootProg/stuff/boot32.asm BootProg/stuff/bootex.asm BootProg/stuff/bootprog.sh expat-dev/receipt expat/receipt memtest/receipt |
line diff
1.1 --- a/BootProg/stuff/boot16.asm Wed Sep 28 10:52:41 2022 +0000 1.2 +++ b/BootProg/stuff/boot16.asm Thu Sep 29 20:05:23 2022 +0000 1.3 @@ -674,9 +674,8 @@ 1.4 ;; Name of the file to load and run ;; 1.5 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1.6 1.7 -ProgramName db "STARTUP BIN" ; name and extension each must be 1.8 - times (510-($-$$)) db ' ' ; padded with spaces (11 bytes total) 1.9 -NameLength equ $-ProgramName 1.10 +NameLength equ 11 1.11 +ProgramName times NameLength db 0 ; name and extension 1.12 1.13 ;;;;;;;;;;;;;;;;;;;;;;;;;; 1.14 ;; End of the sector ID ;;
2.1 --- a/BootProg/stuff/boot32.asm Wed Sep 28 10:52:41 2022 +0000 2.2 +++ b/BootProg/stuff/boot32.asm Thu Sep 29 20:05:23 2022 +0000 2.3 @@ -556,9 +556,8 @@ 2.4 ;; Name of the file to load and run ;; 2.5 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 2.6 2.7 -ProgramName db "STARTUP BIN" ; name and extension each must be 2.8 - times (510-($-$$)) db ' ' ; padded with spaces (11 bytes total) 2.9 -NameLength equ $-ProgramName 2.10 +NameLength equ 11 2.11 +ProgramName times NameLength db 0 ; name and extension 2.12 2.13 ;;;;;;;;;;;;;;;;;;;;;;;;;; 2.14 ;; End of the sector ID ;;
3.1 --- a/BootProg/stuff/bootex.asm Wed Sep 28 10:52:41 2022 +0000 3.2 +++ b/BootProg/stuff/bootex.asm Thu Sep 29 20:05:23 2022 +0000 3.3 @@ -501,8 +501,8 @@ 3.4 ;; Name of the file to load and run ;; 3.5 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 3.6 3.7 -ProgramName db "startup.bin" ; name and extension 3.8 -NameLength equ $-ProgramName 3.9 +NameLength equ 11 3.10 +ProgramName times NameLength db 0 ; name and extension 3.11 3.12 ;;;;;;;;;;;;;;;;;;;;;;;;;; 3.13 ;; End of the sector ID ;;
4.1 --- a/BootProg/stuff/bootprog.sh Wed Sep 28 10:52:41 2022 +0000 4.2 +++ b/BootProg/stuff/bootprog.sh Thu Sep 29 20:05:23 2022 +0000 4.3 @@ -1,18 +1,19 @@ 4.4 #!/bin/sh 4.5 4.6 +set -- "$1" "${2:-startup.bin}" 4.7 [ ! -e "$1" ] && cat<<S && exit 2 4.8 -Usage: [FAT=<FAT12|FAT16|FAT32|EXFAT>] $0 device [file] 4.9 -Example: $0 /dev/fd0 STARTUP.BIN 4.10 +Usage: [FS=<FAT12|FAT16|FAT32|EXFAT>] $0 device [file] 4.11 +Example: $0 /dev/fd0 $2 4.12 S 4.13 r="dd if=$1 count" 4.14 w="dd of=$1 bs=1 conv=notrunc seek" 4.15 while read c o b f 4.16 -do [ "${FAT:-$($r=5 bs=1 skip=$c)}" = "$f" ] || continue 4.17 +do [ "${FS:-$($r=5 bs=1 skip=$c)}" = "$f" ] || continue 4.18 echo "Install $f bootsector on $1." 4.19 for a in "$o skip=$((o+b)) count=$((512-o))" "0 skip=$b count=11" 4.20 do sed '1,/^exit/d' $0 | unlzma | $w=$a; done 4.21 echo -n $f | $w=$c 4.22 - [ "$2" ] && echo "Set boot file '$2'" && echo -n "$2" | case "$f" in 4.23 + echo "Set boot file $2" && echo -n "$2" | case "$f" in 4.24 E*) sed 's| |.|;s| ||g' | cat - /dev/zero;; 4.25 *) tr a-z A-Z | sed 's|\.| |;s|^\(.\{8\}\) *|\1|;s|$| |' 4.26 esac | $w=499 count=11
5.1 --- a/expat-dev/receipt Wed Sep 28 10:52:41 2022 +0000 5.2 +++ b/expat-dev/receipt Thu Sep 29 20:05:23 2022 +0000 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="expat-dev" 5.7 -VERSION="2.4.6" 5.8 +VERSION="2.4.9" 5.9 CATEGORY="development" 5.10 SHORT_DESC="XML parsing library development files." 5.11 MAINTAINER="pankso@slitaz.org"
6.1 --- a/expat/receipt Wed Sep 28 10:52:41 2022 +0000 6.2 +++ b/expat/receipt Thu Sep 29 20:05:23 2022 +0000 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="expat" 6.7 -VERSION="2.4.6" 6.8 +VERSION="2.4.9" 6.9 CATEGORY="x-window" 6.10 SHORT_DESC="XML parsing C library." 6.11 MAINTAINER="pankso@slitaz.org"