Date: Sat, 30 Sep 2023 00:47:51 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 42929fa09fa4 - main - archivers/upx: Update to 4.1.0 Message-ID: <202309300047.38U0lp1B005050@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=42929fa09fa405023a32928161fd93f7186d18c4 commit 42929fa09fa405023a32928161fd93f7186d18c4 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-09-30 00:20:56 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309300047.38U0lp1B005050>