# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1683927309 0
# Node ID 64471e67874e052c901f365d6578613128fc86f3
# Parent  3a856211222e19f9a0323cf696f98daa42c300b0
BootProg: fix boot16.asm

diff -r 3a856211222e -r 64471e67874e BootProg/receipt
--- a/BootProg/receipt	Fri May 12 21:18:30 2023 +0100
+++ b/BootProg/receipt	Fri May 12 21:35:09 2023 +0000
@@ -26,7 +26,7 @@
 	{
 		sed "1,2d;s|FAT32SZ|$(stat -c %s boot32.bin)|" $stuff/bootprog.sh
 		cat ${bs// /.bin }.bin
-	} | xz -z --format=lzma --lzma1=lc=0,pb=0,nice=100,dict=4k >> bootprog
+	} | xz -z --format=lzma --lzma1=lc=0,pb=0,nice=33,dict=4k >> bootprog
 	chmod +x bootprog
 }
 
diff -r 3a856211222e -r 64471e67874e BootProg/stuff/boot16.asm
--- a/BootProg/stuff/boot16.asm	Fri May 12 21:18:30 2023 +0100
+++ b/BootProg/stuff/boot16.asm	Fri May 12 21:35:09 2023 +0000
@@ -11,7 +11,7 @@
 ;;                                                                          ;;
 ;;                                 Features:                                ;;
 ;;                                 ~~~~~~~~~                                ;;
-;; - FAT12 and FAT16 supported using BIOS int 13h function 42h or 02h.      ;;
+;; - FAT12 and/or FAT16 supported using BIOS int 13h function 42h or 02h.   ;;
 ;;                                                                          ;;
 ;; - Loads a 16-bit executable file in the MS-DOS .COM or .EXE format       ;;
 ;;   from the root directory of a disk and transfers control to it          ;;
@@ -31,7 +31,8 @@
 ;; - Need a up to date field bpbHiddenSectors to work in a partition ;      ;;
 ;;   most formatters don't update it correcly in extended partitions.       ;;
 ;;                                                                          ;;
-;; - Partition must fit in the first 8GB disk for CHS reads.                ;;
+;; - Partition must fit in the first 8GB disk of the for CHS reads.         ;;
+;;   (or 2TB for LBA reads).                                                ;;
 ;;                                                                          ;;
 ;;                                                                          ;;
 ;;                                Known Bugs:                               ;;
@@ -93,10 +94,10 @@
 %define bx(label)       bx+label-boot
 %define si(label)       si+label-boot
 NullEntryCheck          equ     1               ; +2 bytes
-ReadRetry               equ     1               ; +9/+10 bytes
-LBAsupport              equ     1               ; +16 bytes
+ReadRetry               equ     1               ; +9/+13 bytes
+LBAsupport              equ     1               ; +18 bytes
 CHSsanityCheck          equ     1               ; +12/+16 bytes 
-GeometryCheck           equ     1               ; +18 bytes
+GeometryCheck           equ     1               ; +20 bytes
 CheckAttrib             equ     0               ; +6 bytes
 WaitForKey              equ     0               ; +5 bytes
 SectorOf512Bytes        equ     0               ; -4/-6 bytes
@@ -210,7 +211,7 @@
 
 %if GeometryCheck != 0
  %if ((main-boot) & 3Fh) != 0
-        xchg    ax, cx                  ; ax & 3Fh == 0
+        xor     cx, cx
  %endif
         mov     ah, 8                   ; update AX,BL,CX,DX,DI, and ES registers
         int     13h                     ; may destroy SI,BP, and DS registers
@@ -597,18 +598,19 @@
         dec     bx
         push    di
 %endif
+        mov     si, sp
 
         xchg    ax, cx                  ; save low LBA
         xchg    ax, dx                  ; get high LBA
         cwd                             ; clear dx (LBA offset <1TB)
         idiv    word [bx(bpbSectorsPerTrack)] ; up to 8GB disks
 
- %if CHSsanityCheck != 0
+%if CHSsanityCheck != 0
         inc     ax
         cmp     ax, [bx(bpbHeadsPerCylinder)]
         ja      CHSoverflow
         dec     ax
- %endif
+%endif
         xchg    ax, cx                  ; restore low LBA, save high LBA / SPT
         idiv    word [bx(bpbSectorsPerTrack)]
                 ; ax = LBA / SPT
@@ -637,16 +639,13 @@
  %endif
 %endif
 CHSoverflow:
-        mov     dl, [bx(DriveNumber)]
-                ; dl = drive no.
-        mov     si, sp
-%if CHSsanityCheck != 0
- %if ReadRetry != 0 || LBAsupport != 0
+%if CHSsanityCheck != 0 && (ReadRetry != 0 || LBAsupport != 0)
         pushf
- %endif
 %endif
 
 ReadSectorRetry:
