From 626025d539a3346ced82493c3197c34cadcbd19c Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 27 Apr 2010 16:09:41 +0200 Subject: [PATCH] Prepare release. --- NEWS | 4 ++-- src/compress_lzma.cpp | 2 +- src/help.cpp | 3 ++- src/linker.cpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index b42ebe91..a1e9027c 100644 --- a/NEWS +++ b/NEWS @@ -3,12 +3,12 @@ User visible changes for UPX ================================================================== Changes in 3.05 (27 Apr 2010): - * Withdraw support for shared libraries on Darwin (Apple Mac OS X) - because upx does not understand enough about .dylib. * i386-linux and amd64-linux support shared libraries (DT_INIT must exist, all info needed by runtime loader must be first in .text, etc.) * Linux /proc/self/exe now is preserved by default, by leaving behind one page. New compress-time option --unmap-all-pages is available. + * Withdraw support for shared libraries on Darwin (Apple Mac OS X) + because upx does not understand enough about .dylib. * bug fixes Changes in 3.04 (27 Sep 2009): diff --git a/src/compress_lzma.cpp b/src/compress_lzma.cpp index 2cc80072..21782527 100644 --- a/src/compress_lzma.cpp +++ b/src/compress_lzma.cpp @@ -546,7 +546,7 @@ int upx_lzma_compress ( const upx_bytep src, unsigned src_len, } error: - *dst_len = os.b_pos; + *dst_len = (unsigned) os.b_pos; //printf("\nlzma_compress: %d: %u %u %u %u %u, %u - > %u\n", r, res->pos_bits, res->lit_pos_bits, res->lit_context_bits, res->dict_size, res->num_probs, src_len, *dst_len); //printf("%u %u %u\n", is.__m_RefCount, os.__m_RefCount, progress.__m_RefCount); return r; diff --git a/src/help.cpp b/src/help.cpp index 183e79c1..95fd8eca 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -51,8 +51,9 @@ void show_head(void) fg = con_fg(f,FG_GREEN); con_fprintf(f, " Ultimate Packer for eXecutables\n" - " Copyright (C) 1996 - 2009\n" + " Copyright (C) 1996 - %s\n" "UPX %-10s Markus Oberhumer, Laszlo Molnar & John Reiser %14s\n\n", + UPX_VERSION_YEAR, #if (ACC_OS_DOS16 || ACC_OS_DOS32) V("d"), #elif (ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64) diff --git a/src/linker.cpp b/src/linker.cpp index fe5439cc..40398ec5 100644 --- a/src/linker.cpp +++ b/src/linker.cpp @@ -469,7 +469,7 @@ int ElfLinker::getSection(const char *sname, int *slen) const const Section *section = findSection(sname); if (slen) *slen = section->size; - return section->output - output; + return (int) (section->output - output); } int ElfLinker::getSectionSize(const char *sname) const