commit upx for openSUSE:Factory

19 Nov 2014

Hello community,

here is the log from the commit of package upx for openSUSE:Factory checked in at 2014-11-19 20:26:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/upx (Old)
 and      /work/SRC/openSUSE:Factory/.upx.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "upx"

Changes:
--------

--- /work/SRC/openSUSE:Factory/upx/upx.changes	2014-01-29 07:17:36.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.upx.new/upx.changes	2014-11-19 20:30:22.000000000 +0100
@@ -1,0 +2,9 @@
+Sun Nov 16 22:43:10 UTC 2014 - crrodriguez@opensuse.org
+
+- upx-endiantests.patch and lzma-x-endian.patch Correct
+  endianness tests by only considering what the compiler says
+  about target system and not a hardcoded architecture list.
+  (drop upx-3.03_ia64-endianity.patch)
+- build with hidden visibility.
+
+-------------------------------------------------------------------

Old:
----
  upx-3.03_ia64-endianity.patch

New:
----
  lzma-x-endian.patch
  upx-endiantests.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ upx.spec ++++++
--- /var/tmp/diff_new_pack.W7dE3u/_old	2014-11-19 20:30:23.000000000 +0100
+++ /var/tmp/diff_new_pack.W7dE3u/_new	2014-11-19 20:30:23.000000000 +0100
@@ -26,13 +26,13 @@
 
 Source:         http://upx.sourceforge.net/download/%{name}-%{version}-src.tar.bz2
 Source1:        http://downloads.sf.net/sevenzip/lzma922.tar.bz2
-Patch1:         %{name}-3.03_ia64-endianity.patch
-# PATCH-FIX-UPSTREAM upx-aarch64.patch schwab@suse.de -- Support for AArch64
-Patch2:         upx-aarch64.patch
 BuildRequires:  gcc-c++
 BuildRequires:  libucl1-devel
 BuildRequires:  zlib-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch0:         upx-aarch64.patch
+Patch1:         upx-endiantests.patch
+Patch2:         lzma-x-endian.patch
 
 %description
 UPX is a free, portable, extendable, high-performance executable packer
@@ -42,11 +42,12 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
-%patch -P 1 -P 2 -p1
-
+%patch0 -p1
+%patch1 -p1
 mkdir "%_builddir/lzma-x"
 pushd "%_builddir/lzma-x"
 tar -xf "%{S:1}"
+%patch2 -p1
 popd
 
 # BSD-4 clause licensed file, remove just in case bnc#753791
@@ -57,7 +58,7 @@
 export UPX_LZMA_VERSION=0x922
 export UPX_UCLDIR=%{_prefix}
 export CXX=g++
-make -C src CXXFLAGS="%{optflags}"
+make -C src CXXFLAGS="%{optflags} -fvisibility=hidden -fvisibility-inlines-hidden"
 make -C doc
 
 %install

++++++ lzma-x-endian.patch ++++++
--- lzma-x.orig/C/CpuArch.h
+++ lzma-x/C/CpuArch.h
@@ -47,12 +47,12 @@ If MY_CPU_LE_UNALIGN is not defined, we
 #if defined(MY_CPU_X86_OR_AMD64)
 #define MY_CPU_LE_UNALIGN
 #endif
-
-#if defined(MY_CPU_X86_OR_AMD64) || defined(MY_CPU_ARM_LE)  || defined(MY_CPU_IA64_LE) || defined(__ARMEL__) || defined(__MIPSEL__) || defined(__LITTLE_ENDIAN__)
+
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 #define MY_CPU_LE
 #endif
 
-#if defined(__BIG_ENDIAN__) || defined(__m68k__) ||  defined(__ARMEB__) || defined(__MIPSEB__)
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #define MY_CPU_BE
 #endif
 
++++++ upx-aarch64.patch ++++++
--- /var/tmp/diff_new_pack.W7dE3u/_old	2014-11-19 20:30:23.000000000 +0100
+++ /var/tmp/diff_new_pack.W7dE3u/_new	2014-11-19 20:30:23.000000000 +0100
@@ -12,14 +12,3 @@
  #else
  #  define ACC_ARCH_UNKNOWN          1
  #  define ACC_INFO_ARCH             "unknown"
