# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1561562694 -7200
# Node ID d8f824013cf6628c831c133e4e98b93ffca2527a
# Parent  2373992ff7512a9012b3d783c1b040eb2846af84
Update icevm & obex-data-server websites

diff -r 2373992ff751 -r d8f824013cf6 icewm/receipt
--- a/icewm/receipt	Mon Jun 24 16:31:09 2019 +0200
+++ b/icewm/receipt	Wed Jun 26 17:24:54 2019 +0200
@@ -7,7 +7,7 @@
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.icewm.org/"
+WEB_SITE="https://ice-wm.org/"
 WGET_URL="$SF_MIRROR/icewm/icewm-${VERSION%.*}/$VERSION/$TARBALL"
 TAGS="window-manager"
 
diff -r 2373992ff751 -r d8f824013cf6 linld/stuff/src/A20.ASM
--- a/linld/stuff/src/A20.ASM	Mon Jun 24 16:31:09 2019 +0200
+++ b/linld/stuff/src/A20.ASM	Wed Jun 26 17:24:54 2019 +0200
@@ -17,6 +17,11 @@
 		dw	_enable_a20_fast, _enable_a20_kbd, _enable_a20_xmm, die
 msg_a20		db	"Can't use A20",0
 overflow	db	"Loaded too close to 9000:0",0
+	global	sssp:dword
+	global	_initrd_desc:dword
+_initrd_desc	dd	90000218h
+		org	$-4
+sssp		dd	?
 
         ends    _DATA
 
@@ -91,17 +96,12 @@
 	global	@moverm$qp11image_himem:near
 @moverm$qp11image_himem:
 		push	si di
-		global	sssp:dword
 		extrn	_heap_top:word
 		ifdef	NO386
 		extrn	_topseg:near
 		call	near _topseg
 		mov	cl,4
-		org	$-4
-sssp		dd	?
 		mov	[word sssp+2],ax
-		;extrn	_initrd_desc:dword
-		;mov	[word _initrd_desc+2],ax
 		xchg	ax,dx
 		mov	ax,[_heap_top]
 		shr	ax,cl
@@ -110,8 +110,6 @@
 		mov	ax,[_heap_top]
 		shr	ax,4
 		mov	dx,9000h
-		org	$-4
-sssp		dd	?
 		endif
 		mov	es,dx
 		mov	cx,cs
diff -r 2373992ff751 -r d8f824013cf6 linld/stuff/src/COMMON.H
--- a/linld/stuff/src/COMMON.H	Mon Jun 24 16:31:09 2019 +0200
+++ b/linld/stuff/src/COMMON.H	Wed Jun 26 17:24:54 2019 +0200
@@ -56,6 +56,7 @@
 
 extern int skip_alloc;
 extern u32 base_himem;
+extern u32 far *initrd_desc;
 
 extern _fastcall void memcpy_image(struct image_himem *m);
 extern _fastcall void storepage(u32 *dst);
diff -r 2373992ff751 -r d8f824013cf6 linld/stuff/src/LOAD.CPP
--- a/linld/stuff/src/LOAD.CPP	Mon Jun 24 16:31:09 2019 +0200
+++ b/linld/stuff/src/LOAD.CPP	Wed Jun 26 17:24:54 2019 +0200
@@ -122,7 +122,6 @@
 static u8 pm_high;	// @ = @rm_size + 2, see JUMP.ASM
 static u8* rm_buf;	// @ = @rm_size + 3, see JUMP.ASM
 struct image_himem imgs[2];
-u32 far *initrd_desc = (u32 far *) MK_FP(0x9000,0x218);
 
 static const char kernel_file_error[] = "Can't use kernel file";
 char *version_string="";
diff -r 2373992ff751 -r d8f824013cf6 linld/stuff/src/_BEG.ASM
--- a/linld/stuff/src/_BEG.ASM	Mon Jun 24 16:31:09 2019 +0200
+++ b/linld/stuff/src/_BEG.ASM	Wed Jun 26 17:24:54 2019 +0200
@@ -146,7 +146,7 @@
 		;call	_get_vcpi_interface
 		mov	bx,offset msg_badmapping
 		jnz	no_vcpi
-		inc	[word bx+_vcpi-msg_badmapping]
+		inc	[byte bx+_vcpi-msg_badmapping]
 endcpu386:
 		ifdef	EXTRA
 		pushfd
diff -r 2373992ff751 -r d8f824013cf6 linld/stuff/src/pipehole.awk
--- a/linld/stuff/src/pipehole.awk	Mon Jun 24 16:31:09 2019 +0200
+++ b/linld/stuff/src/pipehole.awk	Wed Jun 26 17:24:54 2019 +0200
@@ -65,7 +65,7 @@
 		sub(/dx,cs/,"edx,cs")
 		sub(/eax/,"edx")
 		sub(/ax,9/,"dx,9")
-		if (/,0/) sub(/,0/,",dh")
+		if (/,0$/) sub(/,0/,",dh")
 		if (/movzx/) next
 		if (/fallback = base_himem/) { isload=0 }
 	}
diff -r 2373992ff751 -r d8f824013cf6 obex-data-server/receipt
--- a/obex-data-server/receipt	Mon Jun 24 16:31:09 2019 +0200
+++ b/obex-data-server/receipt	Wed Jun 26 17:24:54 2019 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="D-Bus service providing high-level OBEX functionality."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://tadas.dailyda.com/"
+WEB_SITE="https://web.archive.org/web/20181010135741/http://wiki.muiline.com/obex-data-server"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/software/$TARBALL"
 TAGS="bluetooth"