From nobody Sat Sep 30 00:47:51 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ry7qC3Ph4z4twgp; Sat, 30 Sep 2023 00:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ry7qC2DKYz4Pgy; Sat, 30 Sep 2023 00:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696034871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L6QQ6Yrd6dkHvCpjP1msD9XM2/5kG66CB+PE9uKe9GI=; b=DB6N57g8c8ZXtKMQ/ES1PrXC8VUZ8bVgc0+bIz6zWoaQI2qzDIbbViOBbNBqNHiIMTIolX aZAKlNPL1Ok6HMbJ1kFFIzmmKZ0dqaqV1IISgCydplcD7TyQjpxGEJixr79T2yz3pRwjuI 4m+8ZfsmBkveVizIa0MuTnt3dTjJ0xbOzstim+xTf6BKndPWDrzhW3dt+UR6HDnAyWrmUJ ZHMqKCfesM3Anutjjh1sFd6pu0ISP9BQXvvph72ccoy2VlRt6SW8nOX/iccnUFICdmmZJa LY0fsHAx08IGrgNnM3wu+o7CCyoqJ24nu7+6Us0wqTOusHwIDNqyMBkEJduv+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696034871; a=rsa-sha256; cv=none; b=LKjYj9RgHQ2ppGv9QFGrEPbAdY32E8TJ6JYbMi9W7fvwtK9Hc22ghDMsSeRQ2/eR+2TUFr Sf6/7N/GkTmcr5dn18gg3+JVT6qe/mfI2sGETeJgh99QWSvaic60kAEASDLdgYG5GVEJ/+ cRd/i3p2RrzJTYX4PYvl72Z5BKgUPyBT8jf2Rj8V6tcH3BkBT3WN+XvZ09uGKCeMHvkduX L81wK03DPzTbtMEoDhz+U+4HCunlSSYwDLGuePfO4M5LxphORWA8Y0//Q4I3g9QoO8TEOs U0ulUSq0dGh47j7mOb9B/qsGcFodYxNXdFknfA/VSt9xTCH/uTMWS+RWGKh4IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696034871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L6QQ6Yrd6dkHvCpjP1msD9XM2/5kG66CB+PE9uKe9GI=; b=msMhpLkIkkR/U4R/eAfgMjkmNLiAajfvRafZdu0ISQ5jhr2fMr2GkRACR32MGY9rIsndNX N2jssZ7598X3YlcTo/uNi3P22eIEW7O0Se/3/3sbgaK80uHFUBknzzn7V2dHBSM1STL8nk AbIE3uxjY6logLc7tJsLbCAHKKhNu06VQ+JxaHAj1VgkXmqKZ8rdGczQT2Z5VQtSBoc9eH mOfMDHsjDJYcWAskwY54ML7kWIv/Uxt+Nlt3OOf99FhxE+OUaIaSKFuQ3Ha1JM6Eqv+uHl cHqOZFtBlcUxRWbH0CgWNSub1LLiUaJWsgCOIW2w+E/pcW87xmnTLrxkvhkNPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ry7qC1HMgzBKd; Sat, 30 Sep 2023 00:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38U0lper005053; Sat, 30 Sep 2023 00:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38U0lp1B005050; Sat, 30 Sep 2023 00:47:51 GMT (envelope-from git) Date: Sat, 30 Sep 2023 00:47:51 GMT Message-Id: <202309300047.38U0lp1B005050@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 42929fa09fa4 - main - archivers/upx: Update to 4.1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42929fa09fa405023a32928161fd93f7186d18c4 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=42929fa09fa405023a32928161fd93f7186d18c4 commit 42929fa09fa405023a32928161fd93f7186d18c4 Author: Po-Chuan Hsieh AuthorDate: 2023-09-30 00:20:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-30 00:44:19 +0000 archivers/upx: Update to 4.1.0 Changes: https://github.com/upx/upx/releases --- archivers/upx/Makefile | 11 +++++++++-- archivers/upx/distinfo | 6 +++--- archivers/upx/files/patch-src-bele.h | 22 ---------------------- archivers/upx/files/patch-src-miniacc.h | 13 ++++--------- archivers/upx/pkg-plist | 2 +- 5 files changed, 17 insertions(+), 37 deletions(-) diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile index 09d4e298faf8..9027ab2444fe 100644 --- a/archivers/upx/Makefile +++ b/archivers/upx/Makefile @@ -1,5 +1,5 @@ PORTNAME= upx -PORTVERSION= 4.0.2 +PORTVERSION= 4.1.0 MASTER_SITES= https://github.com/upx/upx/releases/download/v${PORTVERSION}/ CATEGORIES= archivers DISTVERSIONSUFFIX= -src @@ -16,7 +16,14 @@ LIB_DEPENDS= libucl.so:archivers/ucl USES= cmake compiler:c++17-lang cpe tar:xz -CMAKE_ON= UPX_CONFIG_DISABLE_GITREV UPX_CONFIG_DISABLE_SANITIZE UPX_CONFIG_DISABLE_SELF_PACK_TEST UPX_CONFIG_DISABLE_WERROR +CMAKE_ON= UPX_CONFIG_DISABLE_BZIP2 \ + UPX_CONFIG_DISABLE_BZIP2 \ + UPX_CONFIG_DISABLE_GITREV \ + UPX_CONFIG_DISABLE_SANITIZE \ + UPX_CONFIG_DISABLE_SELF_PACK_TEST \ + UPX_CONFIG_DISABLE_THREADS \ + UPX_CONFIG_DISABLE_WERROR \ + UPX_CONFIG_DISABLE_WSTRICT CPE_VENDOR= upx_project diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo index ce171dad8ab4..b4d2bdf01a0f 100644 --- a/archivers/upx/distinfo +++ b/archivers/upx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684104302 -SHA256 (upx-4.0.2-src.tar.xz) = 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f -SIZE (upx-4.0.2-src.tar.xz) = 1191960 +TIMESTAMP = 1696001260 +SHA256 (upx-4.1.0-src.tar.xz) = 0582f78b517ea87ba1caa6e8c111474f58edd167e5f01f074d7d9ca2f81d47d0 +SIZE (upx-4.1.0-src.tar.xz) = 1267708 diff --git a/archivers/upx/files/patch-src-bele.h b/archivers/upx/files/patch-src-bele.h deleted file mode 100644 index 782669ce00bb..000000000000 --- a/archivers/upx/files/patch-src-bele.h +++ /dev/null @@ -1,22 +0,0 @@ ---- src/bele.h.orig 2023-01-30 10:18:06 UTC -+++ src/bele.h -@@ -84,19 +84,6 @@ static forceinline unsigned bswap16(unsigned v) { retu - static forceinline unsigned bswap32(unsigned v) { return (unsigned) _byteswap_ulong(v); } - static forceinline upx_uint64_t bswap64(upx_uint64_t v) { return _byteswap_uint64(v); } - --#else -- --static forceinline constexpr unsigned bswap16(unsigned v) { -- // return __builtin_bswap16((upx_uint16_t) (v & 0xffff)); -- // return (unsigned) __builtin_bswap64((upx_uint64_t) v << 48); -- return __builtin_bswap32(v << 16); --} --static forceinline constexpr unsigned bswap32(unsigned v) { -- // return (unsigned) __builtin_bswap64((upx_uint64_t) v << 32); -- return __builtin_bswap32(v); --} --static forceinline constexpr upx_uint64_t bswap64(upx_uint64_t v) { return __builtin_bswap64(v); } -- - #endif - - static forceinline constexpr unsigned no_bswap16(unsigned v) { diff --git a/archivers/upx/files/patch-src-miniacc.h b/archivers/upx/files/patch-src-miniacc.h index 7fc063df0ac2..6709fa756bd8 100644 --- a/archivers/upx/files/patch-src-miniacc.h +++ b/archivers/upx/files/patch-src-miniacc.h @@ -1,16 +1,11 @@ ---- src/miniacc.h.orig 2023-01-30 10:18:06 UTC +--- src/miniacc.h.orig 2023-08-08 08:38:12 UTC +++ src/miniacc.h -@@ -2563,11 +2563,11 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T == - # define ACC_ABI_LITTLE_ENDIAN 1 - #elif (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) +@@ -2567,7 +2567,7 @@ ACC_COMPILE_TIME_ASSERT_HEADER(ACC_SIZEOF_PTRDIFF_T == # 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) +-#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPARC || ACC_ARCH_SPU) ++#elif (ACC_ARCH_AVR32 || ACC_ARCH_M68K || ACC_ARCH_S390 || ACC_ARCH_SPARC || ACC_ARCH_SPU || ACC_ARCH_SPARC) # define ACC_ABI_BIG_ENDIAN 1 #elif 1 && defined(__IAR_SYSTEMS_ICC__) && defined(__LITTLE_ENDIAN__) # if (__LITTLE_ENDIAN__ == 1) diff --git a/archivers/upx/pkg-plist b/archivers/upx/pkg-plist index d8edba164677..4be8d42c075c 100644 --- a/archivers/upx/pkg-plist +++ b/archivers/upx/pkg-plist @@ -3,7 +3,7 @@ bin/upx %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/THANKS +%%PORTDOCS%%%%DOCSDIR%%/THANKS.txt %%PORTDOCS%%%%DOCSDIR%%/upx-doc.html %%PORTDOCS%%%%DOCSDIR%%/upx-doc.txt share/man/man1/upx.1.gz