# HG changeset patch # User Hans-G?nter Theisgen # Date 1573725647 -3600 # Node ID 434bed6be2a5b1fbad949f6f516a6bcce889141a # Parent ec6d9d2d5727b4925fc5997c947579d189c01890# Parent a31ec0e0df8efc0e5282f63cba7c9abd7bb7b816 updated xtrkcad and xtrkcad-dev (4.0.3a1 -> 5.1.2a) diff -r ec6d9d2d5727 -r 434bed6be2a5 get-LibreOffice/stuff/get-LibreOffice --- a/get-LibreOffice/stuff/get-LibreOffice Thu Nov 14 11:00:06 2019 +0100 +++ b/get-LibreOffice/stuff/get-LibreOffice Thu Nov 14 11:00:47 2019 +0100 @@ -115,17 +115,19 @@ if [ "$version" == "latest" ] then - VERSION="$(basename $(wget -O - $PREFIX/ 2> /dev/null | \ - sed '/href=\"[0-9]/!d;s/.*href=\"//;s/[/\">].*//' | tail -1))" - if [ -z "$VERSION" ] + VERSIONS="$(wget -qO - $PREFIX/ | \ + sed '/href=\"[0-9]/!d;s/.*href=\"//;s/[/\">].*//' | tac)" + if [ -z "$VERSIONS" ] then echo "Can't detect an appropriate version. The version numbering or URL may have changed. Exiting." exit 1 fi else - VERSION="$version" + VERSIONS="$version" fi +for VERSION in $VERSIONS; do # foreach VERSION + VER="${VERSION/\-/}" # without hyphens TARBALL="LibreOffice_${VER}_${SUFFIX}" WGET_URL="$PREFIX/${VERSION}/rpm/x86/${TARBALL}" @@ -162,7 +164,7 @@ newline # Check if $SOURCE_DIR exists [ -d $SOURCE_DIR ] || mkdir -p $SOURCE_DIR - wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL + wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL || continue if [ -n $L_TARBALL ] # language pack required? then wget -c $LANG_URL -O $SOURCE_DIR/$L_TARBALL @@ -170,6 +172,10 @@ status fi +break + +done # foreach VERSIONS + if [ ! -f $SOURCE_DIR/$TARBALL ] then rm -rf $SOURCE_DIR diff -r ec6d9d2d5727 -r 434bed6be2a5 linld/stuff/src/A20.ASM --- a/linld/stuff/src/A20.ASM Thu Nov 14 11:00:06 2019 +0100 +++ b/linld/stuff/src/A20.ASM Thu Nov 14 11:00:47 2019 +0100 @@ -96,11 +96,11 @@ include "himem.inc" ;*************************************************************** -;_fastcall void moverm(bx:struct himem *m); +;_fastcall void moverm(bx:u16 *p); ;*************************************************************** - global @moverm$qp11image_himem:near -@moverm$qp11image_himem: + global @moverm$qpus:near +@moverm$qpus: push si di xor di,di extrn _heap_top:word @@ -129,13 +129,13 @@ inc ax extrn N_LXLSH@4:near call N_LXLSH@4 - mov [word ((image_himem bx).fallback)],ax - mov [word ((image_himem bx).fallback)+2],dx - add ax,[word ((image_himem bx).size)] - adc dx,[word ((image_himem bx).size)+2] + mov [word ((image_himem bx+4).fallback)],ax + mov [word ((image_himem bx+4).fallback)+2],dx + add ax,[word ((image_himem bx+4).size)] + adc dx,[word ((image_himem bx+4).size)+2] ifdef MOVE_SETUP mov di,8000h - sub di,[bx-4] ; rm size + sub di,[bx] ; rm_size extrn _rm_offset:word mov [_rm_offset],di sub ax,di ; -rm_offset @@ -168,11 +168,11 @@ @sys@ok: inc ax shl eax,4 - mov [(image_himem bx).fallback],eax - add eax,[(image_himem bx).size] + mov [(image_himem bx+4).fallback],eax + add eax,[(image_himem bx+4).size] ifdef MOVE_SETUP mov di,8000h - sub di,[bx-4] ; rm size + sub di,[bx] ; rm_size extrn _rm_offset:word mov [_rm_offset],di movzx ecx,di ; -rm_offset @@ -188,8 +188,8 @@ endif add dh,ch ; room for malloc_bufv_or_die cmp ax,dx - les cx,[bx-4] ; rm size - mov si,es ; rm data + les cx,[bx] ; rm_size + mov si,es ; rm_buf @jbe_overflow: ; Oops! We can stomp on our toes... better stop now mov bx,offset overflow diff -r ec6d9d2d5727 -r 434bed6be2a5 linld/stuff/src/CRTL.H --- a/linld/stuff/src/CRTL.H Thu Nov 14 11:00:06 2019 +0100 +++ b/linld/stuff/src/CRTL.H Thu Nov 14 11:00:47 2019 +0100 @@ -34,7 +34,7 @@ //extern "C" int open(const char* name, int flags); extern _fastcall int open(const char* name); extern _fastcall int close(int fd); -extern _fastcall int moverm(struct image_himem *m); +extern _fastcall int moverm(unsigned short *p); extern _fastcall int readrm(struct image_himem *m, int sz); extern _fastcall int read(int fd, void* data, int sz); extern _fastcall long lseekcur(int fd, int whence); diff -r ec6d9d2d5727 -r 434bed6be2a5 linld/stuff/src/LOAD.CPP --- a/linld/stuff/src/LOAD.CPP Thu Nov 14 11:00:06 2019 +0100 +++ b/linld/stuff/src/LOAD.CPP Thu Nov 14 11:00:47 2019 +0100 @@ -201,7 +201,7 @@ cmd_line_ok: // Move setup & Check and enable A20 if needed - moverm(m); // break _ES + moverm(&_rm_size); // break _ES // Read remaining kernel (pm part) // Try to load kernel high, maybe even blindly storing it diff -r ec6d9d2d5727 -r 434bed6be2a5 linld/stuff/src/_BEG.ASM --- a/linld/stuff/src/_BEG.ASM Thu Nov 14 11:00:06 2019 +0100 +++ b/linld/stuff/src/_BEG.ASM Thu Nov 14 11:00:47 2019 +0100 @@ -29,14 +29,9 @@ segment _BSS byte public use16 'BSS' -STACK_SIZE = 1024 - global _bss_start:byte label _bss_start byte - global _version_string:byte - label _version_string byte - db STACK_SIZE-2 dup(?) -stktop dw ? + global stktop:byte ifdef NO386 global _cpu386:byte _cpu386 db ? @@ -63,7 +58,7 @@ mov si,offset _bss_start mov bx, 0F000h ; cld ; cli & empty string clearbss: - mov [si],bl ; clear bss + heap + sp + mov [si],bl ; clear bss + heap inc si jne clearbss diff -r ec6d9d2d5727 -r 434bed6be2a5 linld/stuff/src/_END.ASM --- a/linld/stuff/src/_END.ASM Thu Nov 14 11:00:06 2019 +0100 +++ b/linld/stuff/src/_END.ASM Thu Nov 14 11:00:47 2019 +0100 @@ -18,6 +18,13 @@ ends _DATA segment _BSS byte public use16 'BSS' +STACK_SIZE = 1024 + + global _version_string:byte + label _version_string byte + db STACK_SIZE dup(?) + global stktop:byte + label stktop byte global _bss_end:byte label _bss_end byte ends _BSS diff -r ec6d9d2d5727 -r 434bed6be2a5 ucarp/receipt --- a/ucarp/receipt Thu Nov 14 11:00:06 2019 +0100 +++ b/ucarp/receipt Thu Nov 14 11:00:47 2019 +0100 @@ -7,7 +7,7 @@ MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://www.ucarp.org/project/ucarp" +WEB_SITE="https://github.com/jedisct1/UCarp" WGET_URL="http://download.pureftpd.org/pub/$PACKAGE/$TARBALL" TAGS="High availability HA" @@ -17,7 +17,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src sed -i 's/\$(SHELL) @install_sh@/@install_sh@/' po/Makefile.in* ./configure --prefix=/usr --mandir=/usr/share/man \ --localstatedir=/var \