SliTaz Repositories

     1.1 --- a/linld/receipt	Sat Sep 29 15:40:14 2018 +0200
     1.2 +++ b/linld/receipt	Fri Oct 05 23:02:32 2018 +0200
     1.3 @@ -6,7 +6,7 @@
     1.4  SHORT_DESC="Boot loader for DOS/Win9x."
     1.5  MAINTAINER="pascal.bellard@slitaz.org"
     1.6  LICENSE="GPL"
     1.7 -SUFFIX="$(echo $VERSION | sed 's/[^0-9]//')"
     1.8 +SUFFIX="${VERSION/./}"
     1.9  TARBALL="${PACKAGE}${SUFFIX}devel.tar.bz2"
    1.10  BASE_SITE="http://busybox.net/~vda/$PACKAGE"
    1.11  WEB_SITE="$BASE_SITE/README.txt"

     2.1 --- a/linld/stuff/src/ISO9660.CPP	Sat Sep 29 15:40:14 2018 +0200
     2.2 +++ b/linld/stuff/src/ISO9660.CPP	Fri Oct 05 23:02:32 2018 +0200
     2.3 @@ -32,7 +32,6 @@
     2.4  
     2.5  int isoreaddir(int restart)
     2.6  {
     2.7 -	static char dots[] = "..";
     2.8  	int size;
     2.9  	char *p;
    2.10  #ifdef __ROCKRIDGE
    2.11 @@ -49,9 +48,10 @@
    2.12  		if (x->curdirsize < DIRSECTORSZ) return -1;
    2.13  	restarted:
    2.14  		readsector(&x->curdirofs);
    2.15 -		x->curdirofs += SECTORSZ;
    2.16 +		//x->curdirofs += SECTORSZ;
    2.17 +		*(int *)((char *) &x->curdirofs+1) += SECTORSZ/256;
    2.18  		x->curdirsize -= DIRSECTORSZ;
    2.19 -		x->curpos = 0;
    2.20 +		x->curpos &= 0;
    2.21  	}
    2.22  	p = buffer + x->curpos;
    2.23  	if ((size = * (short *) p) == 0)
    2.24 @@ -59,6 +59,7 @@
    2.25  	x->fileofs = (* (unsigned long *) (p + 2)) << SECTORBITS;
    2.26  	x->filesize = * (unsigned long *) (p + 10);
    2.27  	x->filemod = (p[25] & 2) ? 0040755 : 0100755;
    2.28 +	//x->filemod = 0100755 - ((p[25] & (char)2) << 13);
    2.29  #ifdef __ROCKRIDGE
    2.30  	endname = NULL;
    2.31  	// p += 34 + (p[32] & -2); ?
    2.32 @@ -75,8 +76,7 @@
    2.33  			break;
    2.34  		}
    2.35  		p += len;
    2.36 -	}
    2.37 -	while (buffer + x->curpos + size > p + 2);
    2.38 +	} while (buffer + x->curpos + size - p > 2);
    2.39  	if (endname)
    2.40  		*endname = 0;
    2.41  	else
    2.42 @@ -84,14 +84,12 @@
    2.43  	{
    2.44  		p = x->filename = buffer + x->curpos + 33;
    2.45  		p--;
    2.46 -		switch (* (short *) p) {
    2.47 -		case 0x0101:
    2.48 -			x->filename = dots;
    2.49 -			break;
    2.50 -		case 0x0001:
    2.51 -			x->filename = dots + 1;
    2.52 -			break;
    2.53 -		default:
    2.54 +		if (((* (short *) p) & 0xFEFF) -1 == 0) {
    2.55 +			x->filename = "..";
    2.56 +			if ((* (short *) p) == 1)
    2.57 +				x->filename++;
    2.58 +		}
    2.59 +		else {
    2.60  			p += *p; p--;
    2.61  			if (* (short *) (p) != 0x313B) {
    2.62  				p++; p++; // no ;1 to remove

     3.1 --- a/linld/stuff/src/LINLD.CPP	Sat Sep 29 15:40:14 2018 +0200
     3.2 +++ b/linld/stuff/src/LINLD.CPP	Fri Oct 05 23:02:32 2018 +0200
     3.3 @@ -35,7 +35,7 @@
     3.4      );
     3.5  }
     3.6  
     3.7 -static char _cmdline[128];
     3.8 +static char buf_cmdline[128];
     3.9  int main(int argc, char *argv[]) {
    3.10  
    3.11      (void) argc;
    3.12 @@ -112,12 +112,12 @@
    3.13              topmem = strtol(s);
    3.14  	    goto addincmdline;
    3.15          }
    3.16 -        else if(cmdline == (const char *) _cmdline + 1) {
    3.17 +        else if(cmdline == (const char *) buf_cmdline + 1) {
    3.18  addincmdline:
    3.19 -	    strcatb(_cmdline,*argv);
    3.20 +	    strcatb(buf_cmdline,*argv);
    3.21          }
    3.22  	else if(i == 1 && fileattr(s) != -1) {
    3.23 -	    cmdline = (const char *) _cmdline + 1;
    3.24 +	    cmdline = (const char *) buf_cmdline + 1;
    3.25  	    goto set_kernel_name;
    3.26          }
    3.27  	else

     4.1 --- a/linld/stuff/src/MEMCPY32.ASM	Sat Sep 29 15:40:14 2018 +0200
     4.2 +++ b/linld/stuff/src/MEMCPY32.ASM	Fri Oct 05 23:02:32 2018 +0200
     4.3 @@ -11,12 +11,17 @@
     4.4                  p386
     4.5  		endif
     4.6  
     4.7 -        group   DGROUP  _TEXT,_DATA
     4.8 +        group   DGROUP  _TEXT,_DATA,_BSS
     4.9          assume  cs:DGROUP,ds:DGROUP
    4.10  
    4.11          segment _DATA byte public use16 'DATA'
    4.12          ends    _DATA
    4.13  
    4.14 +        segment _BSS byte public use16 'BSS'
    4.15 +		global	sssp:dword
    4.16 +sssp 		dd	?
    4.17 +        ends    _BSS
    4.18 +
    4.19          segment _TEXT byte public use16 'CODE'
    4.20  
    4.21  ;***************************************************************
    4.22 @@ -35,19 +40,15 @@
    4.23  		mov	ds,bx
    4.24  		ifndef	NO386
    4.25  		push	[dword bx+4]		; save step
    4.26 -		mov	ax,sp
    4.27 -		push	ss
    4.28 -		push	ax
    4.29 -		pop	[dword cs:sssp]
    4.30  		mov	[word bx+4],offset step19
    4.31  		else
    4.32  		mov	ax,offset step19
    4.33  		xchg	ax,[word bx+4]
    4.34  		push	[word bx+6]	
    4.35  		push	ax			; save step
    4.36 -		mov	[word cs:sssp],sp
    4.37 -		mov	[word cs:sssp+2],ss
    4.38  		endif
    4.39 +		mov	[word sssp],sp
    4.40 +		mov	[word sssp+2],ss
    4.41  		;cmp	[byte bx+7],0F0h
    4.42  		;jnc	notdos
    4.43  		mov	[bx+6],cs
    4.44 @@ -59,8 +60,6 @@
    4.45  		jmp	[dword bx+4*19h]
    4.46  doiret:
    4.47  		iret
    4.48 -sssp:
    4.49 -		dd	0
    4.50  step19:
    4.51  		push	bx
    4.52  		push	ds
    4.53 @@ -221,7 +220,7 @@
    4.54                  jecxz   @@done
    4.55  
    4.56  		smsw	ax
    4.57 -		test	al,1
    4.58 +                and     al,1	;MSW_PE
    4.59  		jz	@@real_mode
    4.60  ; Note: bp points to std stack frame now. bp will be passed to
    4.61  ; pm routine. This allows params to be passed on stack

     5.1 --- a/linld/stuff/src/MEMTOP.ASM	Sat Sep 29 15:40:14 2018 +0200
     5.2 +++ b/linld/stuff/src/MEMTOP.ASM	Fri Oct 05 23:02:32 2018 +0200
     5.3 @@ -40,15 +40,15 @@
     5.4                  mov     ax,0E801h
     5.5                  int     15h
     5.6                  jc      @@err
     5.7 -		xchg	ax,cx
     5.8 -                push    ax              ;kludge to handle BIOSes
     5.9 -                or      ax,dx           ;  which report their extended
    5.10 -		pop	ax		;  memory in AX/BX rather than
    5.11 -                jnz     @@use_cxdx      ;  CX/DX.  The spec I have read
    5.12 +
    5.13 +		xchg	ax,cx		;kludge to handle BIOSes
    5.14 +		jcxz	@@use_cxdx	;  which report their extended
    5.15 +					;  memory in AX/BX rather than
    5.16 +					;  CX/DX.  The spec I have read
    5.17  @@use_axbx:     mov     dx,bx           ;  seems to indicate AX/BX
    5.18                  xchg	ax,cx		;  are more reasonable anyway...
    5.19 -@@use_cxdx:                     ;now: dx=64k units above 16m
    5.20 -                                ;     ax=1k units above 1m below 16m (max 3c00h)
    5.21 +@@use_cxdx:				;now: dx=64k units above 16m
    5.22 +					;     ax=1k units above 1m below 16m (max 3c00h)
    5.23                  test    dx,dx
    5.24                  jz      tokb            ;dx=0 here, ax=kbs above 1m
    5.25                  xor     ax,ax           ;ignore info on low 16M (assume full)

     6.1 --- a/linld/stuff/src/TAZBOOT.CPP	Sat Sep 29 15:40:14 2018 +0200
     6.2 +++ b/linld/stuff/src/TAZBOOT.CPP	Fri Oct 05 23:02:32 2018 +0200
     6.3 @@ -20,7 +20,7 @@
     6.4  static void next_chunk(struct image_himem *m)
     6.5  {
     6.6  	struct initrd_info *i = &initrd_state.info[m->state];
     6.7 -	m->chunk_size = 0;
     6.8 +	m->chunk_size &= 0;
     6.9  	if (m->state >= initrd_state.cnt) return;
    6.10  	lseekset(m->fd,i->ofs);
    6.11  	m->chunk_size = i->size;
    6.12 @@ -49,7 +49,7 @@
    6.13  	if (!m->size) return;
    6.14  	m->next_chunk = next_chunk;
    6.15  	m->fd = isofd;
    6.16 -	m->state = 0;
    6.17 +	m->state &= 0;
    6.18  	next_chunk(m);
    6.19  	load_initrd();
    6.20  }
    6.21 @@ -76,7 +76,8 @@
    6.22  	if (!*iso || isoreset(*iso) < 0) return;
    6.23  	skip_alloc++;
    6.24  	base_himem = memtop() /2;
    6.25 -	if (base_himem > _64m) base_himem = _64m;
    6.26 +	//if (base_himem > _64m) base_himem = _64m;
    6.27 +	if (* ((char *) &base_himem +3) >= 4) base_himem = _64m;
    6.28  	isoopen("boot") >= 0 ||
    6.29  	isoopen("live") >= 0 ||	// debian
    6.30  	isoopen("casper") >= 0;	// ubuntu

     7.1 --- a/linld/stuff/src/VCPI.ASM	Sat Sep 29 15:40:14 2018 +0200
     7.2 +++ b/linld/stuff/src/VCPI.ASM	Fri Oct 05 23:02:32 2018 +0200
     7.3 @@ -121,10 +121,6 @@
     7.4  
     7.5          segment _BSS byte public use16 'BSS'
     7.6  
     7.7 -label   saved_ss_sp dword
     7.8 -saved_sp        dw      ?
     7.9 -saved_ss        dw      ?
    7.10 -
    7.11  tss             dd      ?,?     ;enough, we'll never use it anyway
    7.12  
    7.13          ends    _BSS
    7.14 @@ -393,8 +389,9 @@
    7.15                  push	ax
    7.16                  push	si
    7.17                  push    ds
    7.18 -                mov     [saved_ss],ss
    7.19 -                mov     [saved_sp],sp
    7.20 +		extrn	sssp:word
    7.21 +                mov     [sssp],sp
    7.22 +                mov     [sssp+2],ss
    7.23  
    7.24  		call	switch_to_pm
    7.25  
    7.26 @@ -413,7 +410,7 @@
    7.27                  mov     cr3,eax         ; flush TLB cache
    7.28  
    7.29  ; Now we are in rm, but not yet: have to restore sregs:
    7.30 -                lss     sp,[saved_ss_sp]; SS
    7.31 +                lss     sp,[dword sssp]; SS
    7.32                  pop     ds              ; DS
    7.33                  pop	si
    7.34                  retf                    ; CS

     8.1 --- a/linld/stuff/src/_BEG.ASM	Sat Sep 29 15:40:14 2018 +0200
     8.2 +++ b/linld/stuff/src/_BEG.ASM	Fri Oct 05 23:02:32 2018 +0200
     8.3 @@ -21,7 +21,7 @@
     8.4  		endif
     8.5          global  _vcpi:byte
     8.6  _vcpi		db	0
     8.7 -msg_badmapping  db      "VCPI: low 640k: need 1:1 mapping"
     8.8 +msg_badmapping  db      "VCPI: low 640k need 1:1 mapping"
     8.9          global  _topmem:dword
    8.10  _topmem		dd	10000000h	; max 256m
    8.11  
    8.12 @@ -142,6 +142,7 @@
    8.13                  test    ah,ah
    8.14  		jnz	no_vcpi
    8.15  is386vcpi:
    8.16 +		inc	[byte _vcpi]
    8.17                  extrn   prepare_vcpi:near
    8.18  		call	prepare_vcpi
    8.19  ;    get_vcpi_interface() || die("VCPI: low 640k: need 1:1 mapping");
    8.20 @@ -149,7 +150,6 @@
    8.21  		;call	_get_vcpi_interface
    8.22  		mov	bx,offset msg_badmapping
    8.23  		jz	endcpu
    8.24 -		inc	[byte bx+_vcpi-msg_badmapping]
    8.25  no_vcpi:
    8.26                  p8086
    8.27                ;;pop     dx              ;$ handle

     9.1 --- a/lz4-dev/receipt	Sat Sep 29 15:40:14 2018 +0200
     9.2 +++ b/lz4-dev/receipt	Fri Oct 05 23:02:32 2018 +0200
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt.
     9.5  
     9.6  PACKAGE="lz4-dev"
     9.7 -VERSION="1.8.2"
     9.8 +VERSION="1.8.3"
     9.9  CATEGORY="development"
    9.10  SHORT_DESC="LZ4 development files."
    9.11  MAINTAINER="pascal.bellard@slitaz.org"

    10.1 --- a/lz4-lib/receipt	Sat Sep 29 15:40:14 2018 +0200
    10.2 +++ b/lz4-lib/receipt	Fri Oct 05 23:02:32 2018 +0200
    10.3 @@ -1,7 +1,7 @@
    10.4  # SliTaz package receipt.
    10.5  
    10.6  PACKAGE="lz4-lib"
    10.7 -VERSION="1.8.2"
    10.8 +VERSION="1.8.3"
    10.9  CATEGORY="base-system"
   10.10  SHORT_DESC="The lz4c compressor shared library"
   10.11  MAINTAINER="pascal.bellard@slitaz.org"

    11.1 --- a/lz4/receipt	Sat Sep 29 15:40:14 2018 +0200
    11.2 +++ b/lz4/receipt	Fri Oct 05 23:02:32 2018 +0200
    11.3 @@ -1,7 +1,7 @@
    11.4  # SliTaz package receipt.
    11.5  
    11.6  PACKAGE="lz4"
    11.7 -VERSION="1.8.2"
    11.8 +VERSION="1.8.3"
    11.9  CATEGORY="base-system"
   11.10  SHORT_DESC="High speed lossless compressor."
   11.11  MAINTAINER="pascal.bellard@slitaz.org"