wok-6.x rev 22749

Up libcomerr (1.44.5)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jan 24 12:15:02 2020 +0100 (2020-01-24)
parents a129a22d1733
children df869cf023e0
files jp2a/receipt libcomerr-dev/receipt libcomerr/receipt linld/stuff/src/CRTL.ASM linld/stuff/src/ISO9660.H linld/stuff/src/TAZBOOT.CPP
line diff
     1.1 --- a/jp2a/receipt	Fri Jan 24 11:07:01 2020 +0100
     1.2 +++ b/jp2a/receipt	Fri Jan 24 12:15:02 2020 +0100
     1.3 @@ -7,7 +7,7 @@
     1.4  MAINTAINER="pascal.bellard@slitaz.org"
     1.5  LICENSE="GPL2"
     1.6  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     1.7 -WEB_SITE="https://csl.name/jp2a/"
     1.8 +WEB_SITE="https://github.com/cslarsen/jp2a"
     1.9  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.10  
    1.11  DEPENDS="jpeg libcurl"
     2.1 --- a/libcomerr-dev/receipt	Fri Jan 24 11:07:01 2020 +0100
     2.2 +++ b/libcomerr-dev/receipt	Fri Jan 24 12:15:02 2020 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="libcomerr-dev"
     2.7 -VERSION="1.44.5"
     2.8 +VERSION="1.45.5"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="The libcomerr devel files."
    2.11  MAINTAINER="pankso@slitaz.org"
     3.1 --- a/libcomerr/receipt	Fri Jan 24 11:07:01 2020 +0100
     3.2 +++ b/libcomerr/receipt	Fri Jan 24 12:15:02 2020 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="libcomerr"
     3.7 -VERSION="1.44.5"
     3.8 +VERSION="1.45.5"
     3.9  CATEGORY="base-system"
    3.10  SHORT_DESC="The libcomerr library files."
    3.11  MAINTAINER="pankso@slitaz.org"
     4.1 --- a/linld/stuff/src/CRTL.ASM	Fri Jan 24 11:07:01 2020 +0100
     4.2 +++ b/linld/stuff/src/CRTL.ASM	Fri Jan 24 12:15:02 2020 +0100
     4.3 @@ -221,8 +221,9 @@
     4.4  
     4.5          global  close:near			; close(ax)
     4.6  close:
     4.7 +		mov	bh,3Eh
     4.8 +dosbx:
     4.9  		xchg	ax,bx
    4.10 -		mov	ah,3Eh
    4.11  		or	bx,bx
    4.12  		jnz	dos
    4.13  		ret
    4.14 @@ -265,7 +266,6 @@
    4.15                  jcxz	fail
    4.16  dos:
    4.17                  int	21h
    4.18 -chkc:
    4.19                  jnc	doret
    4.20  fail:
    4.21  		stc
    4.22 @@ -302,16 +302,14 @@
    4.23  lseekword:
    4.24  		sbb	cx,cx
    4.25  lseekset:
    4.26 -		xchg	ax,bx
    4.27 -lseek:
    4.28 -		mov	ah,42h			; bx=fd cx:dx=offset al=whence
    4.29 -		jmp	dos
    4.30 +		mov	bh,42h			; bx=fd cx:dx=offset al=whence
    4.31 +		jmp	dosbx
    4.32  
    4.33          endp    @rewind$qi
    4.34  
    4.35  		ifdef EXTRA
    4.36  ;***************************************************************
    4.37 -;_fastcall long isolseek(bx:const unsigned long *offset);
    4.38 +;_fastcall void isolseek(bx:const unsigned long *offset);
    4.39  ;_fastcall long lseekset2(ax:int fd, bx:unsigned long* offset);
    4.40  ;***************************************************************
    4.41          global  @isolseek$qpxul:near
    4.42 @@ -335,7 +333,7 @@
    4.43          proc    @isoreadsector$qpxul near
    4.44  
    4.45  		call	isolseek
    4.46 -		jc	doret
    4.47 +		jc	fail
    4.48  		mov	dx,2560
    4.49  		mov	bx,offset _isostate.buffer
    4.50  		mov	ax,[_isostate.fd]
     5.1 --- a/linld/stuff/src/ISO9660.H	Fri Jan 24 11:07:01 2020 +0100
     5.2 +++ b/linld/stuff/src/ISO9660.H	Fri Jan 24 12:15:02 2020 +0100
     5.3 @@ -29,7 +29,7 @@
     5.4  #define	isofilesize isostate.filesize
     5.5  #define	isofilemod isostate.filemod
     5.6  #define	isofilename isostate.filename
     5.7 -extern _fastcall long isolseek(const unsigned long *offset);
     5.8 +extern _fastcall void isolseek(const unsigned long *offset);
     5.9  extern _fastcall int isoreadsector(const unsigned long *offset);
    5.10  extern _fastcall int isoreset(char *name);
    5.11  extern _fastcall int isoopen(const char *name);
     6.1 --- a/linld/stuff/src/TAZBOOT.CPP	Fri Jan 24 11:07:01 2020 +0100
     6.2 +++ b/linld/stuff/src/TAZBOOT.CPP	Fri Jan 24 12:15:02 2020 +0100
     6.3 @@ -115,7 +115,8 @@
     6.4  		    isoopen(rootfs[0] ? rootfs : fallback) != -1) {
     6.5  			addinitrd();
     6.6  		}
     6.7 -		if (*init && isolseek(&initrddesc) != 0) {
     6.8 +		if (*init) {
     6.9 +			isolseek(&initrddesc);
    6.10  			read(x->fd, &x->filemod, 10); // + x->fileofs & x->filesize
    6.11  			magic = x->filemod;
    6.12  			x->fileofs = 0x7FF0 - (x->filesize &= 0xFFFF);