# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1573509476 -3600
# Node ID e7373d3e08188d285ac80788467ea0474b2831b0
# Parent  16a651b0377488217df7290eb5e962ba9d743724
Up chkrootkit (0.53)

diff -r 16a651b03774 -r e7373d3e0818 chkrootkit/receipt
--- a/chkrootkit/receipt	Mon Nov 11 17:53:05 2019 +0100
+++ b/chkrootkit/receipt	Mon Nov 11 22:57:56 2019 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="chkrootkit"
-VERSION="0.52"
+VERSION="0.53"
 CATEGORY="security"
 SHORT_DESC="Locally checks for signs of a rootkit."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -23,6 +23,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/chkrootkit
+	cp $stuff/spectre-meltdown-checker.sh $fs/usr/share/chkrootkit
 	for i in $(cd $src ; ls); do
 		case "$i" in
 		README*) cp $src/$i $fs/usr/share/chkrootkit;;
diff -r 16a651b03774 -r e7373d3e0818 chkrootkit/stuff/spectre-meltdown-checker.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chkrootkit/stuff/spectre-meltdown-checker.sh	Mon Nov 11 22:57:56 2019 +0100
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+wget -qO /tmp/$$.zip https://github.com/speed47/spectre-meltdown-checker/archive/master.zip
+unzip -q /tmp/$$.zip -d /tmp
+mv /tmp/spectre-meltdown-checker-master/spectre-meltdown-checker.sh /bin
+rm -rf /tmp/spectre-meltdown-checker /tmp/$$.zip
+/bin/spectre-meltdown-checker.sh
diff -r 16a651b03774 -r e7373d3e0818 linld/stuff/src/A20.ASM
--- a/linld/stuff/src/A20.ASM	Mon Nov 11 17:53:05 2019 +0100
+++ b/linld/stuff/src/A20.ASM	Mon Nov 11 22:57:56 2019 +0100
@@ -118,7 +118,8 @@
 		test	[_cpu386],cl
 		jne	@bzimage
 		mov	bx,offset bzimage86
-		jmp	godie
+@godie:
+		call	near die
 @zimage:
 		xchg	ax,dx
 		cmp	ax,cx
@@ -142,7 +143,7 @@
 		endif
 		mov	cl,12
 		shl	dx,cl
-		jc	@overflow
+		jc	@jbe_overflow
 @bzimage:
 		extrn	_topseg:near
 		call	near _topseg
@@ -186,16 +187,19 @@
 		and	ch,[_vcpi]
 		endif
 		add	dh,ch		; room for malloc_bufv_or_die
-		cmp	dx,ax
-		jb	@nooverflow
-@overflow:
+		cmp	ax,dx
+		les	cx,[bx-4]	; rm size
+		mov	si,es		; rm data
+@jbe_overflow:
 ; Oops! We can stomp on our toes... better stop now
 		mov	bx,offset overflow
-godie:
+		ifdef	NO386
+		jbe	@godie
+		else
+		ja	@nooverflow
 		call	near die
 @nooverflow:
-		les	cx,[bx-4]	; rm size
-		mov	si,es		; rm data
+		endif
 		mov	es,ax
 @@move_clear:
 		movsb
diff -r 16a651b03774 -r e7373d3e0818 linld/stuff/src/_END.ASM
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linld/stuff/src/_END.ASM	Mon Nov 11 22:57:56 2019 +0100
@@ -0,0 +1,27 @@
+;***************************************************************
+;****** This file is distributed under GPL
+;***************************************************************
+                ideal
+                %crefref
+                %noincl
+                %nomacs
+                p386
+
+        segment _TEXT byte public use16 'CODE'
+        global  _text_end:byte
+        label   _text_end byte
+        ends    _TEXT
+
+        segment _DATA byte public use16 'DATA'
+        global  _data_end:byte
+        label   _data_end byte
+        ends    _DATA
+
+        segment _BSS byte public use16 'BSS'
+        global  _bss_end:byte
+        label   _bss_end byte
+        ends    _BSS
+
+        end
+
+;###### END OF FILE ############################################
diff -r 16a651b03774 -r e7373d3e0818 linld/stuff/src/pipehole.awk
--- a/linld/stuff/src/pipehole.awk	Mon Nov 11 17:53:05 2019 +0100
+++ b/linld/stuff/src/pipehole.awk	Mon Nov 11 22:57:56 2019 +0100
@@ -169,7 +169,6 @@
 			sub(/mov	dx,/,"les	dx,d")
 		}
 		sub(/,ax/,",es")
-		if (/,dx/) isload=0
 		if (/add	ax,word ptr/) $0="	add	ax,cx"
 		if (/i\+29\],0/) {
 			sub(/,0$/,"")