# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1579344171 -3600
# Node ID dab616728814b5d80902f66255d694c41d0ee202
# Parent  3fbd25cd0d97e6dcdd58c91f0ebb01e6d99f3acb
updated drbd-utils again (8.9.1 -> 9.11.0)

diff -r 3fbd25cd0d97 -r dab616728814 drbd-utils/receipt
--- a/drbd-utils/receipt	Fri Jan 17 16:08:05 2020 +0100
+++ b/drbd-utils/receipt	Sat Jan 18 11:42:51 2020 +0100
@@ -27,9 +27,6 @@
 		--with-systemdunitdir=none	\
 		--with-prebuiltman		\
 		$CONFIGURE_ARGS
-	cd	${src}/user/shared/ &&
-	mv	drbd_buildtag.h.new	drbd_buildtag.h
-	cd	$src
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 3fbd25cd0d97 -r dab616728814 linld/stuff/src/CRTL.ASM
--- a/linld/stuff/src/CRTL.ASM	Fri Jan 17 16:08:05 2020 +0100
+++ b/linld/stuff/src/CRTL.ASM	Sat Jan 18 11:42:51 2020 +0100
@@ -17,7 +17,7 @@
 
         segment _DATA byte public use16 'DATA'
 
-msg_hang	db      "High mem corrupted: halt",0
+msg_hang	db      "High mem corrupted",0
 vcpi_alloc_err	db	"VCPI"
 		global	overflow:byte
 overflow	db	"/"
@@ -289,11 +289,19 @@
         global  @rewind$qi:near			; fd=ax
         proc    @rewind$qi near
 
+		ifdef EXTRA
+		xchg	ax,bx			; catch ISO image case
+		mov	cx,-512			; curpos = 512
+		stc				; see LOAD.CPP
+		mov	bl,2
+		jmp	lseekword
+		endif
 rewind:						; rewind(ax)
 		mov	bl,0
 lseek0:						; lseek0(ax,bl=dir)
-		xor	dx,dx
-		xor	cx,cx
+		xor	cx,cx			; clear C
+lseekword:
+		sbb	dx,dx
 lseekset:
 		xchg	ax,bx
 lseek:
diff -r 3fbd25cd0d97 -r dab616728814 linld/stuff/src/LOAD.CPP
--- a/linld/stuff/src/LOAD.CPP	Fri Jan 17 16:08:05 2020 +0100
+++ b/linld/stuff/src/LOAD.CPP	Sat Jan 18 11:42:51 2020 +0100
@@ -121,6 +121,7 @@
 struct image_himem imgs[2];
 
 static const char kernel_file_error[] = "Can't use kernel file";
+#define not_kernel  "Not a kernel"
 void load_kernel() {
 
     struct	image_himem *m = &pm;
@@ -136,8 +137,7 @@
     open_image(m, kernel_name);
 
 do {
- if (readrm(m, 0x200) == 0x200) {
-
+    readrm(m, 0x200);
     rewind(m->fd);
     if(kernelparams->setup_sects == 0) {
 #if 1
@@ -151,15 +151,14 @@
     }
     if((kernelparams->setup_sects)>=(_32k/512) || // 0th sector not counted
 	 kernelparams->boot_flag != 0xAA55)
-        die("Not a kernel");
+        die(not_kernel);
     _rm_size=0x200*(kernelparams->setup_sects+1);
     m->size -= _rm_size;
     m->chunk_size -= _rm_size;
 
     // Read remaining rm loader
     if (readrm(m, _rm_size) == _rm_size) break;
- }
-        die(kernel_file_error);
+    die(kernel_file_error);
 } while (0);
 
     // Tell rm loader some info
diff -r 3fbd25cd0d97 -r dab616728814 python-pyweb/receipt
--- a/python-pyweb/receipt	Fri Jan 17 16:08:05 2020 +0100
+++ b/python-pyweb/receipt	Sat Jan 18 11:42:51 2020 +0100
@@ -8,7 +8,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="PublicDomain"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://webpy.org/"
+WEB_SITE="https://webpy.org/"
 WGET_URL="${WEB_SITE}static/$TARBALL"
 
 DEPENDS="python"