diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e63b96f..f3ef3036 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,8 @@ env: UPX_DEBUG_TEST_FLOAT_DIVISION_BY_ZERO: 1 UPX_DEBUG_TEST_LIBC_QSORT: 1 ZSTD_CLEVEL: 9 - # 2024-08-13 - ZIG_DIST_VERSION: 0.14.0-dev.1033+25096ed89 + # 2024-08-17 + ZIG_DIST_VERSION: 0.14.0-dev.1166+bb7050106 jobs: job-rebuild-and-verify-stubs: @@ -511,7 +511,7 @@ jobs: - { zig_target: x86_64-windows-gnu } name: ${{ format('zigcc {0} {1}', matrix.zig_target, matrix.zig_pic) }} runs-on: ubuntu-latest - container: ${{ contains(matrix.zig_target, 'armeb-') && 'alpine:3.19' || 'alpine:3.20' }} # qemu-armeb bug + container: ${{ contains(matrix.qemu, 'qemu-armeb') && 'alpine:3.19' || 'alpine:3.20' }} # qemu-armeb bug env: # zig is currently missing winpthreads; see https://github.com/ziglang/zig/issues/10989 UPX_CONFIG_EXPECT_THREADS: ${{ contains(matrix.zig_target, '-windows') && 'OFF' || 'ON' }} diff --git a/CMakeLists.txt b/CMakeLists.txt index daee1d99..ac15329b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,13 +78,13 @@ upx_cache_bool_vars(ON CMAKE_C_STANDARD_REQUIRED CMAKE_CXX_STANDARD_REQUIRED CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_REQUIRED_QUIET ) -# internal UPX settings; useful for CI jobs +# internal UPX settings that default to OFF; useful for CI jobs upx_cache_bool_vars(OFF UPX_CONFIG_CMAKE_DISABLE_TEST UPX_CONFIG_CMAKE_DISABLE_INSTALL UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO UPX_CONFIG_CMAKE_DISABLE_PLATFORM_CHECK UPX_CONFIG_DISABLE_C_STANDARD UPX_CONFIG_DISABLE_CXX_STANDARD UPX_CONFIG_DISABLE_RUN_UNPACKED_TEST UPX_CONFIG_DISABLE_RUN_PACKED_TEST - UPX_CONFIG_DISABLE_SHARED_LIBS UPX_CONFIG_REQUIRE_THREADS + UPX_CONFIG_DISABLE_SAVE_TEMPS UPX_CONFIG_DISABLE_SHARED_LIBS UPX_CONFIG_REQUIRE_THREADS ) upx_cache_bool_vars(ON UPX_CONFIG_EXPECT_THREADS) upx_print_env_var(CC CXX) @@ -283,7 +283,9 @@ if(Threads_FOUND) endif() if(NOT result) # failed; under MinGW be sure to use the posix-threads and NOT the win32-threads version - #message(STATUS "Threads FAILED ${f}: ${output}") # debug output from try_compile + if(UPX_CONFIG_REQUIRE_THREADS OR (UPX_CONFIG_EXPECT_THREADS AND NOT UPX_CONFIG_DISABLE_THREADS)) + message(WARNING "Threads FAILED ${f}: ${output}") # output from try_compile + endif() set(Threads_FOUND OFF) break() endif() diff --git a/doc/upx.1 b/doc/upx.1 index 5964f44f..6bc89b74 100644 --- a/doc/upx.1 +++ b/doc/upx.1 @@ -55,7 +55,7 @@ .\" ======================================================================== .\" .IX Title "UPX 1" -.TH UPX 1 2024-06-19 "upx 4.3.0" " " +.TH UPX 1 2024-08-19 "upx 4.3.0" " " .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/misc/podman/rebuild-stubs/Dockerfile b/misc/podman/rebuild-stubs/Dockerfile index dfe67697..5fbc18b5 100644 --- a/misc/podman/rebuild-stubs/Dockerfile +++ b/misc/podman/rebuild-stubs/Dockerfile @@ -17,11 +17,11 @@ RUN dpkg --add-architecture i386 \ 7zip bat bfs btop bubblewrap busybox bzip2 bzip3 cabextract ccache chrpath cmake cpio \ dash diffstat direnv elfutils execstack eza fd-find file fish fzf \ g++ gawk gdb gojq ht htop hyperfine jq ksh \ - libzstd-dev lsb-release lsd lz4 lzip lzop minify mksh moreutils musl neovim ninja-build \ + lftp libzstd-dev lsb-release lsd lz4 lzip lzop minify mksh moreutils musl neovim ninja-build \ p7zip parallel patch patchelf patchutils pax-utils proot \ python3 python3-pyasn1 python3-pycryptodome python3-pycurl python3-tomli python3-tomli-w \ python3-yaml python3-zstd \ - re2c ripgrep rsync screen strace universal-ctags unzip valgrind yash yq \ + re2c ripgrep rsync screen socat strace universal-ctags unzip valgrind yash yq \ zip zlib1g-dev zoxide zsh zstd \ # extra packages for compiling with "gcc -m32" and "gcc -mx32": g++-multilib gcc-multilib \ diff --git a/misc/podman/rebuild-stubs/packages.txt b/misc/podman/rebuild-stubs/packages.txt index 61ce87f9..7311474e 100644 --- a/misc/podman/rebuild-stubs/packages.txt +++ b/misc/podman/rebuild-stubs/packages.txt @@ -17,7 +17,7 @@ ii bsdextrautils 2.39.3-9ubuntu6 amd64 ii bsdutils 1:2.39.3-9ubuntu6 amd64 basic utilities from 4.4BSD-Lite ii btop 1.3.0-1 amd64 Modern and colorful command line resource monitor that shows usage and stats ii bubblewrap 0.9.0-1build1 amd64 utility for unprivileged chroot and namespace manipulation -ii busybox 1:1.36.1-6ubuntu3 amd64 Tiny utilities for small and embedded systems +ii busybox 1:1.36.1-6ubuntu3.1 amd64 Tiny utilities for small and embedded systems ii bzip2 1.0.8-5.1 amd64 high-quality block-sorting file compressor - utilities ii bzip3 1.4.0-1 amd64 better, faster and stronger spiritual successor to bzip2 - utilities ii ca-certificates 20240203 all Common CA certificates @@ -83,6 +83,7 @@ ii jq 1.7.1-3build1 amd64 ii ksh 20240113 all transitional package ii ksh93u+m 1.0.8-1 amd64 AT&T KornShell ii less 590-2ubuntu2.1 amd64 pager program similar to more +ii lftp 4.9.2-2ubuntu1 amd64 Sophisticated command-line FTP/HTTP/BitTorrent client programs ii lib32asan8 14-20240412-0ubuntu1 amd64 AddressSanitizer -- a fast memory error detector (32bit) ii lib32atomic1 14-20240412-0ubuntu1 amd64 support library providing __atomic built-in functions (32bit) ii lib32gcc-13-dev 13.2.0-23ubuntu4 amd64 GCC support library (32 bit development files) @@ -259,6 +260,7 @@ ii libutempter0:amd64 1.2.1-3build1 amd64 ii libuuid1:amd64 2.39.3-9ubuntu6 amd64 Universally Unique ID library ii libuv1t64:amd64 1.48.0-1.1build1 amd64 asynchronous event notification library - runtime library ii libvterm0:amd64 0.3.3-2build1 amd64 abstract terminal library +ii libwrap0:amd64 7.6.q-33 amd64 Wietse Venema's TCP wrappers library ii libx11-6:amd64 2:1.8.7-1build1 amd64 X11 client-side library ii libx11-data 2:1.8.7-1build1 all X11 client-side library ii libx32asan8 14-20240412-0ubuntu1 amd64 AddressSanitizer -- a fast memory error detector (x32) @@ -341,6 +343,7 @@ ii rsync 3.2.7-1ubuntu1 amd64 ii screen 4.9.1-1build1 amd64 terminal multiplexer with VT100/ANSI terminal emulation ii sed 4.9-2build1 amd64 GNU stream editor for filtering/transforming text ii sensible-utils 0.0.22 all Utilities for sensible alternative selection +ii socat 1.8.0.0-4build3 amd64 multipurpose relay for bidirectional data transfer ii strace 6.8-0ubuntu2 amd64 System call tracer ii sysstat 12.6.1-2 amd64 system performance tools for Linux ii sysvinit-utils 3.08-6ubuntu3 amd64 System-V-like utilities @@ -370,7 +373,7 @@ ii zstd 1.5.5+dfsg2-2build1 amd64 ||/ Name Version Architecture Description Packages sorted by Installed-Size: - 985000 ===== TOTAL (364 packages) + 988565 ===== TOTAL (367 packages) 76943 valgrind amd64 72249 gcc-13-x86-64-linux-gnu amd64 37841 g++-13-x86-64-linux-gnu amd64 @@ -463,6 +466,7 @@ Packages sorted by Installed-Size: 1980 aria2 amd64 1900 bash amd64 1885 openssl amd64 + 1848 lftp amd64 1798 zstd amd64 1796 procps amd64 1761 libdb5.3t64 amd64 @@ -471,6 +475,7 @@ Packages sorted by Installed-Size: 1730 libsqlite3-0 amd64 1712 libp11-kit0 amd64 1634 mksh amd64 + 1610 socat amd64 1582 btop amd64 1579 ccache amd64 1504 e2fsprogs amd64 @@ -650,6 +655,7 @@ Packages sorted by Installed-Size: 110 gcc-13-base amd64 109 bzip2 amd64 107 sysvinit-utils amd64 + 107 libwrap0 amd64 105 libx32itm1 amd64 105 libc-dev-bin amd64 103 libio-pty-perl amd64 diff --git a/src/version.h b/src/version.h index 490d5946..8a2ae758 100644 --- a/src/version.h +++ b/src/version.h @@ -2,6 +2,6 @@ #define UPX_VERSION_HEX 0x040300 /* 04.03.00 */ #define UPX_VERSION_STRING "4.3.0" #define UPX_VERSION_STRING4 "4.30" -#define UPX_VERSION_DATE "Jun 19th 2024" -#define UPX_VERSION_DATE_ISO "2024-06-19" +#define UPX_VERSION_DATE "Aug 19th 2024" +#define UPX_VERSION_DATE_ISO "2024-08-19" #define UPX_VERSION_YEAR "2024"