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

7 files changed, 64 insertions, 96 deletions

diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 7e1cce59656..f9e64ddddde 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,44 +1,49 @@
-# $NetBSD: Makefile,v 1.17 2012/02/15 19:27:10 hans Exp $
+# $NetBSD: Makefile,v 1.18 2012/05/02 06:45:14 adam Exp $
 
-DISTNAME=	upx-1.25-src
+DISTNAME=	upx-3.08-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
 CATEGORIES=	misc archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=upx/}
+EXTRACT_SUFX=	.tar.bz2
+# consult src/stub/src/c/Makevars.lzma for the supported LZMA SDK version
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} lzma443${EXTRACT_SUFX}
+SITES.lzma443.tar.bz2=	${MASTER_SITE_SOURCEFORGE:=sevenzip/}
 
 MAINTAINER=	fab@gnux.info
 HOMEPAGE=	http://upx.sourceforge.net/
 COMMENT=	Ultimate packer for executables
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake perl pod2man pod2html pod2text
+NO_CONFIGURE=		yes
 
-USE_TOOLS+=	gmake perl pod2man pod2html pod2text
-USE_LANGUAGES=	c c++
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/upx
 
-INSTALLATION_DIRS=	bin
-
-BUILDLINK_TRANSFORM=	rm:-mcpu=i686
+BUILDLINK_TRANSFORM+=	rm:-mcpu=i686
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM=	rm:-Wl,-Map rm:-Wl,upx.map
+BUILDLINK_TRANSFORM+=	rm:-Wl,-Map rm:-Wl,upx.map
 .endif
 
+post-extract:
+	mkdir -p ${WRKSRC}/src/stub/src/c/lzma-sdk
+	ln -sf ${WRKDIR}/C ${WRKSRC}/src/stub/src/c/lzma-sdk/C
+
 do-build:
-	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} PREFIX=${PREFIX} target=netbsd	\
-			UCLDIR=${PREFIX} LDLIBDIRS=-L${PREFIX}/lib
+	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}	\
+		PREFIX=${PREFIX} UCLDIR=${PREFIX} LDLIBDIRS=-L${PREFIX}/lib
 	cd ${WRKSRC}/doc && ${MAKE_PROGRAM}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/upx ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/upx/
-	${INSTALL_DATA} ${WRKSRC}/doc/upx.doc \
-		${DESTDIR}${PREFIX}/share/doc/upx
-	${INSTALL_DATA} ${WRKSRC}/doc/upx.html \
-		${DESTDIR}${PREFIX}/share/doc/upx
+	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${DESTDIR}${PREFIX}/bin/upx
+	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/upx.doc ${DESTDIR}${PREFIX}/share/doc/upx
+	${INSTALL_DATA} ${WRKSRC}/doc/upx.html ${DESTDIR}${PREFIX}/share/doc/upx
 
 .include "../../devel/ucl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/upx/PLIST b/archivers/upx/PLIST
index b53a0f4590a..e20d7a23f0c 100644
--- a/archivers/upx/PLIST
+++ b/archivers/upx/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/07 15:12:59 ben Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/05/02 06:45:14 adam Exp $
 bin/upx
+man/man1/upx.1
 share/doc/upx/upx.doc
 share/doc/upx/upx.html
diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo
index 5f50f17c6de..c8642027119 100644
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.7 2012/02/15 19:27:10 hans Exp $
+$NetBSD: distinfo,v 1.8 2012/05/02 06:45:14 adam Exp $
 
