upx: update to 3.96

Changes in 3.96 (23 Jan 2020):
  * bug fixes - see https://github.com/upx/upx/milestone/5

Changes in 3.95 (26 Aug 2018):
  * Flag --android-shlib to work around bad design in Android
  * Flag --force-pie when ET_DYN main program is not marked as DF_1_PIE
  * Better compatibility with varying layout of address space on Linux
  * Support for 4 PT_LOAD layout in ELF generated by binutils-2.31
  * bug fixes, particularly better diagnosis of malformed input
  * bug fixes - see https://github.com/upx/upx/milestone/4

Changes in 3.94 (12 May 2017):
  * Add support for arm64-linux (aka "aarch64").
  * Add support for --lzma compression on 64-bit PowerPC (Thierry Fauck).
  * For Mach, "upx -d" will unpack a prefix of the file (and warn).
  * Various improvements to the ELF formats.
  * bug fixes - see https://github.com/upx/upx/milestone/3

Changes in 3.93 (29 Jan 2017):
  * Fixed some win32/pe and win64/pe regressions introduced in 3.92
  * bug fixes - see https://github.com/upx/upx/milestone/2

Changes in 3.92 (11 Dec 2016):
  * INFO: UPX has moved to GitHub - the new home page is https://upx.github.io
  * IMPORTANT: all PE formats: internal changes: reunited the diverged source
    files - please report all regressions into the bug tracker and try UPX 3.91
    in case of problems.
  * Support Apple MacOS 10.12 "Sierra", including more-robust de-compression.
  * Explicitly diagnose Go-language bad PT_LOAD; recommend hemfix.c.
    https://sourceforge.net/p/upx/bugs/195/   https://github.com/pwaller/goupx
  * Fix CERT-FI Case 829767 UPX command line tools segfaults.
    Received by UPX Team on 2015-May-08; originally reported
    by Codenomicon to NCSC-FI on 2015-01-08.
    The vulnerabilities were discovered by Joonas Kuorilehto and
    Antti Häyrynen from Codenomicon.
  * bug fixes - see https://github.com/upx/upx/milestone/1

3 files changed, 20 insertions, 37 deletions

diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 2934afc3519..b5c8de0b541 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.31 2020/01/18 23:29:57 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2020/03/10 12:22:04 tnn Exp $
 
-DISTNAME=		upx-3.91-src
-PKGNAME=		${DISTNAME:S/-src//1}
-PKGREVISION=		6
+DISTNAME=		upx-3.96
 CATEGORIES=		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/}
+MASTER_SITES=		${MASTER_SITE_GITHUB:=upx/}
+GITHUB_TAG=		v${PKGVERSION_NOREV}
+EXTRACT_SUFX=		.tar.gz	# must be defined before SITES.${DISTNAME:...}
+DISTFILES=		${DEFAULT_DISTFILES} ${DISTNAME:S/upx/upx-lzma-sdk/}${EXTRACT_SUFX}
+SITES.${DISTNAME:S/upx/upx-lzma-sdk/}${EXTRACT_SUFX}=	${MASTER_SITE_GITHUB:S,^,-,:=upx/}upx-lzma-sdk/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://upx.sourceforge.net/
+HOMEPAGE=	https://upx.github.io/
 COMMENT=	Ultimate packer for executables
 LICENSE=	gnu-gpl-v2
 
@@ -19,7 +17,7 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake perl pod2man pod2html pod2text
 NO_CONFIGURE=	yes
 BUILD_DIRS=	src doc
-MAKE_ENV+=	PREFIX=${PREFIX} UCLDIR=${PREFIX} LDLIBDIRS=-L${PREFIX}/lib
+MAKE_ENV+=	PREFIX=${PREFIX} UPX_UCLDIR=${PREFIX}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/upx
 
@@ -27,8 +25,8 @@ BUILDLINK_TRANSFORM+=		rm:-mcpu=i686
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-Map rm:-Wl,upx.map
 
 post-extract:
