diff options
author | ben <ben> | 2005-02-10 15:51:38 +0000 |
---|---|---|
committer | ben <ben> | 2005-02-10 15:51:38 +0000 |
commit | e07857a9ab1faeeb716d82d78c570752e6b4497c (patch) | |
tree | 2bc0c9c2bc8814b875d4cc7e67bebbc58c82ee57 /archivers/upx/patches | |
parent | 5ebcfa0e51ce00f0dbf0d6f9724ce6ad3b4badbf (diff) | |
download | pkgsrc-e07857a9ab1faeeb716d82d78c570752e6b4497c.tar.gz |
Update upx to version 1.25. This addresses PR#29327.
Changes include:
* INFO: http://upx.sourceforge.net is the permanent UPX home page
* watcom/le: don't crash on files without relocations
* win32/pe: stricter checks of some PE values
* source code: much improved portability using ACC, the
Automatic Compiler Configuration
* source code: compile fixes for strict ISO C++ compilers
* source code: compile fixes for Win64
Diffstat (limited to 'archivers/upx/patches')
-rw-r--r-- | archivers/upx/patches/patch-aa | 46 | ||||
-rw-r--r-- | archivers/upx/patches/patch-ab | 13 |
2 files changed, 17 insertions, 42 deletions
diff --git a/archivers/upx/patches/patch-aa b/archivers/upx/patches/patch-aa index c40ddc1c960..7b259b46593 100644 --- a/archivers/upx/patches/patch-aa +++ b/archivers/upx/patches/patch-aa @@ -1,43 +1,31 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/01/07 15:12:59 ben Exp $ ---- ../upx-1.24/src/Makefile 2002-10-28 11:43:34.000000000 +0100 -+++ src/Makefile 2003-12-27 22:03:08.000000000 +0100 -@@ -187,6 +187,39 @@ LDFLAGS += $(LDLIBDIRS) +$NetBSD: patch-aa,v 1.2 2005/02/10 15:51:38 ben Exp $ + +--- ../upx-1.25-orig/src/Makefile.bld 2004-06-24 20:35:14.000000000 +0200 ++++ src/Makefile.bld 2005-02-10 13:25:03.000000000 +0100 +@@ -144,6 +144,26 @@ + include $(srcdir)/Makedefs.gcc + endif - - ### ++## +### NetBSD +### + ++ +ifeq ($(target),netbsd) ++include $(srcdir)/Makedefs.gcc +override arch := $(shell uname -m | sed -e 's/^i[3456789]86$$/i386/') -+DEFS += '-DUPX_CONFIG_H="config_h/linux.h"' -+DEFS += -D_FILE_OFFSET_BITS=64 -DWITH_UCL=1 -+LDLIBS += -lucl +ifeq ($(arch),i386) -+ CC += -march=i386 -mcpu=i586 ++ CCARCH += -march=i386 -mcpu=i686 +endif -+ -+ifeq (1,2) # checkergcc -+ CC = checkergcc -+ CXX = checkerg++ -+else ++DEFS += -D_FILE_OFFSET_BITS=64 ++##CFLAGS_WERROR = -Werror +ifeq ($(DEBUG),1) -+ CFLAGS += -O0 -g +else + ##LDFLAGS += -static + STUBEDIT_EXE = objcopy -S -R .comment -R .note $@ -+ ifeq ($(arch),i386) -+ STUBIFY_EXE = perl $(srcdir)/stub/scripts/brandelf.pl $@ -+ CHMOD_EXE = chmod 755 $@ -+ endif +endif -+endif -+LDFLAGS += -L$(PREFIX)/lib -Wl,-rpath=$(PREFIX)/lib -+CFLAGS += -I$(PREFIX)/include -+CC = g++ -+endif # netbsd -+ -+### - ### Linux - ### ++CHMOD_EXE = chmod 755 $@ ++endif # netbsd + ### + ### linux - gcc diff --git a/archivers/upx/patches/patch-ab b/archivers/upx/patches/patch-ab deleted file mode 100644 index e67630acb87..00000000000 --- a/archivers/upx/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/01/11 20:18:39 ben Exp $ - ---- src/conf.h.orig 2002-10-14 11:53:00.000000000 -0700 -+++ src/conf.h -@@ -109,7 +109,7 @@ - # define UPX_E_OK UCL_E_OK - # define UPX_E_ERROR UCL_E_ERROR - # define UPX_E_OUT_OF_MEMORY UCL_E_OUT_OF_MEMORY --# define __UPX_ENTRY __UCL_ENTRY -+# define __UPX_ENTRY __UCL_CDECL - # endif - #endif - #if defined(WITH_NRV) |