-SHA1 (upx-1.25-src.tar.gz) = 7ce05370efe969832d841a73dd165e6a4292f9d4
-RMD160 (upx-1.25-src.tar.gz) = 1c73a1eb8d98d32ef63ed351ca494526f895a9de
-Size (upx-1.25-src.tar.gz) = 250849 bytes
-SHA1 (patch-aa) = d638e86e98e16b629179b188acfccac6cd3140de
-SHA1 (patch-ab) = 5bd7cf8c5deb07d833b48587a95e48eb547d10ac
-SHA1 (patch-src_p__exe.cpp) = 49a57413ad12b0dbf536078d72c220ab0a0cc881
-SHA1 (patch-src_p__exe.h) = 05f2fceeafb1ccb9ebec5905e251790cae1e56e2
+SHA1 (lzma443.tar.bz2) = 1667abfb40da82d53fa2690f3cd58a0e7e751e55
+RMD160 (lzma443.tar.bz2) = f4f19c9f9bd8ded26318208e75ac14c8869c4ef8
+Size (lzma443.tar.bz2) = 178493 bytes
+SHA1 (upx-3.08-src.tar.bz2) = 5ccbc0aacfd3aaee407eceab06ec5989bf1d153a
+RMD160 (upx-3.08-src.tar.bz2) = 3fd7b3c4c66a90ddd622b5fb0ba0502c7145da62
+Size (upx-3.08-src.tar.bz2) = 877691 bytes
+SHA1 (patch-ab) = 710c49b92caeed1ac196abb5d45cfaff01faea6c
+SHA1 (patch-src_p__exe.cpp) = 5455be2fe1e3335c784cb044b31046da2eb40ef4
+SHA1 (patch-src_p__exe.h) = 899f6dbc2e90167bd1cc44b0081fc1797d050430
diff --git a/archivers/upx/patches/patch-aa b/archivers/upx/patches/patch-aa
deleted file mode 100644
index 95aaee2b4d8..00000000000
--- a/archivers/upx/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/03/02 04:35:38 minskim Exp $
-
---- src/Makefile.bld.orig	2004-06-24 13:35:14.000000000 -0500
-+++ src/Makefile.bld
-@@ -76,7 +76,7 @@ CXXFLAGS_OUTPUT = $(CFLAGS_OUTPUT)
- # CXXLD defaults
- CXXLD = $(CXX)
- CXXLDARCH = $(CXXARCH)
--LDFLAGS =
-+#LDFLAGS =
- LINK_EXE_OUTPUT =
- LDLIBS =
- LINK_EXE_LDFLAGS =
-@@ -144,6 +144,26 @@ ifeq ($(target),gcc)
- 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/')
-+ifeq ($(arch),i386)
-+  CCARCH += -march=i386 -mcpu=i686
-+endif
-+DEFS += -D_FILE_OFFSET_BITS=64
-+##CFLAGS_WERROR = -Werror
-+ifeq ($(DEBUG),1)
-+else
-+  ##LDFLAGS += -static
-+  STUBEDIT_EXE = objcopy -S -R .comment -R .note $@
-+endif
-+CHMOD_EXE = chmod 755 $@
-+endif  # netbsd
- 
- ###
- ### linux - gcc
diff --git a/archivers/upx/patches/patch-ab b/archivers/upx/patches/patch-ab
index 0c536ecb4aa..78ee25e5fa7 100644
--- a/archivers/upx/patches/patch-ab
+++ b/archivers/upx/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2007/08/05 17:38:47 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2012/05/02 06:45:14 adam Exp $
 
