# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1491809119 -7200
# Node ID e17c7b3f75a837fb620eff76054112bce1bb6520
# Parent  7caa211f4e5552ae15fabddc1369bcb1fd6ca176
Up backup-manager (0.7.13)

diff -r 7caa211f4e55 -r e17c7b3f75a8 backup-manager/receipt
--- a/backup-manager/receipt	Sun Apr 09 19:18:42 2017 +0000
+++ b/backup-manager/receipt	Mon Apr 10 09:25:19 2017 +0200
@@ -1,15 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="backup-manager"
-GITHASH="72a6561c454ed17aefa7869d2e82235a95d058c6"
-VERSION=${GITHASH:0:7}
+VERSION=0.7.13
 CATEGORY="network"
 SHORT_DESC="A really simple to use backup tool."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.zip"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="https://github.com/sukria/Backup-Manager"
-WGET_URL="$WEB_SITE/archive/$GITHASH.zip"
+WGET_URL="$WEB_SITE/archive/$GITHASH.tar.gz"
 CONFIG_FILES="/etc/backup-manager.conf"
 TAGS="backup"
 
diff -r 7caa211f4e55 -r e17c7b3f75a8 linld/stuff/src/COMMON.H
--- a/linld/stuff/src/COMMON.H	Sun Apr 09 19:18:42 2017 +0000
+++ b/linld/stuff/src/COMMON.H	Mon Apr 10 09:25:19 2017 +0200
@@ -78,7 +78,6 @@
 // External asm helpers
 extern "C" void memcpy32(u32, u16,u32, u32);
 extern "C" void rmcpy();
-extern "C" void set_sregs_jump_seg_ofs();
 extern "C" void xmm_alloc(struct image_himem *m);
 extern u32 topmem;
 extern "C" u32 memtopz();
diff -r 7caa211f4e55 -r e17c7b3f75a8 linld/stuff/src/JUMP.ASM
--- a/linld/stuff/src/JUMP.ASM	Sun Apr 09 19:18:42 2017 +0000
+++ b/linld/stuff/src/JUMP.ASM	Mon Apr 10 09:25:19 2017 +0200
@@ -29,16 +29,21 @@
 
         segment _TEXT byte public use16 'CODE'
 
+;***************************************************************
+;void boot_kernel();
+;****** Never returns
+;***************************************************************
 	global	_boot_kernel:near
-_boot_kernel:
+        proc    _boot_kernel near
+        
 ; Shrink stack: we won't need much of it now and have no malloc() plans
 		extrn	_heap_top:word
 		mov	ax,[_heap_top]
 		inc	ah
 		cmp	ax,sp
-		ja	samesp
+		ja	@@samesp
 		xchg	ax,sp
-samesp:
+@@samesp:
 		ifdef	NO386
 		extrn	_topseg:near
 		call	near _topseg
@@ -56,21 +61,12 @@
 		mov	dx,cs
 		add	ax,dx
 		cmp	ax,bx
-		jb	nooverflow
+		jb	@@nooverflow
 ; Oops! We can stomp on our toes... better stop now
 		mov	bx,offset overflow
 		extrn	die:near
 		jmp	near die
-nooverflow:
-;***************************************************************
-;void set_sregs_jump_seg_ofs(u32 csip);
-;****** Never returns
-;***************************************************************
-        global  _set_sregs_jump_seg_ofs:near
-        proc    _set_sregs_jump_seg_ofs near
-
-		extrn	dos_shutdown:near
-
+@@nooverflow:
 		cli				; we start doing destructive things to DOS
 		push	es
 		pop	ss
@@ -94,13 +90,12 @@
 		rep
 		  movsb
 		cmp	al,cl			; load high ?
-		jne	isbzimage
+		jne	@@isbzimage
 		ifdef	NO386
 		add	bh,9
 		push	bx			; topseg()+0x0900
 		else
-		push	9900h			; 4096 bytes for cmdline
-	;push	9820h			; 512 bytes for cmdline
+		push	9800h+(4096/16)		; 4096 bytes for cmdline
 		endif
 		; finish loading
 		extrn   @last_ditch$qv:near
@@ -113,17 +108,16 @@
 		xor	si,si			;  A000 -9000 -0800(>movedend)
 		xor	di,di			; set ZF
 		mov	cx,offset movedend
-        global  _bss_end:byte
-	;mov	cx,offset _bss_end
 		rep
 		  movsb
 		push	es
-		call	near doretf		; mov cs,es
+		call	near @@doretf		; mov cs,es
 		push	ss
 		pop	es
 		push	cs
 		pop	ds
 		push	ax
+		extrn	dos_shutdown:near
 		call	near dos_shutdown
 		;in	al,70h
 		;or	al,80h			; disable NMI
@@ -133,10 +127,10 @@
 		mov	ax,8
 		cwd				; clear dx
 		cmp	bx,ax
-		ja	bufhigh
+		ja	@@bufhigh
 		sub	ax,bx
 		inc	ax
-bufhigh:
+@@bufhigh:
 		push	ax
 		push	dx			; size=up to 512k
 		push	bx			; src ofs= pm.fallback
@@ -161,10 +155,10 @@
 		cmp	[dword 1E6h],'SKLE'
 		else
 		cmp	[word 1E6h],'LE'
-		jne	notelks
+		jne	@@notelks
 		cmp	[word 1E8h],'SK'
 		endif
-		jne	notelks
+		jne	@@notelks
 		ifdef	NO386
 		mov	cx,120h
 		push	cx
@@ -183,10 +177,9 @@
 		push	es
 		pop	ss
 		push	cx
-notelks:
+@@notelks:
 		endif
-
-isbzimage:
+@@isbzimage:
 		push	ss
 		pop	ds
 		;push	ss
@@ -199,12 +192,11 @@
 		endif
 		assume	nothing
 		assume	cs:DGROUP
-
-doretf:
+@@doretf:
                 retf
 
 movedend:
-        endp    _set_sregs_jump_seg_ofs
+        endp    _boot_kernel
 
         ends    _TEXT