wok rev 22315
updated xtrkcad and xtrkcad-dev (4.0.3a1 -> 5.1.2a)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Thu Nov 14 11:00:47 2019 +0100 (2019-11-14) |
| parents | ec6d9d2d5727 a31ec0e0df8e |
| children | af2cd2c74a98 |
| files | get-LibreOffice/stuff/get-LibreOffice |
line diff
1.1 --- a/get-LibreOffice/stuff/get-LibreOffice Thu Nov 14 11:00:06 2019 +0100 1.2 +++ b/get-LibreOffice/stuff/get-LibreOffice Thu Nov 14 11:00:47 2019 +0100 1.3 @@ -115,17 +115,19 @@ 1.4 1.5 if [ "$version" == "latest" ] 1.6 then 1.7 - VERSION="$(basename $(wget -O - $PREFIX/ 2> /dev/null | \ 1.8 - sed '/href=\"[0-9]/!d;s/.*href=\"//;s/[/\">].*//' | tail -1))" 1.9 - if [ -z "$VERSION" ] 1.10 + VERSIONS="$(wget -qO - $PREFIX/ | \ 1.11 + sed '/href=\"[0-9]/!d;s/.*href=\"//;s/[/\">].*//' | tac)" 1.12 + if [ -z "$VERSIONS" ] 1.13 then 1.14 echo "Can't detect an appropriate version. The version numbering or URL may have changed. Exiting." 1.15 exit 1 1.16 fi 1.17 else 1.18 - VERSION="$version" 1.19 + VERSIONS="$version" 1.20 fi 1.21 1.22 +for VERSION in $VERSIONS; do # foreach VERSION 1.23 + 1.24 VER="${VERSION/\-/}" # without hyphens 1.25 TARBALL="LibreOffice_${VER}_${SUFFIX}" 1.26 WGET_URL="$PREFIX/${VERSION}/rpm/x86/${TARBALL}" 1.27 @@ -162,7 +164,7 @@ 1.28 newline 1.29 # Check if $SOURCE_DIR exists 1.30 [ -d $SOURCE_DIR ] || mkdir -p $SOURCE_DIR 1.31 - wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL 1.32 + wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL || continue 1.33 if [ -n $L_TARBALL ] # language pack required? 1.34 then 1.35 wget -c $LANG_URL -O $SOURCE_DIR/$L_TARBALL 1.36 @@ -170,6 +172,10 @@ 1.37 status 1.38 fi 1.39 1.40 +break 1.41 + 1.42 +done # foreach VERSIONS 1.43 + 1.44 if [ ! -f $SOURCE_DIR/$TARBALL ] 1.45 then 1.46 rm -rf $SOURCE_DIR
2.1 --- a/linld/stuff/src/A20.ASM Thu Nov 14 11:00:06 2019 +0100 2.2 +++ b/linld/stuff/src/A20.ASM Thu Nov 14 11:00:47 2019 +0100 2.3 @@ -96,11 +96,11 @@ 2.4 include "himem.inc" 2.5 2.6 ;*************************************************************** 2.7 -;_fastcall void moverm(bx:struct himem *m); 2.8 +;_fastcall void moverm(bx:u16 *p); 2.9 ;*************************************************************** 2.10 2.11 - global @moverm$qp11image_himem:near 2.12 -@moverm$qp11image_himem: 2.13 + global @moverm$qpus:near 2.14 +@moverm$qpus: 2.15 push si di 2.16 xor di,di 2.17 extrn _heap_top:word 2.18 @@ -129,13 +129,13 @@ 2.19 inc ax 2.20 extrn N_LXLSH@4:near 2.21 call N_LXLSH@4 2.22 - mov [word ((image_himem bx).fallback)],ax 2.23 - mov [word ((image_himem bx).fallback)+2],dx 2.24 - add ax,[word ((image_himem bx).size)] 2.25 - adc dx,[word ((image_himem bx).size)+2] 2.26 + mov [word ((image_himem bx+4).fallback)],ax 2.27 + mov [word ((image_himem bx+4).fallback)+2],dx 2.28 + add ax,[word ((image_himem bx+4).size)] 2.29 + adc dx,[word ((image_himem bx+4).size)+2] 2.30 ifdef MOVE_SETUP 2.31 mov di,8000h 2.32 - sub di,[bx-4] ; rm size 2.33 + sub di,[bx] ; rm_size 2.34 extrn _rm_offset:word 2.35 mov [_rm_offset],di 2.36 sub ax,di ; -rm_offset 2.37 @@ -168,11 +168,11 @@ 2.38 @sys@ok: 2.39 inc ax 2.40 shl eax,4 2.41 - mov [(image_himem bx).fallback],eax 2.42 - add eax,[(image_himem bx).size] 2.43 + mov [(image_himem bx+4).fallback],eax 2.44 + add eax,[(image_himem bx+4).size] 2.45 ifdef MOVE_SETUP 2.46 mov di,8000h 2.47 - sub di,[bx-4] ; rm size 2.48 + sub di,[bx] ; rm_size 2.49 extrn _rm_offset:word 2.50 mov [_rm_offset],di 2.51 movzx ecx,di ; -rm_offset 2.52 @@ -188,8 +188,8 @@ 2.53 endif 2.54 add dh,ch ; room for malloc_bufv_or_die 2.55 cmp ax,dx 2.56 - les cx,[bx-4] ; rm size 2.57 - mov si,es ; rm data 2.58 + les cx,[bx] ; rm_size 2.59 + mov si,es ; rm_buf 2.60 @jbe_overflow: 2.61 ; Oops! We can stomp on our toes... better stop now 2.62 mov bx,offset overflow
3.1 --- a/linld/stuff/src/CRTL.H Thu Nov 14 11:00:06 2019 +0100 3.2 +++ b/linld/stuff/src/CRTL.H Thu Nov 14 11:00:47 2019 +0100 3.3 @@ -34,7 +34,7 @@ 3.4 //extern "C" int open(const char* name, int flags); 3.5 extern _fastcall int open(const char* name); 3.6 extern _fastcall int close(int fd); 3.7 -extern _fastcall int moverm(struct image_himem *m); 3.8 +extern _fastcall int moverm(unsigned short *p); 3.9 extern _fastcall int readrm(struct image_himem *m, int sz); 3.10 extern _fastcall int read(int fd, void* data, int sz); 3.11 extern _fastcall long lseekcur(int fd, int whence);
4.1 --- a/linld/stuff/src/LOAD.CPP Thu Nov 14 11:00:06 2019 +0100 4.2 +++ b/linld/stuff/src/LOAD.CPP Thu Nov 14 11:00:47 2019 +0100 4.3 @@ -201,7 +201,7 @@ 4.4 cmd_line_ok: 4.5 4.6 // Move setup & Check and enable A20 if needed 4.7 - moverm(m); // break _ES 4.8 + moverm(&_rm_size); // break _ES 4.9 4.10 // Read remaining kernel (pm part) 4.11 // Try to load kernel high, maybe even blindly storing it
5.1 --- a/linld/stuff/src/_BEG.ASM Thu Nov 14 11:00:06 2019 +0100 5.2 +++ b/linld/stuff/src/_BEG.ASM Thu Nov 14 11:00:47 2019 +0100 5.3 @@ -29,14 +29,9 @@ 5.4 5.5 segment _BSS byte public use16 'BSS' 5.6 5.7 -STACK_SIZE = 1024 5.8 - 5.9 global _bss_start:byte 5.10 label _bss_start byte 5.11 - global _version_string:byte 5.12 - label _version_string byte 5.13 - db STACK_SIZE-2 dup(?) 5.14 -stktop dw ? 5.15 + global stktop:byte 5.16 ifdef NO386 5.17 global _cpu386:byte 5.18 _cpu386 db ? 5.19 @@ -63,7 +58,7 @@ 5.20 mov si,offset _bss_start 5.21 mov bx, 0F000h ; cld ; cli & empty string 5.22 clearbss: 5.23 - mov [si],bl ; clear bss + heap + sp 5.24 + mov [si],bl ; clear bss + heap 5.25 inc si 5.26 jne clearbss 5.27
6.1 --- a/linld/stuff/src/_END.ASM Thu Nov 14 11:00:06 2019 +0100 6.2 +++ b/linld/stuff/src/_END.ASM Thu Nov 14 11:00:47 2019 +0100 6.3 @@ -18,6 +18,13 @@ 6.4 ends _DATA 6.5 6.6 segment _BSS byte public use16 'BSS' 6.7 +STACK_SIZE = 1024 6.8 + 6.9 + global _version_string:byte 6.10 + label _version_string byte 6.11 + db STACK_SIZE dup(?) 6.12 + global stktop:byte 6.13 + label stktop byte 6.14 global _bss_end:byte 6.15 label _bss_end byte 6.16 ends _BSS
7.1 --- a/ucarp/receipt Thu Nov 14 11:00:06 2019 +0100 7.2 +++ b/ucarp/receipt Thu Nov 14 11:00:47 2019 +0100 7.3 @@ -7,7 +7,7 @@ 7.4 MAINTAINER="pascal.bellard@slitaz.org" 7.5 LICENSE="BSD" 7.6 TARBALL="$PACKAGE-$VERSION.tar.bz2" 7.7 -WEB_SITE="http://www.ucarp.org/project/ucarp" 7.8 +WEB_SITE="https://github.com/jedisct1/UCarp" 7.9 WGET_URL="http://download.pureftpd.org/pub/$PACKAGE/$TARBALL" 7.10 TAGS="High availability HA" 7.11 7.12 @@ -17,7 +17,6 @@ 7.13 # Rules to configure and make the package. 7.14 compile_rules() 7.15 { 7.16 - cd $src 7.17 sed -i 's/\$(SHELL) @install_sh@/@install_sh@/' po/Makefile.in* 7.18 ./configure --prefix=/usr --mandir=/usr/share/man \ 7.19 --localstatedir=/var \