-	mkdir -p ${WRKSRC}/src/stub/src/c/lzma-sdk
-	ln -sf ${WRKDIR}/C ${WRKSRC}/src/stub/src/c/lzma-sdk/C
+	rmdir ${WRKSRC}/src/lzma-sdk
+	ln -sf ${WRKDIR}/upx-lzma-sdk* ${WRKSRC}/src/lzma-sdk
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${DESTDIR}${PREFIX}/bin/upx
diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo
index 3186f4376c5..5d27269ab9b 100644
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 00:56:27 agc Exp $
+$NetBSD: distinfo,v 1.12 2020/03/10 12:22:04 tnn Exp $
 
-SHA1 (lzma443.tar.bz2) = 1667abfb40da82d53fa2690f3cd58a0e7e751e55
-RMD160 (lzma443.tar.bz2) = f4f19c9f9bd8ded26318208e75ac14c8869c4ef8
-SHA512 (lzma443.tar.bz2) = f5525d5b2adecc29c22f675cea2328e3009c84ed0b256f265fcb408a3d8603dbfd2481ec4c9150397d728c0492fe5c13fff5b6b980a0a21800acf07c235f9051
-Size (lzma443.tar.bz2) = 178493 bytes
-SHA1 (upx-3.91-src.tar.bz2) = da962c0affb27eae11aa9b6fbd751c3699717b36
-RMD160 (upx-3.91-src.tar.bz2) = 9da4a4136dc0a1f923dbcd68ceefc9c6afcd2345
-SHA512 (upx-3.91-src.tar.bz2) = 7e9a392fe11daf7baf9632f2c448ef9936da7dfab215f86ba417e9f097770949acb653aaabe6cc5ed812efc486cb35e0c1e128c80026b02825713d8b12251cf5
-Size (upx-3.91-src.tar.bz2) = 904747 bytes
+SHA1 (upx-3.96.tar.gz) = 7156878e617270df5f5ae5b249b8462b7382aeb1
+RMD160 (upx-3.96.tar.gz) = d741374988f6271b95f049b6381fb6355ef143c5
+SHA512 (upx-3.96.tar.gz) = 1baa5208a895f8ed9b729a110646b6dd7779269d7792255b37d3923b26f30fb7cf12e22615eb4d5c520b3ec41153599338814b21c6f14c7a750a835f23831560
+Size (upx-3.96.tar.gz) = 1676172 bytes
+SHA1 (upx-lzma-sdk-3.96.tar.gz) = d07dcd680c564395e692efb207b3d8eda795e4db
+RMD160 (upx-lzma-sdk-3.96.tar.gz) = a50c931d3e4537b2712e652840cc38e1b71ae651
+SHA512 (upx-lzma-sdk-3.96.tar.gz) = 9690a1dfabf8bcb161b26761556a390aa354b633914254b29e36246fe11f9c3e905dafa916d0d52300bd418e2bddedd4122027e447fc87183bce4479e771c7df
+Size (upx-lzma-sdk-3.96.tar.gz) = 109692 bytes
 SHA1 (patch-ab) = f7f963e90f0762325685c487dc9b13e5450d33a2
-SHA1 (patch-src_Makefile) = ccb781a80a6c15d46de863d8678cf7317b16c107
 SHA1 (patch-src_p__exe.cpp) = 21814e235022afe48102b0de021b066b717b3917
 SHA1 (patch-src_p__exe.h) = a03d88ad312c1e85ccc43b78c7bea5b5ce613a09
diff --git a/archivers/upx/patches/patch-src_Makefile b/archivers/upx/patches/patch-src_Makefile
deleted file mode 100644
index 9a848bab8df..00000000000
--- a/archivers/upx/patches/patch-src_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.2 2014/05/26 01:30:39 rodent Exp $
-
-Enable ZLIB support.
-
---- src/Makefile.orig	2013-09-30 15:51:00.000000000 +0000
-+++ src/Makefile
-@@ -57,6 +57,7 @@ ifneq ($(wildcard $(UPX_UCLDIR)/include/
- INCLUDES += -I$(UPX_UCLDIR)/include
- LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext) $(UPX_UCLDIR)/src/.libs/libucl$(libext))))
- endif
-+DEFS += -DWITH_ZLIB
- LIBS += -lucl -lz
- # you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK
- include $(top_srcdir)/src/stub/src/c/Makevars.lzma