kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/archivers/upx/patches/patch-src_p__exe.cpp

41 lines
1.4 KiB
C++
Raw Normal View History

Updated to latest release, 3.91. Minor whitespace fixes in the Makefile. Use BUILD_DIRS and MAKE_ENV instead of writing do-install phase manually. Add sparc{,64} support to package. Fixes build on OpenBSD/sparc64 at least. Defuzz patches. From NEWS: ================================================================== User visible changes for UPX ================================================================== Changes in 3.91 (30 Sep 2013): * Added experimental support for Windows 64-bit PE files, based on work by Stefan Widmann. Please use for testing only! * bug fixes ================================================================== Changes in 3.09 (18 Feb 2013): * New option --preserve-build-id for GNU ELF. * Allow for code signing and LC_UUID on Mac OS X executables. * Allow non-contiguous LC_SEGMENTs and 0==.vmsize for Mach-O. * Allow zero-filled final page in PackUnix::canUnpack(). * bug fixes
2014-05-26 03:30:39 +02:00
$NetBSD: patch-src_p__exe.cpp,v 1.3 2014/05/26 01:30:39 rodent Exp $
Fix build on SunOS.
2012-02-15 20:27:10 +01:00
Updated to latest release, 3.91. Minor whitespace fixes in the Makefile. Use BUILD_DIRS and MAKE_ENV instead of writing do-install phase manually. Add sparc{,64} support to package. Fixes build on OpenBSD/sparc64 at least. Defuzz patches. From NEWS: ================================================================== User visible changes for UPX ================================================================== Changes in 3.91 (30 Sep 2013): * Added experimental support for Windows 64-bit PE files, based on work by Stefan Widmann. Please use for testing only! * bug fixes ================================================================== Changes in 3.09 (18 Feb 2013): * New option --preserve-build-id for GNU ELF. * Allow for code signing and LC_UUID on Mac OS X executables. * Allow non-contiguous LC_SEGMENTs and 0==.vmsize for Mach-O. * Allow zero-filled final page in PackUnix::canUnpack(). * bug fixes
2014-05-26 03:30:39 +02:00
--- src/p_exe.cpp.orig 2013-09-30 15:51:00.000000000 +0000
Changes 3.08: * 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]. * Attempt to suport ELF on QNX 6.3.0 for armel (experimental). * Better diangostic when ELF -fPIC is needed. * PT_NOTE improvements for *BSD. * Preserve more ELF .e_flags on ARM. * Minor code improvements for ELF stubs * Defend against another flavor of corrupt PE header. * bug fixes
2012-05-02 08:45:14 +02:00
+++ src/p_exe.cpp
@@ -110,7 +110,7 @@ int PackExe::fillExeHeader(struct exe_he
oh.ss += 0x20;
if (oh.ss != ih.ss)
Fix build on SunOS.
2012-02-15 20:27:10 +01:00
- flag |= SS;
+ flag |= upx_SS;
Changes 3.08: * 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]. * Attempt to suport ELF on QNX 6.3.0 for armel (experimental). * Better diangostic when ELF -fPIC is needed. * PT_NOTE improvements for *BSD. * Preserve more ELF .e_flags on ARM. * Minor code improvements for ELF stubs * Defend against another flavor of corrupt PE header. * bug fixes
2012-05-02 08:45:14 +02:00
if (oh.sp != ih.sp || M_IS_LZMA(ph.method))
flag |= SP;
return flag;
@@ -131,7 +131,7 @@ void PackExe::addLoaderEpilogue(int flag
Fix build on SunOS.
2012-02-15 20:27:10 +01:00
);
addLoader("EXEMAIN8",
Changes 3.08: * 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]. * Attempt to suport ELF on QNX 6.3.0 for armel (experimental). * Better diangostic when ELF -fPIC is needed. * PT_NOTE improvements for *BSD. * Preserve more ELF .e_flags on ARM. * Minor code improvements for ELF stubs * Defend against another flavor of corrupt PE header. * bug fixes
2012-05-02 08:45:14 +02:00
device_driver ? "DEVICEEND" : "",
Fix build on SunOS.
2012-02-15 20:27:10 +01:00
- (flag & SS) ? "EXESTACK" : "",
+ (flag & upx_SS) ? "EXESTACK" : "",
(flag & SP) ? "EXESTASP" : "",
(flag & USEJUMP) ? "EXEJUMPF" : "",
NULL
Changes 3.08: * 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]. * Attempt to suport ELF on QNX 6.3.0 for armel (experimental). * Better diangostic when ELF -fPIC is needed. * PT_NOTE improvements for *BSD. * Preserve more ELF .e_flags on ARM. * Minor code improvements for ELF stubs * Defend against another flavor of corrupt PE header. * bug fixes
2012-05-02 08:45:14 +02:00
@@ -556,7 +556,7 @@ void PackExe::pack(OutputFile *fo)
{
set_le16(extra_info+eisize,ih.ss);
eisize += 2;
- assert((flag & SS) != 0); // set in fillExeHeader()
+ assert((flag & upx_SS) != 0); // set in fillExeHeader()
Fix build on SunOS.
2012-02-15 20:27:10 +01:00
}
Changes 3.08: * 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]. * Attempt to suport ELF on QNX 6.3.0 for armel (experimental). * Better diangostic when ELF -fPIC is needed. * PT_NOTE improvements for *BSD. * Preserve more ELF .e_flags on ARM. * Minor code improvements for ELF stubs * Defend against another flavor of corrupt PE header. * bug fixes
2012-05-02 08:45:14 +02:00
if (oh.sp != ih.sp)
{
@@ -779,7 +779,7 @@ void PackExe::unpack(OutputFile *fo)
Fix build on SunOS.
2012-02-15 20:27:10 +01:00
{ imagesize -= 2; oh.min = get_le16(ibuf+imagesize); }
if (flag & SP)
{ imagesize -= 2; oh.sp = get_le16(ibuf+imagesize); }
- if (flag & SS)
+ if (flag & upx_SS)
{ imagesize -= 2; oh.ss = get_le16(ibuf+imagesize); }
unsigned ip = (flag & USEJUMP) ? get_le32(ibuf+imagesize-4) : (unsigned) ih.firstreloc;
Reference in a new issue Copy permalink