jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
John Reiser
2011-12-13 10:54:55 -08:00
parent c56eefc739 cf28306997
commit 57e9b27085
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hgtags
+1
View File
@@ -1,3 +1,4 @@
087cafe682c014863b4aa8a6ea21431251a6ad3c RELEASE_308
140415ffbcef86a42b4d672249927364430d3d38 RELEASE_111 140415ffbcef86a42b4d672249927364430d3d38 RELEASE_111
155618b5b7930f97bd84b82befa7a4fd6672efb3 RELEASE_304 155618b5b7930f97bd84b82befa7a4fd6672efb3 RELEASE_304
1931f4f28074970ec53b4cd21c7fc181b4da8e5e RELEASE_301 1931f4f28074970ec53b4cd21c7fc181b4da8e5e RELEASE_301
NEWS
+5 -4
View File
@@ -2,13 +2,14 @@
User visible changes for UPX User visible changes for UPX
================================================================== ==================================================================
Changes in 3.08 (XX XXX XXXX): Changes in 3.09 (XX XXX XXXX):
Changes in 3.08 (12 Dec 2011):
* Fix allocation in runtime stub for darwin.macho-entry (i386 and amd64). * Fix allocation in runtime stub for darwin.macho-entry (i386 and amd64).
* Compress shared library on ELF i386 only [ld.so threatens even this case]. * Compress shared library on ELF i386 only [ld.so threatens even this case].
* Minor edits for portability under various compilers
* Attempt to suport ELF on QNX 6.3.0 for armel (experimental). * Attempt to suport ELF on QNX 6.3.0 for armel (experimental).
* Better diangostic when ELF -fPIC is needed * Better diangostic when ELF -fPIC is needed.
* PT_NOTE improvements for *BSD * PT_NOTE improvements for *BSD.
* Preserve more ELF .e_flags on ARM. * Preserve more ELF .e_flags on ARM.
* Minor code improvements for ELF stubs * Minor code improvements for ELF stubs
* Defend against another flavor of corrupt PE header. * Defend against another flavor of corrupt PE header.
src/p_lx_elf.cpp
+4 -2
View File
@@ -1025,8 +1025,10 @@ static const
#include "stub/arm-linux.elf-entry.h" #include "stub/arm-linux.elf-entry.h"
static const static const
#include "stub/arm-linux.elf-fold.h" #include "stub/arm-linux.elf-fold.h"
#if 0
static const static const
#include "stub/arm-linux.shlib-init.h" #include "stub/arm-linux.shlib-init.h"
#endif
static const static const
#include "stub/armeb-linux.elf-entry.h" #include "stub/armeb-linux.elf-entry.h"
@@ -2375,10 +2377,10 @@ int PackLinuxElf32::ARM_is_QNX(void)
unsigned const sz_interp = get_te32(&phdr->p_filesz); unsigned const sz_interp = get_te32(&phdr->p_filesz);
unsigned const pos_interp = get_te32(&phdr->p_offset); unsigned const pos_interp = get_te32(&phdr->p_offset);
if (sz_interp <= sizeof(interp) if (sz_interp <= sizeof(interp)
&& (sz_interp + pos_interp) <= fi->st_size()) { && (sz_interp + pos_interp) <= (unsigned) fi->st_size()) {
fi->seek(pos_interp, SEEK_SET); fi->seek(pos_interp, SEEK_SET);
fi->readx(interp, sz_interp); fi->readx(interp, sz_interp);
for (int k = -5+ sz_interp; k>=0; --k) { for (int k = sz_interp - 5; k>=0; --k) {
if (0==memcmp("ldqnx", &interp[k], 5)) if (0==memcmp("ldqnx", &interp[k], 5))
return 1; return 1;
} }
src/version.h
+6 -6
View File
@@ -1,6 +1,6 @@
#define UPX_VERSION_HEX 0x030800 /* 03.08.00 */ #define UPX_VERSION_HEX 0x030900 /* 03.09.00 */
#define UPX_VERSION_STRING "3.08" #define UPX_VERSION_STRING "3.09"
#define UPX_VERSION_STRING4 "3.08" #define UPX_VERSION_STRING4 "3.09"
#define UPX_VERSION_DATE "Sep 09th 2010" #define UPX_VERSION_DATE "Dec 13th 2011"
#define UPX_VERSION_DATE_ISO "2010-09-09" #define UPX_VERSION_DATE_ISO "2011-12-13"
#define UPX_VERSION_YEAR "2010" #define UPX_VERSION_YEAR "2011"