# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1650727720 0
# Node ID e197a1539e2e36493eaa1181d9a8bff84c82e0b9
# Parent  17a0bbb74ccd7eaa360b4bf3fe5cfbbf5e809dff
*/stuff/bootloader.S: add CHK_DOS_INT19

diff -r 17a0bbb74ccd -r e197a1539e2e BootProg/stuff/bootex.asm
--- a/BootProg/stuff/bootex.asm	Sat Apr 23 15:05:31 2022 +0100
+++ b/BootProg/stuff/bootex.asm	Sat Apr 23 15:28:40 2022 +0000
@@ -169,7 +169,7 @@
         pop     ds
 
         xor     ebx, ebx
-        mov     [bx], dx                ; store BIOS boot drive number
+        mov     [bx], dl                ; store BIOS boot drive number
 
         mov     esi, [bx(bpbRootDirCluster)] ; esi=cluster # of root dir
 
@@ -213,7 +213,7 @@
         mov     al, [es:di+bx]
         mov     [bx], al
         dec     bx
-        jnz     CopyInfo
+        jnz     CopyInfo		; keep BIOS boot drive number
 
 NotFileInfo:
         mov     al, 0c1h                ; EXFAT_ENTRY_FILE_NAME ?
@@ -232,7 +232,7 @@
         popf                            ; restore carry="not last sector" flag
         jc      RootDirReadContinue     ; continue to the next root dir cluster
 FindNameFailed:                         ; end of root directory (dir end reached)
-        mov     dx, [bx]                ; restore BIOS boot drive number
+        mov     dl, [bx]                ; restore BIOS boot drive number
         call    Error
         db      "File not found."
 FindNameFound:
@@ -252,7 +252,7 @@
         call    ReadCluster             ; read one more sector of the boot file
         sub     [bx+FileSize], ebp
         ja      FileReadContinue
-        mov     dx, [bx]                ; restore BIOS boot drive number
+        mov     dl, [bx]                ; restore BIOS boot drive number
         xor     ax, ax
         pop     bp
 
@@ -370,11 +370,10 @@
 
         mov     esi, [es:si]                    ; esi=next cluster #
 
-        xor     eax, eax
-        inc     ax
+        inc     dx
         mov     cl, [bx(bpbSectorPerClusterBits)]
-        shl     eax, cl                         ; 10000h max (32MB cluster)
-        xchg    eax, ecx
+        shl     edx, cl                         ; 10000h max (32MB cluster)
+        mov     ecx, edx
         xchg    eax, edi                        ; get cluster #-2
         mul     ecx
 
@@ -408,18 +407,19 @@
         push    es
         push    bx
         push    bp                      ; sector count word = 1
-        push    byte 16                 ; packet size byte = 16, reserved byte = 0
+        mov     cx, 16
+        push    cx                      ; packet size byte = 16, reserved byte = 0
 ReadSectorRetry:        
         mov     si, sp
         mov     ah, 42h                 ; ah = 42h = extended read function no.
-        mov     dx, [bx]                ; restore BIOS boot drive number
+        mov     dl, [bx]                ; restore BIOS boot drive number
         int     13h                     ; extended read sectors (DL, DS:SI)
 
         jnc     ReadSuccess
 
         xor     ax, ax
         int     13h                     ; reset drive (DL)
-        loop    ReadSectorRetry         ; sector count retries (8 .. 65536)
+        loop    ReadSectorRetry         ; up to 16 retries
 
         call    Error
         db      "Read error."
diff -r 17a0bbb74ccd -r e197a1539e2e firehol/receipt
--- a/firehol/receipt	Sat Apr 23 15:05:31 2022 +0100
+++ b/firehol/receipt	Sat Apr 23 15:28:40 2022 +0000
@@ -6,7 +6,7 @@
 SHORT_DESC="A firewall for humans..."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://firehol.org/"
+WEB_SITE="https://github.com/firehol/firehol/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/firehol/firehol/releases/download/v$VERSION/$TARBALL"
diff -r 17a0bbb74ccd -r e197a1539e2e ipxe/stuff/bootloader.S
--- a/ipxe/stuff/bootloader.S	Sat Apr 23 15:05:31 2022 +0100
+++ b/ipxe/stuff/bootloader.S	Sat Apr 23 15:28:40 2022 +0000
@@ -23,13 +23,14 @@
 #define  BUGGY_CMDLINE		verify cmdline length		+2
 #define  VCPI			VCPI 4.0 support (386+)		+109
 #define  SHUTDOWNDOS		shutdown DOS services		+29
+#define   CHK_DOS_INT19		do not trace bios		+12/13
 
 /* some contraints to reduce the code size */
 //#define FLOPPY_1440K_ONLY	1.44M floppies support only	-26
