From 51106e730ba6a32fcc507466dd83bff59a132142 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 29 Jun 2004 18:11:52 +0000 Subject: [PATCH] Updated. committer: mfx 1088532712 +0000 --- .cvsignore | 1 + NEWS | 16 ++++++++++++++-- doc/Makefile | 2 +- src/.cvsignore | 1 + src/stub/Makefile | 44 ++++++-------------------------------------- src/version.h | 2 +- 6 files changed, 24 insertions(+), 42 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5646f6a9..f06d6b53 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ +_darcs B ChangeLog.cvs* build diff --git a/NEWS b/NEWS index c66812ea..f8c71d25 100644 --- a/NEWS +++ b/NEWS @@ -7,11 +7,14 @@ User visible changes for UPX [ WARNING: there are known bugs in the win32/pe format which cause crashes on a number of exes ] -Changes in 1.91 beta (XX Apr 2004): +Changes in 1.91 beta (30 Jun 2004): * UNSTABLE BETA VERSION - DO NOT USE EXCEPT FOR TESTING * djgpp2/coff: added support for recent binutils versions + * linux/elf386, linux/sh386: lots of improvements + * vmlinuz/386: added support for recent kernels * watcom/le: don't crash on files without relocations - * Option `--brute' now implies `--crp-ms=999999'. + * win32/pe: stricter checks of some PE values + * option `--brute' now implies `--crp-ms=999999'. * source code: much improved portability using ACC, the Automatic Compiler Configuration * source code: compile fixes for strict ISO C++ compilers @@ -39,6 +42,15 @@ Changes in 1.11 beta (20 Dec 2000): ================================================================== +Changes in 1.25 (29 Jun 2004) + * INFO: http://upx.sourceforge.net is the permanent UPX home page + * watcom/le: don't crash on files without relocations + * win32/pe: stricter checks of some PE values + * source code: much improved portability using ACC, the + Automatic Compiler Configuration + * source code: compile fixes for strict ISO C++ compilers + * source code: compile fixes for Win64 + Changes in 1.24 (07 Nov 2002) * djgpp2/coff: stricter check of the COFF header to work around a problem with certain binutils versions diff --git a/doc/Makefile b/doc/Makefile index 2433041e..c7aec66e 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,7 +3,7 @@ SHELL = /bin/sh top_srcdir = .. PACKAGE = upx -VERSION_DATE = 11 May 2004 +VERSION_DATE = 30 Jun 2004 VERSION := $(shell sed -n 's/^.*UPX_VERSION_STRING .*"\(.*\)".*/\1/p' $(top_srcdir)/src/version.h) TRIMSPACE = cat diff --git a/src/.cvsignore b/src/.cvsignore index 0f7a8de6..0d3d2c57 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -21,3 +21,4 @@ upx_nrv upx_nrv.* upx_ucl upx_ucl.* +version1*.h diff --git a/src/stub/Makefile b/src/stub/Makefile index ee6972b2..fd4b6d93 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -41,9 +41,6 @@ STUBS = \ ifneq ($(strip $(wildcard $(srcdir)/l_ext2.asm)),) STUBS += l_ext2.h endif -ifneq ($(strip $(wildcard $(srcdir)/l_tos2.s)),) -STUBS += l_t_x2b.h l_t_x2bs.h l_t_x2d.h l_t_x2ds.h -endif # util var for use in the rules - basename of the current target @@ -277,35 +274,6 @@ l_t_n2es.h: l_tos.s $(O2BIN) $T.o $T.bin 'UPX1' 'UPX9' $(BIN2H) $T.bin nrv2e_loader_small $@ -# experimental: -l_t_x2b.h: l_tos2.s - $(CPP_M68K) -DNRV2B -o $T.i $< - $(APP_M68K) $T.i $T.asx - $(ASM_M68K) $T.asx - $(O2BIN) $T.o $T.bin 'UPX1' 'UPX9' - $(BIN2H) $T.bin nrv2b_loader $@ - -l_t_x2bs.h: l_tos2.s - $(CPP_M68K) -DNRV2B -DSMALL -o $T.i $< - $(APP_M68K) $T.i $T.asx - $(ASM_M68K) $T.asx - $(O2BIN) $T.o $T.bin 'UPX1' 'UPX9' - $(BIN2H) $T.bin nrv2b_loader_small $@ - -l_t_x2d.h: l_tos2.s - $(CPP_M68K) -DNRV2D -o $T.i $< - $(APP_M68K) $T.i $T.asx - $(ASM_M68K) $T.asx - $(O2BIN) $T.o $T.bin 'UPX1' 'UPX9' - $(BIN2H) $T.bin nrv2d_loader $@ - -l_t_x2ds.h: l_tos2.s - $(CPP_M68K) -DNRV2D -DSMALL -o $T.i $< - $(APP_M68K) $T.i $T.asx - $(ASM_M68K) $T.asx - $(O2BIN) $T.o $T.bin 'UPX1' 'UPX9' - $(BIN2H) $T.bin nrv2d_loader_small $@ - # /*********************************************************************** # // ps1/exe @@ -422,12 +390,12 @@ l_com.h: n2b_d16.asy $(DEPS2) l_djgpp2.h: $(DEPS2) $(DEPS3) l_exe.h: n2b_d8e.asy n2d_d8e.asy n2e_d8e.asy $(DEPS2) l_sys.h: n2b_d16.asy $(DEPS2) -l_t_n2b.h: n2b_d.ash bits.ash $(DEPS1) -l_t_n2bs.h: n2b_d.ash bits.ash $(DEPS1) -l_t_n2d.h: n2d_d.ash bits.ash $(DEPS1) -l_t_n2ds.h: n2d_d.ash bits.ash $(DEPS1) -l_t_n2e.h: n2e_d.ash bits.ash $(DEPS1) -l_t_n2es.h: n2e_d.ash bits.ash $(DEPS1) +l_t_n2b.h: n2b_d.ash bits.ash $(DEPS1) ../version.h +l_t_n2bs.h: n2b_d.ash bits.ash $(DEPS1) ../version.h +l_t_n2d.h: n2d_d.ash bits.ash $(DEPS1) ../version.h +l_t_n2ds.h: n2d_d.ash bits.ash $(DEPS1) ../version.h +l_t_n2e.h: n2e_d.ash bits.ash $(DEPS1) ../version.h +l_t_n2es.h: n2e_d.ash bits.ash $(DEPS1) ../version.h l_tmt.h: $(DEPS2) $(DEPS3) l_vmlinz.h: $(DEPS2) $(DEPS3) l_vxd.h: $(DEPS2) $(DEPS3) diff --git a/src/version.h b/src/version.h index 0a7166fe..088b49af 100644 --- a/src/version.h +++ b/src/version.h @@ -1,4 +1,4 @@ #define UPX_VERSION_HEX 0x019100 /* 01.91.00 */ #define UPX_VERSION_STRING "1.91 beta" #define UPX_VERSION_STRING4 "1.91" -#define UPX_VERSION_DATE "May 11th 2004" +#define UPX_VERSION_DATE "Jun 30th 2004"