Attachment #195507 for bug #230089




# $FreeBSD$

PORTNAME=	upx
DISTVERSIONPREFIX=	v
DISTVERSION=	3.94
CATEGORIES=	archivers
MASTER_SITES=	http://upx.sourceforge.net/download/\
		SF/sevenzip/7-Zip/${LZMA_VER}:lzma
DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
		7z${LZMA_VER:S/.//g}${EXTRACT_SUFX}:lzma

MAINTAINER=	fjoe@FreeBSD.org
COMMENT=	The Ultimate Packer for eXecutables

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libucl.so:archivers/ucl

USES=		gmake
MAKE_ENV=	UPX_UCLDIR=${LOCALBASE} \
USES=		tar:bzip2 gmake perl5
USE_PERL5=	build
MAKE_ENV=	UPX_UCLDIR=${LOCALBASE}\
		UPX_LZMADIR=${WRKDIR}\
		target=freebsd

USE_GITHUB=	yes
GH_TUPLE=	upx:upx-lzma-sdk:${DISTVERSIONPREFIX}${DISTVERSION}:lzma/src/lzma-sdk

PORTDOCS=	BUGS COPYING LICENSE NEWS PROJECTS README\
		README.1ST README.SRC THANKS

PLIST_FILES=	bin/upx \
		man/man1/upx.1.gz


do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx
	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${MANPREFIX}/man/man1

do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}


Lines 1-4 Link Here

(-)archivers/upx/distinfo (-4 / +5 lines)
1	SHA256 (upx-3.91-src.tar.bz2) = 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c	1	TIMESTAMP = 1532707968
2	SIZE (upx-3.91-src.tar.bz2) = 904747	2	SHA256 (upx-upx-v3.94_GH0.tar.gz) = 2ddd9d409620b6946319bfdab6cf9d570c6057a89cd5b0b4707fc5e13cc95929
3	SHA256 (7z465.tar.bz2) = cce25c2b7c98ccb598b1393c302ff56a5c51fe2a5aae9c3885bec007eb06fc70	3	SIZE (upx-upx-v3.94_GH0.tar.gz) = 1601225
4	SIZE (7z465.tar.bz2) = 658088	4	SHA256 (upx-upx-lzma-sdk-v3.94_GH0.tar.gz) = 9e9cea6112bd93fbc71c61d1ff068cc324b2d7bb7789043928b68c5d3cc0672d
		5	SIZE (upx-upx-lzma-sdk-v3.94_GH0.tar.gz) = 109693




--- src/Makefile.orig	2017-05-12 11:01:20 UTC
+++ src/Makefile
@@ -48,7 +48,7 @@ endif
 # we need UCL and zlib - you can set envvar UPX_UCLDIR
 ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)
 INCLUDES += -I$(UPX_UCLDIR)/include

+LIBS += -L$(UPX_UCLDIR)/lib
 endif
 LIBS += -lucl -lz
 # LZMA from https://github.com/upx/upx-lzma-sdk
@@ -62,9 +62,9 @@ CXXFLAGS_OPTIMIZE ?= -O2
 endif
 CXXFLAGS += $(CXXFLAGS_OPTIMIZE)
 # protect against security threats caused by misguided C++ compiler "optimizations"
-ifeq ($(findstring clang,$(CXX)),)
-CXXFLAGS += -fno-delete-null-pointer-checks
-endif
+# ifeq ($(findstring clang,$(CXX)),)
+# CXXFLAGS += -fno-delete-null-pointer-checks
+# endif
 CXXFLAGS += -fno-strict-aliasing -fwrapv
 CXXFLAGS += -funsigned-char
 CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wmissing-declarations -Wpointer-arith -Wshadow -Wvla -Wwrite-strings




--- src/miniacc.h.orig	2017-05-12 11:01:20 UTC
+++ src/miniacc.h
@@ -523,7 +523,7 @@
 #  if defined(_AIX) || defined(__AIX__) || defined(__aix__)
 #    define ACC_OS_POSIX_AIX        1
 #    define ACC_INFO_OS_POSIX       "aix"

 #    define ACC_OS_POSIX_FREEBSD    1
 #    define ACC_INFO_OS_POSIX       "freebsd"
 #  elif defined(__hpux__) || defined(__hpux)
@@ -2502,11 +2502,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEO
 #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)
+#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX || ACC_OS_POSIX_FREEBSD || 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 || ACC_ARCH_RISCV)
 #  define ACC_ABI_LITTLE_ENDIAN     1