-//#define FLOPPY_HAS_2_SIDES	hardcoded heads count to 2	-15
+#define FLOPPY_HAS_2_SIDES	hardcoded heads count to 2	-15
 //#define NO_CMDLINE_SHRINK	remove heading spaces ?		-6-21
 //#define  NO_CMDLINE_FILE	remove @cmdline file support ?	-21
-#define NO_DOTS			show progression dots ?		-5
+//#define NO_DOTS		show progression dots ?		-5
 #ifndef BZIMAGE
 //#define TINY_ZIMAGE		system < 64Kb ?			-11
 //#define NO_MINSETUP		default setup (dos only) ?	-4
@@ -74,6 +75,16 @@
 #ifdef ONLY8086
 	xorw	%si, %si
 	movw	%si, %ds
+# ifdef CHK_DOS_INT19
+	cmpb	$0xF0, 4*0x19+3(%si)
+	jne	stepit
+	popaw
+	pushw	%es
+	movw	$movesys, %si
+	pushw	%si
+	retf
+stepit:
+# endif
 	pushw	4+2(%si)
 	pushw	4(%si)
 	movw	$step19, 4(%si)
@@ -82,6 +93,15 @@
 	pushl	$4
 	popw	%si
 	popw	%ds
+# ifdef CHK_DOS_INT19
+	cmpb	$0xF0, 4*0x19+3-4(%si)
+	jne	stepit
+	popaw
+	pushw	%es
+	pushw	$movesys
+	retf
+stepit:
+# endif
 	pushl	(%si)
 	movl	$step19+(INITSEG<<16), (%si)
 #endif
@@ -90,7 +110,11 @@
 	incb	%ah			# set TF
 	pushw	%ax
 	popfw
+#ifdef ONLY8086
+	ljmp	*4*0x19(%si)
+#else
 	ljmp	*4*0x19-4(%si)
+#endif
 .endm
 
 stacktop	= 0x9E00		# in 0x8000 .. 0xA000
@@ -442,7 +466,6 @@
 # ifdef SHUTDOWNDOS
 	trace_int19
 # else
-	lssw	%cs:EXEADRS(saved_ss_sp),%sp	
 	popaw
 	retf
 # endif
@@ -649,10 +672,6 @@
 	.word	0x03FF
 idt_base:
 	.long	0
-# ifndef SHUTDOWNDOS
-saved_ss_sp:
-	.word	stacktop-4-16-4,INITSEG
-# endif
 #endif
 #ifdef ELKS
 	.org	0x1E3
diff -r 17a0bbb74ccd -r e197a1539e2e memtest-serial/receipt
--- a/memtest-serial/receipt	Sat Apr 23 15:05:31 2022 +0100
+++ b/memtest-serial/receipt	Sat Apr 23 15:28:40 2022 +0000
@@ -7,8 +7,8 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.memtest.org/"
+WANTED="memtest"
 PROVIDE="memtest"
-WANTED="memtest"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 17a0bbb74ccd -r e197a1539e2e memtest/stuff/bootloader.S
--- a/memtest/stuff/bootloader.S	Sat Apr 23 15:05:31 2022 +0100
+++ b/memtest/stuff/bootloader.S	Sat Apr 23 15:28:40 2022 +0000
@@ -23,13 +23,14 @@
 #define  BUGGY_CMDLINE		verify cmdline length		+2
 #define  VCPI			VCPI 4.0 support (386+)		+109
 #define  SHUTDOWNDOS		shutdown DOS services		+29
+#define   CHK_DOS_INT19		do not trace bios		+12/13
 
 /* some contraints to reduce the code size */
 //#define FLOPPY_1440K_ONLY	1.44M floppies support only	-26
 //#define FLOPPY_HAS_2_SIDES	hardcoded heads count to 2	-15
 //#define NO_CMDLINE_SHRINK	remove heading spaces ?		-6-21
 //#define  NO_CMDLINE_FILE	remove @cmdline file support ?	-21
-//#define NO_DOTS		show progression dots ?		-5
+#define NO_DOTS			show progression dots ?		-5
 #ifndef BZIMAGE
 //#define TINY_ZIMAGE		system < 64Kb ?			-11
 //#define NO_MINSETUP		default setup (dos only) ?	-4
@@ -74,6 +75,16 @@
 #ifdef ONLY8086
 	xorw	%si, %si
 	movw	%si, %ds
+# ifdef CHK_DOS_INT19
+	cmpb	$0xF0, 4*0x19+3(%si)
+	jne	stepit
+	popaw
+	pushw	%es
+	movw	$movesys, %si
+	pushw	%si
+	retf
+stepit:
+# endif
 	pushw	4+2(%si)
 	pushw	4(%si)
 	movw	$step19, 4(%si)
@@ -82,6 +93,15 @@
 	pushl	$4
 	popw	%si
 	popw	%ds
+# ifdef CHK_DOS_INT19
+	cmpb	$0xF0, 4*0x19+3-4(%si)
+	jne	stepit
+	popaw
+	pushw	%es
+	pushw	$movesys
+	retf
+stepit:
+# endif
 	pushl	(%si)
 	movl	$step19+(INITSEG<<16), (%si)
 #endif
