# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1664481923 0
# Node ID 81fc994927a629de5c50c3fd08f1bfbbd2190c9c
# Parent  1c1cd9e8b715236f5df7f5751541e2727d227775
Up expat (2.4.9) fixes CVE-2022-40674

diff -r 1c1cd9e8b715 -r 81fc994927a6 BootProg/stuff/boot16.asm
--- a/BootProg/stuff/boot16.asm	Wed Sep 28 10:52:41 2022 +0000
+++ b/BootProg/stuff/boot16.asm	Thu Sep 29 20:05:23 2022 +0000
@@ -674,9 +674,8 @@
 ;; Name of the file to load and run ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-ProgramName     db      "STARTUP BIN"   ; name and extension each must be
-                times (510-($-$$)) db ' ' ; padded with spaces (11 bytes total)
-NameLength      equ     $-ProgramName
+NameLength      equ   11
+ProgramName     times NameLength db 0   ; name and extension
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; End of the sector ID ;;
diff -r 1c1cd9e8b715 -r 81fc994927a6 BootProg/stuff/boot32.asm
--- a/BootProg/stuff/boot32.asm	Wed Sep 28 10:52:41 2022 +0000
+++ b/BootProg/stuff/boot32.asm	Thu Sep 29 20:05:23 2022 +0000
@@ -556,9 +556,8 @@
 ;; Name of the file to load and run ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-ProgramName     db      "STARTUP BIN"   ; name and extension each must be
-                times (510-($-$$)) db ' ' ; padded with spaces (11 bytes total)
-NameLength      equ     $-ProgramName
+NameLength      equ   11
+ProgramName     times NameLength db 0   ; name and extension
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; End of the sector ID ;;
diff -r 1c1cd9e8b715 -r 81fc994927a6 BootProg/stuff/bootex.asm
--- a/BootProg/stuff/bootex.asm	Wed Sep 28 10:52:41 2022 +0000
+++ b/BootProg/stuff/bootex.asm	Thu Sep 29 20:05:23 2022 +0000
@@ -501,8 +501,8 @@
 ;; Name of the file to load and run ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-ProgramName     db      "startup.bin"   ; name and extension
-NameLength      equ     $-ProgramName
+NameLength      equ   11
+ProgramName     times NameLength db 0   ; name and extension
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; End of the sector ID ;;
diff -r 1c1cd9e8b715 -r 81fc994927a6 BootProg/stuff/bootprog.sh
--- a/BootProg/stuff/bootprog.sh	Wed Sep 28 10:52:41 2022 +0000
+++ b/BootProg/stuff/bootprog.sh	Thu Sep 29 20:05:23 2022 +0000
@@ -1,18 +1,19 @@
 #!/bin/sh
 
+set -- "$1" "${2:-startup.bin}"
 [ ! -e "$1" ] && cat<<S && exit 2
-Usage: [FAT=<FAT12|FAT16|FAT32|EXFAT>] $0 device [file]
-Example: $0 /dev/fd0 STARTUP.BIN
+Usage: [FS=<FAT12|FAT16|FAT32|EXFAT>] $0 device [file]
+Example: $0 /dev/fd0 $2
 S
 r="dd if=$1 count"
 w="dd of=$1 bs=1 conv=notrunc seek"
 while read c o b f
-do	[ "${FAT:-$($r=5 bs=1 skip=$c)}" = "$f" ] || continue
+do	[ "${FS:-$($r=5 bs=1 skip=$c)}" = "$f" ] || continue
 	echo "Install $f bootsector on $1."
 	for a in "$o skip=$((o+b)) count=$((512-o))" "0 skip=$b count=11"
 	do sed '1,/^exit/d' $0 | unlzma | $w=$a; done
 	echo -n $f | $w=$c
-	[ "$2" ] && echo "Set boot file '$2'" && echo -n "$2" | case "$f" in
+	echo "Set boot file $2" && echo -n "$2" | case "$f" in
 	E*)	sed 's| |.|;s| ||g' | cat - /dev/zero;;
 	*)	tr a-z A-Z | sed 's|\.|       |;s|^\(.\{8\}\) *|\1|;s|$|   |'
 	esac | $w=499 count=11
diff -r 1c1cd9e8b715 -r 81fc994927a6 expat-dev/receipt
--- a/expat-dev/receipt	Wed Sep 28 10:52:41 2022 +0000
+++ b/expat-dev/receipt	Thu Sep 29 20:05:23 2022 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="expat-dev"
-VERSION="2.4.6"
+VERSION="2.4.9"
 CATEGORY="development"
 SHORT_DESC="XML parsing library development files."
 MAINTAINER="pankso@slitaz.org"
diff -r 1c1cd9e8b715 -r 81fc994927a6 expat/receipt
--- a/expat/receipt	Wed Sep 28 10:52:41 2022 +0000
+++ b/expat/receipt	Thu Sep 29 20:05:23 2022 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="expat"
-VERSION="2.4.6"
+VERSION="2.4.9"
 CATEGORY="x-window"
 SHORT_DESC="XML parsing C library."
 MAINTAINER="pankso@slitaz.org"
diff -r 1c1cd9e8b715 -r 81fc994927a6 memtest/receipt
--- a/memtest/receipt	Wed Sep 28 10:52:41 2022 +0000
+++ b/memtest/receipt	Thu Sep 29 20:05:23 2022 +0000
@@ -13,6 +13,7 @@
 
 BUILD_DEPENDS="xz"
 
+# What is the latest version available today?
 current_version()
 {
 	wget -O - $WEB_SITE 2>/dev/null | \