From owner-svn-ports-all@freebsd.org Thu Aug 30 19:53:23 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40FECEF76DE; Thu, 30 Aug 2018 19:53:23 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DF21B706DC; Thu, 30 Aug 2018 19:53:22 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BADC111191; Thu, 30 Aug 2018 19:53:22 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7UJrMFQ051651; Thu, 30 Aug 2018 19:53:22 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7UJrMXv051647; Thu, 30 Aug 2018 19:53:22 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201808301953.w7UJrMXv051647@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 30 Aug 2018 19:53:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478489 - in head/archivers/upx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/archivers/upx: . files X-SVN-Commit-Revision: 478489 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Aug 2018 19:53:23 -0000 Author: yuri Date: Thu Aug 30 19:53:21 2018 New Revision: 478489 URL: https://svnweb.freebsd.org/changeset/ports/478489 Log: archivers/upx: Update 3.91 -> 3.94 PR: 230089 Submitted by: Dmitri Goutnik Approved by: fjoe (maintainer's timeout; 33 days) Modified: head/archivers/upx/Makefile head/archivers/upx/distinfo head/archivers/upx/files/patch-src_Makefile head/archivers/upx/files/patch-src_miniacc.h Modified: head/archivers/upx/Makefile ============================================================================== --- head/archivers/upx/Makefile Thu Aug 30 19:39:14 2018 (r478488) +++ head/archivers/upx/Makefile Thu Aug 30 19:53:21 2018 (r478489) @@ -2,28 +2,28 @@ # $FreeBSD$ PORTNAME= upx -PORTVERSION= 3.91 +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 -LZMA_VER= 4.65 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src -USES= tar:bzip2 gmake perl5 -USE_PERL5= build -MAKE_ENV= UPX_UCLDIR=${LOCALBASE}\ - UPX_LZMADIR=${WRKDIR}\ +USES= gmake +USE_GITHUB= yes +GH_TUPLE= upx:upx-lzma-sdk:${DISTVERSIONPREFIX}${DISTVERSION}:lzma/src/lzma-sdk + +MAKE_ENV= UPX_UCLDIR=${LOCALBASE} \ target=freebsd -PORTDOCS= BUGS COPYING LICENSE NEWS PROJECTS README\ - README.1ST README.SRC THANKS TODO +PORTDOCS= BUGS COPYING LICENSE NEWS PROJECTS README \ + README.1ST README.SRC THANKS + PLIST_FILES= bin/upx \ man/man1/upx.1.gz @@ -32,6 +32,8 @@ OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${STAGEDIR}${PREFIX}/bin/upx ${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${STAGEDIR}${MANPREFIX}/man/man1 + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} Modified: head/archivers/upx/distinfo ============================================================================== --- head/archivers/upx/distinfo Thu Aug 30 19:39:14 2018 (r478488) +++ head/archivers/upx/distinfo Thu Aug 30 19:53:21 2018 (r478489) @@ -1,4 +1,5 @@ -SHA256 (upx-3.91-src.tar.bz2) = 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c -SIZE (upx-3.91-src.tar.bz2) = 904747 -SHA256 (7z465.tar.bz2) = cce25c2b7c98ccb598b1393c302ff56a5c51fe2a5aae9c3885bec007eb06fc70 -SIZE (7z465.tar.bz2) = 658088 +TIMESTAMP = 1532707968 +SHA256 (upx-upx-v3.94_GH0.tar.gz) = 2ddd9d409620b6946319bfdab6cf9d570c6057a89cd5b0b4707fc5e13cc95929 +SIZE (upx-upx-v3.94_GH0.tar.gz) = 1601225 +SHA256 (upx-upx-lzma-sdk-v3.94_GH0.tar.gz) = 9e9cea6112bd93fbc71c61d1ff068cc324b2d7bb7789043928b68c5d3cc0672d +SIZE (upx-upx-lzma-sdk-v3.94_GH0.tar.gz) = 109693 Modified: head/archivers/upx/files/patch-src_Makefile ============================================================================== --- head/archivers/upx/files/patch-src_Makefile Thu Aug 30 19:39:14 2018 (r478488) +++ head/archivers/upx/files/patch-src_Makefile Thu Aug 30 19:53:21 2018 (r478489) @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2013-09-30 15:51:00 UTC +--- src/Makefile.orig 2017-05-12 11:01:20 UTC +++ src/Makefile -@@ -55,7 +55,7 @@ upx_OBJECTS := $(notdir $(upx_SOURCES:.c +@@ -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 @@ -8,4 +8,17 @@ +LIBS += -L$(UPX_UCLDIR)/lib endif LIBS += -lucl -lz - # you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK + # 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 Modified: head/archivers/upx/files/patch-src_miniacc.h ============================================================================== --- head/archivers/upx/files/patch-src_miniacc.h Thu Aug 30 19:39:14 2018 (r478488) +++ head/archivers/upx/files/patch-src_miniacc.h Thu Aug 30 19:53:21 2018 (r478489) @@ -1,6 +1,6 @@ ---- src/miniacc.h.orig 2013-09-30 15:51:00 UTC +--- src/miniacc.h.orig 2017-05-12 11:01:20 UTC +++ src/miniacc.h -@@ -485,7 +485,7 @@ +@@ -523,7 +523,7 @@ # if defined(_AIX) || defined(__AIX__) || defined(__aix__) # define ACC_OS_POSIX_AIX 1 # define ACC_INFO_OS_POSIX "aix" @@ -9,14 +9,14 @@ # define ACC_OS_POSIX_FREEBSD 1 # define ACC_INFO_OS_POSIX "freebsd" # elif defined(__hpux__) || defined(__hpux) -@@ -1968,11 +1968,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T == +@@ -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) + #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)