@@ -90,7 +110,11 @@
 	incb	%ah			# set TF
 	pushw	%ax
 	popfw
+#ifdef ONLY8086
+	ljmp	*4*0x19(%si)
+#else
 	ljmp	*4*0x19-4(%si)
+#endif
 .endm
 
 stacktop	= 0x9E00		# in 0x8000 .. 0xA000
@@ -442,7 +466,6 @@
 # ifdef SHUTDOWNDOS
 	trace_int19
 # else
-	lssw	%cs:EXEADRS(saved_ss_sp),%sp	
 	popaw
 	retf
 # endif
@@ -649,10 +672,6 @@
 	.word	0x03FF
 idt_base:
 	.long	0
-# ifndef SHUTDOWNDOS
-saved_ss_sp:
-	.word	stacktop-4-16-4,INITSEG
-# endif
 #endif
 #ifdef ELKS
 	.org	0x1E3
diff -r 17a0bbb74ccd -r e197a1539e2e mk-livestatus/receipt
--- a/mk-livestatus/receipt	Sat Apr 23 15:05:31 2022 +0100
+++ b/mk-livestatus/receipt	Sat Apr 23 15:28:40 2022 +0000
@@ -6,7 +6,8 @@
 SHORT_DESC="Nagios status broker module."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://mathias-kettner.de/cms_livestatus.html"
+#WEB_SITE="https://mathias-kettner.de/cms_livestatus.html"
+WEB_SITE="https://github.com/tribe29/checkmk/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://mathias-kettner.de/download/$TARBALL"
diff -r 17a0bbb74ccd -r e197a1539e2e plop/stuff/bootloader.S
--- a/plop/stuff/bootloader.S	Sat Apr 23 15:05:31 2022 +0100
+++ b/plop/stuff/bootloader.S	Sat Apr 23 15:28:40 2022 +0000
@@ -23,6 +23,7 @@
 #define  BUGGY_CMDLINE		verify cmdline length		+2
 #define  VCPI			VCPI 4.0 support (386+)		+109
 #define  SHUTDOWNDOS		shutdown DOS services		+29
+#define   CHK_DOS_INT19		do not trace bios		+12/13
 
 /* some contraints to reduce the code size */
 //#define FLOPPY_1440K_ONLY	1.44M floppies support only	-26
@@ -74,6 +75,16 @@
 #ifdef ONLY8086
 	xorw	%si, %si
 	movw	%si, %ds
+# ifdef CHK_DOS_INT19
+	cmpb	$0xF0, 4*0x19+3(%si)
+	jne	stepit
+	popaw
+	pushw	%es
+	movw	$movesys, %si
+	pushw	%si
+	retf
+stepit:
+# endif
 	pushw	4+2(%si)
 	pushw	4(%si)
 	movw	$step19, 4(%si)
@@ -82,6 +93,15 @@
 	pushl	$4
 	popw	%si
 	popw	%ds
+# ifdef CHK_DOS_INT19
+	cmpb	$0xF0, 4*0x19+3-4(%si)
+	jne	stepit
+	popaw
+	pushw	%es
+	pushw	$movesys
+	retf
+stepit:
+# endif
 	pushl	(%si)
 	movl	$step19+(INITSEG<<16), (%si)
 #endif
@@ -90,7 +110,11 @@
 	incb	%ah			# set TF
 	pushw	%ax
 	popfw
+#ifdef ONLY8086
+	ljmp	*4*0x19(%si)
+#else
 	ljmp	*4*0x19-4(%si)
+#endif
 .endm
 
 stacktop	= 0x9E00		# in 0x8000 .. 0xA000
@@ -442,7 +466,6 @@
 # ifdef SHUTDOWNDOS
 	trace_int19
 # else
-	lssw	%cs:EXEADRS(saved_ss_sp),%sp	
 	popaw
 	retf
 # endif
@@ -649,10 +672,6 @@
 	.word	0x03FF
 idt_base:
 	.long	0
-# ifndef SHUTDOWNDOS
-saved_ss_sp:
-	.word	stacktop-4-16-4,INITSEG
-# endif
 #endif
 #ifdef ELKS
 	.org	0x1E3
diff -r 17a0bbb74ccd -r e197a1539e2e prelink/receipt
--- a/prelink/receipt	Sat Apr 23 15:05:31 2022 +0100
+++ b/prelink/receipt	Sat Apr 23 15:28:40 2022 +0000
@@ -6,7 +6,7 @@
 SHORT_DESC="ELF prelinking utility to speed up dynamic linking"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL"
-WEB_SITE="http://people.redhat.com/jakub/prelink/"
+WEB_SITE="https://people.redhat.com/jakub/prelink/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://people.redhat.com/jakub/$PACKAGE/$TARBALL"