---- src/acc/acc_auto.h.orig	2007-08-05 16:57:56.000000000 +0000
-+++ src/acc/acc_auto.h
-@@ -61,7 +61,6 @@
- #define HAVE_ERRNO_H 1
+--- src/miniacc.h.orig	2012-05-02 06:06:11.000000000 +0000
++++ src/miniacc.h
+@@ -1944,7 +1944,6 @@ extern "C" {
  #define HAVE_FCNTL_H 1
+ #define HAVE_FLOAT_H 1
  #define HAVE_LIMITS_H 1
 -#define HAVE_MALLOC_H 1
  #define HAVE_MEMORY_H 1
diff --git a/archivers/upx/patches/patch-src_p__exe.cpp b/archivers/upx/patches/patch-src_p__exe.cpp
index 3fee5128033..38cf4f9b5f9 100644
--- a/archivers/upx/patches/patch-src_p__exe.cpp
+++ b/archivers/upx/patches/patch-src_p__exe.cpp
@@ -1,35 +1,35 @@
-$NetBSD: patch-src_p__exe.cpp,v 1.1 2012/02/15 19:27:10 hans Exp $
+$NetBSD: patch-src_p__exe.cpp,v 1.2 2012/05/02 06:45:14 adam Exp $
 
---- src/p_exe.cpp.orig	2004-03-25 06:36:19.000000000 +0100
-+++ src/p_exe.cpp	2012-01-11 15:35:13.755302407 +0100
-@@ -347,7 +347,7 @@ void PackExe::pack(OutputFile *fo)
-     {
-         set_le16(extra_info+eisize,ih.ss);
-         eisize += 2;
+--- src/p_exe.cpp.orig	2011-12-12 16:08:00.000000000 +0000
++++ src/p_exe.cpp
+@@ -110,7 +110,7 @@ int PackExe::fillExeHeader(struct exe_he
+         oh.ss += 0x20;
+ 
+     if (oh.ss != ih.ss)
 -        flag |= SS;
 +        flag |= upx_SS;
-     }
-     if (oh.sp != ih.sp)
-     {
-@@ -413,7 +413,7 @@ void PackExe::pack(OutputFile *fo)
-                   NULL
+     if (oh.sp != ih.sp || M_IS_LZMA(ph.method))
+         flag |= SP;
+     return flag;
+@@ -131,7 +131,7 @@ void PackExe::addLoaderEpilogue(int flag
                   );
      addLoader("EXEMAIN8",
+               device_driver ? "DEVICEEND" : "",
 -              (flag & SS) ? "EXESTACK" : "",
 +              (flag & upx_SS) ? "EXESTACK" : "",
                (flag & SP) ? "EXESTASP" : "",
                (flag & USEJUMP) ? "EXEJUMPF" : "",
                NULL
-@@ -480,7 +480,7 @@ void PackExe::pack(OutputFile *fo)
+@@ -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()
      }
-     if (flag & SP)
-         patch_le16(loader,lsize,"SP",ih.sp);
--    if (flag & SS)
-+    if (flag & upx_SS)
-         patch_le16(loader,lsize,"SS",ih.ss);
-     if (relocsize)
-         patch_le16(loader,lsize,"RS",(ph.u_len <= DI_LIMIT || (ph.u_len & 0x7fff) >= relocsize ? 0 : MAXRELOCS) - relocsize);
-@@ -654,7 +654,7 @@ void PackExe::unpack(OutputFile *fo)
+     if (oh.sp != ih.sp)
+     {
+@@ -779,7 +779,7 @@ void PackExe::unpack(OutputFile *fo)
          { imagesize -= 2; oh.min = get_le16(ibuf+imagesize); }
      if (flag & SP)
          { imagesize -= 2; oh.sp = get_le16(ibuf+imagesize); }
diff --git a/archivers/upx/patches/patch-src_p__exe.h b/archivers/upx/patches/patch-src_p__exe.h
index 2118982c6cc..21810c207f8 100644
--- a/archivers/upx/patches/patch-src_p__exe.h
+++ b/archivers/upx/patches/patch-src_p__exe.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_p__exe.h,v 1.1 2012/02/15 19:27:10 hans Exp $
+$NetBSD: patch-src_p__exe.h,v 1.2 2012/05/02 06:45:14 adam Exp $
 
 --- src/p_exe.h.orig	2002-06-01 13:20:17.000000000 +0200
 +++ src/p_exe.h	2012-01-11 15:33:21.472848400 +0100
-@@ -96,7 +96,7 @@ protected:
+@@ -105,7 +105,7 @@ protected:
      enum {
          NORELOC = 1,
          USEJUMP = 2,