# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1555681961 -7200
# Node ID 094f58ac81837a50b11b2377a33ed48c81c57736
# Parent  d17c8727d1ac0b6630b18e091c520c4b27cc8da7
Up libltdl (2.4.6), mtp-tools (1.1.16)

diff -r d17c8727d1ac -r 094f58ac8183 libltdl/receipt
--- a/libltdl/receipt	Fri Apr 19 11:01:25 2019 +0100
+++ b/libltdl/receipt	Fri Apr 19 15:52:41 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libltdl"
-VERSION="2.4.2"
+VERSION="2.4.6"
 CATEGORY="system-tools"
 SHORT_DESC="The GNU Portable Library Tool."
 MAINTAINER="pankso@slitaz.org"
diff -r d17c8727d1ac -r 094f58ac8183 linld/stuff/src/HIMEM.CPP
--- a/linld/stuff/src/HIMEM.CPP	Fri Apr 19 11:01:25 2019 +0100
+++ b/linld/stuff/src/HIMEM.CPP	Fri Apr 19 15:52:41 2019 +0200
@@ -35,7 +35,21 @@
 }
 
 // Called just before rm->pm
-void last_ditch() {
+void far last_ditch() {
+    asm {
+	cli
+	push	ds
+	push	cs
+	pop	ds
+# ifdef NO386
+	push	ax
+	push	bx
+	push	cx
+	push	dx
+# else
+	pusha
+# endif
+    }
     struct image_himem *m = &pm;
     u32 *q;
     vm2rm();
@@ -85,4 +99,15 @@
             } while(q != m->bufv);
         }
     }
+    asm {
+# ifdef NO386
+	pop	dx
+	pop	cx
+	pop	bx
+	pop	ax
+# else
+	popa
+# endif
+	pop	ds
+    }
 }
diff -r d17c8727d1ac -r 094f58ac8183 linld/stuff/src/JUMP.ASM
--- a/linld/stuff/src/JUMP.ASM	Fri Apr 19 11:01:25 2019 +0100
+++ b/linld/stuff/src/JUMP.ASM	Fri Apr 19 15:52:41 2019 +0200
@@ -159,10 +159,17 @@
 		pushf
 		; finish loading
 		extrn   @last_ditch$qv:near
+		mov	ax,[ss:024Ch]
+		jne	@@notzimage
+@@isipxe:
+		push	cs
 		call	@last_ditch$qv
 		dos_shutdown			; clear di; ds=0
 		push	cs
 		pop	ds
+@@notzimage:
+		xor	ax,2b30h
+		je	@@isipxe
 		popf
 		; self move
 		;cld
diff -r d17c8727d1ac -r 094f58ac8183 linld/stuff/src/LOAD.CPP
--- a/linld/stuff/src/LOAD.CPP	Fri Apr 19 11:01:25 2019 +0100
+++ b/linld/stuff/src/LOAD.CPP	Fri Apr 19 15:52:41 2019 +0200
@@ -186,6 +186,9 @@
     {
         {
 #endif
+	    extern void far last_ditch();
+	    kernelparams->realmode_switch_ofs = (u16) last_ditch;
+	    kernelparams->realmode_switch_seg = _CS;
             pm_high++;
 
             // Hook on int15 to work around fn 88 DOS breakage
diff -r d17c8727d1ac -r 094f58ac8183 mtp-tools/receipt
--- a/mtp-tools/receipt	Fri Apr 19 11:01:25 2019 +0100
+++ b/mtp-tools/receipt	Fri Apr 19 15:52:41 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="mtp-tools"
-VERSION="1.1.6"
+VERSION="1.1.16"
 CATEGORY="system-tools"
 SHORT_DESC="Media Transfer Protocol (MTP) utilities"
 MAINTAINER="erjo@slitaz.org"