Merge branch 'devel' of https://github.com/upx/upx into devel

src/p_lx_sh.cpp

@@ -114,7 +114,7 @@ bool PackLinuxI386sh::getShellName(char *buf)
     buf[l_shname] = 0;
     static char const *const shname[] = { // known shells that accept "-c" arg
         "ash", "bash", "bsh", "csh", "ksh", "pdksh", "sh", "tcsh", "zsh",
-        "python",
+        "python", "python2", "python3",
         NULL
     };
     const char *bname = strrchr(buf, '/');

src/pefile.cpp

@@ -2693,15 +2693,7 @@ void PeFile::rebuildRelocs(upx_byte *& extrainfo, unsigned bits,
     }
     rel.finish (oxrelocs,soxrelocs);
 
-    if (opt->win32_pe.strip_relocs && !isdll)
-    {
-        obuf.clear(ODADDR(PEDIR_RELOC) - rvamin, ODSIZE(PEDIR_RELOC));
-        ODADDR(PEDIR_RELOC) = 0;
-        soxrelocs = 0;
-        // FIXME: try to remove the original relocation section somehow
-    }
-    else
-        omemcpy(obuf + ODADDR(PEDIR_RELOC) - rvamin,oxrelocs,soxrelocs);
+    omemcpy(obuf + ODADDR(PEDIR_RELOC) - rvamin,oxrelocs,soxrelocs);
     delete [] oxrelocs; oxrelocs = NULL;
     wrkmem.dealloc();
 
@@ -2933,12 +2925,8 @@ void PeFile::unpack0(OutputFile *fo, const ht &ih, ht &oh,
         ft.unfilter(obuf + oh.codebase - rvamin, oh.codesize);
     }
 
-     //NEW: disable reloc stripping if ASLR is enabled
-    if(ih.dllflags & IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE)
-        opt->win32_pe.strip_relocs = false;
-
     // FIXME: ih.flags is checked here because of a bug in UPX 0.92
-    if ((opt->win32_pe.strip_relocs && !isdll) || (ih.flags & RELOCS_STRIPPED))
+    if (ih.flags & RELOCS_STRIPPED)
     {
         oh.flags |= RELOCS_STRIPPED;
         ODADDR(PEDIR_RELOC) = 0;

src/stub/Makefile

@@ -206,7 +206,7 @@ tc_objdump_disasm_options =
 ECHO_e     = /bin/echo -e
 ECHO_E     = /bin/echo -E
 PERL       = perl
-PYTHON     = python
+PYTHON     = python2
 UNIX2DOS  := $(PERL) -i -pe 's/$$/\r/;'
 
 # trim (strip) trailing whitespace

src/stub/scripts/bin2h.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*-
 #
 #  bin2h.py --

src/stub/scripts/brandelf.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*-
 #
 #  brandelf.py --

src/stub/scripts/gpp_inc.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*-
 #
 #  gpp_inc.py -- Generic PreProcessor: include

src/stub/scripts/xstrip.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*-
 #
 #  xstrip.py -- truncate ELF objects created by multiarch-objcopy-2.17

src/stub/src/arch/i086/cleanasm.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*-
 #
 #  cleanasm.py --

src/stub/src/arch/i086/wdis2gas.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*-
 #
 #  wdis2gas.py --