+        mov     dl, [bx(DriveNumber)]
+                ; dl = drive no.
 %if LBAsupport != 0
         mov     ah, 42h                 ; ah = 42h = extended read function no.
         int     13h                     ; extended read sectors (DL, DS:SI)
diff -r 3a856211222e -r 64471e67874e BootProg/stuff/boot32.asm
--- a/BootProg/stuff/boot32.asm	Fri May 12 21:18:30 2023 +0100
+++ b/BootProg/stuff/boot32.asm	Fri May 12 21:35:09 2023 +0000
@@ -91,13 +91,13 @@
 ClusterMask             equ     1               ; +9 bytes
 NullEntryCheck          equ     1               ; +5 bytes
 CheckAttrib             equ     1               ; +6 bytes
-NonMirroredFATs         equ     1               ; +18 bytes
-ReadRetry               equ     1               ; +7 bytes
-LBA48bits               equ     1               ; +15 bytes
-CHSsupport              equ     1               ; +27 bytes max 8GB
-CHSgeometryCheck        equ     1               ; +18 bytes
-CHSsanityCheck          equ     1               ; +5 bytes 
-SectorOf512Bytes        equ     0               ; -5 bytes
+NonMirroredFATs         equ     1               ; +20 bytes
+ReadRetry               equ     1               ; +6/7 bytes
+LBA48bits               equ     1               ; +10 bytes
+CHSsupport              equ     1               ; +35 bytes max 8GB
+CHSgeometryCheck        equ     1               ; +20 bytes
+CHSsanityCheck          equ     1               ; +9 bytes 
+SectorOf512Bytes        equ     0               ; -4 bytes
 Always2FATs             equ     0               ; -4 bytes
 WaitForKey              equ     0               ; +5 bytes
 
diff -r 3a856211222e -r 64471e67874e BootProg/stuff/bootex.asm
--- a/BootProg/stuff/bootex.asm	Fri May 12 21:18:30 2023 +0100
+++ b/BootProg/stuff/bootex.asm	Fri May 12 21:35:09 2023 +0000
@@ -78,10 +78,10 @@
 
 %define bx(label)       bx+label-boot
 %define si(label)       si+label-boot
-NullEntryCheck          equ     1               ; +3 bytes
-ReadRetry               equ     1               ; +8 bytes
-SectorOf512Bytes        equ     0               ; -11 bytes
-CheckAttrib             equ     0               ; +18 bytes
+NullEntryCheck          equ     1               ; +3/5 bytes
+ReadRetry               equ     1               ; +7 bytes
+SectorOf512Bytes        equ     0               ; -12 bytes
+CheckAttrib             equ     0               ; +16/18 bytes
 WaitForKey              equ     0               ; +5 bytes
 TfatSupport             equ     1               ; +10 bytes
 CheckLBAsupport         equ     0               ; +11/21 bytes
diff -r 3a856211222e -r 64471e67874e ddd/receipt
--- a/ddd/receipt	Fri May 12 21:18:30 2023 +0100
+++ b/ddd/receipt	Fri May 12 21:35:09 2023 +0000
@@ -8,7 +8,8 @@
 LICENSE="GPL3"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/ddd/"
-WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+#WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+WGET_URL="https://fossies.org/linux/misc/old/$TARBALL"
 TAGS="debugger"
 
 DEPENDS="glibc-base gcc-lib-base ncurses freetype zlib util-linux-uuid \
@@ -19,7 +20,7 @@
 # What is the latest version available today?
 current_version()
 {
-	wget -O - ${WGET_URL%/*} 2>/dev/null | \
+	wget -O - $GNU_MIRROR/$PACKAGE/ 2>/dev/null | \
 	sed "/latest/d;/$PACKAGE-/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*\".*|\\1|" | sort -Vr | sed q
 }
 
diff -r 3a856211222e -r 64471e67874e qbittorrent/receipt
--- a/qbittorrent/receipt	Fri May 12 21:18:30 2023 +0100
+++ b/qbittorrent/receipt	Fri May 12 21:35:09 2023 +0000
@@ -6,7 +6,7 @@
 SHORT_DESC="A BitTorrent client in Qt4."
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="https://www.qbittorrent.org/"
+WEB_SITE="https://github.com/qbittorrent/qBittorrent"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 3a856211222e -r 64471e67874e xinput-calibrator/receipt
--- a/xinput-calibrator/receipt	Fri May 12 21:18:30 2023 +0100
+++ b/xinput-calibrator/receipt	Fri May 12 21:35:09 2023 +0000
@@ -9,7 +9,7 @@
 SOURCE="xinput_calibrator"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/xinput_calibrator/"
-WGET_URL="https://github.com/downloads/tias/xinput_calibrator/$TARBALL"
+WGET_URL="https://github.com/tias/xinput_calibrator/archive/refs/tags/v$SOURCE.tar.gz"
 HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libX11"