-#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU)
+#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPU || ACC_ARCH_SPARC)

Return to bug 230089

Lines 2-29 Link Here

(-)archivers/upx/Makefile (-12 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= upx	4	PORTNAME= upx
5	PORTVERSION= 3.91	5	DISTVERSIONPREFIX= v
		6	DISTVERSION= 3.94
6	CATEGORIES= archivers	7	CATEGORIES= archivers
7	MASTER_SITES= http://upx.sourceforge.net/download/\
8	SF/sevenzip/7-Zip/${LZMA_VER}:lzma
9	DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} \
10	7z${LZMA_VER:S/.//g}${EXTRACT_SUFX}:lzma
11		8
12	MAINTAINER= fjoe@FreeBSD.org	9	MAINTAINER= fjoe@FreeBSD.org
13	COMMENT= The Ultimate Packer for eXecutables	10	COMMENT= The Ultimate Packer for eXecutables
14		11
		12	LICENSE= GPLv2+
		13	LICENSE_FILE= ${WRKSRC}/LICENSE
		14
15	LIB_DEPENDS= libucl.so:archivers/ucl	15	LIB_DEPENDS= libucl.so:archivers/ucl
16		16
17	LZMA_VER= 4.65	17	USES= gmake
18	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src	18	MAKE_ENV= UPX_UCLDIR=${LOCALBASE} \
19	USES= tar:bzip2 gmake perl5
20	USE_PERL5= build
21	MAKE_ENV= UPX_UCLDIR=${LOCALBASE}\
22	UPX_LZMADIR=${WRKDIR}\
23	target=freebsd	19	target=freebsd
24		20
		21	USE_GITHUB= yes
		22	GH_TUPLE= upx:upx-lzma-sdk:${DISTVERSIONPREFIX}${DISTVERSION}:lzma/src/lzma-sdk
		23
25	PORTDOCS= BUGS COPYING LICENSE NEWS PROJECTS README\	24	PORTDOCS= BUGS COPYING LICENSE NEWS PROJECTS README\
26	README.1ST README.SRC THANKS TODO	25	README.1ST README.SRC THANKS
		26
27	PLIST_FILES= bin/upx \	27	PLIST_FILES= bin/upx \
28	man/man1/upx.1.gz	28	man/man1/upx.1.gz
29		29
Lines 32-37 Link Here
32	do-install:	32	do-install:
33	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx	33	${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx
34	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${MANPREFIX}/man/man1	34	${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${MANPREFIX}/man/man1
		35
		36	do-install-DOCS-on:
35	@${MKDIR} ${STAGEDIR}${DOCSDIR}	37	@${MKDIR} ${STAGEDIR}${DOCSDIR}
36	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}	38	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
37		39

Lines 1-6 Link Here

(-)archivers/upx/files/patch-src_Makefile (-3 / +16 lines)
1	--- src/Makefile.orig 2013-09-30 15:51:00 UTC	1	--- src/Makefile.orig 2017-05-12 11:01:20 UTC
2	+++ src/Makefile	2	+++ src/Makefile
3	@@ -55,7 +55,7 @@ upx_OBJECTS := $(notdir $(upx_SOURCES:.c	3	@@ -48,7 +48,7 @@ endif
4	# we need UCL and zlib - you can set envvar UPX_UCLDIR	4	# we need UCL and zlib - you can set envvar UPX_UCLDIR
5	ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)	5	ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)
6	INCLUDES += -I$(UPX_UCLDIR)/include	6	INCLUDES += -I$(UPX_UCLDIR)/include
Lines 8-11 Link Here
8	+LIBS += -L$(UPX_UCLDIR)/lib	8	+LIBS += -L$(UPX_UCLDIR)/lib
9	endif	9	endif
10	LIBS += -lucl -lz	10	LIBS += -lucl -lz
11	# you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK	11	# LZMA from https://github.com/upx/upx-lzma-sdk
		12	@@ -62,9 +62,9 @@ CXXFLAGS_OPTIMIZE ?= -O2
		13	endif
		14	CXXFLAGS += $(CXXFLAGS_OPTIMIZE)
		15	# protect against security threats caused by misguided C++ compiler "optimizations"
		16	-ifeq ($(findstring clang,$(CXX)),)
		17	-CXXFLAGS += -fno-delete-null-pointer-checks
		18	-endif
		19	+# ifeq ($(findstring clang,$(CXX)),)
		20	+# CXXFLAGS += -fno-delete-null-pointer-checks
		21	+# endif
		22	CXXFLAGS += -fno-strict-aliasing -fwrapv
		23	CXXFLAGS += -funsigned-char
		24	CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wmissing-declarations -Wpointer-arith -Wshadow -Wvla -Wwrite-strings

Lines 1-6 Link Here

(-)archivers/upx/files/patch-src_miniacc.h (-4 / +4 lines)
1	--- src/miniacc.h.orig 2013-09-30 15:51:00 UTC	1	--- src/miniacc.h.orig 2017-05-12 11:01:20 UTC
2	+++ src/miniacc.h	2	+++ src/miniacc.h
3	@@ -485,7 +485,7 @@	3	@@ -523,7 +523,7 @@
4	# if defined(_AIX) \|\| defined(__AIX__) \|\| defined(__aix__)	4	# if defined(_AIX) \|\| defined(__AIX__) \|\| defined(__aix__)
5	# define ACC_OS_POSIX_AIX 1	5	# define ACC_OS_POSIX_AIX 1
6	# define ACC_INFO_OS_POSIX "aix"	6	# define ACC_INFO_OS_POSIX "aix"
Lines 9-15 Link Here
9	# define ACC_OS_POSIX_FREEBSD 1	9	# define ACC_OS_POSIX_FREEBSD 1
10	# define ACC_INFO_OS_POSIX "freebsd"	10	# define ACC_INFO_OS_POSIX "freebsd"
11	# elif defined(__hpux__) \|\| defined(__hpux)	11	# elif defined(__hpux__) \|\| defined(__hpux)
12	@@ -1968,11 +1968,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T ==	12	@@ -2502,11 +2502,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEO
13	#elif !(ACC_ABI_BIG_ENDIAN) && !(ACC_ABI_LITTLE_ENDIAN)	13	#elif !(ACC_ABI_BIG_ENDIAN) && !(ACC_ABI_LITTLE_ENDIAN)
14	#if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)	14	#if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
15	# define ACC_ABI_BIG_ENDIAN 1	15	# define ACC_ABI_BIG_ENDIAN 1
Lines 16-22 Link Here
16	-#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX \|\| ACC_OS_WIN64)	16	-#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX \|\| ACC_OS_WIN64)
17	+#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX \|\| ACC_OS_POSIX_FREEBSD \|\| ACC_OS_WIN64)	17	+#elif (ACC_ARCH_IA64) && (ACC_OS_POSIX_LINUX \|\| ACC_OS_POSIX_FREEBSD \|\| ACC_OS_WIN64)
18	# define ACC_ABI_LITTLE_ENDIAN 1	18	# define ACC_ABI_LITTLE_ENDIAN 1
19	#elif (ACC_ARCH_ALPHA \|\| ACC_ARCH_AMD64 \|\| ACC_ARCH_BLACKFIN \|\| ACC_ARCH_CRIS \|\| ACC_ARCH_I086 \|\| ACC_ARCH_I386 \|\| ACC_ARCH_MSP430)	19	#elif (ACC_ARCH_ALPHA \|\| ACC_ARCH_AMD64 \|\| ACC_ARCH_BLACKFIN \|\| ACC_ARCH_CRIS \|\| ACC_ARCH_I086 \|\| ACC_ARCH_I386 \|\| ACC_ARCH_MSP430 \|\| ACC_ARCH_RISCV)
20	# define ACC_ABI_LITTLE_ENDIAN 1	20	# define ACC_ABI_LITTLE_ENDIAN 1
21	-#elif (ACC_ARCH_AVR32 \|\| ACC_ARCH_M68K \|\| ACC_ARCH_S390 \|\| ACC_ARCH_SPU)	21	-#elif (ACC_ARCH_AVR32 \|\| ACC_ARCH_M68K \|\| ACC_ARCH_S390 \|\| ACC_ARCH_SPU)
22	+#elif (ACC_ARCH_AVR32 \|\| ACC_ARCH_M68K \|\| ACC_ARCH_S390 \|\| ACC_ARCH_SPU \|\| ACC_ARCH_SPARC)	22	+#elif (ACC_ARCH_AVR32 \|\| ACC_ARCH_M68K \|\| ACC_ARCH_S390 \|\| ACC_ARCH_SPU \|\| ACC_ARCH_SPARC)