wok rev 20456
Up upx (3.95)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sat Oct 06 18:50:19 2018 +0200 (2018-10-06) |
| parents | 45d416bfc91e |
| children | c344508ff4eb |
| files | linld/stuff/src/!COMPILE.BAT linld/stuff/src/!COMPILEX.BAT linld/stuff/src/CRTL.ASM linld/stuff/src/CRTL.H upx/receipt |
line diff
1.1 --- a/linld/stuff/src/!COMPILE.BAT Sat Oct 06 15:26:57 2018 +0200 1.2 +++ b/linld/stuff/src/!COMPILE.BAT Sat Oct 06 18:50:19 2018 +0200 1.3 @@ -3,17 +3,6 @@ 1.4 tasm /h > helptasm.log 1.5 bcc > helpbcc.log 1.6 tlink > helptlink.log 1.7 -rem tasm /la /m *.asm > asm.log 1.8 +bcc @bccopt.opt -S -mt -DLARGE_IMAGES *.cpp > cpp.log 1.9 tasm /la /m /dLARGE_IMAGES *.asm > asm.log 1.10 -rem @pause 1.11 -rem bcc @bccopt.opt -S -mt *.cpp 1.12 -bcc @bccopt.opt -S -mt -DLARGE_IMAGES *.cpp 1.13 -tasm /l /m load.asm 1.14 -tasm /l /m himem.asm 1.15 -tasm /l /m linld.asm 1.16 -tasm /l /m iso9660.asm 1.17 -rem bcc @bccopt.opt -c -mt *.cpp > cpp.log 1.18 -bcc @bccopt.opt -c -mt -DLARGE_IMAGES *.cpp > cpp.log 1.19 -rem @pause 1.20 tlink /m /s /t @link.cmd > lnk.log 1.21 -rem @pause
2.1 --- a/linld/stuff/src/!COMPILEX.BAT Sat Oct 06 15:26:57 2018 +0200 2.2 +++ b/linld/stuff/src/!COMPILEX.BAT Sat Oct 06 18:50:19 2018 +0200 2.3 @@ -1,16 +1,5 @@ 2.4 path ..\BC31;%PATH% 2.5 call !clean.bat 2.6 -rem tasm /la /m /dEXTRA /dNO386 *.asm > asm.log 2.7 +bcc @bccopt.opt -S -mt -DLARGE_IMAGES *.cpp > cpp.log 2.8 tasm /la /m /dEXTRA /dNO386 /dLARGE_IMAGES *.asm > asm.log 2.9 -rem @pause 2.10 -rem bcc @bccopt.opt -S -mt *.cpp 2.11 -bcc @bccopt.opt -S -mt -DLARGE_IMAGES *.cpp 2.12 -tasm /l /m load.asm 2.13 -tasm /l /m himem.asm 2.14 -tasm /l /m tazboot.asm 2.15 -tasm /l /m iso9660.asm 2.16 -rem bcc @bccopt.opt -c -mt *.cpp > cpp.log 2.17 -bcc @bccopt.opt -c -mt -DLARGE_IMAGES *.cpp > cpp.log 2.18 -rem @pause 2.19 tlink /m /s /t @linkx.cmd > lnk.log 2.20 -rem @pause
3.1 --- a/linld/stuff/src/CRTL.ASM Sat Oct 06 15:26:57 2018 +0200 3.2 +++ b/linld/stuff/src/CRTL.ASM Sat Oct 06 18:50:19 2018 +0200 3.3 @@ -171,36 +171,6 @@ 3.4 3.5 3.6 ;*************************************************************** 3.7 -;void* malloc(unsigned sz); 3.8 -;*************************************************************** 3.9 - global _malloc:near 3.10 - proc _malloc near 3.11 - 3.12 - pop ax ;caller return address 3.13 - pop cx ; sz 3.14 - push cx 3.15 - push ax 3.16 - global malloc:near ; malloc(cx) 3.17 -malloc: ; keep CX, use AX,BX 3.18 - mov ax,[_heap_top] 3.19 - mov bx,sp 3.20 - add bh,-14h ; MIN_STACK=_1k+PAGE_SIZE 3.21 - sub bx,ax ; can't overflow 3.22 - cmp bx,cx 3.23 - mov bx,offset msg_malloc 3.24 - jb puts 3.25 - add [_heap_top],cx ; _BEG has zero'd heap 3.26 - ;mov bx,ax 3.27 -@@zalloc: 3.28 - ;mov [byte bx],0 3.29 - ;inc bx ; ZF=0 3.30 - ;loop @@zalloc 3.31 - ret 3.32 - 3.33 - endp _malloc 3.34 - 3.35 - 3.36 -;*************************************************************** 3.37 ;void puts(const char* s): 3.38 ;*************************************************************** 3.39 global _puts:near 3.40 @@ -438,8 +408,14 @@ 3.41 push ax 3.42 global malloc_or_die:near ; malloc_or_die(cx) 3.43 malloc_or_die: 3.44 - call malloc 3.45 - jz _exit 3.46 + mov ax,[_heap_top] ; return value 3.47 + mov bx,sp 3.48 + add bh,-14h ; MIN_STACK=_1k+PAGE_SIZE 3.49 + sub bx,ax ; can't overflow 3.50 + cmp bx,cx 3.51 + mov bx,offset msg_malloc 3.52 + jb die 3.53 + add [_heap_top],cx ; _BEG has zero'd heap 3.54 ret 3.55 3.56 endp _malloc_or_die
4.1 --- a/linld/stuff/src/CRTL.H Sat Oct 06 15:26:57 2018 +0200 4.2 +++ b/linld/stuff/src/CRTL.H Sat Oct 06 18:50:19 2018 +0200 4.3 @@ -37,7 +37,6 @@ 4.4 extern "C" int read(int fd, void* data, int sz); 4.5 extern "C" int write(int fd, const void* data, int sz); 4.6 extern "C" long lseekset(int fd, unsigned long sz); 4.7 -extern "C" void* malloc(unsigned sz); 4.8 extern "C" int puts(const char* s); 4.9 extern "C" unsigned long strtol(const char *s); 4.10
5.1 --- a/upx/receipt Sat Oct 06 15:26:57 2018 +0200 5.2 +++ b/upx/receipt Sat Oct 06 18:50:19 2018 +0200 5.3 @@ -1,29 +1,29 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="upx" 5.7 -VERSION="3.91" 5.8 +VERSION="3.95" 5.9 CATEGORY="system-tools" 5.10 SHORT_DESC="Ultimate Packer for eXecutables (free version using UCL compression)" 5.11 MAINTAINER="devl547@gmail.com" 5.12 LICENSE="GPL2" 5.13 -WEB_SITE="http://upx.sourceforge.net/" 5.14 -TARBALL="$PACKAGE-$VERSION-src.tar.bz2" 5.15 -WGET_URL="http://upx.sourceforge.net/download/$TARBALL" 5.16 -PATCH="http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2" 5.17 -EXTRA_SOURCE_FILES="$PATCH" 5.18 +WEB_SITE="https://upx.github.io/" 5.19 +TARBALL="$PACKAGE-$VERSION.tar.gz" 5.20 +WGET_URL="https://github.com/upx/upx/archive/v$VERSION.tar.gz" 5.21 +PATCH="https://github.com/upx/upx-lzma-sdk/archive/v$VERSION.tar.gz" 5.22 +EXTRA_SOURCE_FILES="lzma-$TARBALL" 5.23 5.24 DEPENDS="ucl zlib" 5.25 -BUILD_DEPENDS="ucl-dev zlib-dev" 5.26 +BUILD_DEPENDS="ucl-dev zlib-dev perl" 5.27 5.28 # Rules to configure and make the package. 5.29 compile_rules() 5.30 { 5.31 - [ -s $SOURCES_REPOSITORY/$(basename $PATCH) ] || 5.32 - wget -P $SOURCES_REPOSITORY $PATCH 5.33 - tar -xjpf $SOURCES_REPOSITORY/$(basename $PATCH) 5.34 - CXXFLAGS="$CXXFLAGS -DWITH_ZLIB=1" 5.35 - cd $src 5.36 - UPX_LZMADIR=$src make all 5.37 + [ -s $SOURCES_REPOSITORY/lzma-$TARBALL ] || 5.38 + wget -O $SOURCES_REPOSITORY/lzma-$TARBALL $PATCH 5.39 + tar -xf $SOURCES_REPOSITORY/lzma-$TARBALL 5.40 + rm -r $src/src/lzma-sdk 5.41 + mv $src/upx-lzma-sdk-$VERSION $src/src/lzma-sdk 5.42 + make CHECK_WHITESPACE=/bin/true all 5.43 } 5.44 5.45 # Rules to gen a SliTaz package suitable for Tazpkg. 5.46 @@ -40,6 +40,5 @@ 5.47 cp $src/THANKS $install/usr/share/doc 5.48 cp $src/NEWS $install/usr/share/doc 5.49 cp $src/BUGS $install/usr/share/doc 5.50 - cp $src/*.txt $install/usr/share/doc 5.51 cp $src/doc/*.1 $install/usr/share/man 5.52 }