-@@ -1388,6 +1391,10 @@ extern "C" {
- #  define ACC_ABI_BIG_ENDIAN        1
- #elif 1 && (ACC_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__)
- #  define ACC_ABI_LITTLE_ENDIAN     1
-+#elif (ACC_ARCH_AARCH64) && defined(__AARCH64EL__)
-+#  define ACC_ABI_LITTLE_ENDIAN     1
-+#elif (ACC_ARCH_AARCH64) && defined(__AARCH64EB__)
-+#  define ACC_ABI_BIG_ENDIAN        1
- #endif
- #endif
- #if (ACC_ABI_BIG_ENDIAN) && (ACC_ABI_LITTLE_ENDIAN)

++++++ upx-endiantests.patch ++++++
--- upx-3.91-src.orig/src/miniacc.h
+++ upx-3.91-src/src/miniacc.h
@@ -1966,46 +1966,15 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEO
 #  undef ACC_ABI_BIG_ENDIAN
 #  undef ACC_ABI_LITTLE_ENDIAN
 #elif !(ACC_ABI_BIG_ENDIAN) && !(ACC_ABI_LITTLE_ENDIAN)
-#if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_WIN64)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__)
-#  if (__LITTLE_ENDIAN__ == 1)
-#    define ACC_ABI_LITTLE_ENDIAN   1
-#  else
-#    define ACC_ABI_BIG_ENDIAN      1
-#  endif
-#elif 1 && defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif 1 && defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif 1 && (ACC_ARCH_ARM) && defined(__ARMEB__) && !defined(__ARMEL__)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif 1 && (ACC_ARCH_ARM) && defined(__ARMEL__) && !defined(__ARMEB__)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif 1 && (ACC_ARCH_ARM && ACC_CC_ARMCC_ARMCC)
-#  if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)
-#    error "unexpected configuration - check your compiler defines"
-#  elif defined(__BIG_ENDIAN)
-#    define ACC_ABI_BIG_ENDIAN      1
-#  else
-#    define ACC_ABI_LITTLE_ENDIAN   1
-#  endif
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif 1 && (ACC_ARCH_ARM64) && defined(__AARCH64EB__) && !defined(__AARCH64EL__)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif 1 && (ACC_ARCH_ARM64) && defined(__AARCH64EL__) && !defined(__AARCH64EB__)
-#  define ACC_ABI_LITTLE_ENDIAN     1
-#elif 1 && (ACC_ARCH_MIPS) && defined(__MIPSEB__) && !defined(__MIPSEL__)
-#  define ACC_ABI_BIG_ENDIAN        1
-#elif 1 && (ACC_ARCH_MIPS) && defined(__MIPSEL__) && !defined(__MIPSEB__)
-#  define ACC_ABI_LITTLE_ENDIAN     1
+
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define ACC_ABI_LITTLE_ENDIAN 1
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define ACC_ABI_BIG_ENDIAN 1
+#else
+#error unknown endianess WTF!
 #endif
+
 #endif
 #if (ACC_ABI_BIG_ENDIAN) && (ACC_ABI_LITTLE_ENDIAN)
 #  error "unexpected configuration - check your compiler defines"
--- upx-3.91-src.orig/src/stub/tools/sstrip/sstrip.c
+++ upx-3.91-src/src/stub/tools/sstrip/sstrip.c
@@ -331,14 +331,14 @@ static int readelfheaderident(int fd, El
 
     /* Compare the file's class and endianness with the program's.
      */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
     if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
         do_reverse_endian = 0;
     } else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) {
 /*      fprintf(stderr, "ELF file has different endianness.\n"); */
         do_reverse_endian = 1;
     }
-#elif __BYTE_ORDER == __BIG_ENDIAN
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
     if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) {
 /*      fprintf(stderr, "ELF file has different endianness.\n"); */
         do_reverse_endian = 1;
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)