all: prepare for release

modified:   NEWS

.clang-format

@@ -1,49 +1,27 @@
-# "Gofmt's style is nobody's favourite, but gofmt is everybody's favourite." --Rob Pike
-#
+# vim:set ft=yaml ts=2 sw=2 et:
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
 # for clang-format-15.0.6 from https://github.com/upx/upx-stubtools/releases
+#
+# "Gofmt's style is nobody's favourite, but gofmt is everybody's favourite." --Rob Pike
 ---
 BasedOnStyle: LLVM
 ColumnLimit: 100
 IndentWidth: 4
 ---
+# settings for C and C++
 Language: Cpp
 AccessModifierOffset: -4
+AlignConsecutiveMacros: AcrossComments
 AlwaysBreakTemplateDeclarations: true
 AttributeMacros:
-  - __acc_cdecl
-  - __acc_cdecl_atexit
-  - __acc_cdecl_qsort
-  - __acc_cdecl_sighandler
-  - __acc_forceinline
-  - __acc_noinline
-  - __acc_static_forceinline
-  - __acc_static_noinline
   - DELETED_FUNCTION
   - XSPAN_DELETED_FUNCTION
-  - forceinline
   - may_throw
-  - noinline
-  - static_forceinline
-  - static_noinline
 EmptyLineBeforeAccessModifier: Leave
+# IndentPPDirectives: AfterHash # TODO later
 SortIncludes: false
 SpaceAfterCStyleCast: true
 Standard: Cpp03
 StatementMacros:
-  - ACCCHK_ASSERT
-  - ACCCHK_ASSERT_IS_SIGNED_T
-  - ACCCHK_ASSERT_IS_UNSIGNED_T
-  - ACCCHK_ASSERT_SIGN_T
-  - ACC_BLOCK_BEGIN
-  - ACC_COMPILE_TIME_ASSERT
-  - ACC_COMPILE_TIME_ASSERT_HEADER
-  - ACC_CXX_DISABLE_NEW_DELETE
-  - ACC_CXX_TRIGGER_FUNCTION
-  - ACC_CXX_TRIGGER_FUNCTION_IMPL
   - CLANG_FORMAT_DUMMY_STATEMENT
-  - COMPILE_TIME_ASSERT
-  - COMPILE_TIME_ASSERT_ALIGNED1
-WhitespaceSensitiveMacros:
-  - ACC_PP_MACRO_EXPAND
-  - ACC_PP_STRINGIZE
 ...

.clang-tidy

@@ -1,13 +1,17 @@
-# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
+# vim:set ft=yaml ts=2 sw=2 et:
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
 ---
 Checks: >
   -*,
   bugprone-*,
     -bugprone-assignment-in-if-condition,
     -bugprone-branch-clone,
+    -bugprone-casting-through-void,
     -bugprone-easily-swappable-parameters,
     -bugprone-empty-catch,
     -bugprone-implicit-widening-of-multiplication-result,
+    -bugprone-inc-dec-in-conditions,
     -bugprone-macro-parentheses,
     -bugprone-narrowing-conversions,
     -bugprone-reserved-identifier,
@@ -20,9 +24,11 @@ Checks: >
     -clang-analyzer-optin.performance.Padding,
     -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
     -clang-analyzer-security.insecureAPI.strcpy,
-  clang-diagnostics-*',
+  clang-diagnostic-*,
   performance-*,
     -performance-avoid-endl,
+    -performance-enum-size,
+    -performance-no-int-to-ptr,
     -performance-unnecessary-value-param,
 FormatStyle: file
 HeaderFilterRegex: '.*'

.clangd

@@ -0,0 +1,44 @@
+# vim:set ft=yaml ts=2 sw=2 et:
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+# for clangd from https://clangd.llvm.org/
+---
+# treat *.h files as C++ source code
+If:
+  PathMatch: src/.*\.h
+  PathExclude: vendor/.*
+CompileFlags:
+  Add:
+    - -xc++
+---
+# C++ flags
+If:
+  PathMatch: [ src/.*\.h, src/.*\.cpp ]
+  PathExclude: vendor/.*
+CompileFlags:
+  Add:
+    - -std=gnu++17
+    # -std=gnu++20 # requires clangd >= 11.0
+    # -std=gnu++23 # requires clangd >= 18.0
+---
+# common flags for all C/C++ files
+If:
+  PathMatch: [ src/.*\.h, src/.*\.c, src/.*\.cpp ]
+  PathExclude: vendor/.*
+CompileFlags:
+  Add:
+    # see https://github.com/clangd/clangd/issues/1038 : Support deterministic relative include path
+    - -Ivendor
+    - -I../vendor
+    - -I../../vendor
+    - -DDEBUG
+    - -fno-strict-aliasing
+    - -fno-strict-overflow
+    - -funsigned-char
+Diagnostics:
+  Includes:
+    # IgnoreHeader: A list of regexes. Include Cleaner will not produce diagnostics
+    # for headers whose path is a suffix match for any of these.
+    IgnoreHeader:
+      - src/.*\.h
+  UnusedIncludes: None
+...

.editorconfig

@@ -1,3 +1,4 @@
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
 # see https://editorconfig.org/
 
 root = true
@@ -14,8 +15,8 @@ trim_trailing_whitespace = true
 indent_size = 8
 indent_style = tab
 
-[*.S]
+[{*.asm,*.S}]
 indent_size = 8
 
-[*.yml]
+[{*.yaml,*.yml}]
 indent_size = 2

.gitattributes

@@ -1,7 +1,12 @@
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
 # see https://github.com/github-linguist/linguist
 #
 # HINT: check settings with
 #   git ls-files | git check-attr --stdin --all
+#   git ls-files --eol
+
+# disable all line ending conversions
+* -text
 
 #
 # tell diff tools that these files are generated automatically
@@ -14,6 +19,9 @@
 /src/stub/src/arch/**/lzma_d_c[fns].S   linguist-generated
 /src/stub/tmp/**                        linguist-generated
 
+/misc/podman/*/packages*.txt            linguist-generated
+/misc/testsuite/*expected_sha256sums*   linguist-generated
+
 #
 # make GitHub language detection more accurate
 #

.github/CODEOWNERS

@@ -1,6 +1,5 @@
 *                               @markus-oberhumer @jreiser
 
-/src/p_elf*                     @jreiser
 /src/p_lx_*                     @jreiser
 /src/p_mach*                    @jreiser
 /src/p_unix*                    @jreiser

.github/dependabot.yml

@@ -1,9 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      # Check for updates to GitHub Actions every Wednesday
-      interval: 'weekly'
-      day: 'wednesday'

.github/typos_config.toml

@@ -1,42 +0,0 @@
-# see https://github.com/crate-ci/typos
-
-# a generic spell-checker that works on source code is quite
-# tricky, so some false positives are fine
-
-[files]
-extend-exclude = ["LICENSE", "misc/*/packages.txt", "misc/*/*/packages.txt"]
-
-[default.extend-identifiers]
-# misc variable names & symbols
-acc_spawnve = "acc_spawnve"
-ba = "ba"
-fo = "fo"
-fof = "fof"
-O_WRONLY = "O_WRONLY"
-# clang-analyzer-optin.cplusplus
-optin = "optin"
-sidelen = "sidelen"
-tpos = "tpos"
-# assembly sources
-CArry = "CArry"
-hda = "hda"
-Larg = "Larg"
-pard = "pard"
-suble = "suble"
-
-# identifiers are intelligently split into words and then checked again
-[default.extend-words]
-delt = "delt"
-FO = "FO"
-fo = "fo"
-# parm is used like param
-PARM = "PARM"
-parm = "parm"
-# rela: ELF relocations
-RELA = "RELA"
-rela = "rela"
-# siz is used for size
-siz = "siz"
-# SEH: Structured Exception Handling
-SEH = "SEH"
-seh = "seh"

.github/workflows/ci.yml

@@ -4,314 +4,419 @@
 # unfortunately this sometimes breaks builds in mysterious ways...
 # see https://github.com/actions/runner-images.git
 
-name: 'CI'
+name: CI
 
 on: [push, workflow_dispatch]
 
 env:
-  CMAKE_REQUIRED_QUIET: OFF
+  CMAKE_REQUIRED_QUIET: 'OFF'
+  CMAKE_VERBOSE_MAKEFILE: 'ON'
+  CTEST_OUTPUT_ON_FAILURE: 'ON'
   DEBIAN_FRONTEND: noninteractive
   UPX_CMAKE_BUILD_FLAGS: --verbose
-  # 2023-07-30
-  ZIG_DIST_VERSION: 0.11.0-dev.4320+6f0a613b6
+  UPX_CMAKE_CONFIG_FLAGS: -Wdev --warn-uninitialized
+  UPX_CONFIG_HAVE_WORKING_BUILD_RPATH: 'ON'
+  UPX_DEBUG_TEST_FLOAT_DIVISION_BY_ZERO: 1
+  UPX_DEBUG_TEST_LIBC_QSORT: 1
+  ZSTD_CLEVEL: 9
+  # 2025-02-18
+  ZIG_DIST_VERSION: 0.14.0-dev.3258+d2e70ef84
 
 jobs:
   job-rebuild-and-verify-stubs:
-    name: 'Rebuild stubs'
-    runs-on: ubuntu-20.04
+    name: Rebuild stubs
+    runs-on: ubuntu-latest
+    container: ubuntu:24.04 # provides glibc-2.39
+    #container: debian:12-slim # also works; provides glibc-2.36
+    #container: debian:testing-slim # also works; currently provides glibc-2.38
     steps:
-      - name: 'Install extra packages'
+      - name: Install packages
         run: |
           uname -a; pwd; id; umask
-          mkdir ../deps; cd ../deps; mkdir packages
-          if ! test -e /usr/bin/python2; then
-            ####sudo apt-get update && sudo apt-get install -y --no-install-recommends python2-minimal
+          dpkg --add-architecture i386
+          apt-get update && apt-get upgrade -y
+          # install system packages
+          apt-get install -y --no-install-recommends bash ca-certificates curl git libmpc3 make perl-base tar time xz-utils libc6:i386 zlib1g:i386
           # install python2-minimal packages from Debian-11
-            wget -q 'https://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7-minimal_2.7.18-8_amd64.deb'
-            wget -q 'https://ftp.debian.org/debian/pool/main/p/python2.7/python2.7-minimal_2.7.18-8_amd64.deb'
-            sudo dpkg -i ./*python2*.deb && rm ./*python2*.deb && sudo ldconfig
-            sudo ln -s -v python2.7 /usr/bin/python2
-          fi
+          mkdir ../deps; cd ../deps; mkdir packages
+          curl -sS -L -O https://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb
+          curl -sS -L -O https://ftp.debian.org/debian/pool/main/p/python2.7/python2.7-minimal_2.7.18-8+deb11u1_amd64.deb
+          dpkg -i ./*python2*.deb && rm ./*python2*.deb && ldconfig
+          ln -s -v python2.7 /usr/bin/python2
           # manually unpack and install compat libs from Ubuntu-16.04
-          wget -q 'https://archive.kernel.org/ubuntu-archive/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.6-1_amd64.deb'
+          curl -sS -L -O https://archive.kernel.org/ubuntu-archive/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.6-1_amd64.deb
           for f in ./*.deb; do dpkg -x $f ./packages; done
-          sudo mv -v -n ./packages/usr/lib/x86_64-linux-gnu/lib* /usr/lib/x86_64-linux-gnu/
-          rm -rf ./*.deb ./packages
-          sudo ldconfig
+          mv -v -n ./packages/usr/lib/x86_64-linux-gnu/lib* /usr/lib/x86_64-linux-gnu/
+          rm -rf ./*.deb ./packages && ldconfig
           # install upx-stubtools
-          wget -q -O - https://github.com/upx/upx-stubtools/releases/download/v20221212/bin-upx-20221212.tar.xz | tar -xJ
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: 'Rebuild and verify stubs'
+          curl -sS -L https://github.com/upx/upx-stubtools/releases/download/v20221212/bin-upx-20221212.tar.xz | tar -xJ
+      - name: Check out code
+        run: |
+          git config --global --add safe.directory '*' # needed when running in a container
+          git clone --branch "$GITHUB_REF_NAME" --depth 1 "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" .
+          git submodule update --init -- vendor/lzma-sdk
+          git fsck --strict --no-progress
+      - name: Rebuild and verify stubs
         run: |
           export PATH="$(readlink -en ../deps/bin-upx-20221212):$PATH"
           make -C src/stub maintainer-clean extra-clean
           git status || true
           make -C src/stub extra-all all
           if ! git diff --quiet; then git diff; exit 1; fi
-      - name: 'Check source code formatting'
+      - run: bash ./misc/scripts/check_whitespace_git.sh
+      - name: Check source code formatting
         run: |
-          bash ./misc/scripts/check_whitespace_git.sh
-          UPX_CLANG_FORMAT="$PWD/../deps/bin-upx-20221212/clang-format-15.0.6" make -C src clang-format
+          export UPX_CLANG_FORMAT="$(readlink -en ../deps/bin-upx-20221212/clang-format-15.0.6)"
+          make -C src clang-format
           if ! git diff --quiet; then git diff; exit 1; fi
+      - name: Rebuild docs
+        run: |
+          make -C doc clean all
+          if ! git diff --quiet; then git diff || true; fi # ignore diff error
 
   job-linux-cmake: # uses cmake + make
-    if: ${{ true }}
+    if: true
     needs: [ job-rebuild-and-verify-stubs ]
-    name: ${{ format('{0} cmake', matrix.os) }}
-    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - { os: ubuntu-22.04, use_m32: true }
-          - { os: ubuntu-20.04, use_m32: false } # use_m32 also works here, but save some CI time
+          - { os: ubuntu-20.04, use_extra: true }
+          - { os: ubuntu-22.04, use_extra: true, use_wine: true }
+          - { os: ubuntu-24.04, use_extra: true, use_wine: true }
+    name: ${{ format('{0}', matrix.os) }}
+    runs-on: ${{ matrix.os }}
     steps:
-      - name: 'Install extra 32-bit and Windows packages'
-        if: ${{ matrix.use_m32 }}
+      - name: Install extra 32-bit and MinGW packages
+        if: ${{ matrix.use_extra }}
         run: |
           sudo dpkg --add-architecture i386
-          sudo apt-get update
+          sudo apt-get update && sudo apt-get upgrade -y
           sudo apt-get install -y g++-multilib g++-mingw-w64-i686 g++-mingw-w64-x86-64
-      - name: 'Check out code'
-        uses: actions/checkout@v3
+          # make sure that we use posix-threads (pthread/winpthreads) and NOT win32-threads
+          for f in i686-w64-mingw32-g++ i686-w64-mingw32-gcc x86_64-w64-mingw32-g++ x86_64-w64-mingw32-gcc; do
+            if test -f /usr/bin/$f-posix; then sudo update-alternatives --set $f /usr/bin/$f-posix; fi
+            ls -l /usr/bin/${f}*
+          done
+          ls -l /etc/alternatives/*mingw* || true
+          sudo apt-get install -y libc6-dbg:i386 valgrind
+      - name: Install Wine
+        if: ${{ matrix.use_extra && matrix.use_wine }}
+        run: |
+          sudo apt-get install -y wine wine32:i386 wine64
+          ls -l /usr/bin/wine*
+          mkdir -p -v ~/.wine && wineboot --init
+      - uses: actions/checkout@v4
         with: { submodules: true }
-      - name: 'Check out test suite'
-        run: 'git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite'
-      - name: 'Build cmake extra/gcc/debug'
-        run:   'make build/extra/gcc/debug'
-      - name: 'Build cmake extra/gcc/release'
-        run:   'make build/extra/gcc/release'
-      - name: 'Build cmake extra/clang/debug'
-        run:   'make build/extra/clang/debug'
-      - name: 'Build cmake extra/clang/release'
-        run:   'make build/extra/clang/release'
-      - name: 'Build cmake extra/gcc-m32/debug'
-        if: ${{ matrix.use_m32 }}
-        run:   'make build/extra/gcc-m32/debug'
-      - name: 'Build cmake extra/gcc-m32/release'
-        if: ${{ matrix.use_m32 }}
-        run:   'make build/extra/gcc-m32/release'
-      - name: 'Build cmake extra/cross-windows-mingw32/release'
-        if: ${{ matrix.use_m32 }}
-        run:   'make build/extra/cross-windows-mingw32/release'
-      - name: 'Build cmake extra/cross-windows-mingw64/release'
-        if: ${{ matrix.use_m32 }}
-        run:   'make build/extra/cross-windows-mingw64/release'
-      - name: 'Make artifact'
+      - name: Check out test suite
+        run: git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite
+      - run: set -x; clang --version; clang++ --version
+      - run: set -x; gcc --version; g++ --version
+      - run: clang   -E -x c   -dM /dev/null # list predefined macros for C
+      - run: clang++ -E -x c++ -dM /dev/null # list predefined macros for C++
+      - run: gcc     -E -x c   -dM /dev/null # list predefined macros for C
+      - run: g++     -E -x c++ -dM /dev/null # list predefined macros for C++
+      - run: make build/extra/gcc/all
+      - run: make build/extra/clang/all
+      - run: make build/extra/gcc-m32/all
+        if: ${{ matrix.use_extra }}
+      - run: make build/extra/gcc-mx32/all
+        if: ${{ matrix.use_extra }}
+      - run: make build/extra/cross-windows-mingw32/all
+        if: ${{ matrix.use_extra }}
+      - run: make build/extra/cross-windows-mingw64/all
+        if: ${{ matrix.use_extra }}
+      - name: Make artifact
         run: |
           N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-${{ matrix.os }}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
           mkdir -p "tmp/artifact/$N"
+          dirs="gcc/debug gcc/release clang/debug clang/release"
+          if test "${{ matrix.use_extra }}" = "true"; then
+            dirs="$dirs gcc-m32/debug gcc-m32/release gcc-mx32/debug gcc-mx32/release"
+            dirs="$dirs cross-windows-mingw32/debug cross-windows-mingw32/release"
+            dirs="$dirs cross-windows-mingw64/debug cross-windows-mingw64/release"
+          fi
+          for d in $dirs; do DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdir/$d" cmake --install build/extra/$d; done
+          for d in $dirs; do DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdirAndStrip/$d" cmake --install build/extra/$d --strip; done
+          for d in $dirs; do cmake --install build/extra/$d --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefix/$d"; done
+          for d in $dirs; do cmake --install build/extra/$d --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefixAndStrip/$d" --strip; done
           (cd build && shopt -s nullglob && cp -ai --parents */upx{,.exe} */*/*/upx{,.exe} "../tmp/artifact/$N")
-          (cd tmp/artifact && tar --sort=name -czf "$N.tar.gz" "$N" && rm -rf "./$N")
-          # GitHub Actions magic: set "artifact_name" environment value for use in next step
+          if command -v hardlink >/dev/null; then (cd "tmp/artifact/$N" && hardlink .) fi
+          (cd tmp/artifact && tar --sort=name --zstd -cf "$N.tar.zst" "$N" && rm -rf "./$N" && ls -la && zstd -tq "$N.tar.zst")
           echo "artifact_name=$N" >> $GITHUB_ENV
       - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: tmp/artifact
-      - name: 'Run install tests'
+        uses: actions/upload-artifact@v4
+        with: { name: '${{ env.artifact_name }}', path: tmp/artifact }
+      - name: Run install tests
         run: |
-          (cd build/extra/gcc/release && DESTDIR=$PWD/Install-with-cmake cmake --install .)
-          (cd build/extra/gcc/release && DESTDIR=$PWD/Install-with-make  make install)
-      - name: 'Run basic tests'
+          (cd build/extra/gcc/release && DESTDIR="$PWD/Install with cmake" cmake --install .)
+          (cd build/extra/gcc/release && DESTDIR="$PWD/Install with make"  make install)
+      - name: Run ctest tests
         run: |
-          make -C build/extra/gcc/debug test
-          make -C build/extra/gcc/release test
-          make -C build/extra/clang/debug test
-          make -C build/extra/clang/release test
-      - name: 'Run basic tests 32-bit'
-        if: ${{ matrix.use_m32 }}
+          jobs="gcc/debug gcc/release clang/debug clang/release"
+          test "${{ matrix.use_extra }}" = "true" && jobs="$jobs gcc-m32/debug gcc-m32/release"
+          command -v wine >/dev/null && jobs="$jobs cross-windows-mingw32/debug cross-windows-mingw32/release"
+          command -v wine >/dev/null && jobs="$jobs cross-windows-mingw64/debug cross-windows-mingw64/release"
+          echo "===== parallel jobs: $jobs"
+          CTEST_JOBS=2 parallel -kv --lb 'make build/extra/{}+test' ::: $jobs
+      - name: Mimic ctest tests
         run: |
-          make -C build/extra/gcc-m32/debug test
-          make -C build/extra/gcc-m32/release test
-      - name: 'Run test suite build/extra/gcc/release'
+          jobs="gcc/debug gcc/release clang/debug clang/release"
+          test "${{ matrix.use_extra }}" = "true" && jobs="$jobs gcc-m32/debug gcc-m32/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/extra/{} && bash ../../../../misc/testsuite/mimic_ctest.sh' ::: $jobs
+      - name: Mimic ctest tests with Valgrind
+        if: true # note: valgrind is SLOW
+        run: |
+          if command -v valgrind >/dev/null; then
+            export UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS=ON # valgrind is SLOW
+            export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet --gen-suppressions=all"
+            # clang/debug does not work before valgrind-3.20, see https://bugs.kde.org/show_bug.cgi?id=452758
+            jobs="gcc/debug gcc/release clang/release"
+            test "${{ matrix.use_extra }}" = "true" && jobs="$jobs gcc-m32/debug gcc-m32/release"
+            echo "===== parallel jobs: $jobs"
+            parallel -kv --lb 'cd build/extra/{} && bash ../../../../misc/testsuite/mimic_ctest.sh' ::: $jobs
+          fi
+      - name: Run file system tests
+        run: |
+          jobs="gcc/debug gcc/release clang/debug clang/release"
+          test "${{ matrix.use_extra }}" = "true" && jobs="$jobs gcc-m32/debug gcc-m32/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/extra/{} && bash ../../../../misc/testsuite/test_symlinks.sh' ::: $jobs
+      - name: Run file system tests with Valgrind
+        if: false # note: valgrind is SLOW
+        run: |
+          if command -v valgrind >/dev/null; then
+            export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet --gen-suppressions=all"
+            # clang/debug does not work before valgrind-3.20, see https://bugs.kde.org/show_bug.cgi?id=452758
+            jobs="gcc/debug gcc/release clang/release"
+            test "${{ matrix.use_extra }}" = "true" && jobs="$jobs gcc-m32/debug gcc-m32/release"
+            echo "===== parallel jobs: $jobs"
+            parallel -kv --lb 'cd build/extra/{} && bash ../../../../misc/testsuite/test_symlinks.sh' ::: $jobs
+          fi
+      - name: Run test suite
         run: |
           export upx_testsuite_SRCDIR="$(readlink -en ../deps/upx-testsuite)"
-          testsuite_1="$(readlink -en ./misc/testsuite/upx_testsuite_1.sh)"
-          env -C build/extra/gcc/release upx_exe=./upx bash "$testsuite_1"
+          jobs="gcc/debug gcc/release clang/debug clang/release"
+          test "${{ matrix.use_extra }}" = "true" && jobs="$jobs gcc-m32/debug gcc-m32/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/extra/{} && bash ../../../../misc/testsuite/upx_testsuite_1.sh' ::: $jobs
 
   job-macos-cmake: # uses cmake + make
-    if: ${{ true }}
+    if: true
     needs: [ job-rebuild-and-verify-stubs ]
-    name: ${{ format('{0} cmake', matrix.os) }}
-    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - { os: macos-11, gcc: gcc-10, gxx: 'g++-10', testsuite: true }
-          - { os: macos-12, gcc: gcc-11, gxx: 'g++-11', testsuite: true }
-          - { os: macos-13, gcc: gcc-12, gxx: 'g++-12', testsuite: true }
+          # NOTE: Xcode updates regularly tend to break Homebrew clang/gcc; often some ld64 issue; use "xcode_version" as needed; or try "-Wl,-ld_classic"
+          # NOTE: macos does not have "env -C"; only with brew coreutils
+          - { os: macos-13, gcc: gcc-12, gxx: g++-12, testsuite: true }
+          - { os: macos-14, gcc: gcc-13, gxx: g++-13, testsuite: true }
+          - { os: macos-15, gcc: gcc-14, gxx: g++-14, testsuite: true }
+    name: ${{ format('{0} {1}{2}', matrix.os, matrix.xcode_version && 'xcode-' || '',  matrix.xcode_version) }}
+    runs-on: ${{ matrix.os }}
     steps:
-      - name: 'Install brew packages'
+      - uses: maxim-lobanov/setup-xcode@v1
+        if: ${{ matrix.xcode_version }}
+        with: { xcode-version: '${{ matrix.xcode_version }}' }
+      - name: Install brew packages
         if: ${{ matrix.testsuite }}
         run: |
+          test -z "$HOMEBREW_PREFIX" && HOMEBREW_PREFIX="$(brew --prefix)"
+          echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX" >> $GITHUB_ENV
           # testsuite needs working "readlink -en" and "sha256sum -b"
-          if ! test -e /usr/local/opt/coreutils/libexec/gnubin/readlink; then
-            echo "===== brew leaves:"; brew leaves; echo "===== brew list:"; brew list
+          packages="ninja parallel util-linux"
+          test -e "$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin/readlink" || packages="$packages coreutils"
+          if test -n "$packages"; then
+            echo "===== brew leaves:"; brew leaves; echo "===== brew list:"; brew list --versions
             # only run "brew update" if needed
-            if ! brew install coreutils; then brew update && brew install coreutils; fi
+            if ! brew install $packages; then echo "===== brew update" && brew update && brew install $packages; fi
           fi
-      - name: 'Check out code'
-        uses: actions/checkout@v3
+          mkdir -p ~/.parallel && : > ~/.parallel/$(echo 6305-4721 | tr 0-7 leticlwi)
+          echo "UPX_DEBUG_FORCE_PACK_MACOS=1" >> $GITHUB_ENV
+          case "${{ matrix.os }}" in
+            # TODO FIXME: UPX on macos-13+ is broken => disable run-packed for now
+            macos-13 | macos-14 | macos-15) echo "UPX_CONFIG_DISABLE_RUN_PACKED_TEST=ON" >> $GITHUB_ENV ;;
+          esac
+      - uses: actions/checkout@v4
         with: { submodules: true }
-      - name: 'Check out test suite'
+      - name: Check out test suite
         if: ${{ matrix.testsuite }}
-        run: 'git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite'
-      - name: 'Build cmake extra/clang/debug'
-        run:   'make build/extra/clang/debug'
-      - name: 'Build cmake extra/clang/release'
-        run:   'make build/extra/clang/release'
-      - name: 'Build cmake extra/gcc/debug'
-        if: ${{ matrix.gcc != '' }}
-        run:   'make build/extra/gcc/debug CC="${{ matrix.gcc }} -static-libgcc" CXX="${{ matrix.gxx }} -static-libgcc -static-libstdc++"'
-      - name: 'Build cmake extra/gcc/release'
-        if: ${{ matrix.gcc != '' }}
-        run:   'make build/extra/gcc/release CC="${{ matrix.gcc }} -static-libgcc" CXX="${{ matrix.gxx }} -static-libgcc -static-libstdc++"'
-      - name: 'Build cmake xtarget/cross-darwin-arm64/debug'
+        run: git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite
+      - run: set -x; xcode-select -p || true; xcodebuild -version || true
+      - run: set -x; clang --version; clang++ --version
+      - run: clang   -E -x c   -dM /dev/null # list predefined macros for C
+      - run: clang++ -E -x c++ -dM /dev/null # list predefined macros for C++
+      - run: set -x; ${{ matrix.gcc }} --version; ${{ matrix.gxx }} --version
+        if: ${{ matrix.gcc }}
+      - run: ${{ matrix.gcc }} -E -x c   -dM /dev/null # list predefined macros for C
+        if: ${{ matrix.gcc }}
+      - run: ${{ matrix.gxx }} -E -x c++ -dM /dev/null # list predefined macros for C++
+        if: ${{ matrix.gcc }}
+      - run: make build/extra/clang/all
+      - name: Build extra/gcc/all
+        if: ${{ matrix.gcc }}
+        run: make build/extra/gcc/all CC="${{ matrix.gcc }} -static-libgcc" CXX="${{ matrix.gxx }} -static-libgcc -static-libstdc++"
+      - name: Build xtarget/cross-darwin-arm64/all
         run: |
-          CC="clang -target arm64-apple-darwin" CXX="clang++ -target arm64-apple-darwin" \
-          make UPX_XTARGET=cross-darwin-arm64 xtarget/debug
-      - name: 'Build cmake xtarget/cross-darwin-arm64/release'
+          make UPX_XTARGET=xtarget/cross-darwin-arm64 xtarget/all \
+            CC="clang -target arm64-apple-darwin" CXX="clang++ -target arm64-apple-darwin"
+      - name: Make artifact
         run: |
-          CC="clang -target arm64-apple-darwin" CXX="clang++ -target arm64-apple-darwin" \
-          make UPX_XTARGET=cross-darwin-arm64 xtarget/release
-      - name: 'Make artifact'
-        run: |
-          N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-${{ matrix.os }}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
+          X="${{ matrix.xcode_version }}"; test -n "$X" && X="-xcode-$X"
+          N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-${{ matrix.os }}$X" | sed 's/[^0-9a-zA-Z_.-]/-/g')
           mkdir -p "tmp/artifact/$N"
+          dirs="clang/debug clang/release"
+          test -n "${{ matrix.gcc }}" && dirs="$dirs gcc/debug gcc/release"
+          for d in $dirs; do DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdir/$d" cmake --install build/extra/$d; done
+          for d in $dirs; do DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdirAndStrip/$d" cmake --install build/extra/$d --strip; done
+          for d in $dirs; do cmake --install build/extra/$d --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefix/$d"; done
+          for d in $dirs; do cmake --install build/extra/$d --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefixAndStrip/$d" --strip; done
           (cd build && rsync -R -a */*/*/upx "../tmp/artifact/$N/")
-          (cd tmp/artifact && gtar --sort=name -czf "$N.tar.gz" "$N" && rm -rf "./$N")
-          # GitHub Actions magic: set "artifact_name" environment value for use in next step
+          hardlink="$HOMEBREW_PREFIX/opt/util-linux/bin/hardlink"
+          if test -f "$hardlink"; then (cd "tmp/artifact/$N" && "$hardlink" .) fi
+          (cd tmp/artifact && gtar --sort=name --zstd -cf "$N.tar.zst" "$N" && rm -rf "./$N" && ls -la && zstd -tq "$N.tar.zst")
           echo "artifact_name=$N" >> $GITHUB_ENV
       - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: tmp/artifact
-      - name: 'Run install tests'
+        uses: actions/upload-artifact@v4
+        with: { name: '${{ env.artifact_name }}', path: tmp/artifact }
+      - name: Run install tests
         run: |
-          (cd build/extra/clang/release && DESTDIR=$PWD/Install-with-cmake cmake --install .)
-          (cd build/extra/clang/release && DESTDIR=$PWD/Install-with-make  make install)
-      - name: 'Run basic tests'
-        if: ${{ !contains(matrix.os, 'macos-13') }} # FIXME: UPX on macos-13 is broken => disable self-test for now
+          (cd build/extra/clang/release && DESTDIR="$PWD/Install with cmake" cmake --install .)
+          (cd build/extra/clang/release && DESTDIR="$PWD/Install with make"  make install)
+      - name: Run ctest tests
         run: |
-          make -C build/extra/clang/debug test
-          make -C build/extra/clang/release test
-      - name: 'Run test suite build/extra/clang/release'
+          for f in ./build/extra/*/*/upx; do file $f; done
+          jobs="clang/debug clang/release"
+          test -n "${{ matrix.gcc }}" && jobs="$jobs gcc/debug gcc/release"
+          echo "===== parallel jobs: $jobs"
+          CTEST_JOBS=2 parallel -kv --lb 'make build/extra/{}+test' ::: $jobs
+      - name: Mimic ctest tests
+        run: |
+          export PATH="$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin:$PATH"
+          jobs="clang/debug clang/release"
+          test -n "${{ matrix.gcc }}" && jobs="$jobs gcc/debug gcc/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/extra/{} && bash ../../../../misc/testsuite/mimic_ctest.sh' ::: $jobs
+      - name: Run file system tests
+        if: ${{ matrix.testsuite }} # for coreutils readlink
+        run: |
+          export PATH="$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin:$PATH"
+          export upx_test_file="$PWD"/build/extra/clang/release/upx
+          jobs="clang/debug clang/release"
+          test -n "${{ matrix.gcc }}" && jobs="$jobs gcc/debug gcc/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/extra/{} && bash ../../../../misc/testsuite/test_symlinks.sh' ::: $jobs
+      - name: Run test suite
         if: ${{ matrix.testsuite }}
         run: |
-          export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
+          export PATH="$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin:$PATH"
           export upx_testsuite_SRCDIR="$(readlink -en ../deps/upx-testsuite)"
-          testsuite_1="$(readlink -en ./misc/testsuite/upx_testsuite_1.sh)"
-          env -C build/extra/clang/release upx_exe=./upx bash "$testsuite_1"
+          jobs="clang/debug clang/release"
+          test -n "${{ matrix.gcc }}" && jobs="$jobs gcc/debug gcc/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/extra/{} && bash ../../../../misc/testsuite/upx_testsuite_1.sh' ::: $jobs
 
   job-windows-cmake: # uses cmake + msbuild
-    if: ${{ true }}
+    if: true
     needs: [ job-rebuild-and-verify-stubs ]
-    name: ${{ format('{0} cmake', matrix.name) }}
-    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          # windows-2019 used to work but got broken with the 20220821.1 runner-image
-          # update; we cannot download that image for inspection, and debugging the
-          # remote image is painful, so disable for now
-          ####- { name: windows-2019-amd64, os: windows-2019, vsversion: 2019, arch: amd64 }
-          - { name: windows-2022-amd64, os: windows-2022, vsversion: 2022, arch: amd64 }
+          - { name: windows-2019-amd64, os: windows-2019, vsversion: 2019, vsarch: amd64 }
+          - { name: windows-2022-amd64, os: windows-2022, vsversion: 2022, vsarch: amd64 }
+    name: ${{ format('{0}', matrix.name) }}
+    runs-on: ${{ matrix.os }}
     steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
+      - run: git config --global core.autocrlf false
+      - uses: actions/checkout@v4
         with: { submodules: true }
-      - name: 'Check out test suite'
-        run: 'git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite'
-      - name: 'Set up Developer Command Prompt'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          vsversion: ${{ matrix.vsversion }}
-          arch: ${{ matrix.arch }}
-      - name: 'Build cmake debug'
-        run:   'make build/debug'
-      - name: 'Build cmake release'
-        run:   'make build/release'
-      - name: 'Make artifact'
+      - name: Check out test suite
+        run: git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite
+      - uses: ilammy/msvc-dev-cmd@v1
+        with: { vsversion: '${{ matrix.vsversion }}', arch: '${{ matrix.vsarch }}' }
+      - run: make build/debug
+      - run: make build/release
+      - name: Make artifact
         shell: bash
         run: |
           N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-${{ matrix.os }}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
           mkdir -p "tmp/artifact/$N"
+          DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdir/debug"   cmake --install build/debug   --config Debug
+          DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdir/release" cmake --install build/release --config Release
+          DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdirAndStrip/debug"   cmake --install build/debug   --config Debug   --strip
+          DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdirAndStrip/release" cmake --install build/release --config Release --strip
+          cmake --install build/debug   --config Debug   --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefix/debug"
+          cmake --install build/release --config Release --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefix/release"
+          cmake --install build/debug   --config Debug   --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefixAndStrip/debug"   --strip
+          cmake --install build/release --config Release --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefixAndStrip/release" --strip
           (cd build && cp -ai --parents */*/upx.exe "../tmp/artifact/$N")
-          # GitHub Actions magic: set "artifact_name" environment value for use in next step
+          (cd tmp/artifact && tar --sort=name --zstd -cf "$N.tar.zst" "$N" && rm -rf "./$N" && ls -la && zstd -tq "$N.tar.zst")
           echo "artifact_name=$N" >> $GITHUB_ENV
       - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: tmp/artifact
-      - name: 'Run basic tests'
-        if: ${{ matrix.arch != 'amd64_arm64' }}
+        uses: actions/upload-artifact@v4
+        with: { name: '${{ env.artifact_name }}', path: tmp/artifact }
+      - name: Run ctest tests
+        if: ${{ matrix.vsarch != 'amd64_arm64' }}
         run: |
-          ctest --test-dir build/debug   -C Debug
-          ctest --test-dir build/release -C Release
-      - name: 'Run test suite build/release'
-        if: ${{ matrix.arch != 'amd64_arm64' }}
+          ctest --test-dir build/debug   --parallel 8 -C Debug
+          ctest --test-dir build/release --parallel 8 -C Release
+      - name: Run test suite build/release
+        if: ${{ matrix.vsarch != 'amd64_arm64' }}
         shell: bash
         run: |
           export upx_testsuite_SRCDIR="$(readlink -en ../deps/upx-testsuite)"
-          testsuite_1="$(readlink -en ./misc/testsuite/upx_testsuite_1.sh)"
-          env -C build/release/Release upx_exe=./upx bash "$testsuite_1"
+          env -C build/release/Release bash "$PWD"/misc/testsuite/upx_testsuite_1.sh
 
   job-windows-toolchains: # build "by hand" using cmd.exe
-    if: ${{ true }}
+    if: github.repository_owner == 'upx'
     needs: [ job-rebuild-and-verify-stubs ]
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { name: amd64-win64-vs2019,   os: windows-2019, vsversion: 2019, vsarch: amd64 }
+          - { name: amd64-win64-vs2022,   os: windows-2022, vsversion: 2022, vsarch: amd64 }
+          - { name: arm64-win64-vs2019,   os: windows-2019, vsversion: 2019, vsarch: amd64_arm64 }
+          - { name: arm64-win64-vs2022,   os: windows-2022, vsversion: 2022, vsarch: amd64_arm64 }
+          - { name: arm64ec-win64-vs2022, os: windows-2022, vsversion: 2022, vsarch: amd64_arm64, cl_machine_flags: -arm64EC, link_machine_flags: '/machine:arm64ec' }
+          # { name: arm64x-win64-vs2022,  os: windows-2022, vsversion: 2022, vsarch: amd64_arm64, cl_machine_flags: -arm64EC, link_machine_flags: '/machine:arm64x' }
+          - { name: i386-win32-vs2019,    os: windows-2019, vsversion: 2019, vsarch: amd64_x86 }
+          - { name: i386-win32-vs2022,    os: windows-2022, vsversion: 2022, vsarch: amd64_x86 }
     name: ${{ format('windows {0}', matrix.name) }}
     runs-on: ${{ matrix.os }}
     env:
       C: ${{ matrix.name }}
       B: release
-      H: 'd:\a\upx\upx'
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { name: amd64-win64-vs2019,   os: windows-2019, vsversion: 2019, arch: amd64 }
-          - { name: amd64-win64-vs2022,   os: windows-2022, vsversion: 2022, arch: amd64 }
-          - { name: arm64-win64-vs2019,   os: windows-2019, vsversion: 2019, arch: amd64_arm64 }
-          - { name: arm64-win64-vs2022,   os: windows-2022, vsversion: 2022, arch: amd64_arm64 }
-          - { name: arm64ec-win64-vs2022, os: windows-2022, vsversion: 2022, arch: amd64_arm64, cl_machine_flags: -arm64EC, link_machine_flags: '/machine:arm64ec' }
-          # { name: arm64x-win64-vs2022,  os: windows-2022, vsversion: 2022, arch: amd64_arm64, cl_machine_flags: -arm64EC, link_machine_flags: '/machine:arm64x' }
-          - { name: i386-win32-vs2019,    os: windows-2019, vsversion: 2019, arch: amd64_x86 }
-          - { name: i386-win32-vs2022,    os: windows-2022, vsversion: 2022, arch: amd64_x86 }
     steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
+      - run: git config --global core.autocrlf false
+      - uses: actions/checkout@v4
         with: { submodules: true }
-      - name: 'Prepare sources and Check out test suite'
+      - name: Prepare sources and Check out test suite
         shell: bash
         run: |
           git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite
           mkdir -p -v build/$C/$B/{bzip2,ucl,upx,zlib,zstd}
-      - name: 'Set up Developer Command Prompt'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          vsversion: ${{ matrix.vsversion }}
-          arch: ${{ matrix.arch }}
-      - name: 'Build by hand'
+          repository_name="${GITHUB_REPOSITORY##*/}" # basename
+          echo "H=d:\\a\\$repository_name\\$repository_name" >> $GITHUB_ENV
+      - uses: ilammy/msvc-dev-cmd@v1
+        with: { vsversion: '${{ matrix.vsversion }}', arch: '${{ matrix.vsarch }}' }
+      - name: Build by hand
         shell: cmd
         run: |
           @REM ===== set vars =====
           where cl & where link
           set RUN_CL=cl ${{ matrix.cl_machine_flags }} -MT
           set RUN_LIB=link -lib ${{ matrix.link_machine_flags }}
-          set DEFS=-D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS
+          @rem UPX only uses the very basic Windows API
+          set DEFS=-D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0501
           set BDIR=%H%\build\%C%\%B%
           git rev-parse --short=12 HEAD > %BDIR%\upx\.GITREV.txt
           @REM ===== build bzip2 =====
           cd %BDIR%\bzip2
-          @rem %RUN_CL% -J -O2 -W4 -wd4127 -wd4244 -wd4267 -WX %DEFS% -c %H%\vendor\bzip2\*.c
+          @rem %RUN_CL% -J -O2 -W4 -wd4127 -wd4244 -wd4267 -WX %DEFS% -DBZ_NO_STDIO -c %H%\vendor\bzip2\*.c
           @rem %RUN_LIB% -out:bzip2.lib *.obj
           @REM ===== build UCL =====
           cd %BDIR%\ucl
@@ -320,7 +425,8 @@ jobs:
           %RUN_LIB% -out:ucl.lib *.obj
           @REM ===== build zlib =====
           cd %BDIR%\zlib
-          %RUN_CL% -J -O2 -W3 -WX %DEFS% -DHAVE_VSNPRINTF -c %H%\vendor\zlib\*.c
+          set s=%H%\vendor\zlib
+          %RUN_CL% -J -O2 -W3 -WX %DEFS% -I%s% -DHAVE_VSNPRINTF -c %H%\vendor\zlib\*.c
           %RUN_LIB% -out:zlib.lib *.obj
           @REM ===== build zstd =====
           cd %BDIR%\zstd
@@ -332,112 +438,110 @@ jobs:
           set s=%H%\src
           cat .GITREV.txt
           set /p GITREV=<.GITREV.txt
-          set UPX_DEFS=-DUPX_CONFIG_DISABLE_WSTRICT=0 -DUPX_CONFIG_DISABLE_WERROR=0 -DWITH_BZIP2=0 -DWITH_ZSTD=0
+          set UPX_DEFS=-DUPX_CONFIG_DISABLE_WSTRICT=0 -DUPX_CONFIG_DISABLE_WERROR=0 -DWITH_THREADS=0 -DWITH_BZIP2=0 -DWITH_ZSTD=0
           set UPX_LIBS=%BDIR%\ucl\ucl.lib %BDIR%\zlib\zlib.lib
           @rem set UPX_LIBS=%BDIR%\bzip2\bzip2.lib %BDIR%\ucl\ucl.lib %BDIR%\zlib\zlib.lib %BDIR%\zstd\zstd.lib
           set sources=%s%\*.cpp %s%\check\*.cpp %s%\compress\*.cpp %s%\console\*.cpp %s%\filter\*.cpp %s%\util\*.cpp
           %RUN_CL% -J -O2 -W4 -WX -std:c++17 -Zc:__cplusplus -EHsc -DUPX_VERSION_GITREV="""%GITREV%""" %DEFS% %UPX_DEFS% -I%H%\vendor -Feupx.exe %sources% %UPX_LIBS% /link ${{ matrix.link_machine_flags }} setargv.obj
-      - name: 'Make artifact'
+      - name: Make artifact
         shell: bash
         run: |
           N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-windows-${{ matrix.name }}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
           mkdir -p "tmp/artifact/$N/$B"
           cp -ai build/$C/$B/upx/upx*.exe "tmp/artifact/$N/$B"
-          # GitHub Actions magic: set "artifact_name" environment value for use in next step
+          (cd tmp/artifact && tar --sort=name --zstd -cf "$N.tar.zst" "$N" && rm -rf "./$N" && ls -la && zstd -tq "$N.tar.zst")
           echo "artifact_name=$N" >> $GITHUB_ENV
       - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: tmp/artifact
-      - name: 'Run basic tests'
-        if: ${{ matrix.arch != 'amd64_arm64' }}
+        uses: actions/upload-artifact@v4
+        with: { name: '${{ env.artifact_name }}', path: tmp/artifact }
+      - name: Run basic tests
+        if: ${{ matrix.vsarch != 'amd64_arm64' }}
         run: |
           $ErrorActionPreference = 'stop'
           $ErrorView = 'NormalView'
           cd $Env:H\build\$Env:C\$Env:B\upx
           $Env:UPX = "--no-color --no-progress"
           .\upx.exe --version
+          .\upx.exe --sysinfo -v
           .\upx.exe upx.exe -o upx_packed.exe
           dir *.exe
           .\upx.exe -l upx_packed.exe
           .\upx.exe -t upx_packed.exe
           .\upx_packed.exe --version
-      - name: 'Run test suite'
-        if: ${{ matrix.arch != 'amd64_arm64' }}
+      - name: Run test suite
+        if: ${{ matrix.vsarch != 'amd64_arm64' }}
         shell: bash
         run: |
           export upx_testsuite_SRCDIR="$(readlink -en ../deps/upx-testsuite)"
-          testsuite_1="$(readlink -en ./misc/testsuite/upx_testsuite_1.sh)"
-          env -C build/$C/$B/upx upx_exe=./upx.exe bash "$testsuite_1"
+          env -C build/$C/$B/upx upx_exe=./upx.exe bash "$PWD"/misc/testsuite/upx_testsuite_1.sh
 
   job-linux-zigcc: # uses cmake + make
-    if: ${{ true }}
+    if: github.repository_owner == 'upx'
     needs: [ job-rebuild-and-verify-stubs ]
-    name: ${{ format('zigcc {0} {1}', matrix.zig_target, matrix.zig_pic) }}
-    runs-on: ubuntu-latest
-    container: 'alpine:3.18' # older versions such as alpine:3.12 also work; no-container also works
     strategy:
       fail-fast: false
       matrix:
         include:
-          # only build a few targets => more targets are tested in the Weekly CI
-          - { zig_target: aarch64-linux-musl }
-          # { zig_target: aarch64-linux-musl, zig_pic: -fPIE }
-          # { zig_target: aarch64-macos-none }
+          # only build a few selected targets => more targets are tested in the Weekly CI
+          - { zig_target: aarch64-linux-musl, qemu: qemu-aarch64 }
           - { zig_target: aarch64-macos.11.0-none }
-          # { zig_target: aarch64-macos.12.0-none }
-          # { zig_target: aarch64-macos.13.0-none }
           - { zig_target: aarch64-windows-gnu }
-          - { zig_target: arm-linux-musleabihf }
-          # { zig_target: arm-linux-musleabihf, zig_pic: -fPIE }
-          # { zig_target: i386-linux-musl }
+          - { zig_target: arm-linux-musleabihf, qemu: qemu-arm }
+          - { zig_target: armeb-linux-musleabihf, qemu: qemu-armeb }
+          - { zig_target: i386-linux-gnu.2.3.4, zig_flags: -march=i586 }
+          - { zig_target: i386-linux-musl, zig_flags: -march=i586, qemu: qemu-i386 }
           - { zig_target: i386-windows-gnu }
-          # { zig_target: mips-linux-musl }
-          # { zig_target: mipsel-linux-musl }
-          # { zig_target: powerpc-linux-musl }
-          # { zig_target: powerpc64-linux-musl }
-          # { zig_target: powerpc64le-linux-musl }
-          - { zig_target: x86_64-linux-musl }
-          # { zig_target: x86_64-linux-musl, zig_pic: -fPIE }
-          # { zig_target: x86_64-macos-none }
+          - { zig_target: mips-linux-musleabi, zig_flags: -msoft-float, qemu: qemu-mips }
+          - { zig_target: mips-linux-musleabihf, qemu: qemu-mips }
+          - { zig_target: mipsel-linux-musleabi, zig_flags: -msoft-float, qemu: qemu-mipsel }
+          - { zig_target: mipsel-linux-musleabihf, qemu: qemu-mipsel }
+          - { zig_target: powerpc-linux-musleabihf, qemu: qemu-ppc }
+          - { zig_target: powerpc64-linux-musl, qemu: qemu-ppc64 }
+          - { zig_target: powerpc64le-linux-musl, qemu: qemu-ppc64le }
+          - { zig_target: x86_64-linux-gnu.2.3.4, qemu: qemu-x86_64 } # can use QEMU because of gcompat
+          - { zig_target: x86_64-linux-musl, qemu: qemu-x86_64 }
           - { zig_target: x86_64-macos.11.0-none }
-          # { zig_target: x86_64-macos.12.0-none }
-          # { zig_target: x86_64-macos.13.0-none }
           - { zig_target: x86_64-windows-gnu }
+    name: ${{ format('zigcc {0} {1}', matrix.zig_target, matrix.zig_pic) }}
+    runs-on: ubuntu-latest
+    container: 'alpine:3.21'
     env:
+      UPX_CONFIG_HAVE_WORKING_BUILD_RPATH: ''
       # for zig-cc wrapper scripts (see below):
       ZIG_CPPFLAGS: -DUPX_DOCTEST_CONFIG_MULTITHREADING
       ZIG_FLAGS: ${{ matrix.zig_flags }}
       ZIG_PIC: ${{ matrix.zig_pic }}
       ZIG_TARGET: ${{ matrix.zig_target }}
     steps:
-      - name: 'Install Alpine Linux container packages'
+      - name: Install Alpine Linux container packages
         if: ${{ job.container }}
         shell: sh
         run: |
-          apk update && apk upgrade && apk add bash cmake file git make tar xz
+          apk update && apk upgrade && apk add bash cmake curl file git make parallel tar util-linux xz zstd
           # set PATH like in Ubuntu
           echo "PATH=$HOME/.local/bin:$PATH" >> $GITHUB_ENV
-          # this seems to be needed when running in a container (beause of UID mismatch??)
-          git config --global --add safe.directory '*'
-      - name: 'Check out code'
-        uses: actions/checkout@v3
+          git config --global --add safe.directory '*' # needed when running in a container
+          mkdir -p ~/.parallel && : > ~/.parallel/$(echo 6305-4721 | tr 0-7 leticlwi)
+      - uses: actions/checkout@v4
         with: { submodules: true }
       - name: ${{ format('Install Zig {0}', env.ZIG_DIST_VERSION) }}
         shell: bash
         run: |
-          # GitHub Actions magic: set "UPX_GITREV_SHORT" environment value for use in steps below
           rev=$(git rev-parse --short=7 HEAD)
           echo "UPX_GITREV_SHORT=$rev" >> $GITHUB_ENV
-          # update ZIG_TARGET (i386 => x86)
-          ZIG_TARGET=${ZIG_TARGET/i386-/x86-}
-          echo "ZIG_TARGET=$ZIG_TARGET" >> $GITHUB_ENV
+          if [[ "${{ matrix.zig_target }}" == i386-linux-gnu.2.3.4 ]]; then
+            echo "UPX_CONFIG_DISABLE_SHARED_LIBS=ON" >> $GITHUB_ENV # zig problem when linking in Debug mode
+          fi
+          if [[ "${{ matrix.zig_target }}" == x86_64-linux-gnu.2.3.4 ]]; then
+            echo "NEED_GCOMPAT=1" >> $GITHUB_ENV
+            # TODO FIXME: problem with self-packed upx and musl+gcompat: "Not a valid dynamic program"
+            echo "UPX_CONFIG_DISABLE_RUN_PACKED_TEST=ON" >> $GITHUB_ENV
+          fi
           # install zig; note that ~/.local/bin is included in the default $PATH on Ubuntu
           mkdir -p -v ~/.local/bin
           cd ~/.local/bin
           ZIG_DIST_NAME=zig-linux-x86_64-${ZIG_DIST_VERSION}
-          wget -q https://ziglang.org/builds/${ZIG_DIST_NAME}.tar.xz
+          curl -sS -L -O https://ziglang.org/builds/${ZIG_DIST_NAME}.tar.xz
           ls -l ${ZIG_DIST_NAME}.tar.xz
           tar -xoJf ${ZIG_DIST_NAME}.tar.xz
           rm ${ZIG_DIST_NAME}.tar.xz
@@ -445,44 +549,105 @@ jobs:
           #echo "PATH=$PATH" && which zig
           echo -n 'zig version: '; zig version
           # create wrapper scripts (needed for CMake)
-          echo -e '#!/bin/sh\nexec zig ar "$@"' > zig-ar
-          echo -e '#!/bin/sh\nexec zig cc  -target $ZIG_TARGET $ZIG_PIC $ZIG_FLAGS $ZIG_CPPFLAGS $ZIG_CFLAGS   "$@"' > zig-cc
-          echo -e '#!/bin/sh\nexec zig c++ -target $ZIG_TARGET $ZIG_PIC $ZIG_FLAGS $ZIG_CPPFLAGS $ZIG_CXXFLAGS "$@"' > zig-cxx
-          echo -e '#!/bin/sh\nexec zig ranlib "$@"' > zig-ranlib
+          log=
+          log='set -x\n'
+          echo -e '#!/bin/sh\n'$log'exec zig ar "$@"' > zig-ar
+          echo -e '#!/bin/sh\n'$log'exec zig cc  -target $ZIG_TARGET $ZIG_PIC $ZIG_FLAGS $ZIG_CPPFLAGS $ZIG_CFLAGS   "$@"' > zig-cc
+          echo -e '#!/bin/sh\n'$log'exec zig c++ -target $ZIG_TARGET $ZIG_PIC $ZIG_FLAGS $ZIG_CPPFLAGS $ZIG_CXXFLAGS "$@"' > zig-cxx
+          echo -e '#!/bin/sh\n'$log'exec zig ranlib "$@"' > zig-ranlib
           chmod +x zig-ar zig-cc zig-cxx zig-ranlib
           ls -la; head zig-ar zig-cc zig-cxx zig-ranlib
+          # update ZIG_TARGET
+          ZIG_TARGET=${ZIG_TARGET/i386-/x86-}    # i386 => x86
+          echo "ZIG_TARGET=$ZIG_TARGET" >> $GITHUB_ENV
+          # -fPIE is for compilation only => also use the correct linker flag "-pie"
+          # INFO: it seems the zig driver does handle this automatically(??), so not really needed
+          if test "X$ZIG_PIC" = "X-fPIE"; then true;
+            ZIG_FLAGS="$ZIG_FLAGS --start-no-unused-arguments -pie --end-no-unused-arguments"
+            echo "UPX_CONFIG_DISABLE_SHARED_LIBS=ON" >> $GITHUB_ENV # conflicts with ZIG_PIC/ZIG_FLAGS
+          fi
+          # zig bug TODO later: need -Wno-unused-command-line-argument
+          case "$ZIG_TARGET" in
+            powerpc*) ZIG_FLAGS="$ZIG_FLAGS -Wno-unused-command-line-argument" ;;
+          esac
+          echo "ZIG_FLAGS=$ZIG_FLAGS" >> $GITHUB_ENV
+      # run: set -x; zig version; zig-cc --version; zig-cxx --version
+      - run: zig-cc  -E -x c   -dM /dev/null # list predefined macros for C
+      - run: zig-cxx -E -x c++ -dM /dev/null # list predefined macros for C++
       - name: ${{ format('Build Release with zig-cc -target {0} {1}', env.ZIG_TARGET, env.ZIG_PIC) }}
         run: |
-          mkdir -p build/zig/${ZIG_TARGET}${ZIG_PIC}/release
-          cd       build/zig/${ZIG_TARGET}${ZIG_PIC}/release
-          cmake ../../../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_AR=$HOME/.local/bin/zig-ar -DCMAKE_C_COMPILER=zig-cc -DCMAKE_CXX_COMPILER=zig-cxx -DCMAKE_RANLIB=$HOME/.local/bin/zig-ranlib $EXTRA_CMAKE_CONFIG_FLAGS_RELEASE
-          cmake --build . --config Release --parallel --verbose
-          file ./upx*
+          make UPX_XTARGET=zig/${ZIG_TARGET}${ZIG_PIC} xtarget/release \
+            CC="zig-cc" CXX="zig-cxx" CMAKE_AR="$HOME/.local/bin/zig-ar" CMAKE_RANLIB="$HOME/.local/bin/zig-ranlib"
+          file build/zig/${ZIG_TARGET}${ZIG_PIC}/release/upx*
       - name: ${{ format('Build Debug with zig-cc -target {0} {1}', env.ZIG_TARGET, env.ZIG_PIC) }}
         run: |
-          mkdir -p build/zig/${ZIG_TARGET}${ZIG_PIC}/debug
-          cd       build/zig/${ZIG_TARGET}${ZIG_PIC}/debug
-          cmake ../../../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_AR=$HOME/.local/bin/zig-ar -DCMAKE_C_COMPILER=zig-cc -DCMAKE_CXX_COMPILER=zig-cxx -DCMAKE_RANLIB=$HOME/.local/bin/zig-ranlib $EXTRA_CMAKE_CONFIG_FLAGS_DEBUG
-          cmake --build . --config Debug --parallel --verbose
-          file ./upx*
+          make UPX_XTARGET=zig/${ZIG_TARGET}${ZIG_PIC} xtarget/debug \
+            CC="zig-cc" CXX="zig-cxx" CMAKE_AR="$HOME/.local/bin/zig-ar" CMAKE_RANLIB="$HOME/.local/bin/zig-ranlib"
+          file build/zig/${ZIG_TARGET}${ZIG_PIC}/debug/upx*
       - name: ${{ format('Make artifact from upx-{0}-{1}', github.ref_name, env.UPX_GITREV_SHORT) }}
         shell: bash
         run: |
           N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-zigcc-${{ matrix.zig_target }}${ZIG_PIC}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
           mkdir -p "tmp/artifact/$N"
+          if [[ "${{ matrix.zig_target }}" == *-linux* ]]; then
+            dirs="${ZIG_TARGET}${ZIG_PIC}/debug ${ZIG_TARGET}${ZIG_PIC}/release"
+            for d in $dirs; do DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdir/$d" cmake --install build/zig/$d; done
+            for d in $dirs; do DESTDIR="$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithDestdirAndStrip/$d" cmake --install build/zig/$d --strip; done
+            for d in $dirs; do cmake --install build/zig/$d --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefix/$d"; done
+            for d in $dirs; do cmake --install build/zig/$d --prefix "$PWD/tmp/artifact/$N/InstallWithCMake/InstallWithPrefixAndStrip/$d" --strip; done
+          fi
           (cd build && shopt -s nullglob && cp -ai --parents */upx{,.exe} */*/*/upx{,.exe} "../tmp/artifact/$N")
-          (cd tmp/artifact && tar --sort=name -czf "$N.tar.gz" "$N" && rm -rf "./$N")
-          # GitHub Actions magic: set "artifact_name" environment value for use in next step
+          if command -v hardlink >/dev/null; then (cd "tmp/artifact/$N" && hardlink .) fi
+          (cd tmp/artifact && tar --sort=name --zstd -cf "$N.tar.zst" "$N" && rm -rf "./$N" && ls -la && zstd -tq "$N.tar.zst")
           echo "artifact_name=$N" >> $GITHUB_ENV
       - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: tmp/artifact
-      - name: 'Run install tests'
+        uses: actions/upload-artifact@v4
+        with: { name: '${{ env.artifact_name }}', path: tmp/artifact }
+      - name: Run install tests
         if: ${{ contains(matrix.zig_target, '-linux') }}
         run: |
-          (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-cmake cmake --install .)
-          (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-make  make install)
-
-# vim:set ts=2 sw=2 et:
+          (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR="$PWD/Install with cmake" cmake --install .)
+          (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR="$PWD/Install with make"  make install)
+      - name: Run ctest tests
+        if: ${{ matrix.zig_target == 'i386-linux-musl' || matrix.zig_target == 'x86_64-linux-musl' || matrix.zig_target == 'x86_64-linux-gnu.2.3.4' }}
+        run: |
+          test -n "$NEED_GCOMPAT" && apk add gcompat
+          jobs="${ZIG_TARGET}${ZIG_PIC}/debug ${ZIG_TARGET}${ZIG_PIC}/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'make build/zig/{}+test' ::: $jobs
+      - name: Mimic ctest tests
+        if: ${{ matrix.zig_target == 'i386-linux-musl' || matrix.zig_target == 'x86_64-linux-musl' || matrix.zig_target == 'x86_64-linux-gnu.2.3.4' }}
+        run: |
+          test -n "$NEED_GCOMPAT" && apk add gcompat
+          jobs="${ZIG_TARGET}${ZIG_PIC}/debug ${ZIG_TARGET}${ZIG_PIC}/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/zig/{} && bash ../../../../misc/testsuite/mimic_ctest.sh' ::: $jobs
+      - name: ${{ format('Mimic ctest tests with QEMU {0}', matrix.qemu) }}
+        if: ${{ matrix.qemu }}
+        run: |
+          qemu="${{ matrix.qemu }}"
+          apk add coreutils "${qemu%% *}"
+          test -n "$NEED_GCOMPAT" && apk add gcompat
+          export upx_exe_runner="$qemu"
+          jobs="${ZIG_TARGET}${ZIG_PIC}/debug ${ZIG_TARGET}${ZIG_PIC}/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/zig/{} && bash ../../../../misc/testsuite/mimic_ctest.sh' ::: $jobs
+      - name: Mimic ctest tests with Valgrind
+        if: ${{ matrix.zig_target == 'x86_64-linux-musl' || matrix.zig_target == 'x86_64-linux-gnu.2.3.4' }}
+        run: |
+          export UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS=ON # valgrind is SLOW
+          apk add coreutils valgrind
+          test -n "$NEED_GCOMPAT" && apk add gcompat
+          export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet --gen-suppressions=all"
+          upx_exe_runner="$upx_exe_runner --suppressions=$PWD/misc/valgrind/musl.supp"
+          jobs="${ZIG_TARGET}${ZIG_PIC}/debug ${ZIG_TARGET}${ZIG_PIC}/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/zig/{} && bash ../../../../misc/testsuite/mimic_ctest.sh' ::: $jobs
+      - name: Run file system tests
+        if: ${{ matrix.zig_target == 'i386-linux-musl' || matrix.zig_target == 'x86_64-linux-musl' || matrix.zig_target == 'x86_64-linux-gnu.2.3.4' }}
+        run: |
+          apk add coreutils sudo
+          test -n "$NEED_GCOMPAT" && apk add gcompat
+          jobs="${ZIG_TARGET}${ZIG_PIC}/debug ${ZIG_TARGET}${ZIG_PIC}/release"
+          echo "===== parallel jobs: $jobs"
+          parallel -kv --lb 'cd build/zig/{} && chmod a+w . && sudo -u nobody bash ../../../../misc/testsuite/test_symlinks.sh' ::: $jobs

.github/workflows/github-close-pull-requests.yml

@@ -1,17 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-name: 'GitHub - Close pull requests'
-on:
-  #pull_request:
-  workflow_dispatch:
-jobs:
-  close-pull-requests:
-    name: 'Close pull requests'
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: 'Close pull requests'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr list --repo='${{ github.repository }}' --state=open --json=number | jq '.[].number' | xargs -r -n1 -- gh pr close --repo='${{ github.repository }}'

.github/workflows/github-close-stale-issues.yml

@@ -12,27 +12,28 @@
 #    Abandoned Issues and Pull Request".
 #   https://igorwiese.com/images/papers/Paper_BotSE_19.pdf
 
-name: 'GitHub - Close inactive issues'
+name: GitHub - Close stale issues
 on:
-  schedule: [cron: '50 3 * * 3'] # run weekly Wednesday 03:50 UTC
+  schedule: [cron: "50 0 * * 1"] # run weekly Monday 00:50 UTC
   workflow_dispatch:
 jobs:
-  close-issues:
-    name: 'Close inactive issues'
+  job-close-stale-issues:
+    if: github.repository_owner == 'upx' && github.repository == 'upx/upx'
+    name: Close stale issues
     runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           operations-per-run: 300
           exempt-all-milestones: true
           exempt-issue-labels: 'blocker,bug,enhancement,help wanted,regression'
-          days-before-stale: 60
+          days-before-stale: 90
           days-before-close: 30
-          stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Please remove the stale label or add a comment or this issue will be closed in 30 days.'
-          stale-pr-message:       'This PR is stale because it has been open 60 days with no activity. Please remove the stale label or add a comment or this PR will be closed in 30 days.'
+          stale-issue-message: 'This issue is stale because it has been open for 90 days with no activity. Please remove the stale label or add a comment or this issue will be closed in 30 days.'
+          stale-pr-message:       'This PR is stale because it has been open for 90 days with no activity. Please remove the stale label or add a comment or this PR will be closed in 30 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity. Please feel free to reopen.'
           close-pr-message:       'This PR was closed because it has been stalled for 30 days with no activity. Please feel free to reopen.'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/misc-spell-check.yml

@@ -1,19 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-# see https://github.com/crate-ci/typos
-
-name: 'Misc - Spell check'
-on:
-  workflow_dispatch:
-env:
-  DEBIAN_FRONTEND: noninteractive
-jobs:
-  job-spell-check:
-    name: 'Spell check'
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: false }
-      - name: 'Spell check with crate-ci/typos'
-        uses: crate-ci/typos@master
-        with: { config: ./.github/typos_config.toml }

.github/workflows/static-analyzer-clang-analyzer.yml

@@ -1,30 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-
-name: 'Static Analyzer - clang-analyzer'
-on:
-  schedule: [cron: '10 5 * * 3'] # run weekly Wednesday 05:10 UTC
-  workflow_dispatch:
-env:
-  CMAKE_REQUIRED_QUIET: OFF
-  DEBIAN_FRONTEND: noninteractive
-
-jobs:
-  job-analyze-clang-analyzer: # uses cmake + make
-    strategy:
-      fail-fast: false
-      matrix: {container: ['alpine:3.16','alpine:3.17','alpine:3.18','alpine:edge','i386/alpine:edge']}
-    name: ${{ format('Analyze {0}', matrix.container) }}
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    steps:
-      - name: ${{ format('Install packages {0}', matrix.container) }}
-        run: 'apk update && apk upgrade && apk add clang clang-analyzer cmake g++ git make'
-      - name: ${{ format('Check out UPX {0} source code', github.ref_name) }}
-        run: |
-          git clone --branch "$GITHUB_REF_NAME" --depth 1 https://github.com/upx/upx
-          git -C upx submodule update --init
-      - name: 'Perform clang-analyzer scan-build Analysis Debug'
-        run: 'make -C upx build/analyze/clang-analyzer/debug'
-      - name: 'Perform clang-analyzer scan-build Analysis Release'
-        if: success() || failure() # run this step even if the previous step failed
-        run: 'make -C upx build/analyze/clang-analyzer/release'

.github/workflows/static-analyzer-clang-tidy.yml

@@ -1,30 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-
-name: 'Static Analyzer - clang-tidy'
-on:
-  schedule: [cron: '30 5 * * 3'] # run weekly Wednesday 05:30 UTC
-  workflow_dispatch:
-env:
-  CMAKE_REQUIRED_QUIET: OFF
-  DEBIAN_FRONTEND: noninteractive
-
-jobs:
-  job-analyze-clang-tidy: # uses cmake + make
-    strategy:
-      fail-fast: false
-      matrix: {container: ['alpine:edge','i386/alpine:edge']}
-    name: ${{ format('Analyze clang-tidy {0}', matrix.container) }}
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    steps:
-      - name: ${{ format('Install packages {0}', matrix.container) }}
-        run: 'apk update && apk upgrade && apk add clang clang-extra-tools cmake g++ git make python3'
-      - name: ${{ format('Check out UPX {0} source code', github.ref_name) }}
-        run: |
-          git clone --branch "$GITHUB_REF_NAME" --depth 1 https://github.com/upx/upx
-          git -C upx submodule update --init
-      - name: 'Perform clang-tidy Analysis Debug'
-        run: 'make -k -C upx build/analyze/clang-tidy/debug'
-      - name: 'Perform clang-tidy Analysis Release'
-        if: success() || failure() # run this step even if the previous step failed
-        run: 'make -k -C upx build/analyze/clang-tidy/release'

.github/workflows/static-analyzer-codeql.yml

@@ -1,34 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-
-name: 'Static Analyzer - CodeQL'
-on:
-  schedule: [cron: '50 5 * * 3'] # run weekly Wednesday 05:50 UTC
-  workflow_dispatch:
-env:
-  CMAKE_REQUIRED_QUIET: OFF
-  DEBIAN_FRONTEND: noninteractive
-
-jobs:
-  job-analyze-codeql:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'cpp' ]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: ${{ matrix.language }}
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2

.github/workflows/test-alpine-linux.yml

@@ -1,135 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-# test minimal number of packages required for building UPX under Alpine Linux
-#   clang: apk add clang cmake make
-#   gcc:   apk add cmake g++ make
-
-name: 'Test - Minimal Alpine build'
-on: [workflow_dispatch]
-env:
-  CMAKE_REQUIRED_QUIET: OFF
-  DEBIAN_FRONTEND: noninteractive
-
-jobs:
-  job-alpine-clang: # uses cmake + make
-    strategy: { matrix: { container: ['alpine:edge','i386/alpine:edge'] } }
-    name: ${{ format('clang {0}', matrix.container) }}
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    steps:
-      - name: ${{ format('Build clang {0}', matrix.container) }}
-        run: |
-          apk update && apk upgrade && apk add clang cmake make
-          wget https://github.com/upx/upx/releases/download/v4.0.2/upx-4.0.2-src.tar.xz
-          tar -xoaf upx-*-src.tar.xz
-          cd upx-*-src
-          make    build/debug   CC="clang -static" CXX="clang++ -static"
-          make    build/release CC="clang -static" CXX="clang++ -static"
-          make -C build/debug   test
-          make -C build/release test
-          make -C build/release install DESTDIR="$PWD/Install"
-          N=$(echo "upx-test-alpine-linux-clang-${{ matrix.container }}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
-          echo "artifact_name=$N" >> $GITHUB_ENV
-      - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        if: ${{ !startsWith(matrix.container, 'i386/') }} # i386: missing nodejs on host
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: 'upx*/build/*/upx'
-
-  job-alpine-gcc: # uses cmake + make
-    strategy: { matrix: { container: ['alpine:edge','i386/alpine:edge'] } }
-    name: ${{ format('gcc {0}', matrix.container) }}
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    steps:
-      - name: ${{ format('Build gcc {0}', matrix.container) }}
-        run: |
-          apk update && apk upgrade && apk add cmake g++ make
-          wget https://github.com/upx/upx/releases/download/v4.0.2/upx-4.0.2-src.tar.xz
-          tar -xoaf upx-*-src.tar.xz
-          cd upx-*-src
-          make    build/debug   CC="gcc -static" CXX="g++ -static"
-          make    build/release CC="gcc -static" CXX="g++ -static"
-          make -C build/debug   test
-          make -C build/release test
-          make -C build/release install DESTDIR="$PWD/Install"
-          N=$(echo "upx-test-alpine-linux-gcc-${{ matrix.container }}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
-          echo "artifact_name=$N" >> $GITHUB_ENV
-      - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        if: ${{ !startsWith(matrix.container, 'i386/') }} # i386: missing nodejs on host
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: 'upx*/build/*/upx'
-
-  job-alpine-by-hand: # uses a POSIX-compliant shell
-    # ...and also uses a subdirectory "upx with space" in order to detect possible quoting issues
-    # ...and also uses ccache as we are running the same build-script again and again
-    if: ${{ true }}
-    strategy: { matrix: { container: ['alpine:3.9','alpine:edge'] } }
-    name: ${{ format('gcc by-hand {0}', matrix.container) }}
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    steps:
-      - name: ${{ format('Install packages {0}', matrix.container) }}
-        run: |
-          # install ccache, g++, git and various POSIX shells
-          shells="bash dash loksh mksh zsh"
-          case ${{ matrix.container }} in
-            *:edge) shells="$shells oksh yash" ;;
-          esac
-          echo "installing shells: $shells"
-          apk update && apk upgrade && apk add ccache g++ git $shells
-          # enable ccache
-          echo -e "CC=ccache gcc\nCXX=ccache g++ -std=gnu++17" >> $GITHUB_ENV
-          # this seems to be needed when running in a container (beause of UID mismatch??)
-          git config --global --add safe.directory '*'
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          path: 'upx with space'
-      - name: 'Build by-hand with bash'
-        run: 'bash "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with bash --posix'
-        run: 'bash --posix "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with busybox ash'
-        run: 'busybox ash "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with busybox sh'
-        run: 'busybox sh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with dash'
-        run: 'dash "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with loksh'
-        run: 'ksh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with loksh -o posix'
-        run: 'ksh -o posix "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with loksh -o sh'
-        run: 'ksh -o sh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with mksh'
-        run: 'mksh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with mksh -o posix'
-        run: 'mksh -o posix "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with mksh -o sh'
-        run: 'mksh -o sh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with oksh'
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: 'oksh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with oksh -o posix'
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: 'oksh -o posix "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with oksh -o sh'
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: 'oksh -o sh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with yash'
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: 'yash "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with zsh'
-        run: 'zsh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with zsh --emulate ksh'
-        run: 'zsh --emulate ksh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Build by-hand with zsh --emulate sh'
-        run: 'zsh --emulate sh "./upx with space/misc/scripts/build_upx_by_hand.sh"'
-      - name: 'Show ccache stats'
-        run: |
-          ccache -s
-          ccache -p

.github/workflows/test-cmake-default.yml

@@ -1,132 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-
-name: 'Test - CMake default build type'
-on: [workflow_dispatch]
-env:
-  CMAKE_REQUIRED_QUIET: OFF
-  DEBIAN_FRONTEND: noninteractive
-
-jobs:
-
-#
-# single-config generators - these use and respect CMAKE_BUILD_TYPE
-#
-
-  cmake-make:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: 'Config, build, test and install'
-        run: |
-          cmake -S . -B build/default -G "Unix Makefiles"
-          cmake --build build/default --parallel --verbose
-          ctest --test-dir build/default
-          (cd build/default && DESTDIR=$PWD/Install-default cmake --install .)
-          # "make test" also works
-          env -C build/default make test
-          # "make install" also works
-          env -C build/default DESTDIR=./Install-with-make make install
-
-  cmake-ninja:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: 'Config, build, test and install'
-        run: |
-          test -f /usr/bin/ninja || sudo apt-get install -y ninja-build
-          cmake -S . -B build/default -G Ninja
-          cmake --build build/default --parallel --verbose
-          ctest --test-dir build/default
-          (cd build/default && DESTDIR=$PWD/Install-default cmake --install .)
-          # "ninja test" also works
-          env -C build/default ninja test
-          # "ninja install" also works
-          env -C build/default DESTDIR=./Install-with-ninja ninja install
-
-  cmake-nmake:
-    runs-on: windows-2022
-    steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: 'Set up Developer Command Prompt'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          vsversion: 2022
-          arch: amd64
-      - name: 'Config, build, test and install'
-        run: |
-          cmake -S . -B build/default -G "NMake Makefiles"
-          cmake --build build/default --parallel --verbose
-          ctest --test-dir build/default
-          # "cmake --install" works on Windows as well, nice
-          env -C build/default DESTDIR=./Install-default cmake --install .
-          # "nmake test" also works
-          env -C build/default nmake test
-          # "nmake install" also works
-          env -C build/default DESTDIR=./Install-with-nmake nmake install
-
-#
-# multi-config generators - these use CMAKE_CONFIGURATION_TYPES, but the defaults seem inconsistent
-#   => when using multi-config generators always explicitly pass the requested build-config
-#
-
-  # ninja-multi-config seems to use the *first* element of CMAKE_CONFIGURATION_TYPES; nice
-  cmake-ninja-multi-config:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: 'Config, build, test and install'
-        run: |
-          test -f /usr/bin/ninja || sudo apt-get install -y ninja-build
-          cmake -S . -B build/default -G "Ninja Multi-Config"
-          cmake --build build/default --parallel --verbose
-          # multi-config: ctest NEEDS a config
-          ctest --test-dir build/default -C Release
-          (cd build/default && DESTDIR=$PWD/Install-default cmake --install .)
-          # "ninja test" also works with multi-config
-          env -C build/default ninja test
-          # "ninja install" also works with multi-config
-          env -C build/default DESTDIR=./Install-with-ninja ninja install
-
-  # vsstudio-multi-config (msbuild) seems to use "Debug" by default
-  cmake-vsstudio-multi-config:
-    runs-on: windows-2022
-    steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: 'Set up Developer Command Prompt'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          vsversion: 2022
-          arch: amd64
-      - name: 'Config, build and test'
-        run: |
-          cmake -S . -B build/default
-          cmake --build build/default --parallel --verbose
-          # multi-config: ctest NEEDS a config
-          ctest --test-dir build/default -C Debug
-          # TODO: does cmake --install work?
-
-  # xcode-multi-config (xcodebuild) seems to use "Debug" by default, except for "cmake --install" (BUG?)
-  cmake-xcode-multi-config:
-    runs-on: macos-12
-    steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: 'Config, build, test and install'
-        run: |
-          cmake -S . -B build/default -G Xcode
-          cmake --build build/default --parallel --verbose
-          # multi-config: ctest NEEDS a config
-          ctest --test-dir build/default -C Debug
-          # BUG(?) multi-config: cmake --install defaults to "Release" !!
-          (cd build/default && DESTDIR=$PWD/Install-default cmake --install . --config Debug)

.github/workflows/weekly-ci-alpine-linux.yml

@@ -1,156 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-# Build under various Alpine Linux versions with clang and gcc, and
-# also test building with C++20 and C++23.
-
-# And also uses a subdirectory "upx with space" that contains whitespace in order
-# to detect possible quoting issues.
-
-# info: Alpine 3.9 has clang-5, cmake-3.13.0 and gcc-8, which nicely
-#   matches our minimal build requirements
-
-name: 'Weekly CI - Alpine Linux'
-on:
-  schedule: [cron: '05 4 * * 3'] # run weekly Wednesday 04:05 UTC
-  workflow_dispatch:
-env:
-  CMAKE_REQUIRED_QUIET: OFF
-  DEBIAN_FRONTEND: noninteractive
-  UPX_TESTSUITE_LEVEL: 2
-
-jobs:
-  job-alpine-cmake: # uses cmake + make
-    strategy:
-      fail-fast: false
-      matrix: { container: ['alpine:3.9','alpine:3.10','alpine:3.11','alpine:3.12','alpine:3.13','alpine:3.14','alpine:3.15','alpine:3.16','alpine:3.17','alpine:3.18','alpine:edge','i386/alpine:edge'] }
-    name: ${{ format('container {0}', matrix.container) }}
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    env: { UPX_CMAKE_CONFIG_FLAGS: '-DCMAKE_VERBOSE_MAKEFILE=ON' }
-    steps:
-      - name: ${{ format('Install packages {0}', matrix.container) }}
-        run: |
-          apk update && apk upgrade && apk add clang cmake g++ git make
-          case ${{ matrix.container }} in
-            # clang-dev is needed on older Alpine versions for clang headers like <emmintrin.h>
-            *:3.[0-9]|*:3.10|*:3.11) apk add clang-dev ;;
-          esac
-      - name: ${{ format('Check out UPX {0} source code', github.ref_name) }}
-        run: |
-          git clone --branch "$GITHUB_REF_NAME" --depth 1 https://github.com/upx/upx "upx with space"
-          git -C "upx with space" submodule update --init
-          x="$(apk list -I "$(apk info -Wq "$(which clang)")")"; echo "clang_package=${x%% *}" >> $GITHUB_ENV
-          x="$(apk list -I "$(apk info -Wq "$(which gcc)")")"; echo "gcc_package=${x%% *}" >> $GITHUB_ENV
-          N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-weekly-ci-alpine-${{ matrix.container }}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
-          echo "artifact_name=$N" >> $GITHUB_ENV
-
-      # build with default C11 and C++17
-      - name: ${{ format('Build clang Release with {0}', env.clang_package) }}
-        run: 'make -C "upx with space" UPX_XTARGET=clang-static CC="clang -static" CXX="clang++ -static"'
-      - name: ${{ format('Build clang Debug with {0}', env.clang_package) }}
-        run: 'make -C "upx with space" UPX_XTARGET=clang-static CC="clang -static" CXX="clang++ -static" xtarget/debug'
-      - name: ${{ format('Build gcc Release with {0}', env.gcc_package) }}
-        run: 'make -C "upx with space" UPX_XTARGET=gcc-static   CC="gcc -static"   CXX="g++ -static"'
-      - name: ${{ format('Build gcc Debug with {0}', env.gcc_package) }}
-        run: 'make -C "upx with space" UPX_XTARGET=gcc-static   CC="gcc -static"   CXX="g++ -static" xtarget/debug'
-
-      - name: 'Update environment'
-        run: |
-          echo "UPX_CONFIG_DISABLE_C_STANDARD=ON" >> $GITHUB_ENV
-          echo "UPX_CONFIG_DISABLE_CXX_STANDARD=ON" >> $GITHUB_ENV
-
-      # build with C17 and C++20 on alpine:edge
-      - name: ${{ format('Build clang C++20 Release with {0}', env.clang_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=clang-cxx20-static CC="clang -std=gnu17 -static" CXX="clang++ -std=gnu++20 -static"
-      - name: ${{ format('Build clang C++20 Debug with {0}', env.clang_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=clang-cxx20-static CC="clang -std=gnu17 -static" CXX="clang++ -std=gnu++20 -static" xtarget/debug
-      - name: ${{ format('Build gcc C++20 Release with {0}', env.gcc_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=gcc-cxx20-static   CC="gcc -std=gnu17 -static"   CXX="g++ -std=gnu++20 -static"
-      - name: ${{ format('Build gcc C++20 Debug with {0}', env.gcc_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=gcc-cxx20-static   CC="gcc -std=gnu17 -static"   CXX="g++ -std=gnu++20 -static" xtarget/debug
-
-      # build with C23 and C++23 on alpine:edge
-      - name: ${{ format('Build clang C++23 Release with {0}', env.clang_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=clang-cxx23-static CC="clang -std=gnu2x -static" CXX="clang++ -std=gnu++2b -static"
-      - name: ${{ format('Build clang C++23 Debug with {0}', env.clang_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=clang-cxx23-static CC="clang -std=gnu2x -static" CXX="clang++ -std=gnu++2b -static" xtarget/debug
-      - name: ${{ format('Build gcc C++23 Release with {0}', env.gcc_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=gcc-cxx23-static   CC="gcc -std=gnu2x -static"   CXX="g++ -std=gnu++23 -static"
-      - name: ${{ format('Build gcc C++23 Debug with {0}', env.gcc_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=gcc-cxx23-static   CC="gcc -std=gnu2x -static"   CXX="g++ -std=gnu++23 -static" xtarget/debug
-
-      # build with -flto=auto on alpine:edge
-      - name: ${{ format('Build clang LTO Release with {0}', env.clang_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=clang-cxxlto-static CC="clang -flto=auto -static" CXX="clang++ -flto=auto -static"
-      - name: ${{ format('Build clang LTO Debug with {0}', env.clang_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=clang-cxxlto-static CC="clang -flto=auto -static" CXX="clang++ -flto=auto -static" xtarget/debug
-      - name: ${{ format('Build gcc LTO Release with {0}', env.gcc_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=gcc-cxxlto-static   CC="gcc -flto=auto -static"   CXX="g++ -flto=auto -static"
-      - name: ${{ format('Build gcc LTO Debug with {0}', env.gcc_package) }}
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          make -C "upx with space" UPX_XTARGET=gcc-cxxlto-static   CC="gcc -flto=auto -static"   CXX="g++ -flto=auto -static" xtarget/debug
-
-      - { name: 'Strip release binaries', run: 'strip -p --strip-unneeded "upx with space"/build/*/*/release/upx' }
-      - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        if: ${{ !startsWith(matrix.container, 'i386/') }} # i386: missing nodejs on host
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: 'upx with space*/build/*/*/*/upx'
-
-      - { name: 'Run basic tests clang Release', run: 'make -C "upx with space"/build/xtarget/clang-static/release test' }
-      - { name: 'Run basic tests clang Debug',   run: 'make -C "upx with space"/build/xtarget/clang-static/debug test' }
-      - { name: 'Run basic tests gcc Release',   run: 'make -C "upx with space"/build/xtarget/gcc-static/release test' }
-      - { name: 'Run basic tests gcc Debug',     run: 'make -C "upx with space"/build/xtarget/gcc-static/debug test' }
-      - name: 'Run basic tests C++20, C++23 and LTO'
-        if: ${{ contains(matrix.container, ':edge') }}
-        run: |
-          for dir in "upx with space"/build/xtarget/*-cxx*/*; do
-             echo "===== $dir"
-             make -C "$dir" test
-          done
-      - name: 'Run install tests'
-        run: |
-          (cd "upx with space"/build/xtarget/clang-static/debug   && DESTDIR="$PWD/Install with cmake" cmake --install .)
-          (cd "upx with space"/build/xtarget/clang-static/debug   && DESTDIR="$PWD/Install with make"  make install)
-          (cd "upx with space"/build/xtarget/clang-static/release && DESTDIR="$PWD/Install with cmake" cmake --install .)
-          (cd "upx with space"/build/xtarget/clang-static/release && DESTDIR="$PWD/Install with make"  make install)
-          (cd "upx with space"/build/xtarget/gcc-static/debug     && DESTDIR="$PWD/Install with cmake" cmake --install .)
-          (cd "upx with space"/build/xtarget/gcc-static/debug     && DESTDIR="$PWD/Install with make"  make install)
-          (cd "upx with space"/build/xtarget/gcc-static/release   && DESTDIR="$PWD/Install with cmake" cmake --install .)
-          (cd "upx with space"/build/xtarget/gcc-static/release   && DESTDIR="$PWD/Install with make"  make install)
-
-      # test suite
-      - name: ${{ format('Run test suite level {0}', env.UPX_TESTSUITE_LEVEL) }}
-        run: |
-          # use a directory that contains whitespace to detect possible quoting issues
-          git clone --depth=1 https://github.com/upx/upx-testsuite "upx-testsuite with space"
-          export upx_testsuite_SRCDIR="$(readlink -fn "upx-testsuite with space")"
-          testsuite_1="$(readlink -fn "upx with space"/misc/testsuite/upx_testsuite_1.sh)"
-          # testsuite needs bash and working "readlink -en" and "sha256sum -b"
-          apk add bash coreutils
-          (cd "upx with space"/build/xtarget/gcc-static/release && upx_exe=./upx bash "$testsuite_1")
-
-# vim:set ts=2 sw=2 et:

.github/workflows/weekly-ci-cmake-macos-xcode.yml

@@ -1,54 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-# build with 'cmake -G Xcode'
-
-name: 'Weekly CI - cmake macOS Xcode'
-on:
-  schedule: [cron: '20 4 * * 3'] # run weekly Wednesday 04:20 UTC
-  workflow_dispatch:
-env:
-  CMAKE_REQUIRED_QUIET: OFF
-  DEBIAN_FRONTEND: noninteractive
-
-jobs:
-  job-cmake-macos-xcode: # uses cmake + xcodebuild
-    name: ${{ format('{0} cmake Xcode', matrix.os) }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { os: macos-11, run_test: true }
-          - { os: macos-12, run_test: true }
-          - { os: macos-13, run_test: false } # TODO: enable once UPX fully works on macos-13
-    steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - { name: 'Config cmake Xcode',        run: 'cmake -S . -B build/xcode -G Xcode' }
-      - { name: 'Build cmake Xcode default', run: 'cmake --build build/xcode' }
-      - { name: 'Build cmake Xcode Debug',   run: 'cmake --build build/xcode --config Debug' }
-      - { name: 'Build cmake Xcode Release', run: 'cmake --build build/xcode --config Release' }
-      - name: 'Make artifact'
-        run: |
-          N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-weekly-ci-xcode-${{ matrix.os }}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
-          mkdir -p "tmp/artifact/$N"
-          (cd build && rsync -R -a */*/upx "../tmp/artifact/$N/")
-          (cd tmp/artifact && gtar --sort=name -czf "$N.tar.gz" "$N" && rm -rf "./$N")
-          # GitHub Actions magic: set "artifact_name" environment value for use in next step
-          echo "artifact_name=$N" >> $GITHUB_ENV
-      - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: tmp/artifact
-      - name: 'Run basic tests'
-        if: ${{ matrix.run_test }}
-        run: |
-          ctest --test-dir build/xcode -C Debug
-          ctest --test-dir build/xcode -C Release
-      - name: 'Run install tests'
-        run: |
-          (cd build/xcode && DESTDIR=$PWD/Install-default cmake --install .)
-          (cd build/xcode && DESTDIR=$PWD/Install-debug   cmake --install . --config Debug)
-          (cd build/xcode && DESTDIR=$PWD/Install-release cmake --install . --config Release)
-          ls -l build/xcode/Install-*/usr/local/bin/upx

.github/workflows/weekly-ci-cmake-windows-nmake.yml

@@ -1,76 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-# build with 'cmake -G "NMake Makefiles"'
-
-name: 'Weekly CI - cmake Windows NMake'
-on:
-  schedule: [cron: '30 4 * * 3'] # run weekly Wednesday 04:30 UTC
-  workflow_dispatch:
-env:
-  CMAKE_REQUIRED_QUIET: OFF
-  DEBIAN_FRONTEND: noninteractive
-
-jobs:
-  job-cmake-windows-nmake: # uses cmake + nmake
-    name: ${{ format('vs{0} {1} {2}', matrix.vsversion, matrix.arch, matrix.clang_cl && 'clang-cl' || '') }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # msvc
-          - { os: windows-2019, vsversion: 2019, arch: amd64 }
-          - { os: windows-2019, vsversion: 2019, arch: amd64_arm64 }
-          - { os: windows-2019, vsversion: 2019, arch: amd64_x86 }
-          - { os: windows-2022, vsversion: 2022, arch: amd64 }
-          - { os: windows-2022, vsversion: 2022, arch: amd64_arm64 }
-          - { os: windows-2022, vsversion: 2022, arch: amd64_x86 }
-          # clang-cl
-          - { os: windows-2022, vsversion: 2022, arch: amd64, clang_cl: true }
-    steps:
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: 'Set up Developer Command Prompt'
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          vsversion: ${{ matrix.vsversion }}
-          arch: ${{ matrix.arch }}
-      - name: 'Build cmake NMake Debug'
-        shell: cmd
-        run: |
-          set X=${{ matrix.clang_cl && '-DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl' || '' }}
-          cmake -S . -B build/debug -G "NMake Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug %X%
-          cd build/debug
-          nmake
-          dir *.exe
-      - name: 'Build cmake NMake Release'
-        shell: cmd
-        run: |
-          set X=${{ matrix.clang_cl && '-DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl' || '' }}
-          cmake -S . -B build/release -G "NMake Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON %X%
-          cd build/release
-          nmake
-          dir *.exe
-      - name: 'Make artifact'
-        shell: bash
-        run: |
-          X="${{ matrix.clang_cl && '-clang-cl' || '' }}"
-          N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-weekly-ci-nmake-vs${{ matrix.vsversion }}-${{ matrix.arch }}$X" | sed 's/[^0-9a-zA-Z_.-]/-/g')
-          mkdir -p "tmp/artifact/$N"
-          (cd build && cp -ai --parents */upx.exe "../tmp/artifact/$N")
-          # GitHub Actions magic: set "artifact_name" environment value for use in next step
-          echo "artifact_name=$N" >> $GITHUB_ENV
-      - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: tmp/artifact
-      - name: 'Run basic tests'
-        if: ${{ matrix.arch != 'amd64_arm64' }}
-        run: |
-          ctest --test-dir build/debug
-          ctest --test-dir build/release
-      - name: 'Run install tests'
-        run: |
-          env DESTDIR=./Install-debug   cmake --install build/debug
-          env DESTDIR=./Install-release cmake --install build/release

.github/workflows/weekly-ci-zigcc.yml

@@ -1,126 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-# build with "zig cc"; see https://ziglang.org/download/
-
-name: 'Weekly CI - zigcc'
-on:
-  schedule: [cron: '40 4 * * 3'] # run weekly Wednesday 04:40 UTC
-  workflow_dispatch:
-env:
-  CMAKE_REQUIRED_QUIET: OFF
-  DEBIAN_FRONTEND: noninteractive
-  # 2023-07-30
-  ZIG_DIST_VERSION: 0.11.0-dev.4320+6f0a613b6
-
-jobs:
-  job-linux-zigcc: # uses cmake + make
-    name: ${{ format('zigcc {0} {1}', matrix.zig_target, matrix.zig_pic) }}
-    runs-on: ubuntu-latest
-    container: 'alpine:3.18' # older versions such as alpine:3.12 also work; no-container also works
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { zig_target: aarch64-linux-musl }
-          - { zig_target: aarch64-linux-musl, zig_pic: -fPIE }
-          - { zig_target: aarch64-macos-none }
-          - { zig_target: aarch64-macos.11.0-none }
-          - { zig_target: aarch64-macos.12.0-none }
-          - { zig_target: aarch64-macos.13.0-none }
-          - { zig_target: aarch64-windows-gnu }
-          - { zig_target: arm-linux-musleabihf }
-          - { zig_target: arm-linux-musleabihf, zig_pic: -fPIE }
-          - { zig_target: i386-linux-musl }
-          - { zig_target: i386-windows-gnu }
-          - { zig_target: mips-linux-musl }
-          - { zig_target: mipsel-linux-musl }
-          - { zig_target: powerpc-linux-musl }
-          - { zig_target: powerpc64-linux-musl }
-          - { zig_target: powerpc64le-linux-musl }
-          - { zig_target: x86_64-linux-musl }
-          - { zig_target: x86_64-linux-musl, zig_pic: -fPIE }
-          - { zig_target: x86_64-macos-none }
-          - { zig_target: x86_64-macos.11.0-none }
-          - { zig_target: x86_64-macos.12.0-none }
-          - { zig_target: x86_64-macos.13.0-none }
-          - { zig_target: x86_64-windows-gnu }
-    env:
-      # for zig-cc wrapper scripts (see below):
-      ZIG_CPPFLAGS: -DUPX_DOCTEST_CONFIG_MULTITHREADING
-      ZIG_FLAGS: ${{ matrix.zig_flags }}
-      ZIG_PIC: ${{ matrix.zig_pic }}
-      ZIG_TARGET: ${{ matrix.zig_target }}
-    steps:
-      - name: 'Install Alpine Linux container packages'
-        if: ${{ job.container }}
-        shell: sh
-        run: |
-          apk update && apk upgrade && apk add bash cmake file git make tar xz
-          # set PATH like in Ubuntu
-          echo "PATH=$HOME/.local/bin:$PATH" >> $GITHUB_ENV
-          # this seems to be needed when running in a container (beause of UID mismatch??)
-          git config --global --add safe.directory '*'
-      - name: 'Check out code'
-        uses: actions/checkout@v3
-        with: { submodules: true }
-      - name: ${{ format('Install Zig {0}', env.ZIG_DIST_VERSION) }}
-        shell: bash
-        run: |
-          # GitHub Actions magic: set "UPX_GITREV_SHORT" environment value for use in steps below
-          rev=$(git rev-parse --short=7 HEAD)
-          echo "UPX_GITREV_SHORT=$rev" >> $GITHUB_ENV
-          # update ZIG_TARGET (i386 => x86)
-          ZIG_TARGET=${ZIG_TARGET/i386-/x86-}
-          echo "ZIG_TARGET=$ZIG_TARGET" >> $GITHUB_ENV
-          # install zig; note that ~/.local/bin is included in the default $PATH on Ubuntu
-          mkdir -p -v ~/.local/bin
-          cd ~/.local/bin
-          ZIG_DIST_NAME=zig-linux-x86_64-${ZIG_DIST_VERSION}
-          wget -q https://ziglang.org/builds/${ZIG_DIST_NAME}.tar.xz
-          ls -l ${ZIG_DIST_NAME}.tar.xz
-          tar -xoJf ${ZIG_DIST_NAME}.tar.xz
-          rm ${ZIG_DIST_NAME}.tar.xz
-          ln -s -v ${ZIG_DIST_NAME}/zig zig
-          #echo "PATH=$PATH" && which zig
-          echo -n 'zig version: '; zig version
-          # create wrapper scripts (needed for CMake)
-          echo -e '#!/bin/sh\nexec zig ar "$@"' > zig-ar
-          echo -e '#!/bin/sh\nexec zig cc  -target $ZIG_TARGET $ZIG_PIC $ZIG_FLAGS $ZIG_CPPFLAGS $ZIG_CFLAGS   "$@"' > zig-cc
-          echo -e '#!/bin/sh\nexec zig c++ -target $ZIG_TARGET $ZIG_PIC $ZIG_FLAGS $ZIG_CPPFLAGS $ZIG_CXXFLAGS "$@"' > zig-cxx
-          echo -e '#!/bin/sh\nexec zig ranlib "$@"' > zig-ranlib
-          chmod +x zig-ar zig-cc zig-cxx zig-ranlib
-          ls -la; head zig-ar zig-cc zig-cxx zig-ranlib
-      - name: ${{ format('Build Release with zig-cc -target {0} {1}', env.ZIG_TARGET, env.ZIG_PIC) }}
-        run: |
-          mkdir -p build/zig/${ZIG_TARGET}${ZIG_PIC}/release
-          cd       build/zig/${ZIG_TARGET}${ZIG_PIC}/release
-          cmake ../../../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_AR=$HOME/.local/bin/zig-ar -DCMAKE_C_COMPILER=zig-cc -DCMAKE_CXX_COMPILER=zig-cxx -DCMAKE_RANLIB=$HOME/.local/bin/zig-ranlib $EXTRA_CMAKE_CONFIG_FLAGS_RELEASE
-          cmake --build . --config Release --parallel --verbose
-          file ./upx*
-      - name: ${{ format('Build Debug with zig-cc -target {0} {1}', env.ZIG_TARGET, env.ZIG_PIC) }}
-        run: |
-          mkdir -p build/zig/${ZIG_TARGET}${ZIG_PIC}/debug
-          cd       build/zig/${ZIG_TARGET}${ZIG_PIC}/debug
-          cmake ../../../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_AR=$HOME/.local/bin/zig-ar -DCMAKE_C_COMPILER=zig-cc -DCMAKE_CXX_COMPILER=zig-cxx -DCMAKE_RANLIB=$HOME/.local/bin/zig-ranlib $EXTRA_CMAKE_CONFIG_FLAGS_DEBUG
-          cmake --build . --config Debug --parallel --verbose
-          file ./upx*
-      - name: ${{ format('Make artifact from upx-{0}-{1}', github.ref_name, env.UPX_GITREV_SHORT) }}
-        shell: bash
-        run: |
-          N=$(echo "upx-${GITHUB_REF_NAME}-${GITHUB_SHA:0:7}-weekly-ci-zigcc-${{ matrix.zig_target }}${ZIG_PIC}" | sed 's/[^0-9a-zA-Z_.-]/-/g')
-          mkdir -p "tmp/artifact/$N"
-          (cd build && shopt -s nullglob && cp -ai --parents */upx{,.exe} */*/*/upx{,.exe} "../tmp/artifact/$N")
-          (cd tmp/artifact && tar --sort=name -czf "$N.tar.gz" "$N" && rm -rf "./$N")
-          # GitHub Actions magic: set "artifact_name" environment value for use in next step
-          echo "artifact_name=$N" >> $GITHUB_ENV
-      - name: ${{ format('Upload artifact {0}', env.artifact_name) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.artifact_name }}
-          path: tmp/artifact
-      - name: 'Run install tests'
-        if: ${{ contains(matrix.zig_target, '-linux') }}
-        run: |
-          (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-cmake cmake --install .)
-          (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-make  make install)
-
-# vim:set ts=2 sw=2 et:

.gitignore

@@ -1,21 +1,27 @@
+/.cache*
 /.hg*
 /.vscode*
-/Makevars.global*
+/CMakeCache*
+/CMakeFiles*
+/CTest*
+/Makevars[.-]global*
 /Testing*
 /build*
 /maint*
 /vendor*
 
-GNUmakefile
-MMakefile
-Makevars.local*
-compile_flags.txt
+GNUmakefile*
+MMakefile*
+Makevars[.-]local*
+compile_commands*.json
+compile_flags*.txt
 Tmp*
 tmp*
 
 *.a
 *.bz2
 *.d
+*.diff
 *.dll
 *.dylib
 *.exe
@@ -36,19 +42,19 @@ tmp*
 *.zip
 *.zst
 
-doc/*.man
-doc/*.ps
-doc/*.tex
+/doc/*.man
+/doc/*.ps
+/doc/*.tex
 
-src/stub/**/.*-stamp
-src/stub/tmp*/*.bin
-src/stub/tmp*/*.bin.bindump
-src/stub/tmp*/*.bin.disasm
-src/stub/tmp*/*.o.disasm
-src/stub/tmp*/mips.r3000-*.[is]
-src/stub/tmp*/mipsel.r3000-*.[is]
-src/stub/src/**/tmp*/*
+/src/stub/**/.*-stamp
+/src/stub/src/**/tmp*/*
+/src/stub/tmp*/*.bin
+/src/stub/tmp*/*.bin.bindump
+/src/stub/tmp*/*.bin.disasm
+/src/stub/tmp*/*.o.disasm
+/src/stub/tmp*/mips.r3000-*.[is]
+/src/stub/tmp*/mipsel.r3000-*.[is]
 
-src/stub/tools/sstrip/amd64-linux-sstrip
-src/stub/tools/sstrip/i386-linux-sstrip
-src/stub/tools/sstrip/sstrip
+/src/stub/tools/sstrip/amd64-linux-sstrip
+/src/stub/tools/sstrip/i386-linux-sstrip
+/src/stub/tools/sstrip/sstrip

CMakeLists.txt

@@ -7,76 +7,71 @@
 #   A C++ compiler that fully implements C++17: clang-5, gcc-8 or msvc-2019-16.11
 #   (older or other compilers may work but are unsupported, use at your own risk)
 
+# Sections of this CMakeLists.txt:
+#   - options
+#   - init
+#   - common compilation flags
+#   - targets
+#   - target compilation flags
+#   - test
+#   - install
+#   - print summary
+
 # CMake version check; using a somewhat current CMake version is highly recommended
+file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/.upx_cmake_config_done.txt")
 if(DEFINED UPX_CONFIG_CMAKE_MINIMUM_REQUIRED_VERSION)
     cmake_minimum_required(VERSION "${UPX_CONFIG_CMAKE_MINIMUM_REQUIRED_VERSION}" FATAL_ERROR)
+elseif(NOT ${CMAKE_VERSION} VERSION_LESS "3.10")
+    cmake_minimum_required(VERSION "3.10" FATAL_ERROR)
 else()
-    cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR) # CMake >= 3.8 is needed for CXX_STANDARD 17
+    cmake_minimum_required(VERSION "3.8" FATAL_ERROR) # CMake >= 3.8 is needed for CXX_STANDARD 17
 endif()
 
+# support functions and some utility
+include("${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/functions.cmake")
+upx_print_var(CMAKE_VERSION UPX_CONFIG_CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_GENERATOR)
+
+#***********************************************************************
+# options
+#***********************************************************************
+
+upx_cmake_include_hook(1_options)
+
 # compilation config options
-if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+if(NOT USE_STRICT_DEFAULTS)
     # permissive config defaults when building from source code tarball
-    option(UPX_CONFIG_DISABLE_GITREV   "Do not compile with default Git version info." ON)
-    option(UPX_CONFIG_DISABLE_SANITIZE "Do not compile with default sanitize options." ON)
+    option(UPX_CONFIG_DISABLE_GITREV   "Do not compile with Git version info."         ON)
+    option(UPX_CONFIG_DISABLE_SANITIZE "Do not compile with sanitize options."         ON)
+    option(UPX_CONFIG_DISABLE_WERROR   "Do not compile with -Werror option."           ON)
     option(UPX_CONFIG_DISABLE_WSTRICT  "Do not compile with strict compiler warnings." ON)
-    option(UPX_CONFIG_DISABLE_WERROR   "Do not compile with default -Werror option."   ON)
 else()
     # strict config defaults for Git developer builds
-    message(STATUS "===== UPX info: strict config defaults enabled")
-    option(UPX_CONFIG_DISABLE_GITREV   "Do not compile with default Git version info." OFF)
-    option(UPX_CONFIG_DISABLE_SANITIZE "Do not compile with default sanitize options." OFF)
+    message(STATUS "===== UPX NOTE: strict developer config defaults enabled =====")
+    option(UPX_CONFIG_DISABLE_GITREV   "Do not compile with Git version info."         OFF)
+    option(UPX_CONFIG_DISABLE_SANITIZE "Do not compile with sanitize options."         OFF)
+    option(UPX_CONFIG_DISABLE_WERROR   "Do not compile with -Werror option."           OFF)
     option(UPX_CONFIG_DISABLE_WSTRICT  "Do not compile with strict compiler warnings." OFF)
-    option(UPX_CONFIG_DISABLE_WERROR   "Do not compile with default -Werror option."   OFF)
 endif()
 
 # test config options (see below)
 # IMPORTANT NOTE: self-pack test can only work if the host executable format is supported by UPX!
 option(UPX_CONFIG_DISABLE_SELF_PACK_TEST   "Do not test packing UPX with itself" OFF)
+option(UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS "Do not run exhaustive tests"         OFF)
 
 #***********************************************************************
 # init
 #***********************************************************************
 
-# Disallow in-source builds. Note that you will still have to manually
-# clean up a few files if you accidentally try an in-source build.
-if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-    set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
-    set(CMAKE_DISABLE_SOURCE_CHANGES  ON)
-    if(",${CMAKE_CURRENT_SOURCE_DIR}," STREQUAL ",${CMAKE_CURRENT_BINARY_DIR},")
-        message(FATAL_ERROR "ERROR: In-source builds are not allowed, please use an extra build dir.")
-    endif()
-endif()
+set(UPX_VERSION_STRING "5.0.0") # this should match src/version.h
 
-# useful for CI jobs: allow settings via environment and cache result
-function(upx_cache_bool_vars)
-    set(default_value "${ARGV0}")
-    list(REMOVE_AT ARGV 0)
-    foreach(var ${ARGV})
-        set(value ${default_value})
-        if(DEFINED UPX_CACHE_${var})
-            set(value "${UPX_CACHE_${var}}")
-        elseif(DEFINED ${var})
-            set(value "${${var}}")
-        elseif("$ENV{${var}}" MATCHES "^(0|1|OFF|ON|FALSE|TRUE)$")
-            set(value "$ENV{${var}}")
-            set(UPX_CACHE_ORIGIN_FROM_ENV_${var} TRUE CACHE INTERNAL "" FORCE)
-        endif()
-        if(value)
-            set(value ON)
-        else()
-            set(value OFF)
-        endif()
-        if(UPX_CACHE_ORIGIN_FROM_ENV_${var})
-            message(STATUS "setting from environment: ${var} = ${value}")
-        endif()
-        set(${var} "${value}" PARENT_SCOPE)
-        set(UPX_CACHE_${var} "${value}" CACHE INTERNAL "" FORCE)
-    endforeach()
-endfunction()
+upx_cmake_include_hook(2_init)
+
+# Disallow in-source build. Note that you will still have to manually
+# clean up a few files if you accidentally try an in-source build.
+upx_disallow_in_source_build()
 
 # global settings
-if(${CMAKE_VERSION} VERSION_GREATER "3.14.7" AND NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
+if(${CMAKE_VERSION} VERSION_GREATER "3.14.99" AND NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
     cmake_policy(SET CMP0091 NEW)
 endif()
@@ -85,12 +80,16 @@ upx_cache_bool_vars(ON
     CMAKE_C_STANDARD_REQUIRED CMAKE_CXX_STANDARD_REQUIRED
     CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_REQUIRED_QUIET
 )
-# internal UPX settings that default to OFF
+# 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_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)
 
 # determine Git revision
 set(GITREV_SHORT "")
@@ -134,31 +133,18 @@ else()
     message(STATUS "UPX_VERSION_GITREV: not set")
 endif()
 
-# set the default build type to "Release"
-get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(NOT is_multi_config AND NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
-endif()
-
 # CMake init
-project(upx VERSION 4.1.0 LANGUAGES C CXX)
+upx_set_default_build_type(Release) # default is CMAKE_BUILD_TYPE=Release
+project(upx VERSION "${UPX_VERSION_STRING}" LANGUAGES C CXX)
+upx_apply_build_type()
+upx_set_global_vars()
+upx_check_working_build_rpath(UPX_CONFIG_HAVE_WORKING_BUILD_RPATH)
 
-# set the default multi-config build type to "Release"
-if(is_multi_config)
-    set(c "${CMAKE_CONFIGURATION_TYPES}")
-    list(INSERT c 0 "Release")
-    list(INSERT c 1 "Debug")
-    if(CMAKE_BUILD_TYPE)
-        list(INSERT c 0 "${CMAKE_BUILD_TYPE}")
+if(DEFINED UPX_CONFIG_CMAKE_EXECUTABLE_SUFFIX)
+    set(CMAKE_EXECUTABLE_SUFFIX "${UPX_CONFIG_CMAKE_EXECUTABLE_SUFFIX}")
 endif()
-    list(REMOVE_DUPLICATES c)
-    set(CMAKE_CONFIGURATION_TYPES "${c}" CACHE STRING "List of supported configuration types." FORCE)
-endif()
-
-# set MSVC_FRONTEND
-set(MSVC_FRONTEND 0)
-if(MSVC OR CMAKE_C_COMPILER_FRONTEND_VARIANT MATCHES "^MSVC")
-    set(MSVC_FRONTEND 1)
+if(NOT UPX_CONFIG_CMAKE_DISABLE_INSTALL AND CMAKE_INSTALL_PREFIX)
+    include(GNUInstallDirs)
 endif()
 
 #***********************************************************************
@@ -166,6 +152,43 @@ endif()
 #***********************************************************************
 
 include(CheckCCompilerFlag)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckStructHasMember)
+include(CheckSymbolExists)
+include(CheckTypeSize)
+
+upx_cmake_include_hook(3_common_compilation_flags)
+
+# assert sane type sizes
+check_type_size("size_t" C_SIZEOF_SIZE_T LANGUAGE C)
+check_type_size("size_t" CXX_SIZEOF_SIZE_T LANGUAGE CXX)
+if(NOT "${C_SIZEOF_SIZE_T}" MATCHES "^(4|8|16)$")
+    message(FATAL_ERROR "ERROR: unexpected C_SIZEOF_SIZE_T '${C_SIZEOF_SIZE_T}'")
+endif()
+if(NOT ",${C_SIZEOF_SIZE_T}," STREQUAL ",${CXX_SIZEOF_SIZE_T},")
+    message(FATAL_ERROR "FATAL ERROR: '${C_SIZEOF_SIZE_T}' '${CXX_SIZEOF_SIZE_T}' mismatch")
+endif()
+
+if(NOT DEFINED HAVE_UNISTD_H)
+    check_include_file("unistd.h" HAVE_UNISTD_H)
+endif()
+if(NOT DEFINED HAVE_UTIMENSAT)
+    # proper checking for utimensat() is somewhat messy
+    check_function_exists(utimensat HAVE_UTIMENSAT_FUNCTION__)
+    if(HAVE_UTIMENSAT_FUNCTION__)
+        check_symbol_exists(utimensat "sys/types.h;fcntl.h;sys/stat.h" HAVE_UTIMENSAT_SYMBOL__)
+        if(HAVE_UTIMENSAT_SYMBOL__)
+            CHECK_STRUCT_HAS_MEMBER("struct stat" "st_mtim.tv_nsec" "sys/types.h;fcntl.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) # POSIX.1-2008
+            if(NOT HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC)
+                CHECK_STRUCT_HAS_MEMBER("struct stat" "st_mtimespec.tv_nsec" "sys/types.h;fcntl.h;sys/stat.h" HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC) # macOS
+            endif()
+            if(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC OR HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC)
+                set(HAVE_UTIMENSAT 1)
+            endif()
+        endif()
+    endif()
+endif()
 
 if(UPX_CONFIG_DISABLE_WSTRICT)
     # enable all basic warnings
@@ -185,38 +208,10 @@ else()
     set(warn_Werror -Werror)
     set(warn_WX -WX)
 endif()
-
-function(upx_add_definitions_with_prefix)
-    set(flag_prefix "${ARGV0}")
-    if(flag_prefix MATCHES "^dummy$") # need dummy to work around bug in old CMake versions
-        set(flag_prefix "")
+if(MSVC_FRONTEND)
+    # disable warning C5105 which may get triggered by some older versions of <windows.h>
+    set(warn_WX -wd5105 ${warn_WX})
 endif()
-    list(REMOVE_AT ARGV 0)
-    set(failed "")
-    foreach(f ${ARGV})
-        set(flag "${flag_prefix}${f}")
-        string(REGEX REPLACE "[^0-9a-zA-Z_]" "_" cache_var "HAVE_CFLAG_${flag}")
-        check_c_compiler_flag("${flag}" ${cache_var})
-        if(${cache_var})
-            #message(STATUS "add_definitions: ${flag}")
-            add_definitions("${flag}")
-        else()
-            list(APPEND failed "${f}")
-        endif()
-    endforeach()
-    set(failed_flags "${failed}" PARENT_SCOPE) # return value
-endfunction()
-
-function(upx_add_definitions)
-    set(failed_flags "")
-    if(MSVC_FRONTEND AND CMAKE_C_COMPILER_ID MATCHES "Clang")
-        # for clang-cl try "-clang:" flag prefix first
-        upx_add_definitions_with_prefix("-clang:" ${ARGV})
-        upx_add_definitions_with_prefix("dummy" ${failed_flags})
-    else()
-        upx_add_definitions_with_prefix("dummy" ${ARGV})
-    endif()
-endfunction()
 
 if(NOT CMAKE_C_COMPILER_ID MATCHES "^MSVC")
     # use -O2 instead of -O3 to reduce code size
@@ -225,12 +220,18 @@ if(NOT CMAKE_C_COMPILER_ID MATCHES "^MSVC")
     set(CMAKE_C_FLAGS_RELEASE "${a}" CACHE STRING "Flags used by the C compiler during RELEASE builds." FORCE)
     set(CMAKE_CXX_FLAGS_RELEASE "${b}" CACHE STRING "Flags used by the CXX compiler during RELEASE builds." FORCE)
 endif()
-if(MSVC_FRONTEND)
+if(MSVC_FRONTEND OR WIN32 OR MINGW OR CYGWIN)
     # disable silly warnings about using "deprecated" POSIX functions like fopen()
     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
     add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-D_SCL_SECURE_NO_DEPRECATE)
+    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+    add_definitions(-DWIN32_LEAN_AND_MEAN)
+    add_definitions(-D__USE_MINGW_ANSI_STDIO)
+endif()
+if(MSVC_FRONTEND)
     # use -funsigned-char; set __cplusplus according to selected C++ standard
     add_definitions(-J -Zc:__cplusplus)
     if(CMAKE_C_COMPILER_ID MATCHES "^MSVC")
@@ -249,85 +250,79 @@ if(NOT CMAKE_C_COMPILER_ID MATCHES "^MSVC")
     endif()
 endif()
 
-# compile a target with -O2 even in Debug build
-function(upx_compile_target_debug_with_O2)
-    foreach(t ${ARGV})
-        if(MSVC_FRONTEND)
-            # MSVC uses some Debug compilation options like -RTC1 that are incompatible with -O2
-        else()
-            target_compile_options(${t} PRIVATE $<$<CONFIG:Debug>:-O2>)
+# examine compiler configuration
+if(NOT UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO)
+    upx_print_common_symbols()
+    upx_print_mingw_symbols()
 endif()
-    endforeach()
-endfunction()
-
-# sanitize a target
-function(upx_sanitize_target)
-    foreach(t ${ARGV})
-        if(UPX_CONFIG_DISABLE_SANITIZE)
-            # no-op
-        elseif(MSVC_FRONTEND)
-            # MSVC uses -GS (similar to -fstack-protector) by default
-        elseif(CMAKE_C_PLATFORM_ID MATCHES "^MinGW" OR MINGW OR CYGWIN)
-            # avoid link errors with current MinGW-w64 versions
-            # see https://www.mingw-w64.org/contribute/#sanitizers-asan-tsan-usan
-        else()
-            # default sanitizer for Debug builds
-            target_compile_options(${t} PRIVATE $<$<CONFIG:Debug>:-fsanitize=undefined -fsanitize-undefined-trap-on-error -fstack-protector-all>)
-            # default sanitizer for Release builds
-            target_compile_options(${t} PRIVATE $<$<CONFIG:MinSizeRel>:-fstack-protector>)
-            target_compile_options(${t} PRIVATE $<$<CONFIG:Release>:-fstack-protector>)
-            target_compile_options(${t} PRIVATE $<$<CONFIG:RelWithDebInfo>:-fstack-protector>)
-        endif()
-    endforeach()
-endfunction()
 
 #***********************************************************************
 # targets
 #***********************************************************************
 
-# internal settings
-set(UPX_CONFIG_DISABLE_THREADS ON) # multithreading is currently not used; maybe in UPX version 5
+# internal settings; these may change in a future versions
+set(UPX_CONFIG_DISABLE_THREADS ON) # multithreading is currently not used; maybe in UPX version 6
 set(UPX_CONFIG_DISABLE_BZIP2 ON)   # bzip2 is currently not used; we might need it to decompress linux kernels
-set(UPX_CONFIG_DISABLE_ZSTD ON)    # zstd is currently not used; maybe in UPX version 5
+set(UPX_CONFIG_DISABLE_ZSTD ON)    # zstd is currently not used; maybe in UPX version 6
+
+upx_cmake_include_hook(4_targets)
 
 if(NOT UPX_CONFIG_DISABLE_THREADS)
     find_package(Threads)
 endif()
+# make sure that threads are indeed fully supported in C++
+if(Threads_FOUND)
+    foreach(f std_lock_guard.cpp types_abi.cpp)
+        set(CMAKE_TRY_COMPILE_TARGET_TYPE "EXECUTABLE")
+        if(NOT UPX_CONFIG_DISABLE_CXX_STANDARD)
+            try_compile(result "${CMAKE_CURRENT_BINARY_DIR}"
+                        "${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/try_compile/${f}"
+                        OUTPUT_VARIABLE output CXX_STANDARD 17)
+        else()
+            try_compile(result "${CMAKE_CURRENT_BINARY_DIR}"
+                        "${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/try_compile/${f}"
+                        OUTPUT_VARIABLE output)
+        endif()
+        if(NOT result)
+            # failed; under MinGW be sure to use the posix-threads and NOT the win32-threads version
+            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()
+    endforeach()
+endif()
 
 if(NOT UPX_CONFIG_DISABLE_BZIP2)
-file(GLOB bzip2_SOURCES "vendor/bzip2/*.c")
-list(SORT bzip2_SOURCES)
+upx_add_glob_files(bzip2_SOURCES "vendor/bzip2/*.c")
 add_library(upx_vendor_bzip2 STATIC ${bzip2_SOURCES})
 if(NOT UPX_CONFIG_DISABLE_C_STANDARD)
     set_property(TARGET upx_vendor_bzip2 PROPERTY C_STANDARD 11)
 endif()
 endif() # UPX_CONFIG_DISABLE_BZIP2
 
-file(GLOB ucl_SOURCES "vendor/ucl/src/*.c")
-list(SORT ucl_SOURCES)
+upx_add_glob_files(ucl_SOURCES "vendor/ucl/src/*.c")
 add_library(upx_vendor_ucl STATIC ${ucl_SOURCES})
 if(NOT UPX_CONFIG_DISABLE_C_STANDARD)
     set_property(TARGET upx_vendor_ucl PROPERTY C_STANDARD 11)
 endif()
 
-file(GLOB zlib_SOURCES "vendor/zlib/*.c")
-list(SORT zlib_SOURCES)
+upx_add_glob_files(zlib_SOURCES "vendor/zlib/*.c")
 add_library(upx_vendor_zlib STATIC ${zlib_SOURCES})
 if(NOT UPX_CONFIG_DISABLE_C_STANDARD)
     set_property(TARGET upx_vendor_zlib PROPERTY C_STANDARD 11)
 endif()
 
 if(NOT UPX_CONFIG_DISABLE_ZSTD)
-file(GLOB zstd_SOURCES "vendor/zstd/lib/*/*.c")
-list(SORT zstd_SOURCES)
+upx_add_glob_files(zstd_SOURCES "vendor/zstd/lib/*/*.c")
 add_library(upx_vendor_zstd STATIC ${zstd_SOURCES})
 if(NOT UPX_CONFIG_DISABLE_C_STANDARD)
     set_property(TARGET upx_vendor_zstd PROPERTY C_STANDARD 11)
 endif()
 endif() # UPX_CONFIG_DISABLE_ZSTD
 
-file(GLOB upx_SOURCES "src/*.cpp" "src/[cfu]*/*.cpp")
-list(SORT upx_SOURCES)
+upx_add_glob_files(upx_SOURCES "src/*.cpp" "src/[cfu]*/*.cpp")
 add_executable(upx ${upx_SOURCES})
 if(NOT UPX_CONFIG_DISABLE_CXX_STANDARD)
     set_property(TARGET upx PROPERTY CXX_STANDARD 17)
@@ -347,15 +342,19 @@ endif()
 # target compilation flags
 #***********************************************************************
 
+upx_cmake_include_hook(5_target_compilation_flags)
+
 if(NOT UPX_CONFIG_DISABLE_BZIP2)
 set(t upx_vendor_bzip2)
 upx_compile_target_debug_with_O2(${t})
 upx_sanitize_target(${t})
+target_compile_definitions(${t} PRIVATE BZ_NO_STDIO=1)
 if(MSVC_FRONTEND)
     target_compile_options(${t} PRIVATE ${warn_WN} -wd4127 -wd4244 -wd4267 ${warn_WX})
-else()
-    target_compile_options(${t} PRIVATE ${warn_Wall} -Wno-implicit-fallthrough ${warn_Werror})
+elseif(GNU_FRONTEND)
+    target_compile_options(${t} PRIVATE ${warn_Wall} ${warn_Werror})
 endif()
+upx_add_target_extra_compile_options(${t} UPX_CONFIG_EXTRA_COMPILE_OPTIONS_BZIP2)
 endif() # UPX_CONFIG_DISABLE_BZIP2
 
 set(t upx_vendor_ucl)
@@ -364,21 +363,25 @@ upx_compile_target_debug_with_O2(${t})
 upx_sanitize_target(${t})
 if(MSVC_FRONTEND)
     target_compile_options(${t} PRIVATE ${warn_WN} ${warn_WX})
-else()
+elseif(GNU_FRONTEND)
     target_compile_options(${t} PRIVATE ${warn_Wall} ${warn_Werror})
 endif()
+upx_add_target_extra_compile_options(${t} UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UCL)
 
 set(t upx_vendor_zlib)
+target_include_directories(${t} PRIVATE vendor/zlib)
 upx_compile_target_debug_with_O2(${t})
 upx_sanitize_target(${t})
 target_compile_definitions(${t} PRIVATE HAVE_VSNPRINTF=1)
+if(HAVE_UNISTD_H)
+    target_compile_definitions(${t} PRIVATE HAVE_UNISTD_H=1)
+endif()
 if(MSVC_FRONTEND)
     target_compile_options(${t} PRIVATE -W3 ${warn_WX})
-else()
-    target_compile_definitions(${t} PRIVATE HAVE_UNISTD_H=1)
-    target_compile_options(${t} PRIVATE -Wall ${warn_Werror})
-    ##target_compile_options(${t} PRIVATE ${warn_Wall} -Wno-cast-align -Wno-cast-qual ${warn_Werror})
+elseif(GNU_FRONTEND)
+    target_compile_options(${t} PRIVATE ${warn_Wall} -Wno-cast-align -Wno-cast-qual ${warn_Werror})
 endif()
+upx_add_target_extra_compile_options(${t} UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZLIB)
 
 if(NOT UPX_CONFIG_DISABLE_ZSTD)
 set(t upx_vendor_zstd)
@@ -387,9 +390,10 @@ upx_sanitize_target(${t})
 target_compile_definitions(${t} PRIVATE DYNAMIC_BMI2=0 ZSTD_DISABLE_ASM=1)
 if(MSVC_FRONTEND)
     target_compile_options(${t} PRIVATE ${warn_WN} ${warn_WX})
-else()
+elseif(GNU_FRONTEND)
     target_compile_options(${t} PRIVATE ${warn_Wall} ${warn_Werror})
 endif()
+upx_add_target_extra_compile_options(${t} UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZSTD)
 endif() # UPX_CONFIG_DISABLE_ZSTD
 
 set(t upx)
@@ -411,64 +415,71 @@ if(NOT UPX_CONFIG_DISABLE_WERROR)
     target_compile_definitions(${t} PRIVATE UPX_CONFIG_DISABLE_WERROR=0)
 endif()
 if(NOT UPX_CONFIG_DISABLE_BZIP2)
-    target_compile_definitions(${t} PRIVATE WITH_BZIP2=0) # FIXME TODO
+    target_compile_definitions(${t} PRIVATE WITH_BZIP2=1)
 endif()
 if(NOT UPX_CONFIG_DISABLE_ZSTD)
     target_compile_definitions(${t} PRIVATE WITH_ZSTD=1)
 endif()
+if(HAVE_UTIMENSAT)
+    target_compile_definitions(${t} PRIVATE USE_UTIMENSAT=1)
+    if(HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC)
+        target_compile_definitions(${t} PRIVATE HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC=1)
+    endif()
+endif()
+# improve speed of the Debug versions
+upx_compile_source_debug_with_O2(src/compress/compress_lzma.cpp)
+upx_compile_source_debug_with_O2(src/filter/filter_impl.cpp)
 #upx_compile_target_debug_with_O2(${t})
 upx_sanitize_target(${t})
 if(MSVC_FRONTEND)
     target_compile_options(${t} PRIVATE -EHsc ${warn_WN} ${warn_WX})
-else()
+elseif(GNU_FRONTEND)
     target_compile_options(${t} PRIVATE ${warn_Wall} ${warn_Werror})
 endif()
+upx_add_target_extra_compile_options(${t} UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UPX)
 
 #***********************************************************************
+# test
 #   ctest
 #   make test
 #   ninja test
 #***********************************************************************
 
+upx_cmake_include_hook(6_test)
+
 if(NOT UPX_CONFIG_CMAKE_DISABLE_TEST)
 
+add_custom_command(TARGET upx POST_BUILD COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/XTesting/$<CONFIG>")
+
 include(CTest)
-if(NOT CMAKE_CROSSCOMPILING)
-    add_test(NAME upx-version COMMAND upx --version)
-    add_test(NAME upx-help    COMMAND upx --help)
+if(NOT CMAKE_CROSSCOMPILING OR CMAKE_CROSSCOMPILING_EMULATOR)
+    upx_add_test(upx-version       upx --version)
+    upx_add_test(upx-version-short upx --version-short)
+    upx_add_test(upx-license       upx --license)
+    upx_add_test(upx-help-1        upx --help)
+    upx_add_test(upx-help-2        upx --help-short)
+    upx_add_test(upx-help-3        upx --help-verbose)
+    upx_add_test(upx-sysinfo-1     upx --sysinfo)
+    upx_add_test(upx-sysinfo-2     upx --sysinfo -v)
+    upx_add_test(upx-sysinfo-3     upx --sysinfo -vv)
+    if(NOT UPX_CONFIG_DISABLE_SELF_PACK_TEST)
+        # IMPORTANT NOTE: these tests can only work if the host executable format
+        #   is supported by UPX!
+        include("${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/self_pack_test.cmake")
     endif()
-if(NOT CMAKE_CROSSCOMPILING AND NOT UPX_CONFIG_DISABLE_SELF_PACK_TEST)
-    # IMPORTANT NOTE: these tests can only work if the host executable format is supported by UPX!
-    function(upx_add_test)
-        set(name "${ARGV0}")
-        list(REMOVE_AT ARGV 0)
-        add_test(NAME "${name}" COMMAND ${ARGV})
-        set_tests_properties("${name}" PROPERTIES RUN_SERIAL TRUE) # run these tests sequentially
-    endfunction()
-    set(exe ${CMAKE_EXECUTABLE_SUFFIX})
-    set(upx_self_exe "$<TARGET_FILE:upx>")
-    set(fo "--force-overwrite")
-    upx_add_test(upx-self-pack      upx -3         "${upx_self_exe}" ${fo} -o upx-packed${exe})
-    upx_add_test(upx-self-pack-n2b  upx -3 --nrv2b "${upx_self_exe}" ${fo} -o upx-packed-n2b${exe})
-    upx_add_test(upx-self-pack-n2d  upx -3 --nrv2d "${upx_self_exe}" ${fo} -o upx-packed-n2d${exe})
-    upx_add_test(upx-self-pack-n2e  upx -3 --nrv2e "${upx_self_exe}" ${fo} -o upx-packed-n2e${exe})
-    upx_add_test(upx-self-pack-lzma upx -1 --lzma  "${upx_self_exe}" ${fo} -o upx-packed-lzma${exe})
-    upx_add_test(upx-list           upx -l         upx-packed${exe} upx-packed-n2b${exe} upx-packed-n2d${exe} upx-packed-n2e${exe} upx-packed-lzma${exe})
-    upx_add_test(upx-fileinfo       upx --fileinfo upx-packed${exe} upx-packed-n2b${exe} upx-packed-n2d${exe} upx-packed-n2e${exe} upx-packed-lzma${exe})
-    upx_add_test(upx-test           upx -t         upx-packed${exe} upx-packed-n2b${exe} upx-packed-n2d${exe} upx-packed-n2e${exe} upx-packed-lzma${exe})
-    upx_add_test(upx-unpack         upx -d upx-packed${exe} ${fo} -o upx-unpacked${exe})
-    upx_add_test(upx-run-unpacked   ./upx-unpacked${exe} --version-short)
-    upx_add_test(upx-run-packed     ./upx-packed${exe} --version-short)
 endif()
 
 endif() # UPX_CONFIG_CMAKE_DISABLE_TEST
 
 #***********************************************************************
+# install
 #   cmake --install .
 #   make install
 #   ninja install
 #***********************************************************************
 
+upx_cmake_include_hook(7_install)
+
 if(NOT UPX_CONFIG_CMAKE_DISABLE_INSTALL)
 
 # installation prefix and directories
@@ -476,61 +487,49 @@ if(NOT CMAKE_INSTALL_PREFIX)
     #message(FATAL_ERROR "ERROR: CMAKE_INSTALL_PREFIX is not defined")
     message(WARNING "WARNING: CMAKE_INSTALL_PREFIX is not defined")
 endif()
-if(CMAKE_INSTALL_PREFIX)
-    include(GNUInstallDirs)
-endif()
-if(CMAKE_INSTALL_PREFIX AND DEFINED CMAKE_INSTALL_FULL_BINDIR)
-    install(TARGETS upx DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
+# install files
+if(CMAKE_INSTALL_PREFIX AND DEFINED CMAKE_INSTALL_BINDIR)
+    install(TARGETS upx DESTINATION "${CMAKE_INSTALL_BINDIR}")
     install(FILES
         COPYING LICENSE NEWS README doc/THANKS.txt doc/upx-doc.html doc/upx-doc.txt
-        DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}"
+        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
     )
-    install(FILES doc/upx.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
+    install(FILES doc/upx.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
 endif()
 
 endif() # UPX_CONFIG_CMAKE_DISABLE_INSTALL
 
 #***********************************************************************
-# finally print some info about the build configuration
+# summary
+# print some info about the build configuration
 #***********************************************************************
 
-function(print_var)
-    foreach(var ${ARGV})
-        if(${var})
-            message(STATUS "${var} = ${${var}}")
-        endif()
-    endforeach()
-endfunction()
+upx_cmake_include_hook(8_summary)
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/maint/make/CMakeLists.maint.txt")
-include("${CMAKE_CURRENT_SOURCE_DIR}/maint/make/CMakeLists.maint.txt")
-endif()
-
-print_var(CMAKE_VERSION UPX_CONFIG_CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_GENERATOR)
+upx_print_var(CMAKE_VERSION UPX_CONFIG_CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_GENERATOR)
 if(NOT UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO)
-print_var(CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_VERSION)
-print_var(CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION CMAKE_CROSSCOMPILING)
-print_var(CMAKE_C_COMPILER_ID CMAKE_C_COMPILER_VERSION CMAKE_C_COMPILER_FRONTEND_VARIANT CMAKE_C_COMPILER_ARCHITECTURE_ID CMAKE_C_PLATFORM_ID CMAKE_C_COMPILER_ABI)
-print_var(CMAKE_CXX_COMPILER_ID CMAKE_CXX_COMPILER_VERSION CMAKE_CXX_COMPILER_FRONTEND_VARIANT CMAKE_CXX_COMPILER_ARCHITECTURE_ID CMAKE_CXX_PLATFORM_ID CMAKE_CXX_COMPILER_ABI)
-print_var(CMAKE_POSITION_INDEPENDENT_CODE)
-print_var(CYGWIN GNUC MINGW MSVC MSVC_FRONTEND MSVC_IDE WIN32 WIN64)
-endif() # UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO
-print_var(CMAKE_INSTALL_PREFIX CMAKE_CONFIGURATION_TYPES CMAKE_BUILD_TYPE)
+    # print detailed info
+    include("${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/print_info.cmake")
+    upx_print_info()
+endif()
+upx_print_var(CMAKE_INSTALL_PREFIX CMAKE_CONFIGURATION_TYPES CMAKE_TRY_COMPILE_CONFIGURATION CMAKE_BUILD_TYPE)
+if(Threads_FOUND)
+    message(STATUS "WITH_THREADS = 1")
+elseif(UPX_CONFIG_REQUIRE_THREADS)
+    message(FATAL_ERROR "ERROR: WITH_THREADS required")
+elseif(UPX_CONFIG_EXPECT_THREADS AND NOT UPX_CONFIG_DISABLE_THREADS)
+    message(FATAL_ERROR "ERROR: WITH_THREADS expected; set UPX_CONFIG_EXPECT_THREADS=OFF")
+endif()
 if(CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|None|Release)$")
     message(WARNING "WARNING: unsupported CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}; please use \"Debug\" or \"Release\"")
 endif()
 
 # extra sanity checks to detect incompatible C vs CXX settings
 if(NOT UPX_CONFIG_CMAKE_DISABLE_PLATFORM_CHECK)
-if(NOT ",${CMAKE_C_PLATFORM_ID}," STREQUAL ",${CMAKE_CXX_PLATFORM_ID},")
-    message(FATAL_ERROR "ERROR: CMAKE_C_PLATFORM_ID CMAKE_CXX_PLATFORM_ID mismatch")
+    upx_platform_check_c_cxx_mismatch()
 endif()
-if(NOT ",${CMAKE_C_COMPILER_ABI}," STREQUAL ",${CMAKE_CXX_COMPILER_ABI},")
-    message(FATAL_ERROR "ERROR: CMAKE_C_COMPILER_ABI CMAKE_CXX_COMPILER_ABI mismatch")
-endif()
-if(NOT ",${CMAKE_C_COMPILER_FRONTEND_VARIANT}," STREQUAL ",${CMAKE_CXX_COMPILER_FRONTEND_VARIANT},")
-    message(FATAL_ERROR "ERROR: CMAKE_C_COMPILER_FRONTEND_VARIANT CMAKE_CXX_COMPILER_FRONTEND_VARIANT mismatch")
-endif()
-endif() # UPX_CONFIG_CMAKE_DISABLE_PLATFORM_CHECK
+
+upx_cmake_include_hook(9_finish)
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/.upx_cmake_config_done.txt" "")
 
 # vim:set ft=cmake ts=4 sw=4 tw=0 et:

Makefile

@@ -8,8 +8,8 @@
 # HINT: if you only have an older CMake 3.x then you can invoke cmake manually like this:
 #   mkdir -p build/release
 #   cd build/release
-#   cmake ../..
-#   make -j     (or use "cmake --build . --parallel")
+#   cmake ../..         # run config
+#   make -j4            # and run build
 
 CMAKE = cmake
 UPX_CMAKE_BUILD_FLAGS += --parallel
@@ -24,14 +24,14 @@ endif
 # default
 #***********************************************************************
 
+.DEFAULT_GOAL = build/release
+
 run_cmake_config = $(CMAKE) -S . -B $1 $(UPX_CMAKE_CONFIG_FLAGS) -DCMAKE_BUILD_TYPE=$2
 run_cmake_build  = $(CMAKE) --build $1 $(UPX_CMAKE_BUILD_FLAGS) --config $2
-# avoid re-running run_cmake_config if CMakeCache.txt already exists
-run_config       = $(if $(wildcard $1/CMakeCache.txt),,$(call run_cmake_config,$1,$2))
+# avoid re-running run_cmake_config if .upx_cmake_config_done.txt already exists
+run_config       = $(if $(wildcard $1/CMakeFiles/.*_cmake_config_done.txt),,$(call run_cmake_config,$1,$2))
 run_build        = $(call run_cmake_build,$1,$2)
 
-.DEFAULT_GOAL = build/release
-
 build/debug: PHONY
 	$(call run_config,$@,Debug)
 	$(call run_build,$@,Debug)
@@ -40,192 +40,50 @@ build/release: PHONY
 	$(call run_config,$@,Release)
 	$(call run_build,$@,Release)
 
-# shortcuts
-all: build/debug build/release
-debug: build/debug
-release: build/release
-
 .NOTPARALLEL: # because the actual builds use "cmake --parallel"
 .PHONY: PHONY
 .SECONDEXPANSION:
 .SUFFIXES:
 
-#
-# END of Makefile; extra stuff follows
-#
+# shortcuts (all => debug + release)
+debug:   build/debug PHONY
+release: build/release PHONY
+all build/all: build/debug build/release PHONY
+build/%/all:   $$(dir $$@)debug $$(dir $$@)release PHONY ;
 
 #***********************************************************************
-# extra builds: some pre-defined build configurations
+# test
 #***********************************************************************
 
-define run_config_and_build
-	$(call run_config,$1,$2)
-	$(call run_build,$1,$2)
-endef
+CTEST = ctest
+CTEST_JOBS ?= 8
+CTEST_FLAGS = --output-on-failure --parallel $(CTEST_JOBS)
 
-# force building with clang/clang++
-build/extra/clang/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/clang/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/clang/%: export CC  = clang
-build/extra/clang/%: export CXX = clang++
+build/debug+test:     $$(dir $$@)debug PHONY; cd "$(dir $@)debug" && $(CTEST) $(CTEST_FLAGS) -C Debug
+build/%/debug+test:   $$(dir $$@)debug PHONY; cd "$(dir $@)debug" && $(CTEST) $(CTEST_FLAGS) -C Debug
+build/release+test:   $$(dir $$@)release PHONY; cd "$(dir $@)release" && $(CTEST) $(CTEST_FLAGS) -C Release
+build/%/release+test: $$(dir $$@)release PHONY; cd "$(dir $@)release" && $(CTEST) $(CTEST_FLAGS) -C Release
+build/%/all+test:     $$(dir $$@)debug+test $$(dir $$@)release+test PHONY ;
 
-# force building with clang/clang++ -m32
-build/extra/clang-m32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/clang-m32/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/clang-m32/%: export CC  = clang -m32
-build/extra/clang-m32/%: export CXX = clang++ -m32
-
-# force building with clang/clang++ -mx32
-build/extra/clang-mx32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/clang-mx32/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/clang-mx32/%: export CC  = clang -mx32
-build/extra/clang-mx32/%: export CXX = clang++ -mx32
-
-# force building with clang/clang++ -m64
-build/extra/clang-m64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/clang-m64/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/clang-m64/%: export CC  = clang -m64
-build/extra/clang-m64/%: export CXX = clang++ -m64
-
-# force building with clang/clang++ -static
-build/extra/clang-static/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/clang-static/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/clang-static/%: export CC  = clang -static
-build/extra/clang-static/%: export CXX = clang++ -static
-
-# force building with gcc/g++
-build/extra/gcc/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/gcc/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/gcc/%: export CC  = gcc
-build/extra/gcc/%: export CXX = g++
-
-# force building with gcc/g++ -m32
-build/extra/gcc-m32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/gcc-m32/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/gcc-m32/%: export CC  = gcc -m32
-build/extra/gcc-m32/%: export CXX = g++ -m32
-
-# force building with gcc/g++ -mx32
-build/extra/gcc-mx32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/gcc-mx32/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/gcc-mx32/%: export CC  = gcc -mx32
-build/extra/gcc-mx32/%: export CXX = g++ -mx32
-
-# force building with gcc/g++ -m64
-build/extra/gcc-m64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/gcc-m64/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/gcc-m64/%: export CC  = gcc -m64
-build/extra/gcc-m64/%: export CXX = g++ -m64
-
-# force building with gcc/g++ -static
-build/extra/gcc-static/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/gcc-static/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/gcc-static/%: export CC  = gcc -static
-build/extra/gcc-static/%: export CXX = g++ -static
-
-# cross compiler: Linux glibc aarch64-linux-gnu (arm64)
-build/extra/cross-linux-gnu-aarch64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/cross-linux-gnu-aarch64/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/cross-linux-gnu-aarch64/%: export CC  = aarch64-linux-gnu-gcc
-build/extra/cross-linux-gnu-aarch64/%: export CXX = aarch64-linux-gnu-g++
-
-# cross compiler: Linux glibc arm-linux-gnueabihf
-build/extra/cross-linux-gnu-arm-eabihf/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/cross-linux-gnu-arm-eabihf/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/cross-linux-gnu-arm-eabihf/%: export CC  = arm-linux-gnueabihf-gcc
-build/extra/cross-linux-gnu-arm-eabihf/%: export CXX = arm-linux-gnueabihf-g++ -Wno-psabi
-
-# cross compiler: Windows x86 win32 MinGW (i386)
-build/extra/cross-windows-mingw32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/cross-windows-mingw32/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/cross-windows-mingw32/%: export CC  = i686-w64-mingw32-gcc -static
-build/extra/cross-windows-mingw32/%: export CXX = i686-w64-mingw32-g++ -static
-
-# cross compiler: Windows x64 win64 MinGW (amd64)
-build/extra/cross-windows-mingw64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/cross-windows-mingw64/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/cross-windows-mingw64/%: export CC  = x86_64-w64-mingw32-gcc -static
-build/extra/cross-windows-mingw64/%: export CXX = x86_64-w64-mingw32-g++ -static
-
-# cross compiler: macOS arm64 (aarch64)
-build/extra/cross-darwin-arm64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/cross-darwin-arm64/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/cross-darwin-arm64/%: export CC  = clang -target arm64-apple-darwin
-build/extra/cross-darwin-arm64/%: export CXX = clang++ -target arm64-apple-darwin
-
-# cross compiler: macOS x86_64 (amd64)
-build/extra/cross-darwin-x86_64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/extra/cross-darwin-x86_64/release: PHONY; $(call run_config_and_build,$@,Release)
-build/extra/cross-darwin-x86_64/%: export CC  = clang -target x86_64-apple-darwin
-build/extra/cross-darwin-x86_64/%: export CXX = clang++ -target x86_64-apple-darwin
-
-#***********************************************************************
-# C/C++ static analyzers
-#***********************************************************************
-
-# force building with clang Static Analyzer (scan-build)
-build/analyze/clang-analyzer/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/analyze/clang-analyzer/release: PHONY; $(call run_config_and_build,$@,Release)
-build/analyze/clang-analyzer/%: CMAKE := scan-build $(CMAKE)
-build/analyze/clang-analyzer/%: export CCC_CC  ?= clang
-build/analyze/clang-analyzer/%: export CCC_CXX ?= clang++
-
-# run clang-tidy: uses file compile_commands.json from an existing clang build
-# does not create any actual files, so purely PHONY
-RUN_CLANG_TIDY = time python3 ./misc/analyze/clang-tidy/run-clang-tidy.py -p $<
-RUN_CLANG_TIDY_WERROR = $(RUN_CLANG_TIDY) '-warnings-as-errors=*'
-build/analyze/clang-tidy-upx/debug build/analyze/clang-tidy-upx/release: build/extra/clang/$$(notdir $$@) PHONY
-	$(RUN_CLANG_TIDY_WERROR) -config-file ./.clang-tidy '/src/.*\.cpp'
-build/analyze/clang-tidy-bzip2/debug build/analyze/clang-tidy-bzip2/release: build/extra/clang/$$(notdir $$@) PHONY
-	$(RUN_CLANG_TIDY)        -config-file ./misc/analyze/clang-tidy/clang-tidy-bzip2.yml /vendor/bzip2/
-build/analyze/clang-tidy-ucl/debug build/analyze/clang-tidy-ucl/release: build/extra/clang/$$(notdir $$@) PHONY
-	$(RUN_CLANG_TIDY_WERROR) -config-file ./misc/analyze/clang-tidy/clang-tidy-ucl.yml   /vendor/ucl/
-build/analyze/clang-tidy-zlib/debug build/analyze/clang-tidy-zlib/release: build/extra/clang/$$(notdir $$@) PHONY
-	$(RUN_CLANG_TIDY_WERROR) -config-file ./misc/analyze/clang-tidy/clang-tidy-zlib.yml  /vendor/zlib/
-build/analyze/clang-tidy-zstd/debug build/analyze/clang-tidy-zstd/release: build/extra/clang/$$(notdir $$@) PHONY
-	$(RUN_CLANG_TIDY)        -config-file ./misc/analyze/clang-tidy/clang-tidy-zstd.yml  /vendor/zstd/
-build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-upx/$$(notdir $$@)
-build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-bzip2/$$(notdir $$@)
-build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-ucl/$$(notdir $$@)
-build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-zlib/$$(notdir $$@)
-build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-zstd/$$(notdir $$@)
-
-# OLD names
-build/extra/scan-build/debug:   build/analyze/clang-analyzer/debug
-build/extra/scan-build/release: build/analyze/clang-analyzer/release
-
-#***********************************************************************
-# advanced: generic extra target
-#***********************************************************************
-
-# usage:
-#   make UPX_XTARGET=my-target CC="my-cc -flags" CXX="my-cxx -flags"
-#   make UPX_XTARGET=my-target CC="my-cc -flags" CXX="my-cxx -flags" xtarget/debug
-
-ifneq ($(UPX_XTARGET),)
-ifneq ($(CC),)
-ifneq ($(CXX),)
-
-UPX_XTARGET := $(UPX_XTARGET)
-build/xtarget/$(UPX_XTARGET)/debug:   PHONY; $(call run_config_and_build,$@,Debug)
-build/xtarget/$(UPX_XTARGET)/release: PHONY; $(call run_config_and_build,$@,Release)
-build/xtarget/$(UPX_XTARGET)/%: export CC
-build/xtarget/$(UPX_XTARGET)/%: export CXX
 # shortcuts
-xtarget/debug:   build/xtarget/$(UPX_XTARGET)/debug
-xtarget/release: build/xtarget/$(UPX_XTARGET)/release
-# set new default
-.DEFAULT_GOAL = xtarget/release
+debug+test:   build/debug+test PHONY
+release+test: build/release+test PHONY
+all+test build/all+test: build/debug+test build/release+test PHONY
 
+test: $$(patsubst %+test,%,$$(.DEFAULT_GOAL))+test PHONY
+
+#
+# END of Makefile
+#
+
+# extra pre-defined build configurations and some utility; optional
+-include ./Makevars-local.mk
+-include ./misc/make/Makefile-extra.mk
+
+# developer convenience
+ifneq ($(wildcard /usr/bin/env),) # need Unix utils like bash, perl, sed, xargs, etc.
+ifneq ($(and $(wildcard ./misc/scripts/.),$(wildcard ./doc/upx.pod)),)
+check-whitespace clang-format run-testsuite run-testsuite-all run-testsuite-debug run-testsuite-release: src/Makefile PHONY
+	$(MAKE) -C src $@
 endif
 endif
-endif
-
-#***********************************************************************
-# check git submodules
-#***********************************************************************
-
-SUBMODULES = doctest lzma-sdk ucl valgrind zlib
-
-dummy := $(foreach m,$(SUBMODULES),$(if $(wildcard vendor/$m/[CL]*),$m,\
-    $(error ERROR: missing git submodule '$m'; run 'git submodule update --init')))

NEWS

@@ -2,6 +2,39 @@
 User visible changes for UPX
 ==================================================================
 
+Changes in 5.0.0 (20 Feb 2025):
+  * ELF: use of memfd_create supports Enforcing mode of SELinux
+  * ELF: two-step de-compression enables future per-PT_LOAD work
+  * ELF: --unmap-all-pages completely avoids /proc/self/exe
+  * ELF: PT_MIPS_ABIFLAGS is now forwarded into the compressed output;
+    qemu-mips can choose the right floating-point emulation
+  * ELF: many minor internal changes fix nits revealed by fuzzing
+  * bug fixes - see https://github.com/upx/upx/milestone/18
+
+Changes in 4.2.4 (09 May 2024):
+  * bug fixes - see https://github.com/upx/upx/milestone/17
+
+Changes in 4.2.3 (27 Mar 2024):
+  * bug fixes - see https://github.com/upx/upx/milestone/16
+
+Changes in 4.2.2 (03 Jan 2024):
+  * bug fixes - see https://github.com/upx/upx/milestone/15
+
+Changes in 4.2.1 (01 Nov 2023):
+  * linux: /proc/self/exe now is optional
+  * windows: use SetFileTime to preserve sub-second file timestamps
+  * official Windows builds: revert activeCodePage change introduced in 4.2.0
+  * bug fixes - see https://github.com/upx/upx/milestone/14
+
+Changes in 4.2.0 (26 Oct 2023):
+  * win32/pe and win64/pe: stricter relocation checks; please report regressions
+  * unix: use utimensat to preserve sub-second file timestamps
+  * new option '--link' to preserve hard-links (Unix only; use with care)
+  * add support for NO_COLOR env var; see https://no-color.org/
+  * disable macOS support until we fix compatibility with macOS 13+
+  * official Windows builds: set activeCodePage to UTF-8
+  * bug fixes - see https://github.com/upx/upx/milestone/13
+
 Changes in 4.1.0 (08 Aug 2023):
   * ELF: handle shared libraries with more than 2 PT_LOAD segments
   * bug fixes - see https://github.com/upx/upx/milestone/11

README

@@ -8,7 +8,7 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2023 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2025 Markus Oberhumer, Laszlo Molnar & John Reiser
                            https://upx.github.io
 
 
@@ -35,7 +35,7 @@ and run exactly as before, with no runtime or memory penalty for most
 of the supported formats.
 
 UPX supports a number of different executable formats, including
-Windows programs and DLLs, macOS apps and Linux executables.
+Windows programs and DLLs, and Linux executables.
 
 UPX is free software distributed under the term of the GNU General
 Public License. Full source code is available.
@@ -85,9 +85,9 @@ THE FUTURE
 COPYRIGHT
 =========
 
-Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-Copyright (C) 1996-2023 Laszlo Molnar
-Copyright (C) 2000-2023 John F. Reiser
+Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2025 Laszlo Molnar
+Copyright (C) 2000-2025 John F. Reiser
 
 UPX is distributed with full source code under the terms of the
 GNU General Public License v2+; either under the pure GPLv2+ (see

doc/BUGS.txt

@@ -8,7 +8,7 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2023 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2025 Markus Oberhumer, Laszlo Molnar & John Reiser
                            https://upx.github.io
 
 

doc/Makefile

@@ -1,8 +1,9 @@
 #
-# UPX doc Makefile - needs GNU make, pod2html, pod2man and pod2text
+# UPX doc Makefile - needs GNU make, sed, pod2html, pod2man and pod2text
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
 #
 
-BUILT_SOURCES = upx.1 upx-doc.html upx-doc.txt
+BUILT_SOURCES := upx.1 upx-doc.html upx-doc.txt
 
 top_srcdir ?= ..
 
@@ -25,6 +26,10 @@ DETAB2 := sed -e 's/$(tab)/  /g'
 
 .DEFAULT_GOAL = all
 
+.PHONY: PHONY
+.SECONDEXPANSION:
+.SUFFIXES:
+
 all: $(BUILT_SOURCES) PHONY
 
 mostlyclean clean distclean maintainer-clean: PHONY
@@ -34,12 +39,13 @@ mostlyclean clean distclean maintainer-clean: PHONY
 # rules
 #***********************************************************************
 
-.SUFFIXES:
 .SUFFIXES: .1 .html .man .pod .ps .tex .txt
 
 %.1 : %.pod
 	pod2man --center=" " --release="$(PACKAGE) $(VERSION)" --date="$(VERSION_DATE)" $< | $(RTRIM) > $@
 	test -s $@
+#	# strip version number from "Pod::Man" comment
+	sed -i -e 's/^\(\.\\" Automatically generated by Pod::Man\).*/\1/' $@
 
 %-doc.html : %.pod
 	pod2html --noindex $< | $(RTRIM) | $(DETAB2) > $@
@@ -68,4 +74,3 @@ mostlyclean clean distclean maintainer-clean: PHONY
 
 $(BUILT_SOURCES): $(top_srcdir)/src/version.h $(MAKEFILE_LIST)
 .DELETE_ON_ERROR: $(BUILT_SOURCES)
-.PHONY: PHONY

doc/THANKS.txt

@@ -8,7 +8,7 @@
 
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2023 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2025 Markus Oberhumer, Laszlo Molnar & John Reiser
                            https://upx.github.io
 
 
@@ -37,6 +37,8 @@ Charles W. Sandmann <sandmann@clio.rice.edu>
   for the idea with the stubless decompressor in djgpp2/coff
 Ice
   for debugging the PE headersize problem down
+Jens Medoch <jssg@users.sourceforge.net>
+  for the ps1/exe format
 Joergen Ibsen <jibz@hotmail.com> and d'b
   for the relocation & address optimization ideas
 John S. Fine <johnfine@erols.com>

doc/elf-to-mem.txt

@@ -1,5 +1,5 @@
            Decompressing ELF Directly to Memory on Linux/x86
-        Copyright (C) 2000-2023 John F. Reiser  jreiser@BitWagon.com
+        Copyright (C) 2000-2025 John F. Reiser  jreiser@BitWagon.com
 
 References:
   <elf.h>   definitions for the ELF file format
@@ -15,7 +15,7 @@ the value that is manipulated by system call 45 (__NR_brk in
 there will be no execve() except for the execve() of the decompressor
 program itself.  So, the decompressor program (which contains the
 compressed version of the original executable) must have the same
-brk() as the original executable.  So, the second PT_LOAD
+brk() as the original executable.  So, the first PT_LOAD
 ELF "segment" of the compressed program is used only to set the brk(0).
 See src/p_lx_elf.cpp, function PackLinuxElf32::generateElfHdr.
 All of the decompressor's code, and all of the compressed image
@@ -25,35 +25,27 @@ decompressor program.
 The decompressor program stub is just under 2K bytes when linked.
 After linking, the decompressor code is converted to an initialized
 array, and #included into the compilation of the compressor;
-see src/stub/l_le_n2b.h.  To make self-contained compressed
+see stub/i386-linux.elf-entry.h.  To make self-contained compressed
 executables even smaller, the compressor also compresses all but the
 startup and decompression subroutine of the decompressor itself,
 saving a few hundred bytes.  The startup code first decompresses the
 rest of the decompressor, then jumps to it.  A nonstandard linker
-script src/stub/l_lx_elf86.lds places both the .text and .data
-of the decompressor into the same PT_LOAD at 0x00401000.  The
-compressor includes the compressed bytes of the original executable
-at the end of this first PT_LOAD.
+script src/stub/src/i386-linux.elf-entry.lds arranges the SECTIONS
+so that PackLinuxElf32x86::buildLoader() and buildLinuxLoader()
+generate the desired stub code, which goes into PT_LOAD[1].
 
-At runtime, the decompressed stub lives at 0x00400000.  In order for the
-decompressed stub to work properly at an address that is different
-from its link-time address, the compiled code must contain no absolute
-addresses.  So, the data items in l_lx_elf.c must be only parameters
-and automatic (on-stack) local variables; no global data, no static data,
-and no string constants.  Use "size l_le_n2b.o l_6e_n2b.o" to check
-that both data and bss have length zero.  Also, the '&' operator
-may not be used to take the address of a function.
-
-The address  0x00400000 was chosen to be out of the way of the usual
-load address 0x08048000, and to minimize fragmentation in kernel
-page tables; one page of page tables covers 4 MiB. The address
-0x00401000 was chosen as 1 page up from a 64 KiB boundary, to
-make the startup code and its constants smaller.
+At runtime, the decompressed stub lives close beyond the brk().
+In order for the decompressed stub to work properly at an address
+that is different from its link-time address, the compiled code must
+contain no absolute addresses.  So, the data items in stub code
+must be only parameters and automatic (on-stack) local variables;
+no global data, no static data, and no string constants.  Also,
+the '&' operator may not be used to take the address of a function.
 
 Decompression of the executable begins by decompressing the Elf32_Ehdr
-and Elf32_Phdr, and then uses the Ehdr and Phdrs to control decompression
-of the PT_LOAD segments.
-Subroutine do_xmap() of src/stub/l_lx_elf.c performs the
+and Elf32_Phdr, and then uses those Ehdr and Phdrs to control decompression
+of the PT_LOAD segments.  Subroutine do_xmap() of src/stub/src/
+i386-linux.elf-main.c performs the
 "virtual execve()" using the compressed data as source, and stores
 the decompressed bytes directly into the appropriate virtual addresses.
 
@@ -74,22 +66,17 @@ expanding $ORIGIN in -rpath, or for application code that relies on
 --unmap-all-pages to achieve that effect at run time.  Upx-3.04
 and previous versions did this by default with no option.  However,
 too much other software erroneously assumes that /proc/self/exe
-always exists.
+always exists.  upx-4.3.0 made /proc/self/exe optional so that
+chroot() and related environments can work.
+For Elf formats, UPX adds an environment variable named "   " [three
+spaces] which saves the results of readlink("/proc/self/exe",,)
+If /proc/self/exe is ENOENT, then the variable has the same value
+as its name "/proc/self/exe".
 
-On arm*-linux-elf there is no good address at which to retain one
-page of the compressed executable.  Pages below the usual .p_vaddr
-0x8000 (32KiB) are rejected by the kernel.  Using a page above the
-original uncompressed brk(0) would require placing the entire initial
-compressed program above uncompressed brk(0), which would significantly
-increase the running brk(0); but too many programs break if brk(0)
-moves.  Thus on arm*-linux-elf the compressed executable begins
-with 0x8000==.p_vaddr, all pages mapped by execve() that are also
-occupied by decompressed bytes are removed before overwriting, and
-/proc/self/exe becomes a "(deleted)" symlink.  It might be possible
-to preserve /proc/self/exe if the original uncompressed executable
-were created with 0x9000==.p_vaddr (one page higher than the usual
-0x8000) so that the compressed page mapped at 0x8000 would linger.
-[This has not been tested.]
+All of the above documentation refers to ET_EXEC main programs,
+which always use the same virtual addresses.  An ET_DYN executable
+(main program or shared library) follows much the same scheme,
+re-using the address space that the kernel chose originally.
 
 Linux stores the pathname argument that was specified to execve()
 immediately after the '\0' which terminates the character string of the
@@ -99,9 +86,24 @@ records a pointer to that character string in Elf32_auxv[AT_EXECFN].
 The pathname is not "bound" to the file as strongly as /proc/self/exe
 (the file may be changed without affecting the pathname), but the
 pathname does provide some information.  The pathname may be relative
-to the working directory, so look before any chdir().
+to the working directory, so look before performing any chdir().
 
-The Elf formats for Linux add an environment variable named "   " [three
-spaces] which saves the results of readlink("/proc/self/exe",,) before
-the runtime stub unmaps all its pages.  As of 2006-10-03 this works
-for linux/elf386 and linux/ElfAMD.
+On any page, then SELinux in strictest enforcing mode prohibits
+simultaneous PROT_EXEC and PROT_WRITE, and also prohibits adding
+PROT_EXEC if the kernel VMA struct (Virtual Memory Area struct)
+that manages that page ever has had PROT_WRITE.  This implies that
+the only way to get PROT_EXEC is to map the page directly from a file.
+Therefore, in late 2023 the various decompression stubs are being
+rewritten to "bounce" the decompressed data through pages in a
+memory-resident file created by the memfd_create() system call,
+and subsequently mapped PROT_EXEC.  Actual copying of the pages
+can be avoided by careful sequence mmap() modes, but the overhead
+of an additional system call is required.
+
+The not-as-strict "targeted enforcing" mode of
+SELinux seems not to demand this extra work, except for executables
+that run with elevated privileges, such as various system daemons.
+So "ordinary" user-mode apps can run in current "targeted enforcing"
+mode.  But because the actual runtime mode of SELinux is unknown
+at compression time, then the memfd_create method should be used
+all the time.

doc/upx-doc.html

@@ -22,7 +22,7 @@
 <h1 id="ABSTRACT">ABSTRACT</h1>
 
 <pre><code>                 The Ultimate Packer for eXecutables
-Copyright (c) 1996-2023 Markus Oberhumer, Laszlo Molnar &amp; John Reiser
+Copyright (c) 1996-2025 Markus Oberhumer, Laszlo Molnar &amp; John Reiser
                         https://upx.github.io</code></pre>
 
 <p><b>UPX</b> is a portable, extendable, high-performance executable packer for several different executable formats. It achieves an excellent compression ratio and offers <i>*very*</i> fast decompression. Your executables suffer no memory overhead or other drawbacks for most of the formats supported, because of in-place decompression.</p>
@@ -779,19 +779,15 @@ http://www.oberhumer.com
 
 Laszlo Molnar &lt;ezerotven+github@gmail.com&gt;
 
-John F. Reiser &lt;jreiser@BitWagon.com&gt;
-
-Jens Medoch &lt;jssg@users.sourceforge.net&gt;</code></pre>
+John F. Reiser &lt;jreiser@BitWagon.com&gt;</code></pre>
 
 <h1 id="COPYRIGHT">COPYRIGHT</h1>
 
-<p>Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer</p>
+<p>Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer</p>
 
-<p>Copyright (C) 1996-2023 Laszlo Molnar</p>
+<p>Copyright (C) 1996-2025 Laszlo Molnar</p>
 
-<p>Copyright (C) 2000-2023 John F. Reiser</p>
-
-<p>Copyright (C) 2002-2023 Jens Medoch</p>
+<p>Copyright (C) 2000-2025 John F. Reiser</p>
 
 <p><b>UPX</b> is distributed with full source code under the terms of the GNU General Public License v2+; either under the pure GPLv2+ (see the file COPYING), or (at your option) under the GPLv+2 with special exceptions and restrictions granting the free usage for all binaries including commercial programs (see the file LICENSE).</p>
 

doc/upx-doc.txt

@@ -6,7 +6,7 @@ SYNOPSIS
 
 ABSTRACT
                         The Ultimate Packer for eXecutables
-       Copyright (c) 1996-2023 Markus Oberhumer, Laszlo Molnar & John Reiser
+       Copyright (c) 1996-2025 Markus Oberhumer, Laszlo Molnar & John Reiser
                                https://upx.github.io
 
     UPX is a portable, extendable, high-performance executable packer for
@@ -815,16 +815,12 @@ AUTHORS
 
      John F. Reiser <jreiser@BitWagon.com>
 
-     Jens Medoch <jssg@users.sourceforge.net>
-
 COPYRIGHT
-    Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+    Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
 
-    Copyright (C) 1996-2023 Laszlo Molnar
+    Copyright (C) 1996-2025 Laszlo Molnar
 
-    Copyright (C) 2000-2023 John F. Reiser
-
-    Copyright (C) 2002-2023 Jens Medoch
+    Copyright (C) 2000-2025 John F. Reiser
 
     UPX is distributed with full source code under the terms of the GNU
     General Public License v2+; either under the pure GPLv2+ (see the file

doc/upx.1

@@ -1,4 +1,5 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
+.\" -*- mode: troff; coding: utf-8 -*-
+.\" Automatically generated by Pod::Man
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -15,29 +16,12 @@
 .ft R
 .fi
 ..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>.
 .ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
 .    ds C` ""
 .    ds C' ""
 'br\}
 .el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
 .    ds C`
 .    ds C'
 'br\}
@@ -68,110 +52,48 @@
 .    \}
 .\}
 .rr rF
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
 .IX Title "UPX 1"
-.TH UPX 1 "2023-08-08" "upx 4.1.0" " "
+.TH UPX 1 2025-02-20 "upx 5.0.0" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
-.SH "NAME"
+.SH NAME
 upx \- compress or expand executable files
-.SH "SYNOPSIS"
+.SH SYNOPSIS
 .IX Header "SYNOPSIS"
 \&\fBupx\fR [\ \fIcommand\fR\ ] [\ \fIoptions\fR\ ] \fIfilename\fR...
-.SH "ABSTRACT"
+.SH ABSTRACT
 .IX Header "ABSTRACT"
 .Vb 3
 \&                    The Ultimate Packer for eXecutables
-\&   Copyright (c) 1996\-2023 Markus Oberhumer, Laszlo Molnar & John Reiser
+\&   Copyright (c) 1996\-2025 Markus Oberhumer, Laszlo Molnar & John Reiser
 \&                           https://upx.github.io
 .Ve
 .PP
-\&\fB\s-1UPX\s0\fR is a portable, extendable, high-performance executable packer for
+\&\fBUPX\fR is a portable, extendable, high-performance executable packer for
 several different executable formats. It achieves an excellent compression
 ratio and offers \fI*very*\fR fast decompression. Your executables suffer
 no memory overhead or other drawbacks for most of the formats supported,
 because of in-place decompression.
-.SH "DISCLAIMER"
+.SH DISCLAIMER
 .IX Header "DISCLAIMER"
-\&\fB\s-1UPX\s0\fR comes with \s-1ABSOLUTELY NO WARRANTY\s0; for details see the file \s-1COPYING.\s0
+\&\fBUPX\fR comes with ABSOLUTELY NO WARRANTY; for details see the file COPYING.
 .PP
 Please report all problems or suggestions to the authors. Thanks.
 .SH "SECURITY CONTEXT"
 .IX Header "SECURITY CONTEXT"
-\&\s-1IMPORTANT NOTE:\s0 \fB\s-1UPX\s0\fR inherits the security context of any files it handles.
+IMPORTANT NOTE: \fBUPX\fR inherits the security context of any files it handles.
 .PP
 This means that packing, unpacking, or even testing or listing a file requires
 the same security considerations as actually executing the file.
 .PP
-Use \fB\s-1UPX\s0\fR on trusted files only!
-.SH "DESCRIPTION"
+Use \fBUPX\fR on trusted files only!
+.SH DESCRIPTION
 .IX Header "DESCRIPTION"
-\&\fB\s-1UPX\s0\fR is a versatile executable packer with the following features:
+\&\fBUPX\fR is a versatile executable packer with the following features:
 .PP
 .Vb 3
 \&  \- secure: as UPX is documented Open Source since many years any relevant
@@ -204,32 +126,32 @@ Use \fB\s-1UPX\s0\fR on trusted files only!
 \&      for commercial programs
 .Ve
 .PP
-You probably understand now why we call \fB\s-1UPX\s0\fR the "\fIultimate\fR"
+You probably understand now why we call \fBUPX\fR the "\fIultimate\fR"
 executable packer.
-.SH "COMMANDS"
+.SH COMMANDS
 .IX Header "COMMANDS"
-.SS "Compress"
+.SS Compress
 .IX Subsection "Compress"
 This is the default operation, eg. \fBupx yourfile.exe\fR will compress the file
 specified on the command line.
-.SS "Decompress"
+.SS Decompress
 .IX Subsection "Decompress"
-All \fB\s-1UPX\s0\fR supported file formats can be unpacked using the \fB\-d\fR switch, eg.
+All \fBUPX\fR supported file formats can be unpacked using the \fB\-d\fR switch, eg.
 \&\fBupx \-d yourfile.exe\fR will uncompress the file you've just compressed.
-.SS "Test"
+.SS Test
 .IX Subsection "Test"
 The \fB\-t\fR command tests the integrity of the compressed and uncompressed
 data, eg. \fBupx \-t yourfile.exe\fR check whether your file can be safely
 decompressed. Note, that this command doesn't check the whole file, only
 the part that will be uncompressed during program execution. This means
 that you should not use this command instead of a virus checker.
-.SS "List"
+.SS List
 .IX Subsection "List"
 The \fB\-l\fR command prints out some information about the compressed files
 specified on the command line as parameters, eg \fBupx \-l yourfile.exe\fR
 shows the compressed / uncompressed size and the compression ratio of
 \&\fIyourfile.exe\fR.
-.SH "OPTIONS"
+.SH OPTIONS
 .IX Header "OPTIONS"
 \&\fB\-q\fR: be quiet, suppress warnings
 .PP
@@ -239,10 +161,10 @@ shows the compressed / uncompressed size and the compression ratio of
 .PP
 \&\fB\-\-help\fR: prints the help
 .PP
-\&\fB\-\-version\fR: print the version of \fB\s-1UPX\s0\fR
+\&\fB\-\-version\fR: print the version of \fBUPX\fR
 .PP
 \&\fB\-\-exact\fR: when compressing, require to be able to get a byte-identical file
-after decompression with option \fB\-d\fR. [\s-1NOTE:\s0 this is work in progress and is
+after decompression with option \fB\-d\fR. [NOTE: this is work in progress and is
 not supported for all formats yet. If you do care, as a workaround you can
 compress and then decompress your program a first time \- any further
 compress-decompress steps should then yield byte-identical results
@@ -255,16 +177,16 @@ as compared to the first decompressed version.]
 [ ...more docs need to be written... \- type `\fBupx \-\-help\fR' for now ]
 .SH "COMPRESSION LEVELS & TUNING"
 .IX Header "COMPRESSION LEVELS & TUNING"
-\&\fB\s-1UPX\s0\fR offers ten different compression levels from \fB\-1\fR to \fB\-9\fR,
+\&\fBUPX\fR offers ten different compression levels from \fB\-1\fR to \fB\-9\fR,
 and \fB\-\-best\fR.  The default compression level is \fB\-8\fR for files
 smaller than 512 KiB, and \fB\-7\fR otherwise.
-.IP "\(bu" 4
+.IP \(bu 4
 Compression levels 1, 2 and 3 are pretty fast.
-.IP "\(bu" 4
+.IP \(bu 4
 Compression levels 4, 5 and 6 achieve a good time/ratio performance.
-.IP "\(bu" 4
+.IP \(bu 4
 Compression levels 7, 8 and 9 favor compression ratio over speed.
-.IP "\(bu" 4
+.IP \(bu 4
 Compression level \fB\-\-best\fR may take a long time.
 .PP
 Note that compression level \fB\-\-best\fR can be somewhat slow for large
@@ -272,28 +194,28 @@ files, but you definitely should use it when releasing a final version
 of your program.
 .PP
 Quick info for achieving the best compression ratio:
-.IP "\(bu" 4
+.IP \(bu 4
 Try \fBupx \-\-brute \-\-no\-lzma myfile.exe\fR or even
 \&\fBupx \-\-ultra\-brute \-\-no\-lzma myfile.exe\fR.
-.IP "\(bu" 4
-The option \fB\-\-lzma\fR enables \s-1LZMA\s0 compression, which compresses better but
+.IP \(bu 4
+The option \fB\-\-lzma\fR enables LZMA compression, which compresses better but
 is *significantly slower* at decompression. You probably do not want
 to use it for large files.
 .Sp
 (Note that \fB\-\-lzma\fR is automatically enabled by \fB\-\-all\-methods\fR and
 \&\fB\-\-brute\fR, use \fB\-\-no\-lzma\fR to override.)
-.IP "\(bu" 4
+.IP \(bu 4
 Try if \fB\-\-overlay=strip\fR works.
-.IP "\(bu" 4
+.IP \(bu 4
 For win32/pe programs there's \fB\-\-strip\-relocs=0\fR. See notes below.
 .SH "OVERLAY HANDLING OPTIONS"
 .IX Header "OVERLAY HANDLING OPTIONS"
-Info: An \*(L"overlay\*(R" means auxiliary data attached after the logical end of
+Info: An "overlay" means auxiliary data attached after the logical end of
 an executable, and it often contains application specific data
 (this is a common practice to avoid an extra data file, though
 it would be better to use resource sections).
 .PP
-\&\fB\s-1UPX\s0\fR handles overlays like many other executable packers do: it simply
+\&\fBUPX\fR handles overlays like many other executable packers do: it simply
 copies the overlay after the compressed image. This works with some
 files, but doesn't work with others, depending on how an application
 actually accesses this overlaid data.
@@ -309,8 +231,8 @@ actually accesses this overlaid data.
 .Ve
 .SH "ENVIRONMENT VARIABLE"
 .IX Header "ENVIRONMENT VARIABLE"
-The environment variable \fB\s-1UPX\s0\fR can hold a set of default
-options for \fB\s-1UPX\s0\fR. These options are interpreted first and
+The environment variable \fBUPX\fR can hold a set of default
+options for \fBUPX\fR. These options are interpreted first and
 can be overwritten by explicit command line parameters.
 For example:
 .PP
@@ -321,18 +243,18 @@ For example:
 .Ve
 .PP
 Under DOS/Windows you must use '#' instead of '=' when setting the
-environment variable because of a \s-1COMMAND.COM\s0 limitation.
+environment variable because of a COMMAND.COM limitation.
 .PP
 Not all of the options are valid in the environment variable \-
-\&\fB\s-1UPX\s0\fR will tell you.
+\&\fBUPX\fR will tell you.
 .PP
 You can explicitly use the \fB\-\-no\-env\fR option to ignore the
 environment variable.
 .SH "NOTES FOR THE SUPPORTED EXECUTABLE FORMATS"
 .IX Header "NOTES FOR THE SUPPORTED EXECUTABLE FORMATS"
-.SS "\s-1NOTES FOR ATARI/TOS\s0"
+.SS "NOTES FOR ATARI/TOS"
 .IX Subsection "NOTES FOR ATARI/TOS"
-This is the executable format used by the Atari \s-1ST/TT,\s0 a Motorola 68000
+This is the executable format used by the Atari ST/TT, a Motorola 68000
 based personal computer which was popular in the late '80s. Support
 of this format is only because of nostalgic feelings of one of
 the authors and serves no practical purpose :\-).
@@ -349,12 +271,12 @@ Extra options available for this executable format:
 \&                      the compression ratio in some cases, but usually
 \&                      the default method gives the best results anyway.
 .Ve
-.SS "\s-1NOTES FOR BVMLINUZ/I386\s0"
+.SS "NOTES FOR BVMLINUZ/I386"
 .IX Subsection "NOTES FOR BVMLINUZ/I386"
 Same as vmlinuz/i386.
-.SS "\s-1NOTES FOR DOS/COM\s0"
+.SS "NOTES FOR DOS/COM"
 .IX Subsection "NOTES FOR DOS/COM"
-Obviously \fB\s-1UPX\s0\fR won't work with executables that want to read data from
+Obviously \fBUPX\fR won't work with executables that want to read data from
 themselves (like some commandline utilities that ship with Win95/98/ME).
 .PP
 Compressed programs only work on a 286+.
@@ -378,11 +300,11 @@ Extra options available for this executable format:
 \&                      the compression ratio in some cases, but usually
 \&                      the default filter gives the best results anyway.
 .Ve
-.SS "\s-1NOTES FOR DOS/EXE\s0"
+.SS "NOTES FOR DOS/EXE"
 .IX Subsection "NOTES FOR DOS/EXE"
-dos/exe stands for all \*(L"normal\*(R" 16\-bit \s-1DOS\s0 executables.
+dos/exe stands for all "normal" 16\-bit DOS executables.
 .PP
-Obviously \fB\s-1UPX\s0\fR won't work with executables that want to read data from
+Obviously \fBUPX\fR won't work with executables that want to read data from
 themselves (like some command line utilities that ship with Win95/98/ME).
 .PP
 Compressed programs only work on a 286+.
@@ -399,7 +321,7 @@ Extra options available for this executable format:
 \&                      the compression ratio in some cases, but usually
 \&                      the default method gives the best results anyway.
 .Ve
-.SS "\s-1NOTES FOR DOS/SYS\s0"
+.SS "NOTES FOR DOS/SYS"
 .IX Subsection "NOTES FOR DOS/SYS"
 Compressed programs only work on a 286+.
 .PP
@@ -422,20 +344,20 @@ Extra options available for this executable format:
 \&                      the compression ratio in some cases, but usually
 \&                      the default filter gives the best results anyway.
 .Ve
-.SS "\s-1NOTES FOR DJGPP2/COFF\s0"
+.SS "NOTES FOR DJGPP2/COFF"
 .IX Subsection "NOTES FOR DJGPP2/COFF"
-First of all, it is recommended to use \fB\s-1UPX\s0\fR *instead* of \fBstrip\fR. strip has
+First of all, it is recommended to use \fBUPX\fR *instead* of \fBstrip\fR. strip has
 the very bad habit of replacing your stub with its own (outdated) version.
-Additionally \fB\s-1UPX\s0\fR corrects a bug/feature in strip v2.8.x: it
+Additionally \fBUPX\fR corrects a bug/feature in strip v2.8.x: it
 will fix the 4 KiB alignment of the stub.
 .PP
-\&\fB\s-1UPX\s0\fR includes the full functionality of stubify. This means it will
-automatically stubify your \s-1COFF\s0 files. Use the option \fB\-\-coff\fR to
+\&\fBUPX\fR includes the full functionality of stubify. This means it will
+automatically stubify your COFF files. Use the option \fB\-\-coff\fR to
 disable this functionality (see below).
 .PP
-\&\fB\s-1UPX\s0\fR automatically handles Allegro packfiles.
+\&\fBUPX\fR automatically handles Allegro packfiles.
 .PP
-The \s-1DLM\s0 format (a rather exotic shared library extension) is not supported.
+The DLM format (a rather exotic shared library extension) is not supported.
 .PP
 Packed programs will be byte-identical to the original after uncompression.
 All debug information and trailing garbage will be stripped, though.
@@ -456,7 +378,7 @@ Extra options available for this executable format:
 \&                      the compression ratio in some cases, but usually
 \&                      the default filter gives the best results anyway.
 .Ve
-.SS "\s-1NOTES FOR LINUX\s0 [general]"
+.SS "NOTES FOR LINUX [general]"
 .IX Subsection "NOTES FOR LINUX [general]"
 Introduction
 .PP
@@ -593,15 +515,15 @@ General notes:
 \&    been modified after compression.
 \&    Running \`strace \-o strace.log compressed_file\*(Aq will tell you more.
 .Ve
-.SS "\s-1NOTES FOR LINUX/ELF386\s0"
+.SS "NOTES FOR LINUX/ELF386"
 .IX Subsection "NOTES FOR LINUX/ELF386"
 Please read the general Linux description first.
 .PP
-The linux/elf386 format decompresses directly into \s-1RAM,\s0
+The linux/elf386 format decompresses directly into RAM,
 uses only one exec, does not use space in /tmp,
 and does not use /proc.
 .PP
-Linux/elf386 is automatically selected for Linux \s-1ELF\s0 executables.
+Linux/elf386 is automatically selected for Linux ELF executables.
 .PP
 Packed programs will be byte-identical to the original after uncompression.
 .PP
@@ -641,12 +563,12 @@ Extra options available for this executable format:
 .Vb 1
 \&  (none)
 .Ve
-.SS "\s-1NOTES FOR LINUX/SH386\s0"
+.SS "NOTES FOR LINUX/SH386"
 .IX Subsection "NOTES FOR LINUX/SH386"
 Please read the general Linux description first.
 .PP
 Shell scripts where the underling shell accepts a ``\-c'' argument
-can use the Linux/sh386 format.  \fB\s-1UPX\s0\fR decompresses the shell script
+can use the Linux/sh386 format.  \fBUPX\fR decompresses the shell script
 into low memory, then maps the shell and passes the entire text of the
 script as an argument with a leading ``\-c''.
 It does not use space in /tmp, and does not use /proc.
@@ -691,7 +613,7 @@ Extra options available for this executable format:
 .Vb 1
 \&  (none)
 .Ve
-.SS "\s-1NOTES FOR LINUX/386\s0"
+.SS "NOTES FOR LINUX/386"
 .IX Subsection "NOTES FOR LINUX/386"
 Please read the general Linux description first.
 .PP
@@ -764,10 +686,10 @@ Extra options available for this executable format:
 \&                      format, i.e. do not try the linux/elf386 and
 \&                      linux/sh386 formats.
 .Ve
-.SS "\s-1NOTES FOR PS1/EXE\s0"
+.SS "NOTES FOR PS1/EXE"
 .IX Subsection "NOTES FOR PS1/EXE"
 This is the executable format used by the Sony PlayStation (PSone),
-a \s-1MIPS R3000\s0 based gaming console which is popular since the late '90s.
+a MIPS R3000 based gaming console which is popular since the late '90s.
 Support of this format is very similar to the Atari one, because of
 nostalgic feelings of one of the authors.
 .PP
@@ -816,12 +738,12 @@ Extra options available for this executable format:
 \&                      but the compressed executable will not boot from a CD.
 \&                      Use it for console transfer only !
 .Ve
-.SS "\s-1NOTES FOR RTM32/PE\s0 and \s-1ARM/PE\s0"
+.SS "NOTES FOR RTM32/PE and ARM/PE"
 .IX Subsection "NOTES FOR RTM32/PE and ARM/PE"
 Same as win32/pe.
-.SS "\s-1NOTES FOR TMT/ADAM\s0"
+.SS "NOTES FOR TMT/ADAM"
 .IX Subsection "NOTES FOR TMT/ADAM"
-This format is used by the \s-1TMT\s0 Pascal compiler \- see http://www.tmt.com/ .
+This format is used by the TMT Pascal compiler \- see http://www.tmt.com/ .
 .PP
 Extra options available for this executable format:
 .PP
@@ -836,11 +758,11 @@ Extra options available for this executable format:
 \&                      the compression ratio in some cases, but usually
 \&                      the default filter gives the best results anyway.
 .Ve
-.SS "\s-1NOTES FOR VMLINUZ/386\s0"
+.SS "NOTES FOR VMLINUZ/386"
 .IX Subsection "NOTES FOR VMLINUZ/386"
 The vmlinuz/386 and bvmlinuz/386 formats take a gzip-compressed
-bootable Linux kernel image (\*(L"vmlinuz\*(R", \*(L"zImage\*(R", \*(L"bzImage\*(R"),
-gzip-decompress it and re-compress it with the \fB\s-1UPX\s0\fR compression method.
+bootable Linux kernel image ("vmlinuz", "zImage", "bzImage"),
+gzip-decompress it and re-compress it with the \fBUPX\fR compression method.
 .PP
 vmlinuz/386 is completely unrelated to the other Linux executable
 formats, and it does not share any of their drawbacks.
@@ -889,14 +811,14 @@ Extra options available for this executable format:
 \&                      the compression ratio in some cases, but usually
 \&                      the default filter gives the best results anyway.
 .Ve
-.SS "\s-1NOTES FOR WATCOM/LE\s0"
+.SS "NOTES FOR WATCOM/LE"
 .IX Subsection "NOTES FOR WATCOM/LE"
-\&\fB\s-1UPX\s0\fR has been successfully tested with the following extenders:
-  \s-1DOS4G, DOS4GW, PMODE/W,\s0 DOS32a, CauseWay.
-  The \s-1WDOS/X\s0 extender is partly supported (for details
-  see the file bugs \s-1BUGS\s0).
+\&\fBUPX\fR has been successfully tested with the following extenders:
+  DOS4G, DOS4GW, PMODE/W, DOS32a, CauseWay.
+  The WDOS/X extender is partly supported (for details
+  see the file bugs BUGS).
 .PP
-DLLs and the \s-1LX\s0 format are not supported.
+DLLs and the LX format are not supported.
 .PP
 Extra options available for this executable format:
 .PP
@@ -904,12 +826,12 @@ Extra options available for this executable format:
 \&  \-\-le                Produce an unbound LE output instead of
 \&                      keeping the current stub.
 .Ve
-.SS "\s-1NOTES FOR WIN32/PE\s0"
+.SS "NOTES FOR WIN32/PE"
 .IX Subsection "NOTES FOR WIN32/PE"
-The \s-1PE\s0 support in \fB\s-1UPX\s0\fR is quite stable now, but probably there are
+The PE support in \fBUPX\fR is quite stable now, but probably there are
 still some incompatibilities with some files.
 .PP
-Because of the way \fB\s-1UPX\s0\fR (and other packers for this format) works, you
+Because of the way \fBUPX\fR (and other packers for this format) works, you
 can see increased memory usage of your compressed files because the whole
 program is loaded into memory at startup.
 If you start several instances of huge compressed programs you're
@@ -922,17 +844,17 @@ smaller, but it's still there.
 If you're running executables from network, then compressed programs
 will load faster, and require less bandwidth during execution.
 .PP
-DLLs are supported. But \s-1UPX\s0 compressed DLLs can not share common data and
+DLLs are supported. But UPX compressed DLLs can not share common data and
 code when they got used by multiple applications. So compressing msvcrt.dll
 is a waste of memory, but compressing the dll plugins of a particular
 application may be a better idea.
 .PP
 Screensavers are supported, with the restriction that the filename
-must end with \*(L".scr\*(R" (as screensavers are handled slightly different
+must end with ".scr" (as screensavers are handled slightly different
 than normal exe files).
 .PP
-\&\s-1UPX\s0 compressed \s-1PE\s0 files have some minor memory overhead (usually in the
-10 \- 30 KiB range) which can be seen by specifying the \*(L"\-i\*(R" command
+UPX compressed PE files have some minor memory overhead (usually in the
+10 \- 30 KiB range) which can be seen by specifying the "\-i" command
 line switch during compression.
 .PP
 Extra options available for this executable format:
@@ -996,16 +918,16 @@ Extra options available for this executable format:
 \&                      the compression ratio in some cases, but usually
 \&                      the default filter gives the best results anyway.
 .Ve
-.SH "DIAGNOSTICS"
+.SH DIAGNOSTICS
 .IX Header "DIAGNOSTICS"
 Exit status is normally 0; if an error occurs, exit status
 is 1. If a warning occurs, exit status is 2.
 .PP
-\&\fB\s-1UPX\s0\fR's diagnostics are intended to be self-explanatory.
-.SH "BUGS"
+\&\fBUPX\fR's diagnostics are intended to be self-explanatory.
+.SH BUGS
 .IX Header "BUGS"
 Please report all bugs immediately to the authors.
-.SH "AUTHORS"
+.SH AUTHORS
 .IX Header "AUTHORS"
 .Vb 2
 \& Markus F.X.J. Oberhumer <markus@oberhumer.com>
@@ -1014,29 +936,25 @@ Please report all bugs immediately to the authors.
 \& Laszlo Molnar <ezerotven+github@gmail.com>
 \&
 \& John F. Reiser <jreiser@BitWagon.com>
-\&
-\& Jens Medoch <jssg@users.sourceforge.net>
 .Ve
-.SH "COPYRIGHT"
+.SH COPYRIGHT
 .IX Header "COPYRIGHT"
-Copyright (C) 1996\-2023 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996\-2025 Markus Franz Xaver Johannes Oberhumer
 .PP
-Copyright (C) 1996\-2023 Laszlo Molnar
+Copyright (C) 1996\-2025 Laszlo Molnar
 .PP
-Copyright (C) 2000\-2023 John F. Reiser
+Copyright (C) 2000\-2025 John F. Reiser
 .PP
-Copyright (C) 2002\-2023 Jens Medoch
-.PP
-\&\fB\s-1UPX\s0\fR is distributed with full source code under the terms of the
-\&\s-1GNU\s0 General Public License v2+; either under the pure GPLv2+ (see
-the file \s-1COPYING\s0), or (at your option) under the GPLv+2 with special
+\&\fBUPX\fR is distributed with full source code under the terms of the
+GNU General Public License v2+; either under the pure GPLv2+ (see
+the file COPYING), or (at your option) under the GPLv+2 with special
 exceptions and restrictions granting the free usage for all binaries
-including commercial programs (see the file \s-1LICENSE\s0).
+including commercial programs (see the file LICENSE).
 .PP
 This program is distributed in the hope that it will be useful,
-but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
-\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .PP
-You should have received a copy of the \s-1UPX\s0 License Agreements along
-with this program; see the files \s-1COPYING\s0 and \s-1LICENSE.\s0 If not,
-visit the \s-1UPX\s0 home page.
+You should have received a copy of the UPX License Agreements along
+with this program; see the files COPYING and LICENSE. If not,
+visit the UPX home page.

doc/upx.pod

@@ -13,7 +13,7 @@ B<upx> S<[ I<command> ]> S<[ I<options> ]> I<filename>...
 =head1 ABSTRACT
 
                     The Ultimate Packer for eXecutables
-   Copyright (c) 1996-2023 Markus Oberhumer, Laszlo Molnar & John Reiser
+   Copyright (c) 1996-2025 Markus Oberhumer, Laszlo Molnar & John Reiser
                            https://upx.github.io
 
 
@@ -926,19 +926,15 @@ Please report all bugs immediately to the authors.
 
  John F. Reiser <jreiser@BitWagon.com>
 
- Jens Medoch <jssg@users.sourceforge.net>
-
 
 
 =head1 COPYRIGHT
 
-Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
 
-Copyright (C) 1996-2023 Laszlo Molnar
+Copyright (C) 1996-2025 Laszlo Molnar
 
-Copyright (C) 2000-2023 John F. Reiser
-
-Copyright (C) 2002-2023 Jens Medoch
+Copyright (C) 2000-2025 John F. Reiser
 
 B<UPX> is distributed with full source code under the terms of the
 GNU General Public License v2+; either under the pure GPLv2+ (see

misc/analyze/clang-tidy/clang-tidy-bzip2.yml

@@ -1,4 +1,6 @@
-# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
+# vim:set ft=yaml ts=2 sw=2 et:
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
 ---
 Checks: >
   -*,
@@ -14,7 +16,7 @@ Checks: >
     -clang-analyzer-core.UndefinedBinaryOperatorResult,
     -clang-analyzer-core.uninitialized.Assign,
     -clang-analyzer-security.insecureAPI.strcpy,
-  clang-diagnostics-*',
+  clang-diagnostic-*,
   performance-*,
 FormatStyle: file
 HeaderFilterRegex: '.*'

misc/analyze/clang-tidy/clang-tidy-ucl.yml

@@ -1,18 +1,22 @@
-# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
+# vim:set ft=yaml ts=2 sw=2 et:
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
 ---
 Checks: >
   -*,
   bugprone-*,
     -bugprone-assignment-in-if-condition,
+    -bugprone-casting-through-void,
     -bugprone-easily-swappable-parameters,
     -bugprone-implicit-widening-of-multiplication-result,
+    -bugprone-inc-dec-in-conditions,
     -bugprone-macro-parentheses,
     -bugprone-reserved-identifier,
     -bugprone-sizeof-expression,
     -bugprone-suspicious-include,
   clang-analyzer-*,
     -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
-  clang-diagnostics-*',
+  clang-diagnostic-*,
   performance-*,
 FormatStyle: file
 HeaderFilterRegex: '.*'

misc/analyze/clang-tidy/clang-tidy-zlib.yml

@@ -1,4 +1,6 @@
-# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
+# vim:set ft=yaml ts=2 sw=2 et:
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
 ---
 Checks: >
   -*,
@@ -6,6 +8,7 @@ Checks: >
     -bugprone-assignment-in-if-condition,
     -bugprone-easily-swappable-parameters,
     -bugprone-implicit-widening-of-multiplication-result,
+    -bugprone-inc-dec-in-conditions,
     -bugprone-macro-parentheses,
     -bugprone-narrowing-conversions,
     -bugprone-reserved-identifier,
@@ -13,7 +16,7 @@ Checks: >
   clang-analyzer-*,
     -clang-analyzer-optin.performance.Padding,
     -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
-  clang-diagnostics-*',
+  clang-diagnostic-*,
   performance-*,
 FormatStyle: file
 HeaderFilterRegex: '.*'

misc/analyze/clang-tidy/clang-tidy-zstd.yml

@@ -1,10 +1,13 @@
-# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
+# vim:set ft=yaml ts=2 sw=2 et:
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
 ---
 Checks: >
   -*,
   bugprone-*,
     -bugprone-assignment-in-if-condition,
     -bugprone-branch-clone,
+    -bugprone-casting-through-void,
     -bugprone-easily-swappable-parameters,
     -bugprone-implicit-widening-of-multiplication-result,
     -bugprone-macro-parentheses,
@@ -16,7 +19,7 @@ Checks: >
     -clang-analyzer-core.UndefinedBinaryOperatorResult,
     -clang-analyzer-deadcode.DeadStores,
     -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
-  clang-diagnostics-*',
+  clang-diagnostic-*,
   performance-*,
     -performance-no-int-to-ptr,
 FormatStyle: file

misc/analyze/clang-tidy/run-clang-tidy.py

@@ -257,7 +257,7 @@ def main():
     parser.add_argument(
         "-allow-enabling-alpha-checkers",
         action="store_true",
-        help="allow alpha checkers from " "clang-analyzer.",
+        help="allow alpha checkers from clang-analyzer.",
     )
     parser.add_argument(
         "-clang-tidy-binary", metavar="PATH", help="path to clang-tidy binary"
@@ -270,7 +270,7 @@ def main():
     parser.add_argument(
         "-checks",
         default=None,
-        help="checks filter, when not specified, use clang-tidy " "default",
+        help="checks filter, when not specified, use clang-tidy default",
     )
     config_group = parser.add_mutually_exclusive_group()
     config_group.add_argument(
@@ -303,15 +303,26 @@ def main():
     parser.add_argument(
         "-line-filter",
         default=None,
-        help="List of files with line ranges to filter the" "warnings.",
+        help="List of files with line ranges to filter the warnings.",
     )
     if yaml:
         parser.add_argument(
             "-export-fixes",
-            metavar="filename",
+            metavar="file_or_directory",
             dest="export_fixes",
-            help="Create a yaml file to store suggested fixes in, "
-            "which can be applied with clang-apply-replacements.",
+            help="A directory or a yaml file to store suggested fixes in, "
+            "which can be applied with clang-apply-replacements. If the "
+            "parameter is a directory, the fixes of each compilation unit are "
+            "stored in individual yaml files in the directory.",
+        )
+    else:
+        parser.add_argument(
+            "-export-fixes",
+            metavar="directory",
+            dest="export_fixes",
+            help="A directory to store suggested fixes in, which can be applied "
+            "with clang-apply-replacements. The fixes of each compilation unit are "
+            "stored in individual yaml files in the directory.",
         )
     parser.add_argument(
         "-j",
@@ -324,12 +335,12 @@ def main():
     )
     parser.add_argument("-fix", action="store_true", help="apply fix-its")
     parser.add_argument(
-        "-format", action="store_true", help="Reformat code " "after applying fixes"
+        "-format", action="store_true", help="Reformat code after applying fixes"
     )
     parser.add_argument(
         "-style",
         default="file",
-        help="The style of reformat " "code after applying fixes",
+        help="The style of reformat code after applying fixes",
     )
     parser.add_argument(
         "-use-color",
@@ -348,14 +359,14 @@ def main():
         dest="extra_arg",
         action="append",
         default=[],
-        help="Additional argument to append to the compiler " "command line.",
+        help="Additional argument to append to the compiler command line.",
     )
     parser.add_argument(
         "-extra-arg-before",
         dest="extra_arg_before",
         action="append",
         default=[],
-        help="Additional argument to prepend to the compiler " "command line.",
+        help="Additional argument to prepend to the compiler command line.",
     )
     parser.add_argument(
         "-quiet", action="store_true", help="Run clang-tidy in quiet mode"
@@ -370,7 +381,7 @@ def main():
     parser.add_argument(
         "-warnings-as-errors",
         default=None,
-        help="Upgrades warnings to errors. Same format as " "'-checks'",
+        help="Upgrades warnings to errors. Same format as '-checks'",
     )
     args = parser.parse_args()
 
@@ -384,12 +395,35 @@ def main():
 
     clang_tidy_binary = find_binary(args.clang_tidy_binary, "clang-tidy", build_path)
 
-    tmpdir = None
     if args.fix:
         clang_apply_replacements_binary = find_binary(
             args.clang_apply_replacements_binary, "clang-apply-replacements", build_path
         )
-        tmpdir = tempfile.mkdtemp()
+
+    combine_fixes = False
+    export_fixes_dir = None
+    delete_fixes_dir = False
+    if args.export_fixes is not None:
+        # if a directory is given, create it if it does not exist
+        if args.export_fixes.endswith(os.path.sep) and not os.path.isdir(
+            args.export_fixes
+        ):
+            os.makedirs(args.export_fixes)
+
+        if not os.path.isdir(args.export_fixes):
+            if not yaml:
+                raise RuntimeError(
+                    "Cannot combine fixes in one yaml file. Either install PyYAML or specify an output directory."
+                )
+
+            combine_fixes = True
+
+        if os.path.isdir(args.export_fixes):
+            export_fixes_dir = args.export_fixes
+
+    if export_fixes_dir is None and (args.fix or combine_fixes):
+        export_fixes_dir = tempfile.mkdtemp()
+        delete_fixes_dir = True
 
     # Load the database and extract all files.
     database = json.load(open(os.path.join(build_path, db_path)))
@@ -408,8 +442,8 @@ def main():
             matched_files.append(name)
     files = sorted(matched_files)
     if not files:
-        if tmpdir:
-            shutil.rmtree(tmpdir)
+        if delete_fixes_dir:
+            shutil.rmtree(export_fixes_dir)
         sys.exit(0)
 
     try:
@@ -460,7 +494,7 @@ def main():
                 args=(
                     args,
                     clang_tidy_binary,
-                    tmpdir,
+                    export_fixes_dir,
                     build_path,
                     task_queue,
                     lock,
@@ -484,14 +518,14 @@ def main():
         # This is a sad hack. Unfortunately subprocess goes
         # bonkers with ctrl-c and we start forking merrily.
         print("\nCtrl-C detected, goodbye.")
-        if tmpdir:
-            shutil.rmtree(tmpdir)
+        if delete_fixes_dir:
+            shutil.rmtree(export_fixes_dir)
         os.kill(0, 9)
 
-    if yaml and args.export_fixes:
+    if combine_fixes:
         print("Writing fixes to " + args.export_fixes + " ...")
         try:
-            merge_replacement_files(tmpdir, args.export_fixes)
+            merge_replacement_files(export_fixes_dir, args.export_fixes)
         except:
             print("Error exporting fixes.\n", file=sys.stderr)
             traceback.print_exc()
@@ -500,14 +534,14 @@ def main():
     if args.fix:
         print("Applying fixes ...")
         try:
-            apply_fixes(args, clang_apply_replacements_binary, tmpdir)
+            apply_fixes(args, clang_apply_replacements_binary, export_fixes_dir)
         except:
             print("Error applying fixes.\n", file=sys.stderr)
             traceback.print_exc()
             return_code = 1
 
-    if tmpdir:
-        shutil.rmtree(tmpdir)
+    if delete_fixes_dir:
+        shutil.rmtree(export_fixes_dir)
     sys.exit(return_code)
 
 

misc/cmake/functions.cmake

@@ -0,0 +1,455 @@
+#
+# UPX "CMake" build file; see https://cmake.org/
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
+
+# set USE_STRICT_DEFAULTS
+if(NOT DEFINED USE_STRICT_DEFAULTS AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+    include("${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/use_strict_defaults.cmake" OPTIONAL)
+endif()
+if(NOT DEFINED USE_STRICT_DEFAULTS)
+    # use permissive config defaults when building from source code tarball
+    set(USE_STRICT_DEFAULTS FALSE CACHE INTERNAL "" FORCE)
+endif()
+
+#***********************************************************************
+# macros
+#***********************************************************************
+
+# support config hooks; developer convenience
+macro(upx_cmake_include_hook section)
+    include("${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/hooks/CMakeLists.${section}.txt" OPTIONAL)
+    include("${CMAKE_CURRENT_SOURCE_DIR}/maint/make/CMakeLists.${section}.txt" OPTIONAL)
+endmacro()
+
+# Disallow in-source build. Note that you will still have to manually
+# clean up a few files if you accidentally try an in-source build.
+macro(upx_disallow_in_source_build)
+    set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+    set(CMAKE_DISABLE_SOURCE_CHANGES  ON)
+    if(",${CMAKE_CURRENT_SOURCE_DIR}," STREQUAL ",${CMAKE_CURRENT_BINARY_DIR},")
+        # try to clean up (does not work)
+        #file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/CMakeCache.txt")
+        #file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cmake.check_cache")
+        message(FATAL_ERROR "ERROR: In-source builds are not allowed, please use an extra build dir.")
+    endif()
+endmacro()
+
+# ternary conditional operator
+macro(upx_ternary result_var_name condition true_value false_value)
+    if(${condition})
+        set(${result_var_name} "${true_value}")
+    else()
+        set(${result_var_name} "${false_value}")
+    endif()
+endmacro()
+
+# set the default build type; must be called BEFORE project() cmake init
+macro(upx_set_default_build_type type)
+    set(upx_global_default_build_type "${type}")
+    get_property(upx_global_is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    if(NOT upx_global_is_multi_config AND NOT CMAKE_BUILD_TYPE)
+        set(CMAKE_BUILD_TYPE "${upx_global_default_build_type}" CACHE STRING "Choose the type of build." FORCE)
+    endif()
+    # also enable some global settings by default
+    if(NOT DEFINED CMAKE_C_STANDARD_REQUIRED)
+        set(CMAKE_C_STANDARD_REQUIRED ON)
+    endif()
+    if(NOT DEFINED CMAKE_CXX_STANDARD_REQUIRED)
+        set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    endif()
+    if(NOT DEFINED CMAKE_EXPORT_COMPILE_COMMANDS)
+        set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+    endif()
+endmacro()
+
+# set the default multi-config build type; must be called AFTER project() cmake init
+macro(upx_apply_build_type)
+    if(upx_global_is_multi_config)
+        set(c "${CMAKE_CONFIGURATION_TYPES}")
+        list(INSERT c 0 "${upx_global_default_build_type}")
+        if(CMAKE_BUILD_TYPE)
+            list(INSERT c 0 "${CMAKE_BUILD_TYPE}")
+        endif()
+        list(REMOVE_DUPLICATES c)
+        set(CMAKE_CONFIGURATION_TYPES "${c}" CACHE STRING "List of supported configuration types." FORCE)
+    endif()
+    # now also set the build type for use in try_compile()
+    if(NOT CMAKE_TRY_COMPILE_CONFIGURATION)
+        if(CMAKE_BUILD_TYPE)
+            set(CMAKE_TRY_COMPILE_CONFIGURATION "${CMAKE_BUILD_TYPE}")
+        else()
+            set(CMAKE_TRY_COMPILE_CONFIGURATION "${upx_global_default_build_type}")
+        endif()
+    endif()
+endmacro()
+
+# set MINGW, MSVC_FRONTEND, GNU_FRONTEND and MSVC_SIMULATE
+macro(upx_set_global_vars)
+    if(NOT DEFINED MINGW AND CMAKE_C_PLATFORM_ID MATCHES "^MinGW")
+        set(MINGW 1)
+    endif()
+    if(NOT DEFINED MSVC_FRONTEND AND (MSVC OR CMAKE_C_COMPILER_FRONTEND_VARIANT MATCHES "^MSVC"))
+        set(MSVC_FRONTEND 1)
+    elseif(NOT DEFINED GNU_FRONTEND AND (CMAKE_C_COMPILER_FRONTEND_VARIANT MATCHES "^GNU" OR CMAKE_C_COMPILER_ID MATCHES "(Clang|GNU|LLVM)"))
+        set(GNU_FRONTEND 1)
+    endif()
+    if(NOT DEFINED MSVC_SIMULATE AND (CMAKE_C_SIMULATE_ID MATCHES "^MSVC"))
+        set(MSVC_SIMULATE 1)
+    endif()
+endmacro()
+
+# useful for CI jobs: check for working BUILD_RPATH
+macro(upx_check_working_build_rpath var_name)
+    if(WIN32 OR MINGW OR CYGWIN)
+        # always works; DLLs reside next to the executables
+        set(${var_name} ON)
+        upx_cache_bool_vars(ON ${var_name})
+    elseif(CMAKE_BUILD_WITH_INSTALL_RPATH OR CMAKE_SKIP_RPATH OR CMAKE_SKIP_BUILD_RPATH)
+        # cannot work; BUILD_RPATH is disabled by global CMake settings
+        set(${var_name} OFF)
+        upx_cache_bool_vars(OFF ${var_name})
+    else()
+        # we do not know if/how the BUILD_RPATH is set; be cautious by default
+        upx_cache_bool_vars(OFF ${var_name})
+    endif()
+endmacro()
+
+#***********************************************************************
+# util
+#***********************************************************************
+
+# convert to CMake bool
+function(upx_make_bool_var result_var_name var_name default_value)
+    set(result "${default_value}")
+    # only query $var_name if it is defined and not empty
+    if(NOT ",${var_name}," STREQUAL ",,")
+        if(DEFINED ${var_name})
+            if(NOT ",${${var_name}}," STREQUAL ",,")
+                set(result "${${var_name}}")
+            endif()
+        endif()
+    endif()
+    if(${result})
+        set(result ON)
+    else()
+        set(result OFF)
+    endif()
+    set(${result_var_name} "${result}" PARENT_SCOPE) # return value
+endfunction()
+
+function(upx_maybe_unused_var) # ARGV
+    foreach(var_name ${ARGV})
+        if(DEFINED ${var_name})
+            set(dummy "${${var_name}}")
+        endif()
+    endforeach()
+endfunction()
+
+function(upx_print_var) # ARGV
+    foreach(var_name ${ARGV})
+        if(DEFINED ${var_name})
+            if(NOT ",${${var_name}}," STREQUAL ",,")
+                if(${var_name})
+                    message(STATUS "${var_name} = ${${var_name}}")
+                endif()
+            endif()
+        endif()
+    endforeach()
+endfunction()
+
+function(upx_print_env_var) # ARGV
+    foreach(var_name ${ARGV})
+        if(DEFINED ENV{${var_name}})
+            if(NOT ",$ENV{${var_name}}," STREQUAL ",,")
+                message(STATUS "ENV{${var_name}} = '$ENV{${var_name}}'")
+            endif()
+        endif()
+    endforeach()
+endfunction()
+
+function(upx_print_have_symbol) # ARGV; needs include(CheckSymbolExists)
+    set(rq "${CMAKE_REQUIRED_QUIET}")
+    set(CMAKE_REQUIRED_QUIET ON)
+    foreach(symbol ${ARGV})
+        set(cache_var_name "HAVE_symbol_${symbol}")
+        check_symbol_exists("${symbol}" "limits.h;stddef.h;stdint.h" "${cache_var_name}")
+        if(${cache_var_name})
+            message(STATUS "HAVE_symbol ${symbol}")
+        endif()
+    endforeach()
+    set(CMAKE_REQUIRED_QUIET "${rq}")
+endfunction()
+
+# examine compiler configuration
+function(upx_print_common_symbols)
+    upx_print_have_symbol(__FAST_MATH__)
+    upx_print_have_symbol(__PIC__ __pic__ __PIE__ __pie__)
+endfunction()
+
+# examine MinGW/Cygwin compiler configuration
+function(upx_print_mingw_symbols)
+    if(WIN32 OR MINGW OR CYGWIN)
+        if(CMAKE_C_COMPILER_ID MATCHES "(Clang|GNU)")
+            # runtime library: msvcrt vs ucrt vs cygwin
+            upx_print_have_symbol(__CRTDLL__ __CYGWIN__ __CYGWIN32__ __CYGWIN64__ __MINGW32__ __MINGW64__ __MINGW64_VERSION_MAJOR __MSVCRT__ __MSVCRT_VERSION__ _UCRT _WIN32 _WIN32_WINNT _WIN64)
+            # exception handing: SJLJ (setjmp/longjmp) vs DWARF vs SEH
+            upx_print_have_symbol(__GCC_HAVE_DWARF2_CFI_ASM __SEH__ __USING_SJLJ_EXCEPTIONS__)
+            # threads: win32 vs posix/pthread/winpthreads vs mcfgthread
+            upx_print_have_symbol(_REENTRANT __USING_MCFGTHREAD__)
+        endif()
+    endif()
+endfunction()
+
+# add wildcard expansions to a variable
+function(upx_add_glob_files) # ARGV
+    set(var_name ${ARGV0})
+    list(REMOVE_AT ARGV 0)
+    if(${CMAKE_VERSION} VERSION_LESS "3.3")
+        file(GLOB files ${ARGV})
+    else()
+        file(GLOB files LIST_DIRECTORIES false ${ARGV})
+    endif()
+    set(result "")
+    if(DEFINED ${var_name})
+        set(result "${${var_name}}")
+    endif()
+    list(APPEND result "${files}")
+    list(SORT result)
+    list(REMOVE_DUPLICATES result)
+    #message(STATUS "upx_add_glob_files: ${var_name} = ${result}")
+    set(${var_name} "${result}" PARENT_SCOPE) # return value
+endfunction()
+
+# remove wildcard expansions from a variable
+function(upx_remove_glob_files) # ARGV
+    set(var_name ${ARGV0})
+    list(REMOVE_AT ARGV 0)
+    file(GLOB files ${ARGV})
+    set(result "")
+    if(DEFINED ${var_name})
+        set(result "${${var_name}}")
+        foreach(file ${files})
+            list(REMOVE_ITEM result "${file}")
+        endforeach()
+        list(SORT result)
+        list(REMOVE_DUPLICATES result)
+    endif()
+    #message(STATUS "upx_remove_glob_files: ${var_name} = ${result}")
+    set(${var_name} "${result}" PARENT_SCOPE) # return value
+endfunction()
+
+# useful for CI jobs: allow settings via environment and cache result
+function(upx_cache_bool_vars) # ARGV
+    set(default_value "${ARGV0}")
+    list(REMOVE_AT ARGV 0)
+    foreach(var_name ${ARGV})
+        set(value ${default_value})
+        if(DEFINED UPX_CACHE_VALUE_${var_name})     # check cache
+            set(value "${UPX_CACHE_VALUE_${var_name}}")
+        elseif(DEFINED ${var_name})                 # defined via "cmake -DXXX=YYY"
+            set(value "${${var_name}}")
+        elseif(DEFINED ENV{${var_name}})            # check environment
+            if("$ENV{${var_name}}" MATCHES "^(0|1|OFF|ON|FALSE|TRUE|off|on|false|true)$")
+                set(value "$ENV{${var_name}}")
+                set(UPX_CACHE_ORIGIN_FROM_ENV_${var_name} TRUE CACHE INTERNAL "" FORCE) # for status message below
+            endif()
+        endif()
+        # convert to bool
+        if(value)
+            set(value ON)
+        else()
+            set(value OFF)
+        endif()
+        # store result
+        if(UPX_CACHE_ORIGIN_FROM_ENV_${var_name})
+            message(STATUS "setting from environment: ${var_name} = ${value}")
+        endif()
+        set(${var_name} "${value}" PARENT_SCOPE) # store result
+        set(UPX_CACHE_VALUE_${var_name} "${value}" CACHE INTERNAL "" FORCE) # and store in cache
+    endforeach()
+endfunction()
+
+function(upx_platform_check_mismatch var_name_1 var_name_2)
+    if(DEFINED ${var_name_1} OR DEFINED ${var_name_2})
+        if(NOT ",${${var_name_1}}," STREQUAL ",${${var_name_2}},")
+            if(UPX_CONFIG_DISABLE_WERROR)
+                message(WARNING "WARNING: '${var_name_1}' '${var_name_2}' mismatch")
+            else()
+                message(FATAL_ERROR "FATAL ERROR: '${var_name_1}' '${var_name_2}' mismatch")
+            endif()
+        endif()
+    endif()
+endfunction()
+
+# check for incompatible C vs CXX settings
+function(upx_platform_check_c_cxx_mismatch)
+    upx_platform_check_mismatch(CMAKE_C_PLATFORM_ID CMAKE_CXX_PLATFORM_ID)
+    upx_platform_check_mismatch(CMAKE_C_SIMULATE_ID CMAKE_CXX_SIMULATE_ID)
+    upx_platform_check_mismatch(CMAKE_C_COMPILER_ABI CMAKE_CXX_COMPILER_ABI)
+    upx_platform_check_mismatch(CMAKE_C_COMPILER_FRONTEND_VARIANT CMAKE_CXX_COMPILER_FRONTEND_VARIANT)
+endfunction()
+
+#***********************************************************************
+# compilation flags
+#***********************************************************************
+
+function(upx_internal_add_definitions_with_prefix) # ARGV; needs include(CheckCCompilerFlag)
+    set(flag_prefix "${ARGV0}")
+    if("${flag_prefix}" MATCHES "^empty$") # need "empty" to work around bug in old CMake versions
+        set(flag_prefix "")
+    endif()
+    list(REMOVE_AT ARGV 0)
+    set(failed "")
+    foreach(f ${ARGV})
+        set(flag "${flag_prefix}${f}")
+        string(REGEX REPLACE "[^0-9a-zA-Z_]" "_" cache_var_name "HAVE_CFLAG_${flag}")
+        check_c_compiler_flag("${flag}" ${cache_var_name})
+        if(${cache_var_name})
+            #message(STATUS "add_definitions: ${flag}")
+            add_definitions("${flag}")
+        else()
+            list(APPEND failed "${f}")
+        endif()
+    endforeach()
+    set(failed_flags "${failed}" PARENT_SCOPE) # return value
+endfunction()
+
+function(upx_add_definitions) # ARGV; needs include(CheckCCompilerFlag)
+    set(failed_flags "")
+    if(MSVC_FRONTEND AND CMAKE_C_COMPILER_ID MATCHES "Clang")
+        # for clang-cl try "-clang:" flag prefix first
+        upx_internal_add_definitions_with_prefix("-clang:" ${ARGV})
+        upx_internal_add_definitions_with_prefix("empty" ${failed_flags})
+    else()
+        upx_internal_add_definitions_with_prefix("empty" ${ARGV})
+    endif()
+endfunction()
+
+# useful for CI jobs: allow target extra compile options
+function(upx_add_target_extra_compile_options) # ARGV
+    set(t "${ARGV0}")
+    list(REMOVE_AT ARGV 0)
+    foreach(var_name ${ARGV})
+        if(NOT DEFINED ${var_name})
+        elseif(",${${var_name}}," STREQUAL ",,")
+        else()
+            set(flags "${${var_name}}")
+            if(NOT flags MATCHES ";") # NOTE: split into list from string only if not already a list
+                if(${CMAKE_VERSION} VERSION_GREATER "3.8.99")
+                    separate_arguments(flags NATIVE_COMMAND "${flags}")
+                else()
+                    separate_arguments(flags)
+                endif()
+            endif()
+            target_compile_options(${t} PRIVATE "${flags}")
+        endif()
+    endforeach()
+endfunction()
+
+# compile a target with -O2 optimization even in Debug build
+function(upx_compile_target_debug_with_O2) # ARGV
+    foreach(t ${ARGV})
+        if(MSVC_FRONTEND)
+            # MSVC uses some Debug compilation options like -RTC1 that are incompatible with -O2
+        else()
+            target_compile_options(${t} PRIVATE $<$<CONFIG:Debug>:-O2>)
+        endif()
+    endforeach()
+endfunction()
+
+# compile a source file with -O2 optimization even in Debug build; messy because of CMake limitations
+function(upx_compile_source_debug_with_O2) # ARGV
+    set(flags "$<$<CONFIG:Debug>:-O2>")
+    if(${CMAKE_VERSION} VERSION_LESS "3.8")
+        # 3.8: The COMPILE_FLAGS source file property learned to support generator expressions
+        if(upx_global_is_multi_config OR NOT CMAKE_BUILD_TYPE MATCHES "^Debug$")
+            return()
+        endif()
+        set(flags "-O2")
+    endif()
+    if(CMAKE_GENERATOR MATCHES "Xcode") # multi-config
+        # NOTE: Xcode does not support per-config per-source COMPILE_FLAGS (as of CMake 3.27.7)
+        return()
+    endif()
+    foreach(source ${ARGV})
+        if(MSVC_FRONTEND)
+            # MSVC uses some Debug compilation options like -RTC1 that are incompatible with -O2
+        else()
+            get_source_file_property(prop "${source}" COMPILE_FLAGS)
+            if("${prop}" MATCHES "^(NOTFOUND)?$")
+                set_source_files_properties("${source}" PROPERTIES COMPILE_FLAGS "${flags}")
+            else()
+                set_source_files_properties("${source}" PROPERTIES COMPILE_FLAGS "${prop} ${flags}")
+            endif()
+        endif()
+    endforeach()
+endfunction()
+
+# sanitize a target; note that this may require special run-time support libs from your toolchain
+function(upx_sanitize_target) # ARGV
+    if(NOT DEFINED UPX_CONFIG_SANITIZE_FLAGS_DEBUG)
+        # default sanitizer for Debug builds
+        set(UPX_CONFIG_SANITIZE_FLAGS_DEBUG -fsanitize=undefined -fsanitize-undefined-trap-on-error -fstack-protector-all)
+    endif()
+    if(NOT DEFINED UPX_CONFIG_SANITIZE_FLAGS_RELEASE)
+        # default sanitizer for Release builds
+        set(UPX_CONFIG_SANITIZE_FLAGS_RELEASE -fstack-protector)
+    endif()
+    foreach(t ${ARGV})
+        if(UPX_CONFIG_DISABLE_SANITIZE)
+            # no-op
+        elseif(MSVC_FRONTEND)
+            # MSVC uses -GS (similar to -fstack-protector) by default
+        elseif(NOT GNU_FRONTEND)
+            # unknown compiler
+        elseif(MINGW OR CYGWIN)
+            # avoid link errors with current MinGW-w64 versions
+            # see https://www.mingw-w64.org/contribute/#sanitizers-asan-tsan-usan
+        elseif(CMAKE_C_COMPILER_ID MATCHES "^Clang$" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "9.0")
+            # unreliable/broken sanitize implementation before clang-9 (Sep 2019)
+            message(WARNING "WARNING: ignoring SANITIZE for target '${t}'")
+        elseif(CMAKE_C_COMPILER_ID MATCHES "^GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "8.0")
+            # unsupported compiler; unreliable/broken sanitize implementation before gcc-8 (May 2018)
+            message(WARNING "WARNING: ignoring SANITIZE for target '${t}'")
+        else()
+            target_compile_options(${t} PRIVATE $<$<CONFIG:Debug>:${UPX_CONFIG_SANITIZE_FLAGS_DEBUG}>)
+            target_compile_options(${t} PRIVATE $<$<CONFIG:MinSizeRel>:${UPX_CONFIG_SANITIZE_FLAGS_RELEASE}>)
+            target_compile_options(${t} PRIVATE $<$<CONFIG:Release>:${UPX_CONFIG_SANITIZE_FLAGS_RELEASE}>)
+            target_compile_options(${t} PRIVATE $<$<CONFIG:RelWithDebInfo>:${UPX_CONFIG_SANITIZE_FLAGS_RELEASE}>)
+            get_target_property(target_type ${t} TYPE)
+            if(NOT ",${target_type}," STREQUAL ",STATIC_LIBRARY,")
+            if(${CMAKE_VERSION} VERSION_GREATER "3.12.99")
+            target_link_options(${t} PRIVATE $<$<CONFIG:Debug>:${UPX_CONFIG_SANITIZE_FLAGS_DEBUG}>)
+            target_link_options(${t} PRIVATE $<$<CONFIG:MinSizeRel>:${UPX_CONFIG_SANITIZE_FLAGS_RELEASE}>)
+            target_link_options(${t} PRIVATE $<$<CONFIG:Release>:${UPX_CONFIG_SANITIZE_FLAGS_RELEASE}>)
+            target_link_options(${t} PRIVATE $<$<CONFIG:RelWithDebInfo>:${UPX_CONFIG_SANITIZE_FLAGS_RELEASE}>)
+            endif() # CMAKE_VERSION
+            endif() # target_type
+        endif()
+    endforeach()
+endfunction()
+
+#***********************************************************************
+# test
+#***********************************************************************
+
+function(upx_add_test) # ARGV
+    set(name "${ARGV0}")
+    list(REMOVE_AT ARGV 0)
+    set(wd "${CMAKE_CURRENT_BINARY_DIR}/XTesting/$<CONFIG>")
+    add_test(NAME "${name}" WORKING_DIRECTORY "${wd}" COMMAND ${ARGV})
+endfunction()
+
+function(upx_test_depends) # ARGV
+    set(name "${ARGV0}")
+    list(REMOVE_AT ARGV 0)
+    get_property(prop TEST "${name}" PROPERTY DEPENDS)
+    if("${prop}" MATCHES "^(NOTFOUND)?$")
+        set_tests_properties("${name}" PROPERTIES DEPENDS "${ARGV}")
+    else()
+        set_tests_properties("${name}" PROPERTIES DEPENDS "${prop};${ARGV}")
+    endif()
+endfunction()
+
+# vim:set ft=cmake ts=4 sw=4 tw=0 et:

misc/cmake/print_info.cmake

@@ -0,0 +1,62 @@
+#
+# UPX "CMake" build file; see https://cmake.org/
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
+
+#***********************************************************************
+# summary section
+# print some info about the build configuration
+#***********************************************************************
+
+function(upx_print_info)
+    get_property(PROPERTY_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    get_property(PROPERTY_TARGET_SUPPORTS_SHARED_LIBS GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
+
+    # generator
+    upx_print_var(CMAKE_GENERATOR_TOOLSET CMAKE_GENERATOR_PLATFORM)
+    upx_print_var(PROPERTY_GENERATOR_IS_MULTI_CONFIG)
+
+    # directories
+    if(NOT ",${CMAKE_BINARY_DIR}," STREQUAL ",${CMAKE_CURRENT_BINARY_DIR}," OR NOT ",${CMAKE_SOURCE_DIR}," STREQUAL ",${CMAKE_CURRENT_SOURCE_DIR},")
+        upx_print_var(CMAKE_BINARY_DIR CMAKE_SOURCE_DIR CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_SOURCE_DIR)
+    endif()
+
+    # system
+    upx_print_var(CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_SYSTEM_PROCESSOR)
+    upx_print_var(CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION CMAKE_SYSTEM_PROCESSOR)
+    upx_print_var(CMAKE_ANDROID_NDK CMAKE_ANDROID_NDK_VERSION CMAKE_ANDROID_STANDALONE_TOOLCHAIN)
+    upx_print_var(CMAKE_APPLE_SILICON_PROCESSOR CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT)
+    upx_print_var(CMAKE_VS_PLATFORM_TOOLSET CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE CMAKE_VS_PLATFORM_TOOLSET_VERSION)
+    upx_print_var(CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR)
+    upx_print_var(CMAKE_SIZEOF_VOID_P)
+
+    # binutils
+    upx_print_var(CMAKE_EXECUTABLE_FORMAT CMAKE_EXECUTABLE_SUFFIX UPX_CONFIG_CMAKE_EXECUTABLE_SUFFIX)
+    upx_print_var(CMAKE_AR CMAKE_RANLIB)
+
+    # compilers
+    foreach(lang IN ITEMS ASM C CXX)
+        upx_print_var(CMAKE_${lang}_COMPILER_LAUNCHER)
+        upx_print_var(CMAKE_${lang}_COMPILER)
+        upx_print_var(CMAKE_${lang}_COMPILER_ARG1)
+        upx_print_var(CMAKE_${lang}_COMPILER_ID)
+        upx_print_var(CMAKE_${lang}_SIMULATE_ID)
+        upx_print_var(CMAKE_${lang}_COMPILER_VERSION)
+        upx_print_var(CMAKE_${lang}_COMPILER_FRONTEND_VARIANT )
+        upx_print_var(CMAKE_${lang}_COMPILER_ARCHITECTURE_ID)
+        upx_print_var(CMAKE_${lang}_PLATFORM_ID)
+        upx_print_var(CMAKE_${lang}_COMPILER_ABI)
+        upx_print_var(CMAKE_${lang}_COMPILER_TARGET)
+    endforeach()
+
+    # misc
+    upx_print_var(CMAKE_BUILD_WITH_INSTALL_RPATH CMAKE_SKIP_RPATH CMAKE_SKIP_BUILD_RPATH CMAKE_SKIP_INSTALL_RPATH)
+    upx_print_var(CMAKE_INTERPROCEDURAL_OPTIMIZATION CMAKE_POSITION_INDEPENDENT_CODE)
+    upx_print_var(PROPERTY_TARGET_SUPPORTS_SHARED_LIBS)
+    upx_print_var(UPX_CONFIG_SANITIZE_FLAGS_DEBUG UPX_CONFIG_SANITIZE_FLAGS_RELEASE)
+
+    # shortcuts
+    upx_print_var(APPLE CLANG CYGWIN GNU_FRONTEND GNUC MINGW MSVC MSVC_FRONTEND MSVC_IDE MSVC_SIMULATE MSVC_TOOLSET_VERSION MSVC_VERSION MSYS UNIX WIN32 WIN64)
+endfunction()
+
+# vim:set ft=cmake ts=4 sw=4 tw=0 et:

misc/cmake/self_pack_test.cmake

@@ -0,0 +1,148 @@
+#
+# UPX "CMake" build file; see https://cmake.org/
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
+
+#***********************************************************************
+# test section: self-pack tests
+#
+# IMPORTANT NOTE: these tests can only work if the host executable format
+#   is supported by UPX!
+#***********************************************************************
+
+set(emu "")
+if(DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    set(emu "${CMAKE_CROSSCOMPILING_EMULATOR}")
+endif()
+set(exe "${CMAKE_EXECUTABLE_SUFFIX}")
+set(upx_self_exe "$<TARGET_FILE:upx>")
+set(fo "--force-overwrite")
+
+#
+# basic tests
+#
+
+upx_add_test(upx-self-pack          upx -3               "${upx_self_exe}" ${fo} -o upx-packed${exe})
+upx_add_test(upx-self-pack-fa       upx -3 --all-filters "${upx_self_exe}" ${fo} -o upx-packed-fa${exe})
+upx_add_test(upx-self-pack-fn       upx -3 --no-filter   "${upx_self_exe}" ${fo} -o upx-packed-fn${exe})
+upx_add_test(upx-self-pack-fr       upx -3 --all-filters --debug-use-random-filter "${upx_self_exe}" ${fo} -o upx-packed-fr${exe})
+upx_add_test(upx-self-pack-nrv2b    upx -3 --nrv2b       "${upx_self_exe}" ${fo} -o upx-packed-nrv2b${exe})
+upx_add_test(upx-self-pack-nrv2d    upx -3 --nrv2d       "${upx_self_exe}" ${fo} -o upx-packed-nrv2d${exe})
+upx_add_test(upx-self-pack-nrv2e    upx -3 --nrv2e       "${upx_self_exe}" ${fo} -o upx-packed-nrv2e${exe})
+upx_add_test(upx-self-pack-lzma     upx -1 --lzma        "${upx_self_exe}" ${fo} -o upx-packed-lzma${exe})
+
+upx_add_test(upx-list               upx -l         upx-packed${exe} upx-packed-fa${exe} upx-packed-fn${exe} upx-packed-fr${exe} upx-packed-nrv2b${exe} upx-packed-nrv2d${exe} upx-packed-nrv2e${exe} upx-packed-lzma${exe})
+upx_add_test(upx-fileinfo           upx --fileinfo upx-packed${exe} upx-packed-fa${exe} upx-packed-fn${exe} upx-packed-fr${exe} upx-packed-nrv2b${exe} upx-packed-nrv2d${exe} upx-packed-nrv2e${exe} upx-packed-lzma${exe})
+upx_add_test(upx-test               upx -t         upx-packed${exe} upx-packed-fa${exe} upx-packed-fn${exe} upx-packed-fr${exe} upx-packed-nrv2b${exe} upx-packed-nrv2d${exe} upx-packed-nrv2e${exe} upx-packed-lzma${exe})
+
+upx_add_test(upx-unpack             upx -d upx-packed${exe}       ${fo} -o upx-unpacked${exe})
+upx_add_test(upx-unpack-fa          upx -d upx-packed-fa${exe}    ${fo} -o upx-unpacked-fa${exe})
+upx_add_test(upx-unpack-fn          upx -d upx-packed-fn${exe}    ${fo} -o upx-unpacked-fn${exe})
+upx_add_test(upx-unpack-fr          upx -d upx-packed-fr${exe}    ${fo} -o upx-unpacked-fr${exe})
+upx_add_test(upx-unpack-nrv2b       upx -d upx-packed-nrv2b${exe} ${fo} -o upx-unpacked-nrv2b${exe})
+upx_add_test(upx-unpack-nrv2d       upx -d upx-packed-nrv2d${exe} ${fo} -o upx-unpacked-nrv2d${exe})
+upx_add_test(upx-unpack-nrv2e       upx -d upx-packed-nrv2e${exe} ${fo} -o upx-unpacked-nrv2e${exe})
+upx_add_test(upx-unpack-lzma        upx -d upx-packed-lzma${exe}  ${fo} -o upx-unpacked-lzma${exe})
+
+# all unpacked files must be identical
+upx_add_test(upx-compare-fa         "${CMAKE_COMMAND}" -E compare_files upx-unpacked${exe} upx-unpacked-fa${exe})
+upx_add_test(upx-compare-fn         "${CMAKE_COMMAND}" -E compare_files upx-unpacked${exe} upx-unpacked-fn${exe})
+upx_add_test(upx-compare-fr         "${CMAKE_COMMAND}" -E compare_files upx-unpacked${exe} upx-unpacked-fr${exe})
+upx_add_test(upx-compare-nrv2b      "${CMAKE_COMMAND}" -E compare_files upx-unpacked${exe} upx-unpacked-nrv2b${exe})
+upx_add_test(upx-compare-nrv2d      "${CMAKE_COMMAND}" -E compare_files upx-unpacked${exe} upx-unpacked-nrv2d${exe})
+upx_add_test(upx-compare-nrv2e      "${CMAKE_COMMAND}" -E compare_files upx-unpacked${exe} upx-unpacked-nrv2e${exe})
+upx_add_test(upx-compare-lzma       "${CMAKE_COMMAND}" -E compare_files upx-unpacked${exe} upx-unpacked-lzma${exe})
+
+# test dependencies
+upx_test_depends(upx-list           "upx-self-pack;upx-self-pack-fa;upx-self-pack-fn;upx-self-pack-fr;upx-self-pack-nrv2b;upx-self-pack-nrv2d;upx-self-pack-nrv2e;upx-self-pack-lzma")
+upx_test_depends(upx-fileinfo       "upx-self-pack;upx-self-pack-fa;upx-self-pack-fn;upx-self-pack-fr;upx-self-pack-nrv2b;upx-self-pack-nrv2d;upx-self-pack-nrv2e;upx-self-pack-lzma")
+upx_test_depends(upx-test           "upx-self-pack;upx-self-pack-fa;upx-self-pack-fn;upx-self-pack-fr;upx-self-pack-nrv2b;upx-self-pack-nrv2d;upx-self-pack-nrv2e;upx-self-pack-lzma")
+upx_test_depends(upx-unpack         upx-self-pack)
+upx_test_depends(upx-unpack-fa      upx-self-pack-fa)
+upx_test_depends(upx-unpack-fn      upx-self-pack-fn)
+upx_test_depends(upx-unpack-fr      upx-self-pack-fr)
+upx_test_depends(upx-unpack-nrv2b   upx-self-pack-nrv2b)
+upx_test_depends(upx-unpack-nrv2d   upx-self-pack-nrv2d)
+upx_test_depends(upx-unpack-nrv2e   upx-self-pack-nrv2e)
+upx_test_depends(upx-unpack-lzma    upx-self-pack-lzma)
+upx_test_depends(upx-compare-fa     "upx-unpack;upx-unpack-fa")
+upx_test_depends(upx-compare-fn     "upx-unpack;upx-unpack-fn")
+upx_test_depends(upx-compare-fr     "upx-unpack;upx-unpack-fr")
+upx_test_depends(upx-compare-nrv2b  "upx-unpack;upx-unpack-nrv2b")
+upx_test_depends(upx-compare-nrv2d  "upx-unpack;upx-unpack-nrv2d")
+upx_test_depends(upx-compare-nrv2e  "upx-unpack;upx-unpack-nrv2e")
+upx_test_depends(upx-compare-lzma   "upx-unpack;upx-unpack-lzma")
+# tests with higher COST values will run first
+set_tests_properties(upx-self-pack       PROPERTIES COST 90)
+set_tests_properties(upx-self-pack-fa    PROPERTIES COST 20)
+set_tests_properties(upx-self-pack-fn    PROPERTIES COST 20)
+set_tests_properties(upx-self-pack-fr    PROPERTIES COST 20)
+set_tests_properties(upx-self-pack-nrv2b PROPERTIES COST 20)
+set_tests_properties(upx-self-pack-nrv2d PROPERTIES COST 20)
+set_tests_properties(upx-self-pack-nrv2e PROPERTIES COST 20)
+set_tests_properties(upx-self-pack-lzma  PROPERTIES COST 30)
+set_tests_properties(upx-unpack          PROPERTIES COST 10)
+
+if(NOT UPX_CONFIG_DISABLE_RUN_UNPACKED_TEST)
+    upx_add_test(upx-run-unpacked           ${emu} ./upx-unpacked${exe} --version-short)
+    upx_test_depends(upx-run-unpacked       upx-unpack)
+endif()
+
+if(NOT UPX_CONFIG_DISABLE_RUN_PACKED_TEST)
+    upx_add_test(upx-run-packed             ${emu} ./upx-packed${exe}       --version-short)
+    upx_add_test(upx-run-packed-fa          ${emu} ./upx-packed-fa${exe}    --version-short)
+    upx_add_test(upx-run-packed-fn          ${emu} ./upx-packed-fn${exe}    --version-short)
+    upx_add_test(upx-run-packed-fr          ${emu} ./upx-packed-fr${exe}    --version-short)
+    upx_add_test(upx-run-packed-nrv2b       ${emu} ./upx-packed-nrv2b${exe} --version-short)
+    upx_add_test(upx-run-packed-nrv2d       ${emu} ./upx-packed-nrv2d${exe} --version-short)
+    upx_add_test(upx-run-packed-nrv2e       ${emu} ./upx-packed-nrv2e${exe} --version-short)
+    upx_add_test(upx-run-packed-lzma        ${emu} ./upx-packed-lzma${exe}  --version-short)
+    upx_test_depends(upx-run-packed         upx-self-pack)
+    upx_test_depends(upx-run-packed-fa      upx-self-pack-fa)
+    upx_test_depends(upx-run-packed-fn      upx-self-pack-fn)
+    upx_test_depends(upx-run-packed-fr      upx-self-pack-fr)
+    upx_test_depends(upx-run-packed-nrv2b   upx-self-pack-nrv2b)
+    upx_test_depends(upx-run-packed-nrv2d   upx-self-pack-nrv2d)
+    upx_test_depends(upx-run-packed-nrv2e   upx-self-pack-nrv2e)
+    upx_test_depends(upx-run-packed-lzma    upx-self-pack-lzma)
+endif()
+
+#
+# exhaustive tests
+#
+
+if(NOT UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS)
+    foreach(method IN ITEMS nrv2b nrv2d nrv2e lzma)
+        foreach(level IN ITEMS 1 2 3 4 5 6 7)
+            set(s "${method}-${level}")
+            upx_add_test(upx-self-pack-${s}         upx --${method} -${level} --all-filters --debug-use-random-filter "${upx_self_exe}" ${fo} -o upx-packed-${s}${exe})
+            upx_add_test(upx-list-${s}              upx -l upx-packed-${s}${exe})
+            upx_add_test(upx-fileinfo-${s}          upx --fileinfo upx-packed-${s}${exe})
+            upx_add_test(upx-test-${s}              upx -t upx-packed-${s}${exe})
+            upx_add_test(upx-unpack-${s}            upx -d upx-packed-${s}${exe} ${fo} -o upx-unpacked-${s}${exe})
+            upx_add_test(upx-compare-${s}           "${CMAKE_COMMAND}" -E compare_files upx-unpacked${exe} upx-unpacked-${s}${exe})
+            upx_test_depends(upx-list-${s}          upx-self-pack-${s})
+            upx_test_depends(upx-fileinfo-${s}      upx-self-pack-${s})
+            upx_test_depends(upx-test-${s}          upx-self-pack-${s})
+            upx_test_depends(upx-unpack-${s}        upx-self-pack-${s})
+            upx_test_depends(upx-compare-${s}       "upx-unpack;upx-unpack-${s}")
+            if(method MATCHES "lzma")
+                set_tests_properties(upx-self-pack-${s} PROPERTIES COST "3${level}")
+            else()
+                set_tests_properties(upx-self-pack-${s} PROPERTIES COST "2${level}")
+            endif()
+            if(NOT UPX_CONFIG_DISABLE_RUN_PACKED_TEST)
+                upx_add_test(upx-run-packed-${s}        ${emu} ./upx-packed-${s}${exe} --version-short)
+                upx_test_depends(upx-run-packed-${s}    upx-self-pack-${s})
+            endif()
+        endforeach()
+    endforeach()
+endif() # UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS
+
+# clean up
+set(emu "")
+set(exe "")
+set(upx_self_exe "")
+set(fo "")
+
+# vim:set ft=cmake ts=4 sw=4 tw=0 et:

misc/cmake/try_compile/std_lock_guard.cpp

@@ -0,0 +1,10 @@
+// Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+#include <mutex>
+
+static std::mutex lock_mutex;
+
+int main() {
+    std::lock_guard<std::mutex> lock(lock_mutex);
+    return 0;
+}

misc/cmake/try_compile/types_abi.cpp

@@ -0,0 +1,22 @@
+// Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+#include <stddef.h>
+#include <stdint.h>
+
+// check ABI - require proper alignment of fundamental types for use in atomics
+static_assert(alignof(char) == sizeof(char), "");
+static_assert(alignof(signed char) == sizeof(signed char), "");
+static_assert(alignof(unsigned char) == sizeof(unsigned char), "");
+static_assert(alignof(short) == sizeof(short), "");
+static_assert(alignof(unsigned short) == sizeof(unsigned short), "");
+static_assert(alignof(int) == sizeof(int), "");
+static_assert(alignof(unsigned int) == sizeof(unsigned int), "");
+static_assert(alignof(long) == sizeof(long), "");
+static_assert(alignof(unsigned long) == sizeof(unsigned long), "");
+static_assert(alignof(ptrdiff_t) == sizeof(ptrdiff_t), "");
+static_assert(alignof(size_t) == sizeof(size_t), "");
+static_assert(alignof(intptr_t) == sizeof(intptr_t), "");
+static_assert(alignof(uintptr_t) == sizeof(uintptr_t), "");
+static_assert(alignof(void *) == sizeof(void *), "");
+
+int main() { return 0; }

misc/make/Makefile-extra.mk

@@ -0,0 +1,359 @@
+#
+# UPX top-level Makefile - needs GNU make and CMake >= 3.13
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
+
+ifeq ($(UPX_MAKEFILE_EXTRA_MK_INCLUDED),)
+override UPX_MAKEFILE_EXTRA_MK_INCLUDED := 1
+
+#***********************************************************************
+# support functions
+#***********************************************************************
+
+override check_defined   = $(foreach 1,$1,$(if $(filter undefined,$(origin $1)),$(error ERROR: variable '$1' is not defined),))
+override check_undefined = $(foreach 1,$1,$(if $(filter undefined,$(origin $1)),,$(error ERROR: variable '$1' is already defined)))
+
+# return "1" or empty-string
+override eq = $(if $(subst x$1,,x$2)$(subst x$2,,x$1),,1)
+override ne = $(if $(subst x$1,,x$2)$(subst x$2,,x$1),1,)
+
+override tolower = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))
+override toupper = $(subst a,A,$(subst b,B,$(subst c,C,$(subst d,D,$(subst e,E,$(subst f,F,$(subst g,G,$(subst h,H,$(subst i,I,$(subst j,J,$(subst k,K,$(subst l,L,$(subst m,M,$(subst n,N,$(subst o,O,$(subst p,P,$(subst q,Q,$(subst r,R,$(subst s,S,$(subst t,T,$(subst u,U,$(subst v,V,$(subst w,W,$(subst x,X,$(subst y,Y,$(subst z,Z,$1))))))))))))))))))))))))))
+
+# canonicalize the case of CMAKE_BUILD_TYPE to "Debug" and "Release"
+override cm_build_type = $(if $(call eq,$1,),$(error EMPTY-build-type),$(if $(call eq,$(call tolower,$1),debug),Debug,$(if $(call eq,$(call tolower,$1),release),Release,$(if $(call eq,$(call tolower,$1),none),None,$1))))
+
+#***********************************************************************
+# extra builds: some pre-defined build configurations
+#***********************************************************************
+
+$(call check_defined,run_config run_build)
+$(call check_undefined,run_config_and_build)
+
+define run_config_and_build
+	$(call run_config,$1,$2)
+	$(call run_build,$1,$2)
+endef
+
+# force building with clang/clang++
+build/extra/clang/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang/%: export CC  = clang
+build/extra/clang/%: export CXX = clang++
+
+# force building with clang/clang++ -m32
+build/extra/clang-m32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang-m32/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang-m32/%: export CC  = clang   -m32
+build/extra/clang-m32/%: export CXX = clang++ -m32
+
+# force building with clang/clang++ -mx32
+build/extra/clang-mx32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang-mx32/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang-mx32/%: export CC  = clang   -mx32
+build/extra/clang-mx32/%: export CXX = clang++ -mx32
+
+# force building with clang/clang++ -m64
+build/extra/clang-m64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang-m64/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang-m64/%: export CC  = clang   -m64
+build/extra/clang-m64/%: export CXX = clang++ -m64
+
+# force building with clang/clang++ -flto=auto
+build/extra/clang-lto-auto/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang-lto-auto/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang-lto-auto/%: export CC  = clang   -flto=auto
+build/extra/clang-lto-auto/%: export CXX = clang++ -flto=auto
+
+# force building with clang/clang++ -static
+build/extra/clang-static/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang-static/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang-static/%: export CC  = clang   -static
+build/extra/clang-static/%: export CXX = clang++ -static
+build/extra/clang-static/%: export UPX_CONFIG_DISABLE_SHARED_LIBS = ON
+
+# force building with clang/clang++ -static-pie
+build/extra/clang-static-pie/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang-static-pie/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang-static-pie/%: export CC  = clang   -static-pie -fPIE -Wno-unused-command-line-argument
+build/extra/clang-static-pie/%: export CXX = clang++ -static-pie -fPIE -Wno-unused-command-line-argument
+build/extra/clang-static-pie/%: export UPX_CONFIG_DISABLE_SHARED_LIBS = ON
+
+# force building with clang/clang++ -static -flto
+build/extra/clang-static-lto/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang-static-lto/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang-static-lto/%: export CC  = clang   -static -flto
+build/extra/clang-static-lto/%: export CXX = clang++ -static -flto
+build/extra/clang-static-lto/%: export UPX_CONFIG_DISABLE_SHARED_LIBS = ON
+
+# force building with clang/clang++ C++20 (and C17)
+build/extra/clang-std-cxx20/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang-std-cxx20/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang-std-cxx20/%: export CC  = clang   -std=gnu17
+build/extra/clang-std-cxx20/%: export CXX = clang++ -std=gnu++20
+build/extra/clang-std-cxx20/%: export UPX_CONFIG_DISABLE_C_STANDARD = ON
+build/extra/clang-std-cxx20/%: export UPX_CONFIG_DISABLE_CXX_STANDARD = ON
+
+# force building with clang/clang++ C++23 (and C23)
+build/extra/clang-std-cxx23/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/clang-std-cxx23/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/clang-std-cxx23/%: export CC  = clang   -std=gnu2x -Wno-constant-logical-operand
+build/extra/clang-std-cxx23/%: export CXX = clang++ -std=gnu++2b
+build/extra/clang-std-cxx23/%: export UPX_CONFIG_DISABLE_C_STANDARD = ON
+build/extra/clang-std-cxx23/%: export UPX_CONFIG_DISABLE_CXX_STANDARD = ON
+
+# force building with gcc/g++
+build/extra/gcc/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc/%: export CC  = gcc
+build/extra/gcc/%: export CXX = g++
+
+# force building with gcc/g++ -m32
+build/extra/gcc-m32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-m32/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-m32/%: export CC  = gcc -m32
+build/extra/gcc-m32/%: export CXX = g++ -m32
+
+# force building with gcc/g++ -mx32
+build/extra/gcc-mx32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-mx32/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-mx32/%: export CC  = gcc -mx32
+build/extra/gcc-mx32/%: export CXX = g++ -mx32
+
+# force building with gcc/g++ -m64
+build/extra/gcc-m64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-m64/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-m64/%: export CC  = gcc -m64
+build/extra/gcc-m64/%: export CXX = g++ -m64
+
+# force building with gcc/g++ -flto=auto
+build/extra/gcc-lto-auto/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-lto-auto/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-lto-auto/%: export CC  = gcc -flto=auto
+build/extra/gcc-lto-auto/%: export CXX = g++ -flto=auto
+
+# force building with gcc/g++ -static
+build/extra/gcc-static/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-static/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-static/%: export CC  = gcc -static
+build/extra/gcc-static/%: export CXX = g++ -static
+build/extra/gcc-static/%: export UPX_CONFIG_DISABLE_SHARED_LIBS = ON
+
+# force building with gcc/g++ -static-pie
+build/extra/gcc-static-pie/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-static-pie/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-static-pie/%: export CC  = gcc -static-pie -fPIE
+build/extra/gcc-static-pie/%: export CXX = g++ -static-pie -fPIE
+build/extra/gcc-static-pie/%: export UPX_CONFIG_DISABLE_SHARED_LIBS = ON
+
+# force building with gcc/g++ -static -flto
+build/extra/gcc-static-lto/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-static-lto/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-static-lto/%: export CC  = gcc -static -flto
+build/extra/gcc-static-lto/%: export CXX = g++ -static -flto
+build/extra/gcc-static-lto/%: export UPX_CONFIG_DISABLE_SHARED_LIBS = ON
+
+# force building with gcc/g++ C++20 (and C17)
+build/extra/gcc-std-cxx20/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-std-cxx20/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-std-cxx20/%: export CC  = gcc -std=gnu17
+build/extra/gcc-std-cxx20/%: export CXX = g++ -std=gnu++20
+build/extra/gcc-std-cxx20/%: export UPX_CONFIG_DISABLE_C_STANDARD = ON
+build/extra/gcc-std-cxx20/%: export UPX_CONFIG_DISABLE_CXX_STANDARD = ON
+
+# force building with gcc/g++ C++23 (and C23)
+build/extra/gcc-std-cxx23/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-std-cxx23/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-std-cxx23/%: export CC  = gcc -std=gnu2x
+build/extra/gcc-std-cxx23/%: export CXX = g++ -std=gnu++2b
+build/extra/gcc-std-cxx23/%: export UPX_CONFIG_DISABLE_C_STANDARD = ON
+build/extra/gcc-std-cxx23/%: export UPX_CONFIG_DISABLE_CXX_STANDARD = ON
+
+# force building with gcc/g++ C++26 (EXPERIMENTAL; need gcc-14)
+build/extra/gcc-std-cxx26/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/gcc-std-cxx26/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/gcc-std-cxx26/%: export CC  = gcc -std=gnu23
+build/extra/gcc-std-cxx26/%: export CXX = g++ -std=gnu++26
+build/extra/gcc-std-cxx26/%: export UPX_CONFIG_DISABLE_C_STANDARD = ON
+build/extra/gcc-std-cxx26/%: export UPX_CONFIG_DISABLE_CXX_STANDARD = ON
+
+# cross compiler: Linux glibc aarch64-linux-gnu (arm64)
+build/extra/cross-linux-gnu-aarch64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/cross-linux-gnu-aarch64/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/cross-linux-gnu-aarch64/%: export CC  = aarch64-linux-gnu-gcc
+build/extra/cross-linux-gnu-aarch64/%: export CXX = aarch64-linux-gnu-g++
+build/extra/cross-linux-gnu-aarch64/%: CMAKE_SYSTEM_NAME ?= Linux
+build/extra/cross-linux-gnu-aarch64/%: CMAKE_CROSSCOMPILING_EMULATOR ?= qemu-aarch64
+
+# cross compiler: Linux glibc arm-linux-gnueabihf
+build/extra/cross-linux-gnu-arm-eabihf/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/cross-linux-gnu-arm-eabihf/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/cross-linux-gnu-arm-eabihf/%: export CC  = arm-linux-gnueabihf-gcc
+build/extra/cross-linux-gnu-arm-eabihf/%: export CXX = arm-linux-gnueabihf-g++ -Wno-psabi
+build/extra/cross-linux-gnu-arm-eabihf/%: CMAKE_SYSTEM_NAME ?= Linux
+build/extra/cross-linux-gnu-arm-eabihf/%: CMAKE_CROSSCOMPILING_EMULATOR ?= qemu-arm
+
+# cross compiler: Windows x86 win32 MinGW (i386)
+build/extra/cross-windows-mingw32/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/cross-windows-mingw32/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/cross-windows-mingw32/%: export CC  = i686-w64-mingw32-gcc -static -D_WIN32_WINNT=0x0501
+build/extra/cross-windows-mingw32/%: export CXX = i686-w64-mingw32-g++ -static -D_WIN32_WINNT=0x0501
+build/extra/cross-windows-mingw32/%: CMAKE_SYSTEM_NAME ?= Windows
+build/extra/cross-windows-mingw32/%: CMAKE_SYSTEM_PROCESSOR ?= X86
+build/extra/cross-windows-mingw32/%: CMAKE_CROSSCOMPILING_EMULATOR ?= wine
+
+# cross compiler: Windows x64 win64 MinGW (amd64)
+build/extra/cross-windows-mingw64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/cross-windows-mingw64/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/cross-windows-mingw64/%: export CC  = x86_64-w64-mingw32-gcc -static -D_WIN32_WINNT=0x0501
+build/extra/cross-windows-mingw64/%: export CXX = x86_64-w64-mingw32-g++ -static -D_WIN32_WINNT=0x0501
+build/extra/cross-windows-mingw64/%: CMAKE_SYSTEM_NAME ?= Windows
+build/extra/cross-windows-mingw64/%: CMAKE_SYSTEM_PROCESSOR ?= AMD64
+build/extra/cross-windows-mingw64/%: CMAKE_CROSSCOMPILING_EMULATOR ?= wine
+
+# cross compiler: macOS arm64 (aarch64)
+build/extra/cross-darwin-arm64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/cross-darwin-arm64/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/cross-darwin-arm64/%: export CC  = clang   -target arm64-apple-darwin
+build/extra/cross-darwin-arm64/%: export CXX = clang++ -target arm64-apple-darwin
+build/extra/cross-darwin-arm64/%: CMAKE_SYSTEM_NAME ?= Darwin
+build/extra/cross-darwin-arm64/%: CMAKE_SYSTEM_PROCESSOR ?= arm64
+
+# cross compiler: macOS x86_64 (amd64)
+build/extra/cross-darwin-x86_64/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/extra/cross-darwin-x86_64/release: PHONY; $(call run_config_and_build,$@,Release)
+build/extra/cross-darwin-x86_64/%: export CC  = clang   -target x86_64-apple-darwin
+build/extra/cross-darwin-x86_64/%: export CXX = clang++ -target x86_64-apple-darwin
+build/extra/cross-darwin-x86_64/%: CMAKE_SYSTEM_NAME ?= Darwin
+build/extra/cross-darwin-x86_64/%: CMAKE_SYSTEM_PROCESSOR ?= x86_64
+
+#***********************************************************************
+# C/C++ static analyzers
+#***********************************************************************
+
+# force building with clang Static Analyzer (scan-build)
+SCAN_BUILD = scan-build
+build/analyze/clang-analyzer/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/analyze/clang-analyzer/release: PHONY; $(call run_config_and_build,$@,Release)
+build/analyze/clang-analyzer/%: override CMAKE := $(SCAN_BUILD) $(CMAKE)
+build/analyze/clang-analyzer/%: export CCC_CC  ?= clang
+build/analyze/clang-analyzer/%: export CCC_CXX ?= clang++
+
+# run clang-tidy: uses file compile_commands.json from an existing clang build;
+#   does not create any actual files, so purely PHONY
+CLANG_TIDY_BUILD_BASE = build/extra/clang
+RUN_CLANG_TIDY = time python3 ./misc/analyze/clang-tidy/run-clang-tidy.py -p $<
+RUN_CLANG_TIDY_WERROR = $(RUN_CLANG_TIDY) '-warnings-as-errors=*'
+build/analyze/clang-tidy-upx/debug build/analyze/clang-tidy-upx/release: $$(CLANG_TIDY_BUILD_BASE)/$$(notdir $$@) PHONY
+	$(RUN_CLANG_TIDY_WERROR) -config-file ./.clang-tidy '/src/.*\.cpp'
+build/analyze/clang-tidy-bzip2/debug build/analyze/clang-tidy-bzip2/release: $$(CLANG_TIDY_BUILD_BASE)/$$(notdir $$@) PHONY
+	$(RUN_CLANG_TIDY)        -config-file ./misc/analyze/clang-tidy/clang-tidy-bzip2.yml /vendor/bzip2/
+build/analyze/clang-tidy-ucl/debug build/analyze/clang-tidy-ucl/release: $$(CLANG_TIDY_BUILD_BASE)/$$(notdir $$@) PHONY
+	$(RUN_CLANG_TIDY_WERROR) -config-file ./misc/analyze/clang-tidy/clang-tidy-ucl.yml   /vendor/ucl/
+build/analyze/clang-tidy-zlib/debug build/analyze/clang-tidy-zlib/release: $$(CLANG_TIDY_BUILD_BASE)/$$(notdir $$@) PHONY
+	$(RUN_CLANG_TIDY)        -config-file ./misc/analyze/clang-tidy/clang-tidy-zlib.yml  /vendor/zlib/
+build/analyze/clang-tidy-zstd/debug build/analyze/clang-tidy-zstd/release: $$(CLANG_TIDY_BUILD_BASE)/$$(notdir $$@) PHONY
+	$(RUN_CLANG_TIDY)        -config-file ./misc/analyze/clang-tidy/clang-tidy-zstd.yml  /vendor/zstd/
+build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-upx/$$(notdir $$@)
+build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-bzip2/$$(notdir $$@)
+build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-ucl/$$(notdir $$@)
+build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-zlib/$$(notdir $$@)
+build/analyze/clang-tidy/debug build/analyze/clang-tidy/release: build/analyze/clang-tidy-zstd/$$(notdir $$@)
+
+# OLD names [deprecated]
+build/extra/scan-build/debug:   build/analyze/clang-analyzer/debug PHONY
+build/extra/scan-build/release: build/analyze/clang-analyzer/release PHONY
+
+#***********************************************************************
+# advanced: generic eXtra target
+#***********************************************************************
+
+# usage:
+#   make UPX_XTARGET=my-target CC="my-cc -flags" CXX="my-cxx -flags"
+#   make UPX_XTARGET=my-target CC="my-cc -flags" CXX="my-cxx -flags" xtarget/debug
+
+ifneq ($(UPX_XTARGET),)
+ifneq ($(CC),)
+ifneq ($(CXX),)
+
+UPX_XTARGET := $(UPX_XTARGET)
+build/$(UPX_XTARGET)/debug:   PHONY; $(call run_config_and_build,$@,Debug)
+build/$(UPX_XTARGET)/release: PHONY; $(call run_config_and_build,$@,Release)
+build/$(UPX_XTARGET)/%: export CC  := $(CC)
+build/$(UPX_XTARGET)/%: export CXX := $(CXX)
+# shortcuts
+xtarget/debug:   build/$(UPX_XTARGET)/debug PHONY
+xtarget/release: build/$(UPX_XTARGET)/release PHONY
+xtarget/all:     xtarget/debug xtarget/release PHONY
+xtarget/debug+test:   build/$(UPX_XTARGET)/debug+test PHONY
+xtarget/release+test: build/$(UPX_XTARGET)/release+test PHONY
+xtarget/all+test:     xtarget/debug+test xtarget/release+test PHONY
+# set new default
+.DEFAULT_GOAL := build/$(UPX_XTARGET)/release
+
+endif
+endif
+endif
+
+#***********************************************************************
+# assemble cmake config flags; useful for CI jobs
+#
+# info: by default CMake only honors the CC and CXX environment variables; make
+# it easy to set other variables like CMAKE_AR or CMAKE_RANLIB
+#***********************************************************************
+
+UPX_CMAKE_CONFIG_FLAGS += $(UPX_CMAKE_CONFIG_FLAGS_GENERATOR)
+UPX_CMAKE_CONFIG_FLAGS += $(UPX_CMAKE_CONFIG_FLAGS_TOOLSET)
+UPX_CMAKE_CONFIG_FLAGS += $(UPX_CMAKE_CONFIG_FLAGS_PLATFORM)
+
+$(call check_undefined,__add_cmake_config)
+# promote an environment or Make variable to a CMake cache entry:
+__add_cmake_config = $(and $($1),-D$1="$($1)")
+
+# pass common CMake settings
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_VERBOSE_MAKEFILE)
+# pass common CMake toolchain settings
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_ADDR2LINE)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_AR)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_DLLTOOL)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_LINKER)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_NM)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_OBJCOPY)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_OBJDUMP)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_RANLIB)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_READELF)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_STRIP)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_TAPI)
+# pass common CMake LTO toolchain settings
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_C_COMPILER_AR)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_C_COMPILER_RANLIB)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_CXX_COMPILER_AR)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_CXX_COMPILER_RANLIB)
+# pass common CMake cross compilation settings
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_SYSTEM_NAME)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_SYSTEM_PROCESSOR)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_CROSSCOMPILING_EMULATOR)
+# pass UPX config options; see CMakeLists.txt
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_GITREV)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_SANITIZE)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_WERROR)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_WSTRICT)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_SELF_PACK_TEST)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS)
+# pass UPX extra compile options; see CMakeLists.txt
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_BZIP2)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UCL)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UPX)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZLIB)
+UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZSTD)
+
+#***********************************************************************
+# check git submodules
+#***********************************************************************
+
+SUBMODULES = doctest lzma-sdk ucl valgrind zlib
+
+$(foreach 1,$(SUBMODULES),$(if $(wildcard vendor/$1/[CL]*),,\
+    $(error ERROR: missing git submodule '$1'; run 'git submodule update --init')))
+
+endif # UPX_MAKEFILE_EXTRA_MK_INCLUDED

misc/podman/cross-compile-upx-ubuntu/10-create-image.sh

@@ -1,19 +0,0 @@
-#! /usr/bin/env bash
-## vim:set ts=4 sw=4 et:
-set -e; set -o pipefail
-argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
-
-# create the image from Dockerfile
-# using a rootless Podman container
-
-# NOTE: this image is based on rebuild-stubs/upx-stubtools-20221212-v6,
-#   so you have to create that image first
-# WARNING: we install many packages, so the resulting image needs A LOT of disk space!
-image=upx-cross-compile-ubuntu2204-20230721-v1
-[[ $1 == --print-image ]] && echo "$image" && exit 0
-
-podman build -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
-
-podman image list "$image"
-echo
-podman image tree "$image"

misc/podman/cross-compile-upx-ubuntu/11-list-packages.sh

@@ -1,40 +0,0 @@
-#! /usr/bin/env bash
-## vim:set ts=4 sw=4 et:
-set -e; set -o pipefail
-argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
-
-# list all system packages that are installed in the image
-# using a rootless Podman container
-
-image="$("$argv0dir/10-create-image.sh" --print-image)"
-
-podman image list "$image"
-echo
-podman image tree "$image"
-
-echo 'Packages:'
-flags=( --read-only --rm --pull=never )
-flags+=( --cap-drop=all )               # drop all capabilities
-flags+=( --network=none )               # no network needed
-podman run "${flags[@]}" "$image" bash -c $'dpkg -l | sed \'s/ *$//\' | LC_ALL=C sort'
-
-echo
-echo 'Packages sorted by Installed-Size:'
-podman run "${flags[@]}" "$image" bash -c $'awk \'
-BEGIN {
-    arch = "UNKNOWN"; size = 0; package = "UNKNOWN";
-}
-{
-    if ($1 == "Architecture:") arch = $2;
-    if ($1 == "Installed-Size:") size = $2;
-    if ($1 == "Package:") package = $2;
-    if ($1 == "") {
-        printf("%9d %-40s %s\\n", size, package, arch);
-        count += 1; total += size;
-        arch = "UNKNOWN"; size = 0; package = "UNKNOWN";
-    }
-}
-END {
-    printf("%9d ===== TOTAL (%d packages)\\n", total, count);
-}
-\' /var/lib/dpkg/status | LC_ALL=C sort -rn'

misc/podman/cross-compile-upx-ubuntu/20-image-run-shell.sh

@@ -1,60 +0,0 @@
-#! /usr/bin/env bash
-## vim:set ts=4 sw=4 et:
-set -e; set -o pipefail
-argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
-
-# run an interactive shell in the image
-# using a rootless Podman container
-
-image="$("$argv0dir/10-create-image.sh" --print-image)"
-
-flags=( --read-only --rm --pull=never )
-flags+=( --cap-drop=all )               # drop all capabilities
-flags+=( --network=none )               # no network needed
-flags+=( -ti -e TERM="$TERM" )          # allocate an interactive pseudo-tty and pass $TERM
-if [[ 1 == 1 ]]; then
-    # run as user upx 2000:2000
-    flags+=( --user 2000 )
-    # map container users 0..999 to subuid-users 1..1000, and map container user 2000 to current host user
-    flags+=( --uidmap=0:1:1000 --uidmap=2000:0:1 )
-    # map container groups 0..999 to subgid-groups 1..1000, and map container group 2000 to current host group
-    flags+=( --gidmap=0:1:1000 --gidmap=2000:0:1 )
-    # NOTE: we mount the upx top-level directory read-write under /home/upx/src/upx
-    # INFO: SELinux users *may* have to add ":z" to the volume mount flags; check the docs!
-    flags+=( -v "${argv0dir}/../../..:/home/upx/src/upx" )
-    flags+=( -w /home/upx/src/upx )     # set working directory
-    flags+=( --tmpfs /home/upx/.cache:rw,exec ) # mount a writeable tmpfs
-    flags+=( --tmpfs /home/upx/.local:rw,exec ) # mount a writeable tmpfs
-else
-    # run as user root 0:0
-    # ONLY FOR DEBUGGING THE IMAGE
-    # map container user/group 0 to current host user/group
-    flags+=( --user 0 )
-fi
-
-if [[ $# == 0 ]]; then
-    podman run "${flags[@]}" "$image" bash -l
-else
-    podman run "${flags[@]}" "$image" "$@"
-fi
-
-# now we can cross-compile UPX for Windows:
-#   cd /home/upx/src/upx
-#   rm -rf ./build/extra/cross-windows-mingw64/release
-#   make build/extra/cross-windows-mingw64/release
-
-# and we can run the clang Static Analyzer (scan-build)
-#   cd /home/upx/src/upx
-#   rm -rf ./build/extra/scan-build/release
-#   make build/extra/scan-build/release
-
-# and lots of other cross-compilers are installed; see "ls /usr/bin/*g++*"
-
-# and finally see
-#   ./misc/podman/cross-compile-upx-ubuntu/build-all-inside-container.sh
-# after running that script we can do cool things like:
-#   cd /home/upx/src/upx/build/cross-compile-upx-ubuntu2204/alpha-linux-gnu/debug
-#   qemu-alpha -L /usr/alpha-linux-gnu ./upx --version
-#   cd /home/upx/src/upx/build/cross-compile-upx-ubuntu2204/hppa-linux-gnu/debug
-#   qemu-hppa -L /usr/hppa-linux-gnu ./upx --version
-# (similar for many other architectures/builds)

misc/podman/cross-compile-upx-ubuntu/Dockerfile

@@ -1,54 +0,0 @@
-# NOTE: this image is based on rebuild-stubs/upx-stubtools-20221212-v6,
-#   so you have to create that image first
-# WARNING: we install many packages, so the resulting image needs A LOT of disk space!
-FROM localhost/upx-stubtools-20221212-v6
-ENV UPX_CONTAINER_IMAGE_NAME=upx-cross-compile-ubuntu2204-20230721-v1
-ARG DEBIAN_FRONTEND=noninteractive
-
-USER root
-
-# Ubuntu 22.04
-RUN apt-get update && apt-get upgrade -y \
-    && apt-get install -y \
-        # Linux glibc cross compilers
-        g++-aarch64-linux-gnu \
-        g++-alpha-linux-gnu \
-        g++-arm-linux-gnueabi \
-        g++-arm-linux-gnueabihf \
-        g++-hppa-linux-gnu \
-        g++-i686-linux-gnu \
-        g++-m68k-linux-gnu \
-        g++-mips-linux-gnu \
-        g++-mipsel-linux-gnu \
-        g++-mips64-linux-gnuabi64 \
-        g++-mips64el-linux-gnuabi64 \
-        g++-powerpc-linux-gnu \
-        g++-powerpc64-linux-gnu \
-        g++-powerpc64le-linux-gnu \
-        g++-riscv64-linux-gnu \
-        g++-s390x-linux-gnu \
-        g++-sh4-linux-gnu \
-        g++-sparc64-linux-gnu \
-        # Linux glibc cross compilers - ILP32 on 64-bit CPUs
-        g++-x86-64-linux-gnux32 \
-        # Windows cross compilers
-        g++-mingw-w64-i686 \
-        g++-mingw-w64-x86-64 \
-    && true
-RUN apt-get install -y \
-        # clang-14 and tools
-        clang-14 clang-format-14 clang-tidy-14 clang-tools-14 lldb-14 llvm-14 \
-        # QEMU and Wine
-        qemu-system qemu-user wine wine32:i386 wine64 \
-        # misc
-        gdb lsb-release valgrind \
-    && true
-RUN cd /usr/bin \
-    # create unversioned clang symlinks in /usr/local/bin
-    && for f in clang*-14 llvm-*-14 scan-*-14; do ln -s -v ../../bin/$f /usr/local/bin/${f%-14}; done \
-    && ln -s -v ../../bin/obj2yaml-14 /usr/local/bin/llvm-obj2yaml \
-    && ln -s -v ../../bin/yaml2obj-14 /usr/local/bin/llvm-yaml2obj \
-    && true
-
-# switch back to default user upx:upx 2000:2000
-USER upx

misc/podman/cross-compile-upx-ubuntu/build-all-inside-container.sh

@@ -1,99 +0,0 @@
-#! /usr/bin/env bash
-## vim:set ts=4 sw=4 et:
-set -e; set -o pipefail
-argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
-
-# build UPX for 21 targets; must be run inside the container!
-# using a rootless Podman container
-
-# simple sanity check that we are indeed running inside the container
-if [[ $UPX_CONTAINER_IMAGE_NAME != upx-cross-compile-* ]]; then
-    echo "$argv0: NOTE: please run this script *inside* the container"
-    exit 1
-fi
-
-# go to upx top-level directory
-cd "$argv0dir/../../.." || exit 1
-pwd
-test -f doc/upx.pod   || exit 1 # sanity check
-test -f src/version.h || exit 1 # sanity check
-
-function run_config_and_build {
-    # requires: AR CC CXX RANLIB
-    local toolchain=$1
-    local cmake_config_flags build_type bdir
-    # cmake flags
-    cmake_config_flags=
-    case $toolchain in
-        # these old architectures do not support sanitize
-        alpha-linux-gnu) cmake_config_flags=-DUPX_CONFIG_DISABLE_SANITIZE=ON ;;
-        hppa-linux-gnu) cmake_config_flags=-DUPX_CONFIG_DISABLE_SANITIZE=ON ;;
-        # avoid sanitize link errors with current MinGW-w64 versions; link libstdc++ statically
-        i686-w64-mingw32)
-            cmake_config_flags=-DUPX_CONFIG_DISABLE_SANITIZE=ON
-            CC="$CC -static"; CXX="$CXX -static" ;;
-        x86_64-w64-mingw32)
-            cmake_config_flags=-DUPX_CONFIG_DISABLE_SANITIZE=ON
-            CC="$CC -static"; CXX="$CXX -static" ;;
-        # avoid warnings about arm libstdc++ ABI change in gcc-7
-        arm-linux-*) CXX="$CXX -Wno-psabi" ;;
-    esac
-    if [[ 1 == 1 ]]; then
-        # prefer building with Ninja (ninja-build)
-        cmake_config_flags="$cmake_config_flags -G Ninja -DUPX_CONFIG_CMAKE_DISABLE_INSTALL=ON"
-    fi
-    # for all build types
-    for build_type in Debug Release; do
-        bdir="build/cross-compile-upx-ubuntu2204/$toolchain/${build_type,,}"
-        mkdir -p "$bdir"
-        # run_config
-        if [[ ! -f $bdir/CMakeCache.txt ]]; then
-            export CMAKE_REQUIRED_QUIET=OFF
-            cmake -S . -B "$bdir" -DCMAKE_BUILD_TYPE=$build_type -DCMAKE_AR=$AR -DCMAKE_RANLIB=$RANLIB $cmake_config_flags
-        fi
-        # run_build
-        cmake --build "$bdir" --config $build_type --parallel
-    done
-}
-
-# see Dockerfile for packages
-for package in \
-        g++-aarch64-linux-gnu \
-        g++-alpha-linux-gnu \
-        g++-arm-linux-gnueabi \
-        g++-arm-linux-gnueabihf \
-        g++-hppa-linux-gnu \
-        g++-i686-linux-gnu \
-        g++-m68k-linux-gnu \
-        g++-mips-linux-gnu \
-        g++-mipsel-linux-gnu \
-        g++-mips64-linux-gnuabi64 \
-        g++-mips64el-linux-gnuabi64 \
-        g++-powerpc-linux-gnu \
-        g++-powerpc64-linux-gnu \
-        g++-powerpc64le-linux-gnu \
-        g++-riscv64-linux-gnu \
-        g++-s390x-linux-gnu \
-        g++-sh4-linux-gnu \
-        g++-sparc64-linux-gnu \
-        g++-x86-64-linux-gnux32 \
-        g++-mingw-w64-i686 \
-        g++-mingw-w64-x86-64
-do
-    # setup toolchain and environment variables
-    toolchain=$package
-    toolchain=${toolchain/-x86-64/-x86_64}
-    toolchain=${toolchain/g++-/}
-    case $toolchain in
-        mingw-w64-i686) toolchain=i686-w64-mingw32 ;;
-        mingw-w64-x86_64) toolchain=x86_64-w64-mingw32 ;;
-    esac
-    echo "========== $toolchain"
-    export AR=/usr/bin/${toolchain}-ar
-    export CC=/usr/bin/${toolchain}-gcc
-    export CXX=/usr/bin/${toolchain}-g++
-    export RANLIB=/usr/bin/${toolchain}-ranlib
-    ls -l $AR $CC $CXX $RANLIB
-    run_config_and_build $toolchain
-    unset AR CC CXX RANLIB
-done

misc/podman/rebuild-stubs/10-create-image.sh

@@ -5,8 +5,9 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
 
 # create the image from Dockerfile
 # using a rootless Podman container
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
 
-image=upx-stubtools-20221212-v6
+image=upx-stubtools-20240405-v1
 [[ $1 == --print-image ]] && echo "$image" && exit 0
 
 podman build -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"

misc/podman/rebuild-stubs/11-list-packages.sh

@@ -5,6 +5,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
 
 # list all system packages that are installed in the image
 # using a rootless Podman container
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
 
 image="$("$argv0dir/10-create-image.sh" --print-image)"
 

misc/podman/rebuild-stubs/20-image-run-shell.sh

@@ -5,6 +5,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
 
 # run an interactive shell in the image
 # using a rootless Podman container
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
 
 image="$("$argv0dir/10-create-image.sh" --print-image)"
 
@@ -24,6 +25,7 @@ if [[ 1 == 1 ]]; then
     flags+=( -v "${argv0dir}/../../..:/home/upx/src/upx" )
     flags+=( -w /home/upx/src/upx )              # set working directory
     flags+=( --tmpfs /home/upx/.cache:rw,exec )  # mount a writeable tmpfs
+    flags+=( --tmpfs /home/upx/.config:rw,exec ) # mount a writeable tmpfs
     flags+=( --tmpfs /home/upx/.local:rw,exec )  # mount a writeable tmpfs
 else
     # run as user root 0:0

misc/podman/rebuild-stubs/30-rebuild-stubs.sh

@@ -0,0 +1,42 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# rebuild stubs from source code
+#   (also see 20-image-run-shell.sh for more container usage examples)
+# using a rootless Podman container
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+image="$("$argv0dir/10-create-image.sh" --print-image)"
+
+flags=( --read-only --rm --pull=never )
+flags+=( --cap-drop=all )               # drop all capabilities
+flags+=( --network=none )               # no network needed
+if [[ 1 == 1 ]]; then
+    # run as user upx 2000:2000
+    flags+=( --user 2000 )
+    # map container users 0..999 to subuid-users 1..1000, and map container user 2000 to current host user
+    flags+=( --uidmap=0:1:1000 --uidmap=2000:0:1 )
+    # map container groups 0..999 to subgid-groups 1..1000, and map container group 2000 to current host group
+    flags+=( --gidmap=0:1:1000 --gidmap=2000:0:1 )
+    # NOTE: we mount the upx top-level directory read-write under /home/upx/src/upx
+    # INFO: SELinux users *may* have to add ":z" to the volume mount flags; check the docs!
+    flags+=( -v "${argv0dir}/../../..:/home/upx/src/upx" )
+fi
+
+podman run "${flags[@]}" "$image" bash -c $'
+set -ex; set -o pipefail
+cd /home/upx/src/upx
+# check whitespace
+[[ -d .git ]] && bash ./misc/scripts/check_whitespace_git.sh
+# rebuild docs
+make -C doc clean all
+# rebuild stubs
+cd /home/upx/src/upx/src/stub
+make maintainer-clean extra-clean
+git status . || true # make sure the stub files got deleted
+make extra-all all
+echo "===== Rebuilt stubs. All done. ====="
+exit 0
+'

misc/podman/rebuild-stubs/Dockerfile

@@ -1,5 +1,6 @@
-FROM docker.io/library/ubuntu:22.04
-ENV UPX_CONTAINER_IMAGE_NAME=upx-stubtools-20221212-v6
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+FROM docker.io/library/ubuntu:24.04
+ENV UPX_CONTAINER_IMAGE_NAME=upx-stubtools-20240405-v1
 ARG DEBIAN_FRONTEND=noninteractive
 ENV LANG=C.UTF-8
 
@@ -7,20 +8,37 @@ ENV LANG=C.UTF-8
 RUN dpkg --add-architecture i386 \
     && apt-get update && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends \
-        aria2 bash bash-completion ca-certificates dash git less libmpc3 libncurses5 \
-        make ncurses-term perl-base python2-minimal time wget xz-utils \
+        aria2 bash bash-completion ca-certificates curl git less libmpc3 \
+        make ncurses-term perl-base tar time wget xz-utils \
         libc6:i386 zlib1g:i386 \
         # the following packages are not required for rebuilding the stubs, but
         # they do make the image *much* more convenient and also allow building
         # the full UPX binary inside the container via CMake:
-        7zip bfs busybox bzip2 cabextract ccache chrpath cmake cpio curl elfutils fd-find file fzf \
-        g++ gawk gdb gojq ht htop hyperfine jq libzstd-dev lsb-release lz4 lzip lzop \
-        mksh moreutils ninja-build p7zip parallel patch patchelf pax-utils paxctl \
-        re2c ripgrep rsync screen universal-ctags unzip vim yash zip zlib1g-dev zsh zstd \
-        # extra packages for compiling with "gcc -m32" and and "gcc -mx32":
+        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 \
+        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 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 \
     && true
 
+# install python2-minimal packages from Debian-11; REQUIRED
+RUN cd /root \
+    && aria2c --checksum=sha-256=85833c92314011b89bbead6f9a5a7a360b5ee4f9b95e001225afead4ebf9f7d3 \
+              'https://ftp.debian.org/debian/pool/main/p/python2.7/libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb' \
+    && aria2c --checksum=sha-256=44f0cdc1a343303d31c55fcb3a6402cfe326adf749ec30e375e6e0c0c5f7c1f7 \
+              'https://ftp.debian.org/debian/pool/main/p/python2.7/python2.7-minimal_2.7.18-8+deb11u1_amd64.deb' \
+    && dpkg -i ./*.deb \
+    && rm ./*.deb \
+    && if ! test -f /usr/bin/python2; then ln -s -v python2.7 /usr/bin/python2; fi \
+    && ldconfig \
+    && true
+
 # manually unpack and install compat libs from Ubuntu-16.04; REQUIRED
 RUN cd /root \
     && aria2c --checksum=sha-256=de22baf3dd851a10e16fbf66a243e70149ca46e06b2939fdc79429196cefc090 \
@@ -43,22 +61,42 @@ RUN cd /root \
 
 # install official UPX release binaries into /usr/local/bin; not required but convenient for testing
 RUN cd /root \
-    && wget -q https://github.com/upx/upx/releases/download/v3.91/upx-3.91-amd64_linux.tar.bz2 \
-    && for v in 3.92 3.93 3.94 3.95 3.96 4.0.0 4.0.1 4.0.2 4.1.0; do wget -q https://github.com/upx/upx/releases/download/v${v}/upx-${v}-amd64_linux.tar.xz; done \
+    && curl -sS -L -O https://github.com/upx/upx/releases/download/v3.91/upx-3.91-amd64_linux.tar.bz2 \
+    && xzversions="3.92 3.93 3.94 3.95 3.96 4.0.0 4.0.1 4.0.2 4.1.0 4.2.0 4.2.1 4.2.2 4.2.3 4.2.4" \
+    && for v in $xzversions; do curl -sS -L -O https://github.com/upx/upx/releases/download/v${v}/upx-${v}-amd64_linux.tar.xz; done \
     && for f in ./upx-*.tar.*; do tar -xoaf $f; done \
-    && for v in 3.91 3.92 3.93 3.94 3.95 3.96 4.0.0 4.0.1 4.0.2 4.1.0; do d=upx-${v}-amd64_linux; ./$d/upx -qq -d $d/upx -o /usr/local/bin/upx-${v}; done \
+    && for v in 3.91 $xzversions; do d=upx-${v}-amd64_linux; ./$d/upx -qq -d $d/upx -o /usr/local/bin/upx-${v}; done \
     && rm -r ./upx-*.tar.* ./upx-*linux \
     && true
 
-# create default user upx:upx 2000:2000
+# create default container user upx:upx 2000:2000
 RUN useradd upx -U --uid 2000 --shell /bin/bash -m \
     && cd /home/upx && chmod 00700 . \
-    # prepare ~/.cache and ~/.local for possible tmpfs mounts
+    # prepare ~/.cache, ~/.config and ~/.local for possible tmpfs mounts
     && mkdir -p .cache/tmp .local/bin src/upx \
-    && for d in ccache fontconfig go-build mesa_shader_cache tmp wine zig; do mkdir -p .cache/$d; done \
+    && for d in ccache fontconfig go-build mesa_shader_cache parallel tmp wine zig; do mkdir -p .cache/$d; done \
+    && for d in fish git helix kak nvim; do mkdir -p .config/$d; done \
     && for d in bin include lib share state; do mkdir -p .local/$d; done \
     && ln -s .cache/wine .wine && ln -s .cache/tmp tmp \
+    # symlink upx-stubtools
     && ln -s /usr/local/bin/bin-upx-20221212 .local/bin/bin-upx \
+    # some convenience settings according to upx developer preferences
+    && echo "alias path='echo PATH=\"\$PATH\"'" >> .bashrc \
+    && echo "alias md=mkdir" >> .bashrc \
+    && echo "alias rd=rmdir" >> .bashrc \
+    && echo 'mdd() { mkdir "$1" && cd "$1"; }' >> .bashrc \
+    && echo 'm() { make "$@"; }' >> .bashrc \
+    && echo 'mm() { make -j8 "$@"; }' >> .bashrc \
+    && echo 'tn() { time nice "$@"; }' >> .bashrc \
+    && echo 'tnm() { time nice make "$@"; }' >> .bashrc \
+    && echo 'tnmm() { time nice make -j8 "$@"; }' >> .bashrc \
+    && echo 'source /usr/share/bash-completion/completions/make' >> .bashrc \
+    && echo 'complete -F _make m mm tnm tnmm' >> .bashrc \
+    && echo 'eval "$(zoxide init bash)"' >> .bashrc \
+    && echo "alias zz=zi\nalias y=z\nalias yy=zi" >> .bashrc \
+    && echo "alias cd..='cd ..'" >> .bashrc \
+    && echo "alias ..='cd ..'" >> .bashrc \
+    && echo "alias .='cd ..'" >> .bashrc \
     && chown -R upx:upx . \
     && true
 USER upx

misc/scripts/build_upx_by_hand.sh

@@ -1,127 +0,0 @@
-#! /bin/sh
-## vim:set ts=4 sw=4 et:
-set -e
-
-#
-# build UPX "by hand", using a POSIX-compliant shell and
-# a minimal number of compilation flags
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-#
-
-# uses optional environment variables: AR, CC, CXX, OPTIMIZE, top_srcdir
-
-# shell init
-### set -x # enable logging
-DUALCASE=1; export DUALCASE # for MKS sh
-test -n "${ZSH_VERSION+set}" && emulate sh # for zsh
-my_argv0="$0"
-
-# toolchain settings and compilation flags
-AR="${AR:-ar}"
-CC="${CC:-cc}"
-CXX="${CXX:-c++ -std=gnu++17}"
-# HINT: use "export AR=false" if "$AR rcs" does not work on your system; see below
-if test "x$AR" = "x0" || test "x$AR" = "xfalse" || test "x$AR" = "x/bin/false"; then
-    AR="" # do not use $AR
-fi
-# protect against security threats caused by misguided compiler "optimizations"
-mandatory_flags="-fno-strict-aliasing -fno-strict-overflow -funsigned-char"
-if test "x$OPTIMIZE" != "x" && test "x$OPTIMIZE" != "x0"; then
-    # not mandatory and not minimal, but usually a good idea:
-    mandatory_flags="-Wall -O2 $mandatory_flags"
-fi
-CC="$CC $mandatory_flags"
-CXX="$CXX $mandatory_flags"
-
-# go to upx top-level directory
-# HINT: set "top_srcdir" manually if your system does not have "readlink"
-if test "x$top_srcdir" = "x"; then
-    my_argv0abs="$(readlink -fn "$my_argv0")"
-    test "x$my_argv0abs" = "x" && exit 1
-    my_argv0dir="$(dirname "$my_argv0abs")"
-    test "x$my_argv0dir" = "x" && exit 1
-    cd "$my_argv0dir/../.." || exit 1
-else
-    cd "$top_srcdir" || exit 1
-fi
-top_srcdir="$(pwd)"             # absolute
-rel_top_srcdir=.                # relative top_srcdir
-echo "# current directory: '$(pwd)'"
-test -f doc/upx.pod   || exit 1 # sanity check
-test -f src/version.h || exit 1 # sanity check
-rm -rf ./build/by-hand          # WARNING: existing build-directory gets deleted!
-
-# helper function
-run() {
-    if test 0 = 1; then
-        # DEBUG dry-run: print command, but don't actually run unless $1 is "+"
-        if test "x$1" = "x+"; then
-            shift; echo "$@"; "$@"; return
-        fi
-        shift; echo "$@"; return
-    fi
-    # print short info and run command
-    test "x$1" != "x" && test "x$1" != "x+" && echo "$1"
-    shift; "$@"
-}
-
-# helper function
-check_submodule() {
-    #local ff # "local" seems unsupported by some versions of ksh
-    for ff in COPYING LICENSE LICENSE.txt; do
-        if test -f "$rel_top_srcdir/vendor/$1/$ff"; then
-            # create and enter build directory; updates global $rel_top_srcdir
-            run "+" cd "$rel_top_srcdir" || exit 1
-            rel_top_srcdir=.
-            echo "#==== build $1 ====="
-            run "+" mkdir "build/by-hand/$1"
-            run "+" cd "build/by-hand/$1" || exit 1
-            rel_top_srcdir=../../..
-            return 0
-        fi
-    done
-    return 1
-}
-
-# build
-run "+" mkdir -p "build/by-hand"
-if check_submodule bzip2; then
-    for f in "$rel_top_srcdir"/vendor/bzip2/*.c; do
-        run "CC  $f" $CC -c "$f"
-    done
-fi
-if check_submodule ucl; then
-    for f in "$rel_top_srcdir"/vendor/ucl/src/*.c; do
-        run "CC  $f" $CC -I"$rel_top_srcdir"/vendor/ucl/include -I"$rel_top_srcdir"/vendor/ucl -c "$f"
-    done
-fi
-if check_submodule zlib; then
-    for f in "$rel_top_srcdir"/vendor/zlib/*.c; do
-        run "CC  $f" $CC -DHAVE_UNISTD_H -DHAVE_VSNPRINTF -c "$f"
-    done
-fi
-if check_submodule zstd; then
-    for f in "$rel_top_srcdir"/vendor/zstd/lib/*/*.c; do
-        run "CC  $f" $CC -DDYNAMIC_BMI2=0 -DZSTD_DISABLE_ASM -c "$f"
-    done
-fi
-run "+" cd "$rel_top_srcdir" || exit 1
-rel_top_srcdir=.
-echo "#==== build UPX ====="
-run "+" cd "build/by-hand" || exit 1
-rel_top_srcdir=../..
-for f in "$rel_top_srcdir"/src/*.cpp "$rel_top_srcdir"/src/*/*.cpp; do
-    run "CXX $f"     $CXX -I"$rel_top_srcdir"/vendor -c "$f"
-done
-# echo "#==== link UPX ====="
-if test "x$AR" = "x"; then
-    # link without using $AR
-    run "CXX upx"    $CXX -o upx *.o */*.o
-else
-    run "AR  libupx" $AR rcs libupx_submodules.a */*.o
-    run "CXX upx"    $CXX -o upx *.o -L. -lupx_submodules
-fi
-echo "# current directory: '$(pwd)'"
-ls -l upx*
-
-echo "# All done."

misc/scripts/check_whitespace.sh

@@ -32,6 +32,7 @@ LC_ALL=C sort -z | xargs -0r perl -n -e '
     }
     if (m,\t,) {
         if ($ARGV =~ m,(^|/)(gnu|m)?make(file|vars),i) { }
+        elsif ($ARGV =~ m,\.mk$,) { }
         elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { }
         elsif ($ARGV =~ m,/src/stub/src/arch/.*/lzma\w+\.S$,) { }
         else { print "ERROR: hard TAB detected $ARGV: $_"; exit(1); }

misc/scripts/check_whitespace_git.sh

@@ -26,6 +26,7 @@ git ls-files --full-name -z | perl -0 -n -e '
     }
     if (m,\t,) {
         if ($ARGV =~ m,(^|/)(gnu|m)?make(file|vars),i) { }
+        elsif ($ARGV =~ m,\.mk$,) { }
         elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { }
         elsif ($ARGV =~ m,/src/stub/src/arch/.*/lzma\w+\.S$,) { }
         else { print "ERROR: hard TAB detected $ARGV: $_"; exit(1); }

misc/scripts/readlink-en.py

@@ -0,0 +1,17 @@
+#! /usr/bin/env python3
+## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*-
+
+# simulate "readlink -en FILE"
+# - result may differ from actual readlink(1) for edge cases
+# - works with Python2 and Python3
+#
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+import os, sys
+if len(sys.argv) != 2:
+    sys.exit(1)
+real_path = os.path.realpath(sys.argv[1])
+if not os.path.exists(real_path):
+    sys.exit(1)
+sys.stdout.write(real_path)
+sys.stdout.flush()

misc/scripts/readlink-fn.py

@@ -0,0 +1,15 @@
+#! /usr/bin/env python3
+## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*-
+
+# simulate "readlink -fn FILE" for systems that lack it (e.g. macOS-11)
+# - result may differ from actual readlink(1) for edge cases
+# - works with Python2 and Python3
+#
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+
+import os, sys
+if len(sys.argv) != 2:
+    sys.exit(1)
+real_path = os.path.realpath(sys.argv[1])
+sys.stdout.write(real_path)
+sys.stdout.flush()

misc/scripts/run_cmake_config.sh

@@ -0,0 +1,42 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+# assemble cmake config flags; useful for CI jobs
+# also see misc/make/Makefile-extra.mk
+
+cmake_config_flags=()
+
+# promote an environment variable to a CMake cache entry:
+__add_cmake_config() {
+    [[ -z "${!1}" ]] || cmake_config_flags+=( -D$1="${!1}" )
+}
+
+# pass common CMake settings
+for v in CMAKE_VERBOSE_MAKEFILE; do
+    __add_cmake_config $v
+done
+# pass common CMake toolchain settings
+for v in CMAKE_ADDR2LINE CMAKE_AR CMAKE_DLLTOOL CMAKE_LINKER CMAKE_NM CMAKE_OBJCOPY CMAKE_OBJDUMP CMAKE_RANLIB CMAKE_READELF CMAKE_STRIP CMAKE_TAPI; do
+    __add_cmake_config $v
+done
+# pass common CMake LTO toolchain settings
+for v in CMAKE_C_COMPILER_AR CMAKE_C_COMPILER_RANLIB CMAKE_CXX_COMPILER_AR CMAKE_CXX_COMPILER_RANLIB; do
+    __add_cmake_config $v
+done
+# pass common CMake cross compilation settings
+for v in CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PROCESSOR CMAKE_CROSSCOMPILING_EMULATOR; do
+    __add_cmake_config $v
+done
+# pass UPX config options; see CMakeLists.txt
+for v in UPX_CONFIG_DISABLE_GITREV UPX_CONFIG_DISABLE_SANITIZE UPX_CONFIG_DISABLE_WERROR UPX_CONFIG_DISABLE_WSTRICT UPX_CONFIG_DISABLE_SELF_PACK_TEST UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS; do
+    __add_cmake_config $v
+done
+# pass UPX extra compile options; see CMakeLists.txt
+for v in UPX_CONFIG_EXTRA_COMPILE_OPTIONS_BZIP2 UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UCL UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UPX UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZLIB UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZSTD; do
+    __add_cmake_config $v
+done
+
+exec "${CMAKE:-cmake}" $UPX_CMAKE_CONFIG_FLAGS "${cmake_config_flags[@]}" "$@"
+exit 99

misc/scripts/upx-clang-format.sh

@@ -2,11 +2,13 @@
 ## vim:set ts=4 sw=4 et:
 set -e; set -o pipefail
 
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
 # "Gofmt's style is nobody's favourite, but gofmt is everybody's favourite." --Rob Pike
-
+#
 # NOTE: we are using clang-format-15.0.6 from upx-stubtools
 # see https://github.com/upx/upx-stubtools/releases
-
+#
 # NOTE: we use .clang-format config from upx.git/.clang-format
 
 if [[ ! -f $UPX_CLANG_FORMAT ]]; then
@@ -29,4 +31,4 @@ ulimit -v 1048576 || true
 
 #echo $UPX_CLANG_FORMAT
 exec "$UPX_CLANG_FORMAT" -style=file "$@"
-exit 1
+exit 99

misc/testsuite/mimic_ctest.sh

@@ -0,0 +1,167 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs=$(readlink -fn "$argv0"); argv0dir=$(dirname "$argv0abs")
+
+#
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
+# mimic running "ctest", i.e. the "test" section of CMakeLists.txt
+#   - does not redirect stdout
+#   - allows freely setting $upx_exe_runner, while CMake is restricted to configure-time settings
+#
+# requires:
+#   $upx_exe                (required, but with convenience fallback "./upx")
+# optional settings:
+#   $upx_exe_runner         (e.g. "qemu-x86_64 -cpu Nehalem" or "valgrind")
+#
+
+#***********************************************************************
+# init & checks
+#***********************************************************************
+
+# upx_exe
+[[ -z $upx_exe && -f ./upx && -x ./upx ]] && upx_exe=./upx # convenience fallback
+if [[ -z $upx_exe ]]; then echo "UPX-ERROR: please set \$upx_exe"; exit 1; fi
+if [[ ! -f $upx_exe ]]; then echo "UPX-ERROR: file '$upx_exe' does not exist"; exit 1; fi
+upx_exe=$(readlink -fn "$upx_exe") # make absolute
+[[ -f $upx_exe ]] || exit 1
+
+# set emu and run_upx
+emu=()
+if [[ -n $upx_exe_runner ]]; then
+    # usage examples:
+    #   export upx_exe_runner="qemu-x86_64 -cpu Nehalem"
+    #   export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet"
+    #   export upx_exe_runner="wine"
+    IFS=' ' read -r -a emu <<< "$upx_exe_runner" # split at spaces into array
+elif [[ -n $CMAKE_CROSSCOMPILING_EMULATOR ]]; then
+    IFS=';' read -r -a emu <<< "$CMAKE_CROSSCOMPILING_EMULATOR" # split at semicolons into array
+fi
+run_upx=( "${emu[@]}" "$upx_exe" )
+echo "run_upx='${run_upx[*]}'"
+
+# run_upx sanity check
+if ! "${run_upx[@]}" --version-short >/dev/null; then echo "UPX-ERROR: FATAL: upx --version-short FAILED"; exit 1; fi
+if ! "${run_upx[@]}" -L >/dev/null 2>&1; then echo "UPX-ERROR: FATAL: upx -L FAILED"; exit 1; fi
+if ! "${run_upx[@]}" --help >/dev/null;  then echo "UPX-ERROR: FATAL: upx --help FAILED"; exit 1; fi
+
+#***********************************************************************
+# see CMakeLists.txt
+#
+# IDEA: create a Makefile and use "make -j8" so that these tests can
+#   run in parallel much like "ctest --parallel 8"
+#***********************************************************************
+
+# similar to cmake function upx_cache_bool_vars()
+set_cmake_bool_vars() {
+    local default_value="$1"; shift
+    local var_name
+    for var_name do
+        case "${!var_name}" in
+            0 | FALSE | OFF | false | off) eval "export $var_name=OFF" ;;
+            1 | TRUE | ON | true | on) eval "export $var_name=ON" ;;
+            *) eval "export $var_name=$default_value" ;;
+        esac
+    done
+}
+
+set -x
+set_cmake_bool_vars OFF UPX_CONFIG_DISABLE_SELF_PACK_TEST
+set_cmake_bool_vars OFF UPX_CONFIG_DISABLE_RUN_UNPACKED_TEST
+set_cmake_bool_vars OFF UPX_CONFIG_DISABLE_RUN_PACKED_TEST
+if [[ "${emu[0]}" == *valgrind* ]]; then # valgrind is SLOW
+    set_cmake_bool_vars ON  UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS
+else
+    set_cmake_bool_vars OFF UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS
+fi
+
+export UPX="--prefer-ucl --no-color --no-progress"
+export UPX_DEBUG_DISABLE_GITREV_WARNING=1
+export UPX_DEBUG_DOCTEST_DISABLE=1 # already checked above
+
+"${run_upx[@]}" --version
+"${run_upx[@]}" --version-short
+"${run_upx[@]}" --license
+"${run_upx[@]}" --help
+"${run_upx[@]}" --help-short
+"${run_upx[@]}" --help-verbose
+"${run_upx[@]}" --sysinfo
+"${run_upx[@]}" --sysinfo -v
+"${run_upx[@]}" --sysinfo -vv
+
+if [[ $UPX_CONFIG_DISABLE_SELF_PACK_TEST == ON ]]; then
+    echo "Self-pack test disabled. All done."; exit 0
+fi
+
+exe=".out"
+upx_self_exe=$upx_exe
+fo="--force-overwrite"
+
+"${run_upx[@]}" -3               "${upx_self_exe}" ${fo} -o upx-packed${exe}
+"${run_upx[@]}" -3 --all-filters "${upx_self_exe}" ${fo} -o upx-packed-fa${exe}
+"${run_upx[@]}" -3 --no-filter   "${upx_self_exe}" ${fo} -o upx-packed-fn${exe}
+"${run_upx[@]}" -3 --all-filters --debug-use-random-filter "${upx_self_exe}" ${fo} -o upx-packed-fr${exe}
+"${run_upx[@]}" -3 --nrv2b       "${upx_self_exe}" ${fo} -o upx-packed-nrv2b${exe}
+"${run_upx[@]}" -3 --nrv2d       "${upx_self_exe}" ${fo} -o upx-packed-nrv2d${exe}
+"${run_upx[@]}" -3 --nrv2e       "${upx_self_exe}" ${fo} -o upx-packed-nrv2e${exe}
+"${run_upx[@]}" -1 --lzma        "${upx_self_exe}" ${fo} -o upx-packed-lzma${exe}
+
+"${run_upx[@]}" -l         upx-packed${exe} upx-packed-fa${exe} upx-packed-fn${exe} upx-packed-fr${exe} upx-packed-nrv2b${exe} upx-packed-nrv2d${exe} upx-packed-nrv2e${exe} upx-packed-lzma${exe}
+"${run_upx[@]}" --fileinfo upx-packed${exe} upx-packed-fa${exe} upx-packed-fn${exe} upx-packed-fr${exe} upx-packed-nrv2b${exe} upx-packed-nrv2d${exe} upx-packed-nrv2e${exe} upx-packed-lzma${exe}
+"${run_upx[@]}" -t         upx-packed${exe} upx-packed-fa${exe} upx-packed-fn${exe} upx-packed-fr${exe} upx-packed-nrv2b${exe} upx-packed-nrv2d${exe} upx-packed-nrv2e${exe} upx-packed-lzma${exe}
+
+"${run_upx[@]}" -d upx-packed${exe}       ${fo} -o upx-unpacked${exe}
+"${run_upx[@]}" -d upx-packed-fa${exe}    ${fo} -o upx-unpacked-fa${exe}
+"${run_upx[@]}" -d upx-packed-fn${exe}    ${fo} -o upx-unpacked-fn${exe}
+"${run_upx[@]}" -d upx-packed-fr${exe}    ${fo} -o upx-unpacked-fr${exe}
+"${run_upx[@]}" -d upx-packed-nrv2b${exe} ${fo} -o upx-unpacked-nrv2b${exe}
+"${run_upx[@]}" -d upx-packed-nrv2d${exe} ${fo} -o upx-unpacked-nrv2d${exe}
+"${run_upx[@]}" -d upx-packed-nrv2e${exe} ${fo} -o upx-unpacked-nrv2e${exe}
+"${run_upx[@]}" -d upx-packed-lzma${exe}  ${fo} -o upx-unpacked-lzma${exe}
+
+# all unpacked files must be identical
+cmp -s upx-unpacked${exe} upx-unpacked-fa${exe}
+cmp -s upx-unpacked${exe} upx-unpacked-fn${exe}
+cmp -s upx-unpacked${exe} upx-unpacked-fr${exe}
+cmp -s upx-unpacked${exe} upx-unpacked-nrv2b${exe}
+cmp -s upx-unpacked${exe} upx-unpacked-nrv2d${exe}
+cmp -s upx-unpacked${exe} upx-unpacked-nrv2e${exe}
+cmp -s upx-unpacked${exe} upx-unpacked-lzma${exe}
+
+if [[ $UPX_CONFIG_DISABLE_RUN_UNPACKED_TEST != ON ]]; then
+    "${emu[@]}" ./upx-unpacked${exe} --version-short
+fi
+
+if [[ $UPX_CONFIG_DISABLE_RUN_PACKED_TEST != ON ]]; then
+    "${emu[@]}" ./upx-packed${exe}       --version-short
+    "${emu[@]}" ./upx-packed-fa${exe}    --version-short
+    "${emu[@]}" ./upx-packed-fn${exe}    --version-short
+    "${emu[@]}" ./upx-packed-fr${exe}    --version-short
+    "${emu[@]}" ./upx-packed-nrv2b${exe} --version-short
+    "${emu[@]}" ./upx-packed-nrv2d${exe} --version-short
+    "${emu[@]}" ./upx-packed-nrv2e${exe} --version-short
+    "${emu[@]}" ./upx-packed-lzma${exe}  --version-short
+fi
+
+if [[ $UPX_CONFIG_DISABLE_EXHAUSTIVE_TESTS != ON ]]; then
+    set +x
+    for method in nrv2b nrv2d nrv2e lzma; do
+        for level in 1 2 3 4 5 6 7; do
+            s="${method}-${level}"
+            echo "========== $s =========="
+            "${run_upx[@]}" -qq --${method} -${level} --all-filters --debug-use-random-filter "${upx_self_exe}" ${fo} -o upx-packed-${s}${exe}
+            "${run_upx[@]}" -qq -l upx-packed-${s}${exe}
+            "${run_upx[@]}" -qq --fileinfo upx-packed-${s}${exe}
+            "${run_upx[@]}" -qq -t upx-packed-${s}${exe}
+            "${run_upx[@]}" -qq -d upx-packed-${s}${exe} ${fo} -o upx-unpacked-${s}${exe}
+            cmp -s upx-unpacked${exe} upx-unpacked-${s}${exe}
+            if [[ $UPX_CONFIG_DISABLE_RUN_PACKED_TEST != ON ]]; then
+                "${emu[@]}" ./upx-packed-${s}${exe} --version-short
+            fi
+        done
+    done
+fi
+
+echo "run_upx='${run_upx[*]}'"
+echo "All done."

misc/testsuite/test_symlinks.sh

@@ -0,0 +1,425 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs=$(readlink -fn "$argv0"); argv0dir=$(dirname "$argv0abs")
+
+#
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
+# test file system behaviour with symlinks; requires:
+#   $upx_exe                (required, but with convenience fallback "./upx")
+# optional settings:
+#   $upx_exe_runner         (e.g. "qemu-x86_64 -cpu Nehalem" or "valgrind")
+#   $upx_test_file
+#
+
+# IMPORTANT NOTE: this script only works on Unix
+# IMPORTANT NOTE: do NOT run as user root!
+umask 0022
+
+# disable on macOS for now, see https://github.com/upx/upx/issues/612
+if [[ "$(uname)" == Darwin ]]; then
+    case "$UPX_DEBUG_FORCE_PACK_MACOS" in
+        "" | "0") echo "$0: SKIPPED"; exit 0 ;;
+    esac
+fi
+
+id || true
+echo "PWD='$PWD'"
+if [[ $UID == 0 || $EUID == 0 ]]; then
+    echo "ERROR: do not run as root: UID=$UID EUID=$EUID"
+    exit 91
+fi
+
+#***********************************************************************
+# init & checks
+#***********************************************************************
+
+# upx_exe
+[[ -z $upx_exe && -f ./upx && -x ./upx ]] && upx_exe=./upx # convenience fallback
+if [[ -z $upx_exe ]]; then echo "UPX-ERROR: please set \$upx_exe"; exit 1; fi
+if [[ ! -f $upx_exe ]]; then echo "UPX-ERROR: file '$upx_exe' does not exist"; exit 1; fi
+upx_exe=$(readlink -fn "$upx_exe") # make absolute
+[[ -f $upx_exe ]] || exit 1
+
+# set emu and run_upx
+emu=()
+if [[ -n $upx_exe_runner ]]; then
+    # usage examples:
+    #   export upx_exe_runner="qemu-x86_64 -cpu Nehalem"
+    #   export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet"
+    #   export upx_exe_runner="wine"
+    IFS=' ' read -r -a emu <<< "$upx_exe_runner" # split at spaces into array
+elif [[ -n $CMAKE_CROSSCOMPILING_EMULATOR ]]; then
+    IFS=';' read -r -a emu <<< "$CMAKE_CROSSCOMPILING_EMULATOR" # split at semicolons into array
+fi
+run_upx=( "${emu[@]}" "$upx_exe" )
+echo "run_upx='${run_upx[*]}'"
+
+# run_upx sanity check
+if ! "${run_upx[@]}" --version-short >/dev/null; then echo "UPX-ERROR: FATAL: upx --version-short FAILED"; exit 1; fi
+if ! "${run_upx[@]}" -L >/dev/null 2>&1; then echo "UPX-ERROR: FATAL: upx -L FAILED"; exit 1; fi
+if ! "${run_upx[@]}" --help >/dev/null;  then echo "UPX-ERROR: FATAL: upx --help FAILED"; exit 1; fi
+
+#***********************************************************************
+# util functions
+#***********************************************************************
+
+exit_code=0
+num_errors=0
+all_errors=
+
+failed() {
+    ####exit $1
+    # log error and keep going
+    exit_code=1
+    local a="$(basename "$(dirname "$PWD")")"
+    local b="$(basename "$PWD")"
+    let num_errors+=1 || true
+    all_errors="${all_errors} $a/$b/$1"
+    echo "    FAILED $b/$1"
+}
+
+assert_file() {
+    local f
+    for f in "$@"; do
+        [[ ! -L "$f" && -f "$f" ]] && continue
+        echo "failed '$f': not a regular file"
+        failed 21
+    done
+}
+
+assert_symlink_to_file() {
+    local f
+    for f in "$@"; do
+        [[ -L "$f" && -f "$f" ]] && continue
+        echo "failed '$f': not a symlink to file"
+        failed 22
+    done
+}
+
+assert_symlink_to_dir() {
+    local f
+    for f in "$@"; do
+        [[ -L "$f" && -d "$f" ]] && continue
+        echo "failed '$f': not a symlink to dir"
+        failed 23
+    done
+}
+
+assert_symlink_dangling() {
+    local f
+    for f in "$@"; do
+        [[ -L "$f" && ! -e "$f" ]] && continue
+        echo "failed '$f': not a dangling symlink"
+        failed 24
+    done
+}
+
+copy_directory() {
+    if command -v rsync >/dev/null; then
+        rsync -aH "$1/" "$2"
+    else
+        cp -ai "$1" "$2"
+    fi
+}
+
+create_files() {
+    # clean
+    local d
+    for d in z_dir_1 z_dir_2 z_dir_3 z_dir_4; do
+        if [[ -d $d ]]; then
+            chmod -R +rwx "./$d"
+            rm -rf "./$d"
+        fi
+    done
+
+    mkdir z_dir_1
+    cd z_dir_1
+    : > z_file
+    ln -s z_file z_symlink_file
+    : > z_file_link_1
+    ln z_file_link_1 z_file_link_2
+    ln -s z_file_link_1 z_symlink_file_link
+    mkdir z_dir
+    ln -s z_dir z_symlink_dir
+    ln -s z_file_missing z_symlink_dangling
+    assert_file             z_file*
+    assert_symlink_to_file  z_symlink_file
+    assert_symlink_to_dir   z_symlink_dir
+    assert_symlink_dangling z_symlink_dangling
+    cd ..
+
+    # write-protect z_dir_2/z_file*
+    copy_directory z_dir_1 z_dir_2
+    chmod a-w z_dir_2/z_file*
+
+    # write-protect z_dir_3 itself
+    copy_directory z_dir_1 z_dir_3
+    chmod a-w z_dir_3
+
+    # write-protect everything in z_dir_4
+    copy_directory z_dir_1 z_dir_4
+    chmod -R a-w z_dir_4
+}
+
+print_header() {
+    local x='==========='; x="$x$x$x$x$x$x$x"
+    echo -e "\n${x}\n${1}\n${x}\n"
+}
+
+enter_dir() {
+    cd "$1" || exit 1
+    echo "===== $(basename "$PWD")"
+}
+leave_dir() {
+    echo "===== $(basename "$PWD") files"
+    ls -lA
+    cd ..
+}
+
+#***********************************************************************
+# setup
+#***********************************************************************
+
+#set -x # debug
+
+export UPX="--prefer-ucl --no-color --no-progress"
+export UPX_DEBUG_DISABLE_GITREV_WARNING=1
+export UPX_DEBUG_DOCTEST_DISABLE=1 # already checked above
+
+# get $test_file
+if [[ -f $upx_test_file ]]; then
+    test_file="$(readlink -fn "$upx_test_file")"
+else
+    for test_file in /usr/bin/gmake /usr/bin/make /usr/bin/env /bin/ls; do
+        if [[ -f $test_file ]]; then
+            test_file="$(readlink -fn "$test_file")"
+            break
+        fi
+    done
+fi
+ls -l "$test_file"
+file "$test_file" || true
+
+# create and enter a tmpdir in the current directory
+tmpdir="$(mktemp -d tmp-upx-test-XXXXXX)"
+cd "./$tmpdir" || exit 1
+
+#***********************************************************************
+# default
+#***********************************************************************
+
+print_header "default"
+flags="-qq -2 --no-filter"
+mkdir default
+cd default
+create_files
+enter_dir z_dir_1
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              && failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      && failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link && failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  && failed 18
+assert_symlink_to_file  z_symlink_file z_symlink_file_link
+assert_symlink_to_dir   z_symlink_dir
+assert_symlink_dangling z_symlink_dangling
+leave_dir
+enter_dir z_dir_2
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              && failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      && failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link && failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  && failed 18
+assert_symlink_to_file  z_symlink_file z_symlink_file_link
+assert_symlink_to_dir   z_symlink_dir
+assert_symlink_dangling z_symlink_dangling
+leave_dir
+enter_dir z_dir_3
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              && failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      && failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link && failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  && failed 18
+assert_symlink_to_file  z_symlink_file z_symlink_file_link
+assert_symlink_to_dir   z_symlink_dir
+assert_symlink_dangling z_symlink_dangling
+leave_dir
+enter_dir z_dir_4
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              && failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      && failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link && failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  && failed 18
+assert_symlink_to_file  z_symlink_file z_symlink_file_link
+assert_symlink_to_dir   z_symlink_dir
+assert_symlink_dangling z_symlink_dangling
+leave_dir
+cd ..
+
+#***********************************************************************
+# force-overwrite
+#***********************************************************************
+
+print_header "force-overwrite"
+flags="-qq -2 --no-filter --force-overwrite"
+mkdir force-overwrite
+cd force-overwrite
+create_files
+enter_dir z_dir_1
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              || failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       || failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  || failed 18
+assert_file z_symlink_file z_symlink_file_link
+assert_file z_symlink_dir
+assert_file z_symlink_dangling
+leave_dir
+enter_dir z_dir_2
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              || failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       || failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  || failed 18
+assert_file z_symlink_file z_symlink_file_link
+assert_file z_symlink_dir
+assert_file z_symlink_dangling
+leave_dir
+enter_dir z_dir_3
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              || failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  && failed 18
+assert_symlink_to_file  z_symlink_file z_symlink_file_link
+assert_symlink_to_dir   z_symlink_dir
+assert_symlink_dangling z_symlink_dangling
+leave_dir
+enter_dir z_dir_4
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              || failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  && failed 18
+assert_symlink_to_file  z_symlink_file z_symlink_file_link
+assert_symlink_to_dir   z_symlink_dir
+assert_symlink_dangling z_symlink_dangling
+leave_dir
+cd ..
+
+#***********************************************************************
+# link
+#***********************************************************************
+
+print_header "link"
+flags="-qq -2 --no-filter --link"
+mkdir link
+cd link
+create_files
+enter_dir z_dir_1
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              || failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       || failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  || failed 18
+assert_file z_symlink_file z_symlink_file_link
+assert_file z_symlink_dir
+assert_file z_symlink_dangling
+leave_dir
+enter_dir z_dir_2
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              && failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       || failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  || failed 18
+assert_file z_symlink_file z_symlink_file_link
+assert_file z_symlink_dir
+assert_file z_symlink_dangling
+leave_dir
+enter_dir z_dir_3
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              || failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  && failed 18
+assert_symlink_to_file  z_symlink_file z_symlink_file_link
+assert_symlink_to_dir   z_symlink_dir
+assert_symlink_dangling z_symlink_dangling
+leave_dir
+enter_dir z_dir_4
+"${run_upx[@]}" $flags                 z_symlink_file      && failed 10
+"${run_upx[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${run_upx[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${run_upx[@]}" $flags "$test_file" -o z_file              && failed 13
+"${run_upx[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${run_upx[@]}" $flags "$test_file" -o z_symlink_dangling  && failed 18
+assert_symlink_to_file  z_symlink_file z_symlink_file_link
+assert_symlink_to_dir   z_symlink_dir
+assert_symlink_dangling z_symlink_dangling
+leave_dir
+cd ..
+
+#***********************************************************************
+# done
+#***********************************************************************
+
+# clean up
+cd ..
+chmod -R +rwx "./$tmpdir"
+rm -rf "./$tmpdir"
+
+if [[ $exit_code == 0 ]]; then
+    echo "UPX testsuite passed. All done."
+else
+    echo "UPX-ERROR: UPX testsuite FAILED:${all_errors}"
+    echo "UPX-ERROR: UPX testsuite FAILED with $num_errors error(s). See log file."
+fi
+exit $exit_code

misc/testsuite/upx_testsuite_1-expected_sha256sums.sh

@@ -46,164 +46,164 @@ b8c35fa2956da17ca505956e9f5017bb5f3a746322647e24ccb8ff28059cafa4 *powerpc-linux.
 a0950546dc17fca9437219431d8ddb0249ce5b08e899e0c799a87ac982adee70 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t110_compress_ucl_nrv2b_3_no_filter="\
-d0b9b8a5bdbbc2f037e7e7b7a9fd2acd7b434ac03d7c59b4f2779c8621eed95e *amd64-linux.elf/upx-3.91
-d36bff9e6f49c93e4c37ab50e109bd6378128017555f8f819080f02235d48d7e *amd64-linux.elf/upx-3.95
-9c312f13ddd40a62fed7ee9f6a21fff15cae7517d4ddf55f493101b22d8e43f1 *amd64-win64.pe/upx-3.95.exe
-b138d38c3955697ee0302332c031c996bacacf5e17eea8fce3282c4ea88f7299 *arm-linux.elf/upx-3.95
-e0436401972603f7fad6c693e96c89c37370113e75b8bdb4d4ecd14dda4cd8fe *arm-wince.pe/upx-3.91.exe
-22107e27f63c5509f5d1c1312cb8ea1e116811695ee7f4deb765f0aa53b25a51 *arm64-linux.elf/upx-3.95
-beae687a0575a65cec981e7cc63fd562d212d7ed64befe5dde2f0b7f92e4838e *armeb-linux.elf/upx-3.91
-55391ffd6bccd2be4e423466d327b9f345371f9941dbb30c003e677b984e8a5e *armeb-linux.elf/upx-3.95
-a467edf8758a5b3e219bc193a9d143cb880f7d1a94771367cda7117129b34cfc *i386-dos32.djgpp2.coff/upx-3.91.exe
-934593ba98f2dfff94197885894e7e56ff452da02a234e70734e2445b27ae8aa *i386-dos32.djgpp2.coff/upx-3.95.exe
-f26697e9a9fceca98b10c1ab6a834fa6b2bd2826a2285deaafe8cd1c754a2f61 *i386-linux.elf/upx-3.91
-f23467fde1af895827e7ad7c46c372802820143620fef2abe657aa8b6e7bdb26 *i386-linux.elf/upx-3.95
-9dd14ff1328b0d501aca10d36623b2b76c754e9677cc0bdd0c5ded740796cecf *i386-win32.pe/upx-3.91.exe
-5320b28b44ae1a50ea435ccabf7fe94c8031be7375c425ed618cb1f9a649442f *i386-win32.pe/upx-3.95.exe
-d30bf134c5231317ae2182059034842f58d906b9dc49546bbb552f4e0411085f *m68k-atari.tos/upx-3.91.ttp
-9d0fca1d248d11ec8e96801dae3978c959a26e372e05836c15b56cfc0b4aa077 *mips-linux.elf/upx-3.95
-d68a073cb1c222515502a3a0e8f91f424cb8cedb0d849d247531c2955fa5399a *mipsel-linux.elf/upx-3.91
-48919a0e564866d59ae1efae06269cea2cf7ebb5e3fda4a9ce70f9f1092a7e59 *mipsel-linux.elf/upx-3.95
-93f04183b21f077d6423c23efee62f0c920cd63463b0932ac6200e966e423763 *powerpc-linux.elf/upx-3.91
-9ef05193c11073f477606ff2c8654f11c370951ff5a7902ba0cab31598751029 *powerpc-linux.elf/upx-3.95
-1c04d45914809449337f22c93bf645703c6c6aa499e789ff9d2dd787be257e96 *powerpc64le-linux.elf/upx-3.95
+f0c85faf008ad8e51e71f9c29122fe23cce8e584fdea2c7a56b1b49bf9bfe8bc *amd64-linux.elf/upx-3.91
+82c13304a9799c5afb1963bc666f888e0c05923cb088d8d2bcc62c4aa734ad8f *amd64-linux.elf/upx-3.95
+f3a107343e8bf9d079cf669c34139bc2c99695b87881e440e5441c0403548d1f *amd64-win64.pe/upx-3.95.exe
+862dc98313017cda5c7f5bc859cd7c46c203ad8da95fbf3784dbc0229672af43 *arm-linux.elf/upx-3.95
+e6636ae5cf7f54cbe65f3768f0858d5045b0b67e087b85ddcab029d76ca46e7d *arm-wince.pe/upx-3.91.exe
+3f3223911d8044d2e32eb3b185bbe5a148f8719fd19cdba7fc3f5e389019e994 *arm64-linux.elf/upx-3.95
+c91d57c236864a6237566ac9ee32e2b1aa89bcecf688a548d6b9e80339c7fcbc *armeb-linux.elf/upx-3.91
+5ffe5dadc9c0b18f427c6a13de0065946d4437ff43ef260c48702d5ba3a0d7e6 *armeb-linux.elf/upx-3.95
+a5ba2584080983aada1956c12692189742f4e0bf878b60e19a9ec1bc4228f301 *i386-dos32.djgpp2.coff/upx-3.91.exe
+1cd743f67f24c2588b99cfca15299bc4237fc1667f1d0615f8be995fac1696a3 *i386-dos32.djgpp2.coff/upx-3.95.exe
+6af6e47762c51b8789c11619bd95fef07cacb1b8f875ee8139e903fa1cc764d7 *i386-linux.elf/upx-3.91
+01442d33443d9b7328464597bbaf7d410b0b6f04d10d3edf6d9c1b3bad3b563b *i386-linux.elf/upx-3.95
+a12101d24d8a248163584774c742fa2e054f5c377665b25726f824d2dfdb2878 *i386-win32.pe/upx-3.91.exe
+53f31cfa7f07d723620764df42abc47fbae679901760ca1b53a4c79a88ada2a0 *i386-win32.pe/upx-3.95.exe
+65f8e36edecb0635eae313c66a81e1529a4f6b1693f72416dfbc285824846f88 *m68k-atari.tos/upx-3.91.ttp
+6a5d54b5a4805f96cc59a65a137002c1d25531d1429699139b09943ee9caf18f *mips-linux.elf/upx-3.95
+421ac9190bd99715acd2f4a97becca55039c8f78c350ea6043f8a3b06978f0d8 *mipsel-linux.elf/upx-3.91
+b17bc6b7673c33075bc3906e1bf7d7f109af7fba7bac3255b1c6fd13df89346d *mipsel-linux.elf/upx-3.95
+dd82483277f03e4ed6042a4ac863f76500f9a0ba074c8225590c798d2153e278 *powerpc-linux.elf/upx-3.91
+d65b9f3241982b4c4a0050cf3f3421f70d0019092560291e1e45cd88f146ee81 *powerpc-linux.elf/upx-3.95
+0a155990ebcc5af095b907a9a69cf072e5d0f531ec70358d8deee785009cc543 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t120_compress_ucl_nrv2d_3_no_filter="\
-89369823c5f2316f00f4a8af2e810a94050e28254669a2a2547a73b166178db2 *amd64-linux.elf/upx-3.91
-a267b53b2de081c414ef82351a5e88431cafdd86f8202e48929d637bf6af9192 *amd64-linux.elf/upx-3.95
-1f40d3e26e266b7c305e01a0e480f936746d1c54df32826f5f6f16fbbe58f20b *amd64-win64.pe/upx-3.95.exe
-3d1ac6e85dfa79f8aa36d2d73073181c5cf7dd6c3e83da3b9248fa990c535d2a *arm-linux.elf/upx-3.95
-856d307362db229387d3d33ad8478a8cba45c71d67d5bbf2d9794154a755722f *arm-wince.pe/upx-3.91.exe
-2fdec54995bf5367991ef64a7582a3a0e3724a71d89e77fdbe8c5bb67071d65e *arm64-linux.elf/upx-3.95
-ddde64e009beff80e2e185b03dbe1b966ffa4c5db18fcd80c409b52233d4bb81 *armeb-linux.elf/upx-3.91
-08aece1b25973a84bedb155c2976ca08e4ce1334e21659e5583f17a0e9e3bc3c *armeb-linux.elf/upx-3.95
-ee07e1e15ff7a467f9ad262daa12886211f107886cae154795651d3cdba6fba3 *i386-dos32.djgpp2.coff/upx-3.91.exe
-f73ac819d5f7f81b7cf62198381a51273df6a697d5429a144f42fabef0bcc327 *i386-dos32.djgpp2.coff/upx-3.95.exe
-3b9e78245b5fa3108d2e69c22764e8204d24089f6661790edbdb88a508923191 *i386-linux.elf/upx-3.91
-6a9aa8025e9389cbbe81a04926d12e120fd57b9909de4ee934e878a04fcf6169 *i386-linux.elf/upx-3.95
-7a667cc2b566ae2f8836cc3c21d55e45bf35d61beca22ec2a806d6bcbfa1f082 *i386-win32.pe/upx-3.91.exe
-cdd58a31c4914bdde47f03d81b988ffc9aa2af482de775c88cae144b4ff04293 *i386-win32.pe/upx-3.95.exe
-02b969917d52c4bd07e49e4ad589db8a1e4fa27984eac2eede03bc1abf73c376 *m68k-atari.tos/upx-3.91.ttp
-722ac1505bdaed421b6cce390608661be7236d4108429853485b8354b3c59347 *mips-linux.elf/upx-3.95
-7309ee902e2c41ae72cc111c185d34e355e3892566e826698780fe69845174ad *mipsel-linux.elf/upx-3.91
-fec12c58da7886a1eaf4702b2b0c710e2b72c4179070b04691b963d1c503c73b *mipsel-linux.elf/upx-3.95
-13ad283bc0e4f37f9f06eddb8c384faa4a2e66e045496aa79dfde0ae59f14a95 *powerpc-linux.elf/upx-3.91
-812550c5b65c39e347648e6ab9d51b2466919205a8b0928ef941ab3160151471 *powerpc-linux.elf/upx-3.95
-0e651fdc257be7b3143ad06559a137be6c87f7b7ec721d1f727dc138465b219d *powerpc64le-linux.elf/upx-3.95
+58c0b1d2ba1d1affb532efe1e55646629c53644dc55bf5dff585bbce1db5eb1a *amd64-linux.elf/upx-3.91
+3f5942d5a43fa2473146bcad10ffd28d7e3aa13981adb3e73827cffbb3d7e1f6 *amd64-linux.elf/upx-3.95
+e3e0c4a4c17c494d2228def4cfedf9def9f66d53eefe9208178565178882c442 *amd64-win64.pe/upx-3.95.exe
+82d1a89589d7beb1e16d13e9abb1636ddc21a182da9dec302303f05fa253f87b *arm-linux.elf/upx-3.95
+fed423b4a93090db5e94739f5662c183f10605bca3ebec0dc497936bf1357e00 *arm-wince.pe/upx-3.91.exe
+d7d2e6dd5e314d1ca6987f24d28dfa4a7a733486744f7ead068428683924bf5e *arm64-linux.elf/upx-3.95
+be64f68e93443dea8b44d2a793c160efc4bc8a143018dbe227603dc832a8e93f *armeb-linux.elf/upx-3.91
+5b3f6ecc52562f4b0bda58283cee0824015869199803112163ed0f9a2296da87 *armeb-linux.elf/upx-3.95
+65bfc96aadb43c6828e9e42e1992176b61d339ff17a4e70e5f0af7a898e81a9e *i386-dos32.djgpp2.coff/upx-3.91.exe
+78cf195faccd6b5b9ff1790cbb2008bfafc49a8e3eb3fa6c11b74d8c3128b315 *i386-dos32.djgpp2.coff/upx-3.95.exe
+6dfc802b397c976078e81ea298031af215961f1ee6254a4100a1402b1f097648 *i386-linux.elf/upx-3.91
+14c1d4ef28374188b9e03714258507fd5f1fdc3e602d7a32343815a23456c941 *i386-linux.elf/upx-3.95
+24c0712c8b1ad505762429c4f31ef68bbc030d29f6bde18a9cb9722a78e7ba2b *i386-win32.pe/upx-3.91.exe
+a4338529d1dfa339cb2ac25fbc0c56028d288e7393b2fda57e5d6588f388313a *i386-win32.pe/upx-3.95.exe
+4f1d68f6e66df8fecad727d0177cfad9a2b9a66fb298600a4fb4a5273b531a60 *m68k-atari.tos/upx-3.91.ttp
+595912450d678df1832d3f6e33f0f1d3787ff2fb9fb2ebf9712378d563c06835 *mips-linux.elf/upx-3.95
+42c3485bdb4455bac91ac7279b061a26d203c46b8bb8284d00d93da9c50acf08 *mipsel-linux.elf/upx-3.91
+bd20dd1f41bf72d61fbd59be2cfa008e7a0a052272a5731e0d880c47cf6bfd5a *mipsel-linux.elf/upx-3.95
+a3be663023c7cc534edb14477fb639da47d32ef88c25055ed94f22419bc34159 *powerpc-linux.elf/upx-3.91
+cc883bf36c11a4ceae5371c66e0f4b28dafa9ea4076df5eae533bcdc611c3be5 *powerpc-linux.elf/upx-3.95
+ce5bf80740e5c13883f44fecc42f8f4eb61fe768b10eda796e7ab1fc66d76dbe *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t130_compress_ucl_nrv2e_3_no_filter="\
-5ee77141a1fdf1af31f3f9be97e60446873e659e341993a3bbceacb655618aa5 *amd64-linux.elf/upx-3.91
-b94c4603c372400a06c2ae7838ed9f41e6e9393d81e091a0ceed39c861e3443f *amd64-linux.elf/upx-3.95
-c9230d017885d7727ca766cb7933d0681a93ef21856c39fbf807899b734172c0 *amd64-win64.pe/upx-3.95.exe
-6ae717a2a7ebe99f6d1c3af8c83939f5efe2144670806c336640ad88c29a9d90 *arm-linux.elf/upx-3.95
-6dbd0442d9e45c82d113463eb592d117c6761fd073e942342516fb0339d935e7 *arm-wince.pe/upx-3.91.exe
-6f12e95d71382a7960b9712c75a897974f29561d2a8e774b7e984c9fba380aea *arm64-linux.elf/upx-3.95
-94dbeae5763e5c86d865e9c6e473aafdb200b1ed06bfd5981728e0fa5cc6dcc6 *armeb-linux.elf/upx-3.91
-cab852c4a69042aca4337869edce3af5f5aab8bf562a626ab755da0a5517bd73 *armeb-linux.elf/upx-3.95
-dc6d412f41101e334f9e09c52e63f513e2b0bd047064283c0f7389276dd6d28b *i386-dos32.djgpp2.coff/upx-3.91.exe
-0ab8e2454b1f5bfed09a8d0c231f4c595c7445b09077387ebb9348292206be59 *i386-dos32.djgpp2.coff/upx-3.95.exe
-7b6efd3d82b503f4d0ea3a111e80b0a1b785a2766ddea9f4090a7de190f811be *i386-linux.elf/upx-3.91
-c1ede9406344f8b0d5fb08777c31c62016e36f54f3ff69fc03ffbc09d5b40a0e *i386-linux.elf/upx-3.95
-728c6dc0c02d9ea3f7a0c86595fd64423f5545651b3a7bbc9e708759d8eec157 *i386-win32.pe/upx-3.91.exe
-8569f6942377259c5a92acfe5bf0b2874f6ef3af40177947a8055e7641a776ef *i386-win32.pe/upx-3.95.exe
-c4753f47328d70823f85b5d378502556388ee0a9ea6bf100cd6c73651126b3fb *m68k-atari.tos/upx-3.91.ttp
-a918b7825fd5bf50097a62177b4638abee5aeb864e06ce1624042cace8a9a922 *mips-linux.elf/upx-3.95
-4b5cddac9a79b5e7aa99b7589d7e862bfbe026da44c2fed2a1f396883b072442 *mipsel-linux.elf/upx-3.91
-cc1be3f4d27d3ab5f6073f38c47ca72f4ba47121b14b7e60a4906a6d04af4e9c *mipsel-linux.elf/upx-3.95
-cedc2def9464f839e9aab153dfe93dda0d37d0da43e8c600ef366f6adf17b64b *powerpc-linux.elf/upx-3.91
-748a4a2481b73ff2881b6de39749f1672b8b8d7f1d66a6453374caf6d840777d *powerpc-linux.elf/upx-3.95
-f07f45141bf199db4847fd11ff56f496790efc3b7cff248a93c4ca45ca76a71a *powerpc64le-linux.elf/upx-3.95
+2207030b7262baa62b107c876399753ae080021eebd65bc26f2811ab9c584109 *amd64-linux.elf/upx-3.91
+813c26d1c905ff526c60bde16c6f3fc00b05ec391c1265c8f08e73b10d97e229 *amd64-linux.elf/upx-3.95
+0136fbd3b9706eedff270c2a59bbce60bc56f939ce8fe64cc03ae2524c80cdc0 *amd64-win64.pe/upx-3.95.exe
+7f34ca5efb80c4a54c5b7e1d2225ed0a594394b85d2d22741687511d4056779b *arm-linux.elf/upx-3.95
+a52b38546e1273920936aef97d6880f768cf951aaacb1cefdb7349db581ea792 *arm-wince.pe/upx-3.91.exe
+9d52fb78b10e30b213926bb0e3749f7fb86303267d57616729e34aa180125ab8 *arm64-linux.elf/upx-3.95
+87fd843f80b2e8ce8321db6ec0b54742457d332f913ede8ed8507bdbb377dda0 *armeb-linux.elf/upx-3.91
+d3cf89367b1af3f444e3f47b527b59e77a8bd01849f78a1b40e0831edd789b74 *armeb-linux.elf/upx-3.95
+10f60ea47cdce4b63c44d55709978cbe77e2cb507b3498320df98e9464dc1475 *i386-dos32.djgpp2.coff/upx-3.91.exe
+c80cec60ad9ed268b3a150299881d25035fa45638885df5a82287596d0708ef1 *i386-dos32.djgpp2.coff/upx-3.95.exe
+8f96a1d430eefa75f76207dc7cddf3f3b06cc3b6611a2cab4131e6694d54bf03 *i386-linux.elf/upx-3.91
+76fb0e1394b7ac7c9e08522f5e7d4a7996515eceb6b804c8114ee819ffcee206 *i386-linux.elf/upx-3.95
+03a74c66ce822c948abc20f1b41b7508a2d5a60975912f89569997795f92f957 *i386-win32.pe/upx-3.91.exe
+c84de2b06d4a82a788c0c63ff1acd92a01344601b156c0cc878ccc24a07bc7d0 *i386-win32.pe/upx-3.95.exe
+15dea9aa84e82d1be8d847eb7b774abd0080fb938896d37a06d9fbf07ee137d2 *m68k-atari.tos/upx-3.91.ttp
+3c2e472ce7aea4d8bf8fcd27488764fef52fee7fa48807f3879c44dfabf3c131 *mips-linux.elf/upx-3.95
+db72872a3e605bec878dbb7e841b950c8f8b9279b088fdb4b8142accbf85d78b *mipsel-linux.elf/upx-3.91
+407b5b6465d5af0ef43fbaf0e041115bba224a30f84f061249bfea4a7ed21b2e *mipsel-linux.elf/upx-3.95
+8d751e64f87be51d847dcc4bf0bf54f92213bed18b16919659c94dea5e5e77f8 *powerpc-linux.elf/upx-3.91
+d56e4ca8274f11a26fb33518e155ca6aad6c88953bdbced23c4378c43ed7e531 *powerpc-linux.elf/upx-3.95
+c20cde25c44f9c4f1aa68b4307615be23a241d31acffcf612d9f5066e9703b43 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t140_compress_lzma_2_no_filter="\
-f553659c34a772cbdaf571d83d9c8173b75f1e2deecf7c590d38e34b46cab43b *amd64-linux.elf/upx-3.91
-9464896ca0082d41cf7e51159e7cd58a637b0a9d7a9151930e81746f1f43898b *amd64-linux.elf/upx-3.95
-255ef236a7fe03865dd300ce447c57754aef05de537564f38715eef64285c6fa *amd64-win64.pe/upx-3.95.exe
-88ae278afa54ac766f1940f3607c91d4915cdd492988dafac9be274dbda6fd5b *arm-linux.elf/upx-3.95
-14f77ebb33e788aa8f9a9ad608232c3f9047dc6dfd55ceb02244a36cac9aea25 *arm-wince.pe/upx-3.91.exe
-a79b9a7fc7e8a5e0b42fdf342fe44aae827e63809b0797d3deefd4b9f184388c *arm64-linux.elf/upx-3.95
-17603d9f6b48e10b438d65c70e8afbf87a82f84a6ee12e96ac66371663d4f18f *armeb-linux.elf/upx-3.91
-5162fcc6f1327c76c2221d7a5f9668d05dd828f7a6d4dbbc732005d244947805 *armeb-linux.elf/upx-3.95
-3a94cec95fd3eac557bf929b372b20b155e8d331e44e47eb3486b048ebb36c9f *i386-dos32.djgpp2.coff/upx-3.91.exe
-632b63bce916203d52d997d191728667d1091694a5cfc1a2ed327b540357e7e9 *i386-dos32.djgpp2.coff/upx-3.95.exe
-04edc6bc3ec1a4217461ee6b81b0ea29fb25a62721c92ea62ab0dfaa147412b1 *i386-linux.elf/upx-3.91
-36f47959198dace24777e95c3dcff64940ce514dc62b9cb794e957e969f07bae *i386-linux.elf/upx-3.95
-cf3c0f31aca86f30edb45e4bd945997d7acca9c2d54acfc427936fe4ff2ba355 *i386-win32.pe/upx-3.91.exe
-c774fb5e3dcc0a00fa58ce223c30d7805f2f96606d9dddda30075c6a6c35a639 *i386-win32.pe/upx-3.95.exe
-3be124d31c578530d8aa4da4ad53346a6fd62c8d4f3a9b1d068d5f912d9117ee *m68k-atari.tos/upx-3.91.ttp
-0ed619426db38bdbb783e2f47a1ce36c4b6831e00be8626f560cdf968b61f8a1 *mips-linux.elf/upx-3.95
-9b83be53c444ad4dda60b8fa3faf9a7ae4ffb1f99027364a2af52e6c12e64462 *mipsel-linux.elf/upx-3.91
-e405854a04fc1ebf272e57ffc74580e387ce8860ec460d77e660c829d30d9153 *mipsel-linux.elf/upx-3.95
-f876a78a55939bf5ec990aaa3ece0a8a69d0a70eb7b00422d44ee1f0fa9ec6ea *powerpc-linux.elf/upx-3.91
-8e65ca7e13e26b18c5ee93ab2c1a06f244dd7fff72da4523de3225feed9a4002 *powerpc-linux.elf/upx-3.95
-07c6d83eeb6c664674df125fa9711c76140ccec562022f8d1334c761c00e787e *powerpc64le-linux.elf/upx-3.95
+50532540dbd85b45c7a5968311144dcc28087453ed053d9b025e59a79d1085a9 *amd64-linux.elf/upx-3.91
+b750a28c3a4e15a5cde30b4bc98880dc2d9119cb1a0f8507a47ecebecc0b638c *amd64-linux.elf/upx-3.95
+1f8bb9320a0083fcd6a9debefc1ef7bd0a1fdc83a60d5f920f91c7b6fc6940b9 *amd64-win64.pe/upx-3.95.exe
+aaa86b905cf1e0b75446a4d02212fe6dd7c07d473aabf59711fc2f9cc7f4c447 *arm-linux.elf/upx-3.95
+518d80035753e184eff1a0b26c76f79df7725a28dfe6738355263a9b4eed9788 *arm-wince.pe/upx-3.91.exe
+148227eed271db8ef9367349211d91520c6e10fdd1cc31382fe3b83ca6dad30d *arm64-linux.elf/upx-3.95
+487a46b214fd36db0cd814a98fe608ec6baad5fa3111c5fcf5b5902c554b9149 *armeb-linux.elf/upx-3.91
+94a2289a1c17bf647681d52ac050677149bbcee8a6eb944051b7734d94e5c7d0 *armeb-linux.elf/upx-3.95
+d6dcbfb921ce4fb936f3c90929bab1c4922b557068a45a7f5e2d1e4af7462b6d *i386-dos32.djgpp2.coff/upx-3.91.exe
+efd3af572e9517128e49d0b013358abc0174966a8e596648af08bc3a3c822a05 *i386-dos32.djgpp2.coff/upx-3.95.exe
+b98b1d2c9bea47155d26d078e152bd73a675cf91051db1419e872ba3b23d8b82 *i386-linux.elf/upx-3.91
+5182b9e69dd6440eacaae7213ebbe2a4bb7d4a0a2bbd650bb2b0cad0dbe8704f *i386-linux.elf/upx-3.95
+770117cff05d8cf50a1ef7be873aae7d11649f2757d02b17dc8817104fa70f0d *i386-win32.pe/upx-3.91.exe
+460c437f090f68a8bc2c5f2557b8aa784b3a5cd7f8ef87fa6992305e1070125c *i386-win32.pe/upx-3.95.exe
+eaf53678fb35365dd6a20983b0379251b8aa28350a238b1636141ddc555a4520 *m68k-atari.tos/upx-3.91.ttp
+77dcc76fda69c13a8f58cbaf34376e734457909810ec351b291b63774752e1de *mips-linux.elf/upx-3.95
+ad82bf571be17ecdd19520959e9e770205163693561cc6b3a6c206ca7ce8694d *mipsel-linux.elf/upx-3.91
+7f3f5b2522761550f01d1c88b5f68d0f4a391c3470418b86a10f6ca5872f4357 *mipsel-linux.elf/upx-3.95
+63a339a06d497120002ad45d549eef5db2f07e7419f1c68a8ede9f36c7ec4b96 *powerpc-linux.elf/upx-3.91
+5ba0f8485b832d8da4d7210f01c09850fdad9a9d1f99d3726147494fed90b130 *powerpc-linux.elf/upx-3.95
+0c89a155ff7acbaf5ca9618a7d632650ceb99c089d3dd8e56280b28d44302361 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t150_compress_ucl_2_all_filters="\
-c41d2eb5d32c57b1302ceb17bb18b3cf7f611f8e31478f47e188cc39870b0e8d *amd64-linux.elf/upx-3.91
-0dd8f6812aed9accea975c855dc2b4ae48fa2d03554614484de1d0335364e370 *amd64-linux.elf/upx-3.95
-8cf83b49aab1a366318591fe69d87408ec1f7b36c3470a9cee82fd1fc39d7899 *amd64-win64.pe/upx-3.95.exe
-b4b25da30e8f5da864bd8319d1c9b193eff9cf20f365d768763a2972a02d4c0f *arm-linux.elf/upx-3.95
-040117965a54878b7665b7f8155230e0f171a7749c961a1dca26eb76719b3b97 *arm-wince.pe/upx-3.91.exe
-2b790cb0fe0b83ade980b1014e4b2f9336557f4f3ae469b94a32757ea88a281c *arm64-linux.elf/upx-3.95
-aa7ad6e9b537ab8a17d4bee539d220b39ec0fded7e9924178e3be786c6cc6907 *armeb-linux.elf/upx-3.91
-66b161bdb4f9c94518f04acb385ddcaa180913f62bafc060d9f723f2bde40bdb *armeb-linux.elf/upx-3.95
-1584cbffe0037e9e3c441aeac8fc2ef226ee78d0430d4298070c7258a5de650e *i386-dos32.djgpp2.coff/upx-3.91.exe
-da37d160c4c185dfb7c0754637278a512503ecc396741678adfda38423eaae44 *i386-dos32.djgpp2.coff/upx-3.95.exe
-39d8526dfd19d6fa8753731dc4dd362ede4a360f834f41f7d320f3e5ac1aa083 *i386-linux.elf/upx-3.91
-3a86c29348f68ec5b99dad6b739a66c36f64bf35adcc7defa950e3140c99e11d *i386-linux.elf/upx-3.95
-6cc7deccbafc7c5a658a017ca18613b004d3b9b21e2a4e08343f92fbb82587fb *i386-win32.pe/upx-3.91.exe
-43c04b1eef6ea89821dc8689f09865008784fcb2152cbc59a3be7c091a56a536 *i386-win32.pe/upx-3.95.exe
-d0ccb6fa3cb2557923c494a5d41615e2ba6687960144a98ae575761d20ff29d6 *m68k-atari.tos/upx-3.91.ttp
-9a217e5a233b523a1d031819f8e9acb00d5be03e8e8b718dc18a8819b5b04a3a *mips-linux.elf/upx-3.95
-a5e18b41cad43cc4583cbb49248c3608d64df760a8deb302aaed5f96d3f9a46b *mipsel-linux.elf/upx-3.91
-b799dbcfc4fde1cdfa572a0143a4513d83636ea0883eec320761ae57a7c36ccd *mipsel-linux.elf/upx-3.95
-ce42a8aad4bbed730e7bcd7970efa170040eef22c9ecad4a993b81d2f6780329 *powerpc-linux.elf/upx-3.91
-6c812174a92107ac598a6b36b2e14cad82109813e14c436a2aa9d517bdea107b *powerpc-linux.elf/upx-3.95
-047a4063962c372bce50aed451404d06e3f00a4f8a535acf0f92895ebc47ba0a *powerpc64le-linux.elf/upx-3.95
+af5fcd8a9b1c3869b082b2fe72c962a4dc651f1f2d8979eedbea4b2a82e6b955 *amd64-linux.elf/upx-3.91
+4e0eb2be5592d19ee7ac0acfb68dec8d4393b996d4e3c112c34ffac0ba59b7b8 *amd64-linux.elf/upx-3.95
+0bc7af47ffb8a45b6877289c6bf8693d118a122190501438f7d77f318f8f7490 *amd64-win64.pe/upx-3.95.exe
+6b16659fa1fb13af0709273f41e18d3304996bb7c71ee679f589c7701b7480de *arm-linux.elf/upx-3.95
+2510e493e524dcb86b5cffc16cdeb116fe41e2a6ef765f066a88dad30b09e039 *arm-wince.pe/upx-3.91.exe
+a19d8c1b68864540a0e6394fbd77f55293de372903821f9e11ad4782c5bc313c *arm64-linux.elf/upx-3.95
+bd7c2bf7bcfd4d70fdfaba51a2dfb9820f586e61a6414fb6c888f9c5b1a64ed6 *armeb-linux.elf/upx-3.91
+1080b69f81b9fe7de4abee22e7ba88efbc6ea1a3e8d59f4e48268072a4cfc7f7 *armeb-linux.elf/upx-3.95
+8998ed7c785b2f242ebff1aa88225702c281eeb31bf02f6edd61851c22271fd0 *i386-dos32.djgpp2.coff/upx-3.91.exe
+c955d35d9f829ba442db2bd26b2eb9d65c06ac15ffbbf96d77577365f489c2c9 *i386-dos32.djgpp2.coff/upx-3.95.exe
+cffe561026b58c3a16a78392ca835b212a6f82b7d995a6f0d607aea8b90e35a9 *i386-linux.elf/upx-3.91
+9fe71ad10328ddf551ed58ed377fe4b131a8deb2de9c0b3e56c1d5936075d540 *i386-linux.elf/upx-3.95
+f4754aa1ab522cd208c93e9caf49ac0d4c357a2636fea1d94a24de3f54252c4a *i386-win32.pe/upx-3.91.exe
+54ebf5551a267e36c6afbebcde77e0f2ac1b52f66834545da082c4146f2ec03e *i386-win32.pe/upx-3.95.exe
+a085aa278eab7c2b82d9d7b931a889bb8cdff2af993b2a446dfc652603c9b8b1 *m68k-atari.tos/upx-3.91.ttp
+9ab8d07b0e5aa4269d18bd0783f74c8cad6d681839774f091ea65b35231aa0be *mips-linux.elf/upx-3.95
+ab46fcc2f009fab7b5186c33e3d288df999e3ac96f3863fa82c314d4f8fa3d43 *mipsel-linux.elf/upx-3.91
+b23c4c341228a30a7f8a6e027279a2f016510e8011b2da4b460657bc633303fb *mipsel-linux.elf/upx-3.95
+ac26cabae4f900d5dbe06ec2128c66ff3d3934967d4e8f7fa8003d977827b554 *powerpc-linux.elf/upx-3.91
+f109345301a767465e966c59f9b97fcbc57dd123f0cfd6b3a1508d063afcb71a *powerpc-linux.elf/upx-3.95
+14925049ea4d38ba1a7b1fa88397ea47c32b3e75aa73311acd5ce984dc9edff9 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t160_compress_all_methods_1_no_filter="\
-848eff62a732dce17b36fa34277727cdbe68637dd169c0d4fa831a8085369c6c *amd64-linux.elf/upx-3.91
-9a7a1df07d95f17b64a9c714a444b61baf790a3a3378b53c1f0f7752c5ef7aa3 *amd64-linux.elf/upx-3.95
-ff5f4d665a04bfa1bddabf9853686626aea828a8e542006ef7d76d49b549d9d5 *amd64-win64.pe/upx-3.95.exe
-a1f0f5df99eeed2009cdf2d253c824335b7010d91458297718bd257a2c2bc464 *arm-linux.elf/upx-3.95
-8b236855f4df2df1072a93d3bd1f7203c3d43801830a38679afc354250c6a7be *arm-wince.pe/upx-3.91.exe
-e0644a18614e3ff48c3a8c306ab0c057a3ef58fab7015e522a6ef7a9aeb28970 *arm64-linux.elf/upx-3.95
-bffe4754c49568fcc9cf67e973ecb9a48e8119bab4b03d9ebae436192fbfe76b *armeb-linux.elf/upx-3.91
-e69f6fc17db59b12c6910af45704c33387079492c24b1659038433e4211a8898 *armeb-linux.elf/upx-3.95
-14133daa854c4355b25e58803ad9b5e4bfb5e665fdbf12489f8b7c29ef6646a3 *i386-dos32.djgpp2.coff/upx-3.91.exe
-1a903afd11b866820a1814c6ee8a68431727e5c570045169295a425a6198a273 *i386-dos32.djgpp2.coff/upx-3.95.exe
-86a466a5d4568b225216cce95738fc63457b065b36590ca4d204108768ca8f78 *i386-linux.elf/upx-3.91
-79077dc8b999ee25171ee721e8ca56880c6d0b486f88747861ef437370075504 *i386-linux.elf/upx-3.95
-58b93bd7d162f89c2ea187590c515192649831ab94435b87b27d47a9e74379e4 *i386-win32.pe/upx-3.91.exe
-34c4260a53579a6859668cf3eb6c069cf5db82c00ad605bfdc8b2f1e0450aa16 *i386-win32.pe/upx-3.95.exe
-8495d281bf4a8f193a204b5a56d49b3c645370049e8e83db4154db3e02d55543 *m68k-atari.tos/upx-3.91.ttp
-388b013a17b84b1068502fb01b13a78a17bec5f1bd7953ec127ee3c952a7da1c *mips-linux.elf/upx-3.95
-466da371ef3123d18c61e2a094d7a609e16dd005f0ea8a46d813690405e1d616 *mipsel-linux.elf/upx-3.91
-36bed2f441c3abc918b46cfb80ff1bd31c82b264c3f69dcf0c1c28521fd53128 *mipsel-linux.elf/upx-3.95
-0b988e12ea324ce2c6ba9506209bbb80c10bb6a02ff8949887e810f44d710338 *powerpc-linux.elf/upx-3.91
-94981cf2f48631c476da88f8e5dcecf3ee68772ce12b189d33aaf871ef7a9536 *powerpc-linux.elf/upx-3.95
-616a829f2d1324fad2863481a5cba088f2a51c38de866c20fe9d9d7a75df3dfc *powerpc64le-linux.elf/upx-3.95
+0b4129ac4d2660a61f65f89f5e4dfd337e757504ce7cdc865dfc40236a32fb98 *amd64-linux.elf/upx-3.91
+56dbdb335ebaa58fb9a5b2cb1a0ca7ca9b0e6f02d4d06bc6cefc0433c166b5b2 *amd64-linux.elf/upx-3.95
+1b508481525d63d90d7b9125a7ce5f3f2adfedaa6b771f2a8f4f4502cd425dfb *amd64-win64.pe/upx-3.95.exe
+0768ad7425df8a1397cacd6e611beaefec03e6b2be97109dfce5ee71773b3b9d *arm-linux.elf/upx-3.95
+24d9a9331ed1bf1f29286e58a3cf7f3c3d2cfc1e8763393088e8d967a0c404eb *arm-wince.pe/upx-3.91.exe
+43f8f19d6928d072f6a8889c1045b39664d731b1164427c8f200d9aee00b8f15 *arm64-linux.elf/upx-3.95
+7520c0b23566e2acec6989d4d657dd004773e8da2b2f4c6440f41c5af3be0b23 *armeb-linux.elf/upx-3.91
+3adb141d33987869834da0fa971b1c5fde50cca227e2981856dba4be8e439909 *armeb-linux.elf/upx-3.95
+73759310b8554f0011db0e5d443717e112a70f67376fa180bf1d08575f410998 *i386-dos32.djgpp2.coff/upx-3.91.exe
+10a3d68b8a5364b4244f5273165530bc3b68f853a9096dd83d1f8536e7d679e0 *i386-dos32.djgpp2.coff/upx-3.95.exe
+69d47a715530e3d4e45a51be5c3c64ed59c1237d2b4c59d8cb8d11dcdd85266a *i386-linux.elf/upx-3.91
+f90e868783a5f216a59d230e4685d88abdc7d920de78139a841726bfc8a2395b *i386-linux.elf/upx-3.95
+6354a77c83a760b0621242982ace576a58941c687c8d0e2154d91263d45a7fd9 *i386-win32.pe/upx-3.91.exe
+43d261ecf3dccf8bb1c3591b38dc20acedd846b1f5bba0a9fa290d29e6f5bd8f *i386-win32.pe/upx-3.95.exe
+586ad3f4d1a421cbfc86a38bc0b1f3d48dc5bf76ecd8281b001ff1e42cd5ed6c *m68k-atari.tos/upx-3.91.ttp
+d88760fbaac2c4628c1cb6c8b3828c3ec717ac02e87c7c452d39fb2de9e32412 *mips-linux.elf/upx-3.95
+a3599c2acd0a449693468612a5ca897e48612cff448489df42f2d78775c36606 *mipsel-linux.elf/upx-3.91
+bbe0cad71e7c0f93884f972ed1f0b464184a6f7bed57fc8c5120db758166e742 *mipsel-linux.elf/upx-3.95
+1247a34c56ae1eea834207a409f955a39362184ed730d0bdf797e20440fbad2a *powerpc-linux.elf/upx-3.91
+318e5c3db467a6d14d157828931932e4ae822b255970b8a6a8f4038e6c14ad03 *powerpc-linux.elf/upx-3.95
+424837c52bce0853f0f97dc69273de4e2f0c3cf09fd992b08b1bfd79fbe04281 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t170_compress_all_methods_no_lzma_5_no_filter="\
-55046a0c623116f9d6c78e62d7f3fb781e3aa8d8a03e987f49f0705ee3a7840b *amd64-linux.elf/upx-3.91
-a9ca57293b43b093fb9582a81a2ad2877f7c2546a536541bf3766452a9faa4aa *amd64-linux.elf/upx-3.95
-3247a637f6cc56219bc2d6a3b16237226e1ba97ac1d0fce012657e23bfe256c3 *amd64-win64.pe/upx-3.95.exe
-d43683421216236ab6e90f4f7d6ad69f3b1d18e53bc5dd57b5dcea2916fe480f *arm-linux.elf/upx-3.95
-387787098a33b61637b39d7d015972d18e687771d8596b74286764ac73ee9286 *arm-wince.pe/upx-3.91.exe
-e2e476b9ccfd13f14940f28240b8e6f85ce0e21f6cc5b619cc2972b9238b5bd2 *arm64-linux.elf/upx-3.95
-538eef066d7deb4b6c07de4a50ffaf24a759278beeee9204e4d6c642aa382de3 *armeb-linux.elf/upx-3.91
-9349eca3e551ce1d2ab95735b8898efc54439c3d87395f2c0bddbe88fbc35cbc *armeb-linux.elf/upx-3.95
-ce768b3be6ffeb84d0558a937a9a5778427ce56898a9b3ef9490e7e5ba6ce688 *i386-dos32.djgpp2.coff/upx-3.91.exe
-849e285cb39e5609f384559398c47f5e34d2067711c58aacc5ed1c97495b8da0 *i386-dos32.djgpp2.coff/upx-3.95.exe
-6a0b78c2af8d68faac587531b32679a3a264fa86f524cf801db31a41a231becb *i386-linux.elf/upx-3.91
-e524ee0c3058ba4a44073ec29d67982bc39721865b33e6881dffbe2329a79279 *i386-linux.elf/upx-3.95
-06d281a60d5ed815f74052e3e133915739e58c3a563a2e914186e85114687a12 *i386-win32.pe/upx-3.91.exe
-a1c3256670c4f55d3aea58063c4689d122c605d079537a27b1952eeab8d5d6ad *i386-win32.pe/upx-3.95.exe
-b866f184c6fe911b410afa8080acd1c7fddc11131d15bd272eb8adbca20439d2 *m68k-atari.tos/upx-3.91.ttp
-197d7dace27bbeba5627868b7a333b4580673ffe38353f3a11bd2d65b4216470 *mips-linux.elf/upx-3.95
-9b13d57d59a97313e20a0d3e02641045fddd5eb3bcbbcf7772181d5d87c4b3bf *mipsel-linux.elf/upx-3.91
-6f671511e19d9719c0bc7c2344d65cbf13a04da1c9bae9e55d2ca83ba9dede0a *mipsel-linux.elf/upx-3.95
-4ec415399f04f546d9831758a3cfedb00f20b06cb7e1c2eb38354aff3b6d3004 *powerpc-linux.elf/upx-3.91
-20e31a1df4eb5f6a930b34707b591265c6b5609ee2b2cdd5f504009284d1afc9 *powerpc-linux.elf/upx-3.95
-fe4dd9c59e6ae76ff23d6b4df27ca0df4289f6d13c8e3dc8d82c22982639ddd9 *powerpc64le-linux.elf/upx-3.95
+301f1ac99e989824b4171305c4bf21f848da49169a0ea35f9d954b6782946e3f *amd64-linux.elf/upx-3.91
+bbd292d29f547d15d7ce1e5c16470282e91017a4bd317b24e71c9fc078e625e8 *amd64-linux.elf/upx-3.95
+dea208e13322f5545cd0f16ff06969dc9ded456191bc827803f5a871ec6e239f *amd64-win64.pe/upx-3.95.exe
+93762a9cbeed31a7eee4762f410baee0c92ffaabc36c9dc92a7eb21e6f4fc526 *arm-linux.elf/upx-3.95
+56349a327b7172010484f58e3ed13a9c5819241e1326d20843516458d85ec6c2 *arm-wince.pe/upx-3.91.exe
+9c12ee31c2dbffb30ca41e799ea22f37a82be3b3af0cb3d93fb8159d57ad40b5 *arm64-linux.elf/upx-3.95
+6f4f80cb1bc8aedf2aade7b48e404c1edfd9e361818dc52d495b66951684107a *armeb-linux.elf/upx-3.91
+b1d33445d3732860c6c20c9dc7b643886c8fd180a19abccdf489c7af297d1575 *armeb-linux.elf/upx-3.95
+abdb6b7df1c5bcb30cf7534de2527df0e9edc961828a68e77c336a29a01810b8 *i386-dos32.djgpp2.coff/upx-3.91.exe
+3bda7b44bf9ca7a5a3272a2fb0202cba96017a34b1829cc371c9b7cbd7f43f2f *i386-dos32.djgpp2.coff/upx-3.95.exe
+503edbca35752de11340e0364374432a08da5ab4b2719aadea9482f7018f3e68 *i386-linux.elf/upx-3.91
+99c951666eeecab20e08a88b198943ca694d755570135ef218396968edec76e4 *i386-linux.elf/upx-3.95
+c5960e4e4fb392a6b439a95d5b41a86be95e3f7898923268bf76534be4bfd6f2 *i386-win32.pe/upx-3.91.exe
+d391d97db4a4593e8c3871968b3731817a8cac52953649619d0d63deb27fea74 *i386-win32.pe/upx-3.95.exe
+6eec8f9d2eb1a0547f8f8c1c346227468422387dc8899782878a682d4d4e03a2 *m68k-atari.tos/upx-3.91.ttp
+a18383777c6c3ee7436447e7babb131e29608d235de47ea2583d1233b9b7103e *mips-linux.elf/upx-3.95
+f4bf1e6fc9ebbdb798a6cd4875419bd9e7bfcf12d9439d926581ff60430dbd84 *mipsel-linux.elf/upx-3.91
+7df55c1c945968d986ac6321f2503379a4a6b061f2ac59ab2dd68e2cb509839e *mipsel-linux.elf/upx-3.95
+40b7830288602fb85b8068b7daebdb6c33fb64b79543ad87a412189dfdfc3583 *powerpc-linux.elf/upx-3.91
+f012035e5268519485025fbc8a1286c4a380f2c80d979df182190bc32d7258e2 *powerpc-linux.elf/upx-3.95
+439cd93ccaa2b916bfb6d6c1c91cd09451121f9a8d8cad3386d628940b966870 *powerpc64le-linux.elf/upx-3.95
 "
 ########## end .sha256sums.recreate

misc/testsuite/upx_testsuite_1.sh

@@ -3,21 +3,25 @@
 set -e; set -o pipefail
 argv0=$0; argv0abs=$(readlink -fn "$argv0"); argv0dir=$(dirname "$argv0abs")
 
+#
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
 # very first version of the upx-testsuite; requires:
 #   $upx_exe                (required, but with convenience fallback "./upx")
 #   $upx_testsuite_SRCDIR   (required, but with convenience fallback)
 #   $upx_testsuite_BUILDDIR (optional)
 #
 # optional settings:
-#   $upx_exe_runner         (e.g. "qemu-x86_64 -cpu Westmere" or "valgrind")
+#   $upx_exe_runner         (e.g. "qemu-x86_64 -cpu Nehalem" or "valgrind")
 #   $UPX_TESTSUITE_VERBOSE
 #   $UPX_TESTSUITE_LEVEL
 #
 # see https://github.com/upx/upx-testsuite.git
+#
 
-# /***********************************************************************
-# // init & checks
-# ************************************************************************/
+#***********************************************************************
+# init & checks
+#***********************************************************************
 
 # upx_exe
 [[ -z $upx_exe && -f ./upx && -x ./upx ]] && upx_exe=./upx # convenience fallback
@@ -25,21 +29,25 @@ if [[ -z $upx_exe ]]; then echo "UPX-ERROR: please set \$upx_exe"; exit 1; fi
 if [[ ! -f $upx_exe ]]; then echo "UPX-ERROR: file '$upx_exe' does not exist"; exit 1; fi
 upx_exe=$(readlink -fn "$upx_exe") # make absolute
 [[ -f $upx_exe ]] || exit 1
-upx_run=()
+
+# set emu and run_upx
+emu=()
 if [[ -n $upx_exe_runner ]]; then
     # usage examples:
-    #   export upx_exe_runner="qemu-x86_64 -cpu Westmere"
+    #   export upx_exe_runner="qemu-x86_64 -cpu Nehalem"
     #   export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet"
     #   export upx_exe_runner="wine"
-    IFS=' ' read -r -a upx_run <<< "$upx_exe_runner" # split at spaces into array
+    IFS=' ' read -r -a emu <<< "$upx_exe_runner" # split at spaces into array
+elif [[ -n $CMAKE_CROSSCOMPILING_EMULATOR ]]; then
+    IFS=';' read -r -a emu <<< "$CMAKE_CROSSCOMPILING_EMULATOR" # split at semicolons into array
 fi
-upx_run+=( "$upx_exe" )
-echo "upx_run='${upx_run[*]}'"
+run_upx=( "${emu[@]}" "$upx_exe" )
+echo "run_upx='${run_upx[*]}'"
 
-# upx_run check, part1
-if ! "${upx_run[@]}" --version-short >/dev/null; then echo "UPX-ERROR: FATAL: upx --version-short FAILED"; exit 1; fi
-if ! "${upx_run[@]}" -L >/dev/null 2>&1; then echo "UPX-ERROR: FATAL: upx -L FAILED"; exit 1; fi
-if ! "${upx_run[@]}" --help >/dev/null;  then echo "UPX-ERROR: FATAL: upx --help FAILED"; exit 1; fi
+# run_upx sanity check
+if ! "${run_upx[@]}" --version-short >/dev/null; then echo "UPX-ERROR: FATAL: upx --version-short FAILED"; exit 1; fi
+if ! "${run_upx[@]}" -L >/dev/null 2>&1; then echo "UPX-ERROR: FATAL: upx -L FAILED"; exit 1; fi
+if ! "${run_upx[@]}" --help >/dev/null;  then echo "UPX-ERROR: FATAL: upx --help FAILED"; exit 1; fi
 
 # upx_testsuite_SRCDIR
 if [[ -z $upx_testsuite_SRCDIR ]]; then
@@ -68,19 +76,30 @@ fi
 mkdir -p "$upx_testsuite_BUILDDIR" || exit 1
 upx_testsuite_BUILDDIR=$(readlink -fn "$upx_testsuite_BUILDDIR") # make absolute
 [[ -d $upx_testsuite_BUILDDIR ]] || exit 1
-
 cd / && cd "$upx_testsuite_BUILDDIR" || exit 1
 : > ./.mfxnobackup
 
-# upx_run check, part2
-if ! "${upx_run[@]}" --version-short >/dev/null; then
+# run_upx sanity check after "cd"
+if ! "${run_upx[@]}" --version-short >/dev/null; then
     echo "UPX-ERROR: FATAL: upx --version-short FAILED"
     echo "please make sure that \$upx_exe contains ABSOLUTE file paths and can be run from any directory"
-    echo "INFO: upx_run='${upx_run[*]}'"
+    echo "INFO: run_upx='${run_upx[*]}'"
     exit 1
 fi
-if ! "${upx_run[@]}" -L >/dev/null 2>&1; then echo "UPX-ERROR: FATAL: upx -L FAILED"; exit 1; fi
-if ! "${upx_run[@]}" --help >/dev/null;  then echo "UPX-ERROR: FATAL: upx --help FAILED"; exit 1; fi
+
+#***********************************************************************
+# setup
+#***********************************************************************
+
+#set -x # debug
+
+exit_code=0
+num_errors=0
+all_errors=
+
+export UPX="--prefer-ucl --no-color --no-progress"
+export UPX_DEBUG_DISABLE_GITREV_WARNING=1
+export UPX_DEBUG_DOCTEST_DISABLE=1 # already checked above
 
 case $UPX_TESTSUITE_LEVEL in
     [0-8]) ;;
@@ -91,35 +110,22 @@ if [[ $UPX_TESTSUITE_LEVEL == 0 ]]; then
     exit 0
 fi
 
-# /***********************************************************************
-# // setup
-# ************************************************************************/
-
-#set -x # debug
-exit_code=0
-num_errors=0
-all_errors=
-
-export UPX="--prefer-ucl --no-color --no-progress"
-export UPX_DEBUG_DISABLE_GITREV_WARNING=1
-export UPX_DEBUG_DOCTEST_VERBOSE=0
-
 rm -rf ./testsuite_1
 mkdir testsuite_1 || exit 1
 cd testsuite_1 || exit 1
 
-# /***********************************************************************
-# // support functions
-# ************************************************************************/
+#***********************************************************************
+# support functions
+#***********************************************************************
 
 run_upx() {
     local ec=0
     if [[ $UPX_TESTSUITE_VERBOSE == 1 ]]; then
-        echo "LOG: '${upx_run[*]}' $*"
+        echo "LOG: '${run_upx[*]}' $*"
     fi
-    "${upx_run[@]}" "$@" || ec=$?
+    "${run_upx[@]}" "$@" || ec=$?
     if [[ $ec != 0 ]]; then
-        echo "FATAL: '${upx_run[*]}' $*"
+        echo "FATAL: '${run_upx[*]}' $*"
         echo "  (exit code was $ec)"
         exit 42
     fi
@@ -194,13 +200,13 @@ testsuite_run_compress() {
     fi
 }
 
-# /***********************************************************************
-# // expected checksums
-# //
-# // To ease maintenance of this script in case of updates this section
-# // can be automatically re-created from the current checksums -
-# // see call of function recreate_expected_sha256sums below.
-# ************************************************************************/
+#***********************************************************************
+# expected checksums
+#
+# To ease maintenance of this script in case of updates this section
+# can be automatically re-created from the current checksums -
+# see call of function recreate_expected_sha256sums below.
+#***********************************************************************
 
 recreate_expected_sha256sums() {
     local o="$1"
@@ -218,9 +224,9 @@ recreate_expected_sha256sums() {
 
 source "$argv0dir/upx_testsuite_1-expected_sha256sums.sh" || exit 1
 
-# /***********************************************************************
-# // decompression tests
-# ************************************************************************/
+#***********************************************************************
+# decompression tests
+#***********************************************************************
 
 testdir=t010_decompressed
 mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha256sums.expected
@@ -250,11 +256,11 @@ for f in t010_decompressed/*/*; do
 done
 testsuite_check_sha $testdir
 
-# /***********************************************************************
-# // compression tests
-# // info: we use fast compression levels because we want to
-# //   test UPX and not the compression libraries
-# ************************************************************************/
+#***********************************************************************
+# compression tests
+# info: we use fast compression levels because we want to
+#   test UPX and not the compression libraries
+#***********************************************************************
 
 if [[ $UPX_TESTSUITE_LEVEL -ge 2 ]]; then
 testdir=t110_compress_ucl_nrv2b_3_no_filter
@@ -298,9 +304,9 @@ mkdir $testdir; v=expected_sha256sums__$testdir; echo -n "${!v}" >$testdir/.sha2
 time testsuite_run_compress --all-methods --no-lzma -5 --no-filter
 fi
 
-# /***********************************************************************
-# // summary
-# ************************************************************************/
+#***********************************************************************
+# summary
+#***********************************************************************
 
 # recreate checksums from current version for an easy update in case of changes
 recreate_expected_sha256sums .sha256sums.recreate
@@ -313,7 +319,7 @@ ls -l "$upx_exe"
 if command -v file >/dev/null; then
     file "$upx_exe" || true
 fi
-echo "upx_run='${upx_run[*]}'"
+echo "run_upx='${run_upx[*]}'"
 echo "upx_testsuite_SRCDIR='$upx_testsuite_SRCDIR'"
 echo "upx_testsuite_BUILDDIR='$upx_testsuite_BUILDDIR'"
 echo ".sha256sums.{expected,current} counts:"

misc/valgrind/musl.supp

@@ -0,0 +1,41 @@
+#
+# valgrind suppressions for musl libc
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
+
+# musl malloc
+{
+   musl-malloc-enframe
+   Memcheck:Cond
+   fun:enframe
+}
+
+# these are only needed for older musl versions
+
+{
+   musl-malloc-mal0_clear
+   Memcheck:Cond
+   fun:mal0_clear
+   fun:calloc
+}
+
+{
+   musl-string-memchr
+   Memcheck:Cond
+   fun:memchr
+}
+{
+   musl-string-stpcpy
+   Memcheck:Cond
+   fun:stpcpy
+}
+{
+   musl-string-strchrnul
+   Memcheck:Cond
+   fun:strchrnul
+}
+{
+   musl-string-strlen
+   Memcheck:Cond
+   fun:strlen
+}

src/Makefile

@@ -3,52 +3,42 @@
 # Copyright (C) Markus Franz Xaver Johannes Oberhumer
 #
 
-# NOTE: this Makefile is deprecated - please directly use the CMake build
-# instead. And see the top-level Makefile for some pre-defined CMake
-# build configurations.
-
-MAKEFLAGS += -r
-export SHELL = /bin/sh
+# NOTE: this Makefile is intended for developers - please use
+#   the top-level Makefile instead
 
 ifndef srcdir
-  srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
-  srcdir := $(shell echo '$(srcdir)' | sed 's,/*$$,,' || echo 'ERROR')
+  srcdir := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
 endif
 ifndef top_srcdir
   top_srcdir := $(srcdir)/..
 endif
 
-#
-# redirect to top-level CMake build
-#
+#***********************************************************************
+# redirect to top-level Makefile
+#***********************************************************************
 
-# NOTE that top-level Makefile .DEFAULT_GOAL is build/release
-.DEFAULT_GOAL = build/debug
-
-build/debug:   $(top_srcdir)/build/debug/upx
-build/release: $(top_srcdir)/build/release/upx
-# shortcuts
-all: build/debug build/release
-debug: build/debug
-release: build/release
-
-$(top_srcdir)/build/debug/upx: PHONY
-	$(MAKE) -C $(top_srcdir) build/debug
-$(top_srcdir)/build/release/upx: PHONY
-	$(MAKE) -C $(top_srcdir) build/release
+# NOTE that the top-level Makefile .DEFAULT_GOAL is build/release
+.DEFAULT_GOAL = build/all
 
 .NOTPARALLEL: # because the actual builds use "cmake --parallel"
 .PHONY: PHONY
 .SECONDEXPANSION:
 .SUFFIXES:
 
-#
-# "make run-testsuite"
-# see https://github.com/upx/upx-testsuite.git
-#
+build/debug build/release build/all:                PHONY; $(MAKE) -C $(top_srcdir) $@
+build/debug+test build/release+test build/all+test: PHONY; $(MAKE) -C $(top_srcdir) $@
+# shortcuts
+debug release all:                                  PHONY; $(MAKE) -C $(top_srcdir) $@
+debug+test release+test all+test:                   PHONY; $(MAKE) -C $(top_srcdir) $@
 
-# search for the UPX testsuite -- git clone https://github.com/upx/upx-testsuite.git
-# you also can override upx_testsuite_SRCDIR
+test: $$(patsubst %+test,%,$$(.DEFAULT_GOAL))+test PHONY
+
+#***********************************************************************
+# make run-testsuite
+# git clone https://github.com/upx/upx-testsuite.git
+#***********************************************************************
+
+# search for the UPX testsuite; you can override by setting "upx_testsuite_SRCDIR"
 ifndef upx_testsuite_SRCDIR
 # search standard locations below $(top_srcdir)
 ifneq ($(wildcard $(top_srcdir)/../upx--upx-testsuite.git/files/packed/.),)
@@ -62,49 +52,57 @@ endif
 
 # run the UPX testsuite
 # The expected (old) checksums are in $(top_srcdir)/misc/testsuite/upx_testsuite_1-expected_sha256sums.sh
-# The   actual (new) checksums are in ./tmp-upx-testsuite/testsuite_1/.sha256sums.recreate
+# The   actual (new) checksums are in ./tmp-upx-testsuite-*/testsuite_1/.sha256sums.recreate
 ifneq ($(wildcard $(upx_testsuite_SRCDIR)/files/packed/.),)
 ifneq ($(wildcard $(top_srcdir)/misc/testsuite/upx_testsuite_1.sh),)
-run-testsuite: run-testsuite-release
+run-testsuite:     run-testsuite-release PHONY
+run-testsuite-all: run-testsuite-debug run-testsuite-release PHONY
 run-testsuite-%: export upx_testsuite_SRCDIR := $(upx_testsuite_SRCDIR)
-run-testsuite-%: export upx_testsuite_BUILDDIR := ./tmp-upx-testsuite
+run-testsuite-debug: export upx_testsuite_BUILDDIR := ./tmp-upx-testsuite-debug
 run-testsuite-debug: export upx_exe := $(top_srcdir)/build/debug/upx
-run-testsuite-debug: PHONY $(top_srcdir)/build/debug/upx
+run-testsuite-debug: build/debug PHONY
 	time -p bash $(top_srcdir)/misc/testsuite/upx_testsuite_1.sh
+run-testsuite-release: export upx_testsuite_BUILDDIR := ./tmp-upx-testsuite-release
 run-testsuite-release: export upx_exe := $(top_srcdir)/build/release/upx
-run-testsuite-release: PHONY $(top_srcdir)/build/release/upx
+run-testsuite-release: build/release PHONY
 	time -p bash $(top_srcdir)/misc/testsuite/upx_testsuite_1.sh
 endif
 endif
 
-#
-# "make clang-format"
-#
+#***********************************************************************
+# make check-whitespace
+#***********************************************************************
 
-# automatically format some C++ source code files
-ifeq ($(shell uname),Linux)
-# Markus loves clang-format, but John hates it; find a compromise
-CLANG_FORMAT_EXCLUDE_FILES += conf.h miniacc.h version.h packer_c.cpp
-CLANG_FORMAT_EXCLUDE_FILES += p_elf.h p_elf_enum.h p_lx_% p_mach% p_unix% p_vmlin%
-CLANG_FORMAT_EXCLUDE_FILES += compress/compress.h filter/filter_impl.cpp
-CLANG_FORMAT_FILES := $(sort $(wildcard *.[ch]* ../maint/src/*.[ch]* [cu]*/*.[ch]*))
-CLANG_FORMAT_FILES := $(filter-out $(CLANG_FORMAT_EXCLUDE_FILES),$(CLANG_FORMAT_FILES))
-clang-format: PHONY $(CLANG_FORMAT_FILES)
-	@echo "running upx-clang-format"
-	@$(top_srcdir)/misc/scripts/upx-clang-format.sh -i $(CLANG_FORMAT_FILES)
-endif
+ifneq ($(wildcard /usr/bin/env),) # need Unix utils like bash, perl, sed, xargs, etc.
 
-#
-# "make check-whitespace"
-#
-
-CHECK_WHITESPACE =
-ifeq ($(shell uname),Linux)
-CHECK_WHITESPACE = $(top_srcdir)/misc/scripts/check_whitespace.sh $(top_srcdir)
+CHECK_WHITESPACE = bash $(top_srcdir)/misc/scripts/check_whitespace.sh $(top_srcdir)
 ifneq ($(wildcard $(top_srcdir)/.git/.),)
-CHECK_WHITESPACE = $(top_srcdir)/misc/scripts/check_whitespace_git.sh $(top_srcdir)
+CHECK_WHITESPACE = bash $(top_srcdir)/misc/scripts/check_whitespace_git.sh $(top_srcdir)
 endif
 check-whitespace: PHONY; $(CHECK_WHITESPACE)
-endif
+
+endif # /usr/bin/env
+
+#***********************************************************************
+# make clang-format
+#***********************************************************************
+
+# automatically format most C++ source code files
+ifneq ($(wildcard /usr/bin/env),)
+ifeq ($(shell uname),Linux)
+
+# Markus loves clang-format, but John hates it; find a compromise
+CLANG_FORMAT_EXCLUDE_FILES += stub/%.h util/miniacc.h
+CLANG_FORMAT_EXCLUDE_FILES += p_lx_% p_mach% p_unix% p_vmlin%
+CLANG_FORMAT_FILES := $(sort $(wildcard *.[ch]* ../maint/src/*.[ch]* */*.[ch]*))
+CLANG_FORMAT_FILES += $(sort $(wildcard stub/tools/*/*.[ch]*))
+CLANG_FORMAT_FILES += $(sort $(wildcard ../misc/cmake/try_compile/*.[ch]*))
+CLANG_FORMAT_FILES := $(sort $(filter-out $(CLANG_FORMAT_EXCLUDE_FILES),$(CLANG_FORMAT_FILES)))
+clang-format: $(CLANG_FORMAT_FILES) PHONY
+	@echo "running upx-clang-format"
+	@bash $(top_srcdir)/misc/scripts/upx-clang-format.sh -i $(CLANG_FORMAT_FILES)
+
+endif # Linux
+endif # /usr/bin/env
 
 # vim:set ts=8 sw=8 noet:

src/bele_policy.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -33,12 +33,14 @@
 
 #if defined(BELE_CTP)
 // CTP - Compile-Time Polymorphism (templates)
-#define V static inline
+#define V  static inline bele_constexpr
+#define VV static forceinline_constexpr
 #define S  static int __acc_cdecl_qsort
 #define C  noexcept
 #elif defined(BELE_RTP)
 // RTP - Run-Time Polymorphism (virtual functions)
 #define V  virtual
+#define VV virtual
 #define S  virtual int
 #define C  const noexcept
 #else
@@ -47,7 +49,7 @@
 
 #if defined(BELE_RTP)
 struct AbstractPolicy {
-    explicit inline AbstractPolicy() noexcept {}
+    explicit inline AbstractPolicy() noexcept = default;
     virtual inline ~AbstractPolicy() noexcept {}
     V bool isBE() C = 0;
     V bool isLE() C = 0;
@@ -79,12 +81,9 @@ struct AbstractPolicy {
 
 private:
     // disable copy and move
-    AbstractPolicy(const AbstractPolicy &) DELETED_FUNCTION;
-    AbstractPolicy &operator=(const AbstractPolicy &) DELETED_FUNCTION;
-    AbstractPolicy(AbstractPolicy &&) noexcept DELETED_FUNCTION;
-    AbstractPolicy &operator=(AbstractPolicy &&) noexcept DELETED_FUNCTION;
+    UPX_CXX_DISABLE_COPY_MOVE(AbstractPolicy)
     // disable dynamic allocation
-    ACC_CXX_DISABLE_NEW_DELETE
+    UPX_CXX_DISABLE_NEW_DELETE(AbstractPolicy)
 };
 #endif
 
@@ -93,19 +92,19 @@ private:
 #define C const noexcept override
 #endif
 
-struct BEPolicy
+struct BEPolicy final
 #if defined(BELE_RTP)
-    final : public AbstractPolicy
+    : public AbstractPolicy
 #endif
 {
-    explicit inline BEPolicy() noexcept {}
+    explicit inline BEPolicy() noexcept = default;
 #if defined(BELE_CTP)
     typedef N_BELE_RTP::BEPolicy RTP_Policy;
 #elif defined(BELE_RTP)
     typedef N_BELE_CTP::BEPolicy CTP_Policy;
 #endif
-    V bool isBE() C { return true; }
-    V bool isLE() C { return false; }
+    VV bool isBE() C { return true; }
+    VV bool isLE() C { return false; }
 
     typedef BE16 U16;
     typedef BE32 U32;
@@ -147,27 +146,24 @@ struct BEPolicy
 
 private:
     // disable copy and move
-    BEPolicy(const BEPolicy &) DELETED_FUNCTION;
-    BEPolicy &operator=(const BEPolicy &) DELETED_FUNCTION;
-    BEPolicy(BEPolicy &&) noexcept DELETED_FUNCTION;
-    BEPolicy &operator=(BEPolicy &&) noexcept DELETED_FUNCTION;
+    UPX_CXX_DISABLE_COPY_MOVE(BEPolicy)
     // disable dynamic allocation
-    ACC_CXX_DISABLE_NEW_DELETE
+    UPX_CXX_DISABLE_NEW_DELETE(BEPolicy)
 };
 
-struct LEPolicy
+struct LEPolicy final
 #if defined(BELE_RTP)
-    final : public AbstractPolicy
+    : public AbstractPolicy
 #endif
 {
-    explicit inline LEPolicy() noexcept {}
+    explicit inline LEPolicy() noexcept = default;
 #if defined(BELE_CTP)
     typedef N_BELE_RTP::LEPolicy RTP_Policy;
 #elif defined(BELE_RTP)
     typedef N_BELE_CTP::LEPolicy CTP_Policy;
 #endif
-    V bool isBE() C { return false; }
-    V bool isLE() C { return true; }
+    VV bool isBE() C { return false; }
+    VV bool isLE() C { return true; }
 
     typedef LE16 U16;
     typedef LE32 U32;
@@ -209,12 +205,9 @@ struct LEPolicy
 
 private:
     // disable copy and move
-    LEPolicy(const LEPolicy &) DELETED_FUNCTION;
-    LEPolicy &operator=(const LEPolicy &) DELETED_FUNCTION;
-    LEPolicy(LEPolicy &&) noexcept DELETED_FUNCTION;
-    LEPolicy &operator=(LEPolicy &&) noexcept DELETED_FUNCTION;
+    UPX_CXX_DISABLE_COPY_MOVE(LEPolicy)
     // disable dynamic allocation
-    ACC_CXX_DISABLE_NEW_DELETE
+    UPX_CXX_DISABLE_NEW_DELETE(LEPolicy)
 };
 
 // Native Endianness policy (aka host policy)
@@ -229,6 +222,7 @@ typedef LEPolicy HostPolicy;
 #endif
 
 #undef V
+#undef VV
 #undef S
 #undef C
 

src/check/dt_impl.cpp

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -24,6 +24,9 @@
    <markus@oberhumer.com>
  */
 
+#include "../util/system_defs.h"
+#include "../util/system_features.h"
+
 /*************************************************************************
 // doctest support code implementation
 **************************************************************************/
@@ -33,7 +36,10 @@
 
 #if !defined(DOCTEST_CONFIG_DISABLE)
 
-#if defined(__i386__) && defined(__MSDOS__) && defined(__DJGPP__) && defined(__GNUC__)
+#if defined(__wasi__)
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_CONFIG_NO_POSIX_SIGNALS
+#elif defined(__i386__) && defined(__MSDOS__) && defined(__DJGPP__) && defined(__GNUC__)
 #define DOCTEST_CONFIG_NO_MULTITHREADING
 #define DOCTEST_CONFIG_NO_POSIX_SIGNALS
 #elif defined(__m68k__) && defined(__atarist__) && defined(__GNUC__)
@@ -43,14 +49,24 @@
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-#if !defined(UPX_DOCTEST_CONFIG_MULTITHREADING)
+#if !(WITH_THREADS) && !defined(UPX_DOCTEST_CONFIG_MULTITHREADING)
+#ifndef DOCTEST_CONFIG_NO_MULTITHREADING
 #define DOCTEST_CONFIG_NO_MULTITHREADING
 #endif
+#endif
 
-#if defined(__clang__) && defined(__FAST_MATH__) && defined(__INTEL_LLVM_COMPILER)
+#if defined(__FAST_MATH__) && defined(__clang__) && (__clang_major__ + 0 > 0)
+#if __clang_major__ >= 6
 // warning: comparison with NaN always evaluates to false in fast floating point modes
 #pragma clang diagnostic ignored "-Wtautological-constant-compare"
 #endif
+#if defined(__has_warning)
+#if __has_warning("-Wnan-infinity-disabled")
+// warning: use of NaN is undefined behavior due to the currently enabled floating-point options
+#pragma clang diagnostic ignored "-Wnan-infinity-disabled"
+#endif
+#endif
+#endif
 
 #include <doctest/doctest/parts/doctest.cpp>
 

src/check/dt_xspan.cpp

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -43,6 +43,7 @@ TEST_CASE("raw_bytes ptr") {
     ptr = buf;
     CHECK(ptr_udiff_bytes(raw_index_bytes(ptr, 1, 1), ptr) == 2u);
     CHECK(ptr_udiff_bytes(raw_index_bytes(ptr, 4, 0), ptr) == 8u);
+    UNUSED(ptr);
 }
 
 TEST_CASE("raw_bytes bounded array") {
@@ -55,6 +56,7 @@ TEST_CASE("raw_bytes bounded array") {
     CHECK_THROWS(raw_index_bytes(buf, 3, 3));
     CHECK(ptr_udiff_bytes(raw_index_bytes(buf, 1, 1), buf) == 2u);
     CHECK(ptr_udiff_bytes(raw_index_bytes(buf, 4, 0), buf) == 8u);
+    UNUSED(buf);
 }
 
 /*************************************************************************
@@ -62,7 +64,7 @@ TEST_CASE("raw_bytes bounded array") {
 **************************************************************************/
 
 TEST_CASE("basic xspan usage") {
-    char buf[4] = {0, 1, 2, 3};
+    alignas(4) char buf[4] = {0, 1, 2, 3};
 
     SUBCASE("XSPAN_x") {
         XSPAN_0(char) a0 = nullptr;
@@ -112,6 +114,28 @@ TEST_CASE("basic xspan usage") {
         CHECK_THROWS(raw_bytes(cs, 5));
         CHECK_THROWS(raw_index_bytes(cs, 1, 4));
 #endif
+
+        XSPAN_0(upx_uint16_t) c0_2 = XSPAN_TYPE_CAST(upx_uint16_t, c0 + 2);
+        XSPAN_P(upx_uint16_t) cp_2 = XSPAN_TYPE_CAST(upx_uint16_t, cp + 2);
+        XSPAN_S(upx_uint16_t) cs_2 = XSPAN_TYPE_CAST(upx_uint16_t, cs + 2);
+        CHECK(ptr_udiff_bytes(c0_2, c0) == 2u);
+        CHECK(ptr_udiff_bytes(cp_2, c0) == 2u);
+        CHECK(ptr_udiff_bytes(cs_2, c0) == 2u);
+        CHECK(ptr_udiff_bytes(c0_2, cp) == 2u);
+        CHECK(ptr_udiff_bytes(cp_2, cp) == 2u);
+        CHECK(ptr_udiff_bytes(cs_2, cp) == 2u);
+        CHECK(ptr_udiff_bytes(c0_2, cs) == 2u);
+        CHECK(ptr_udiff_bytes(cp_2, cs) == 2u);
+        CHECK(ptr_udiff_bytes(cs_2, cs) == 2u);
+        XSPAN_0(upx_uint16_t) c0_2b = XSPAN_TYPE_CAST(upx_uint16_t, c0) + 1;
+        XSPAN_P(upx_uint16_t) cp_2b = XSPAN_TYPE_CAST(upx_uint16_t, cp) + 1;
+        XSPAN_S(upx_uint16_t) cs_2b = XSPAN_TYPE_CAST(upx_uint16_t, cs) + 1;
+        CHECK(c0_2 == c0_2b);
+        CHECK(cp_2 == cp_2b);
+        CHECK(cs_2 == cs_2b);
+
+        CHECK(sizeof(*c0) == 1u);
+        CHECK(sizeof(*c0_2) == 2u);
     }
 
     SUBCASE("XSPAN_x_VAR") {
@@ -169,6 +193,28 @@ TEST_CASE("basic xspan usage") {
         CHECK_THROWS(raw_bytes(cs, 5));
         CHECK_THROWS(raw_index_bytes(cs, 1, 4));
 #endif
+
+        XSPAN_0_VAR(upx_uint16_t, c0_2, XSPAN_TYPE_CAST(upx_uint16_t, c0 + 2));
+        XSPAN_P_VAR(upx_uint16_t, cp_2, XSPAN_TYPE_CAST(upx_uint16_t, cp + 2));
+        XSPAN_S_VAR(upx_uint16_t, cs_2, XSPAN_TYPE_CAST(upx_uint16_t, cs + 2));
+        CHECK(ptr_udiff_bytes(c0_2, c0) == 2u);
+        CHECK(ptr_udiff_bytes(cp_2, c0) == 2u);
+        CHECK(ptr_udiff_bytes(cs_2, c0) == 2u);
+        CHECK(ptr_udiff_bytes(c0_2, cp) == 2u);
+        CHECK(ptr_udiff_bytes(cp_2, cp) == 2u);
+        CHECK(ptr_udiff_bytes(cs_2, cp) == 2u);
+        CHECK(ptr_udiff_bytes(c0_2, cs) == 2u);
+        CHECK(ptr_udiff_bytes(cp_2, cs) == 2u);
+        CHECK(ptr_udiff_bytes(cs_2, cs) == 2u);
+        XSPAN_0_VAR(upx_uint16_t, c0_2b, XSPAN_TYPE_CAST(upx_uint16_t, c0) + 1);
+        XSPAN_P_VAR(upx_uint16_t, cp_2b, XSPAN_TYPE_CAST(upx_uint16_t, cp) + 1);
+        XSPAN_S_VAR(upx_uint16_t, cs_2b, XSPAN_TYPE_CAST(upx_uint16_t, cs) + 1);
+        CHECK(c0_2 == c0_2b);
+        CHECK(cp_2 == cp_2b);
+        CHECK(cs_2 == cs_2b);
+
+        CHECK(sizeof(*c0) == 1u);
+        CHECK(sizeof(*c0_2) == 2u);
     }
 
     SUBCASE("xspan in class") {
@@ -195,6 +241,35 @@ TEST_CASE("basic xspan usage") {
     }
 }
 
+TEST_CASE("xspan array access") {
+    const size_t N = 16;
+    char buf[N];
+    memset(buf, 0, sizeof(buf));
+    XSPAN_0_VAR(char, c0, buf, sizeof(buf));
+    XSPAN_P_VAR(char, cp, buf, sizeof(buf));
+    XSPAN_S_VAR(char, cs, buf, sizeof(buf));
+    for (size_t i = 0; i != N; ++i)
+        c0[i] += 1;
+    for (size_t i = 0; i != N; ++i)
+        cp[i] += 1;
+    for (size_t i = 0; i != N; ++i)
+        cs[i] += 1;
+#if __cplusplus >= 201103L
+    for (auto ptr = c0; ptr != c0 + N; ++ptr)
+        *ptr += 1;
+    for (auto ptr = c0 + 0; ptr < c0 + N; ++ptr)
+        *ptr += 1;
+    for (auto ptr = cp; ptr != cp + N; ++ptr)
+        *ptr += 1;
+    for (auto ptr = cp + 0; ptr < cp + N; ++ptr)
+        *ptr += 1;
+    for (auto ptr = cs; ptr != cs + N; ++ptr)
+        *ptr += 1;
+    for (auto ptr = cs + 0; ptr < cs + N; ++ptr)
+        *ptr += 1;
+#endif
+}
+
 /*************************************************************************
 //
 **************************************************************************/
@@ -405,6 +480,7 @@ TEST_CASE("PtrOrSpan") {
     CHECK_THROWS(sp_with_base = s0_no_base);   // nullptr assignment
     CHECK_THROWS(sp_with_base = s0_with_base); // nullptr assignment
 #endif
+    UNUSED(my_null);
 }
 
 /*************************************************************************
@@ -556,6 +632,7 @@ TEST_CASE("Span") {
         CHECK((XSPAN_S_MAKE(char, b1_b1).raw_base() == base_buf + 1));
     }
 #endif
+    UNUSED(my_null);
 }
 
 /*************************************************************************
@@ -610,6 +687,9 @@ TEST_CASE("Span subspan") {
     CHECK((as + 2).subspan(0, -2)[0] == 0);
     CHECK_THROWS(as.subspan(1, 0)[0]);
     CHECK_THROWS(as.subspan(1, 1)[-1]);
+    CHECK(as.subspan(1)[0] == 1);
+    CHECK(as.subspan(2)[0] == 2);
+    CHECK(as.subspan(3)[0] == 3);
 }
 
 TEST_CASE("Span constness") {
@@ -686,6 +766,7 @@ TEST_CASE("PtrOrSpan") {
     CHECK(my_memcmp_v1(buf, nullptr, 4) == -2);
     CHECK(my_memcmp_v2(buf + 4, buf + 4, 999) == 0);
     CHECK(my_memcmp_v2(buf, buf + 2, 3) == 0);
+    UNUSED(buf);
 }
 
 /*************************************************************************
@@ -801,7 +882,7 @@ TEST_CASE("PtrOrSpan int") {
 
 namespace {
 template <class T>
-__acc_static_noinline int foo(T p) {
+static noinline int foo(T p) {
     unsigned r = 0;
     r += *p++;
     r += *++p;
@@ -839,8 +920,91 @@ TEST_CASE("Span codegen") {
     CHECK(foo(XSPAN_0_MAKE(upx_uint8_t, buf, 8)) == 0 + 2 + 5 + 4 + 4 + 3);
     CHECK(foo(XSPAN_P_MAKE(upx_uint8_t, buf, 8)) == 0 + 2 + 5 + 4 + 4 + 3);
     CHECK(foo(XSPAN_S_MAKE(upx_uint8_t, buf, 8)) == 0 + 2 + 5 + 4 + 4 + 3);
+    UNUSED(buf);
 }
 
 #endif // WITH_XSPAN >= 2
 
+/*************************************************************************
+// misc
+**************************************************************************/
+
+namespace {
+template <class T>
+struct PointerTraits {
+    typedef typename std::add_lvalue_reference<T>::type reference;
+    typedef
+        typename std::add_lvalue_reference<typename std::add_const<T>::type>::type const_reference;
+    typedef typename std::add_pointer<T>::type pointer;
+    typedef typename std::add_pointer<typename std::add_const<T>::type>::type const_pointer;
+};
+} // namespace
+
+#if __cplusplus >= 201103L
+
+TEST_CASE("decltype integral constants") {
+    static_assert((std::is_same<decltype(0), int>::value), "");
+    static_assert((std::is_same<decltype(0u), unsigned>::value), "");
+    static_assert((std::is_same<decltype(0l), long>::value), "");
+    static_assert((std::is_same<decltype(0ul), unsigned long>::value), "");
+    static_assert((std::is_same<decltype(0ll), long long>::value), "");
+    static_assert((std::is_same<decltype(0ull), unsigned long long>::value), "");
+    static_assert((std::is_same<decltype((char) 0), char>::value), "");
+    static_assert((std::is_same<decltype((short) 0), short>::value), "");
+    static_assert((std::is_same<decltype((long) 0), long>::value), "");
+    static_assert((std::is_same<decltype((long long) 0), long long>::value), "");
+    static_assert((std::is_same<decltype(char(0)), char>::value), "");
+    static_assert((std::is_same<decltype(short(0)), short>::value), "");
+    static_assert((std::is_same<decltype(long(0)), long>::value), "");
+}
+
+TEST_CASE("decltype pointer") {
+    int dummy = 0;
+    int *p = &dummy;
+    const int *c = &dummy;
+    static_assert((std::is_same<decltype(p - p), std::ptrdiff_t>::value), "");
+    static_assert((std::is_same<decltype(c - c), std::ptrdiff_t>::value), "");
+    static_assert((std::is_same<decltype(p - c), std::ptrdiff_t>::value), "");
+    static_assert((std::is_same<decltype(c - p), std::ptrdiff_t>::value), "");
+    typedef PointerTraits<int> TInt;
+    typedef PointerTraits<const int> TConstInt;
+    static_assert((std::is_same<int *, TInt::pointer>::value), "");
+    static_assert((std::is_same<const int *, TInt::const_pointer>::value), "");
+    static_assert((std::is_same<const int *, TConstInt::pointer>::value), "");
+    static_assert((std::is_same<const int *, TConstInt::const_pointer>::value), "");
+    //
+    static_assert((std::is_same<decltype(p), TInt::pointer>::value), "");
+    static_assert((std::is_same<decltype(c), TInt::const_pointer>::value), "");
+    static_assert((std::is_same<decltype(c), TConstInt::pointer>::value), "");
+    static_assert((std::is_same<decltype(p + 1), TInt::pointer>::value), "");
+    static_assert((std::is_same<decltype(c + 1), TInt::const_pointer>::value), "");
+    static_assert((std::is_same<decltype(c + 1), TConstInt::pointer>::value), "");
+    static_assert((std::is_same<decltype(c + 1), TConstInt::const_pointer>::value), "");
+    static_assert((std::is_same<decltype(c + 1), const int *>::value), "");
+    // dereference
+    static_assert((std::is_same<decltype(*p), TInt::reference>::value), "");
+    static_assert((std::is_same<decltype(*c), TInt::const_reference>::value), "");
+#if 0
+    // this works, but avoid clang warnings:
+    //   "Expression with side effects has no effect in an unevaluated context"
+    static_assert((std::is_same<decltype(*p++), TInt::reference>::value), "");
+    static_assert((std::is_same<decltype(*++p), TInt::reference>::value), "");
+    static_assert((std::is_same<decltype(*c++), TInt::const_reference>::value), "");
+    static_assert((std::is_same<decltype(*c++), TConstInt::reference>::value), "");
+    static_assert((std::is_same<decltype(*c++), TConstInt::const_reference>::value), "");
+    static_assert((std::is_same<decltype(*++c), TInt::const_reference>::value), "");
+    static_assert((std::is_same<decltype(*++c), TConstInt::reference>::value), "");
+    static_assert((std::is_same<decltype(*++c), TConstInt::const_reference>::value), "");
+#endif
+    // array access
+    static_assert((std::is_same<decltype(p[0]), TInt::reference>::value), "");
+    static_assert((std::is_same<decltype(c[0]), TInt::const_reference>::value), "");
+    static_assert((std::is_same<decltype(c[0]), TConstInt::reference>::value), "");
+    static_assert((std::is_same<decltype(c[0]), TConstInt::const_reference>::value), "");
+    UNUSED(p);
+    UNUSED(c);
+}
+
+#endif // __cplusplus >= 201103L
+
 /* vim:set ts=4 sw=4 et: */

src/compress/compress.cpp

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -62,7 +62,7 @@ unsigned upx_crc32(const void *buf, unsigned len, unsigned crc)
 **************************************************************************/
 
 int upx_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigned *dst_len,
-                 upx_callback_p cb, int method, int level, const upx_compress_config_t *cconf,
+                 upx_callback_t *cb, int method, int level, const upx_compress_config_t *cconf,
                  upx_compress_result_t *cresult) {
     int r = UPX_E_ERROR;
     upx_compress_result_t cresult_buffer;
@@ -92,8 +92,13 @@ int upx_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigned
     cresult->debug.c_len = 0;
 #endif
 
+    const unsigned orig_dst_len = *dst_len;
     if (__acc_cte(false)) {
     }
+#if (WITH_BZIP2)
+    else if (M_IS_BZIP2(method))
+        r = upx_bzip2_compress(src, src_len, dst, dst_len, cb, method, level, cconf, cresult);
+#endif
 #if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_compress(src, src_len, dst, dst_len, cb, method, level, cconf, cresult);
@@ -111,13 +116,14 @@ int upx_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigned
         r = upx_zstd_compress(src, src_len, dst, dst_len, cb, method, level, cconf, cresult);
 #endif
     else {
-        throwInternalError("unknown compression method");
+        throwInternalError("unknown compression method %d", method);
     }
 
 #if 1
     // debugging aid
     cresult->debug.c_len = *dst_len;
 #endif
+    assert_noexcept(*dst_len <= orig_dst_len);
     return r;
 }
 
@@ -135,8 +141,13 @@ int upx_decompress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigne
     if (cresult && cresult->debug.method == 0)
         cresult = nullptr;
 
+    const unsigned orig_dst_len = *dst_len;
     if (__acc_cte(false)) {
     }
+#if (WITH_BZIP2)
+    else if (M_IS_BZIP2(method))
+        r = upx_bzip2_decompress(src, src_len, dst, dst_len, method, cresult);
+#endif
 #if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_decompress(src, src_len, dst, dst_len, method, cresult);
@@ -158,9 +169,10 @@ int upx_decompress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigne
         r = upx_zstd_decompress(src, src_len, dst, dst_len, method, cresult);
 #endif
     else {
-        throwInternalError("unknown decompression method");
+        throwInternalError("unknown compression method %d", method);
     }
 
+    assert_noexcept(*dst_len <= orig_dst_len);
     return r;
 }
 
@@ -180,8 +192,13 @@ int upx_test_overlap(const upx_bytep buf, const upx_bytep tbuf, unsigned src_off
     unsigned overlap_overhead = src_off + src_len - *dst_len;
     assert((int) overlap_overhead > 0);
 
+    const unsigned orig_dst_len = *dst_len;
     if (__acc_cte(false)) {
     }
+#if (WITH_BZIP2)
+    else if (M_IS_BZIP2(method))
+        r = upx_bzip2_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
+#endif
 #if (WITH_LZMA)
     else if (M_IS_LZMA(method))
         r = upx_lzma_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
@@ -199,9 +216,10 @@ int upx_test_overlap(const upx_bytep buf, const upx_bytep tbuf, unsigned src_off
         r = upx_zstd_test_overlap(buf, tbuf, src_off, src_len, dst_len, method, cresult);
 #endif
     else {
-        throwInternalError("unknown decompression method");
+        throwInternalError("unknown compression method %d", method);
     }
 
+    assert_noexcept(*dst_len <= orig_dst_len);
     return r;
 }
 

src/compress/compress.h

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -25,8 +25,8 @@
  */
 
 #pragma once
-#ifndef UPX_COMPRESS_H__
-#define UPX_COMPRESS_H__ 1
+
+// clang-format off
 
 /*************************************************************************
 //
@@ -37,7 +37,7 @@ int upx_bzip2_init(void);
 const char *upx_bzip2_version_string(void);
 int upx_bzip2_compress     ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned *dst_len,
-                                   upx_callback_p cb,
+                                   upx_callback_t *cb,
                                    int method, int level,
                              const upx_compress_config_t *cconf,
                                    upx_compress_result_t *cresult );
@@ -53,13 +53,12 @@ int upx_bzip2_test_overlap ( const upx_bytep buf,
                              const upx_compress_result_t *cresult );
 #endif
 
-
 #if (WITH_LZMA)
 int upx_lzma_init(void);
 const char *upx_lzma_version_string(void);
 int upx_lzma_compress      ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned *dst_len,
-                                   upx_callback_p cb,
+                                   upx_callback_t *cb,
                                    int method, int level,
                              const upx_compress_config_t *cconf,
                                    upx_compress_result_t *cresult );
@@ -75,13 +74,12 @@ int upx_lzma_test_overlap  ( const upx_bytep buf,
                              const upx_compress_result_t *cresult );
 #endif
 
-
 #if (WITH_NRV)
 int upx_nrv_init(void);
 const char *upx_nrv_version_string(void);
 int upx_nrv_compress       ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned *dst_len,
-                                   upx_callback_p cb,
+                                   upx_callback_t *cb,
                                    int method, int level,
                              const upx_compress_config_t *cconf,
                                    upx_compress_result_t *cresult );
@@ -97,13 +95,12 @@ int upx_nrv_test_overlap   ( const upx_bytep buf,
                              const upx_compress_result_t *cresult );
 #endif
 
-
 #if (WITH_UCL)
 int upx_ucl_init(void);
 const char *upx_ucl_version_string(void);
 int upx_ucl_compress       ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned *dst_len,
-                                   upx_callback_p cb,
+                                   upx_callback_t *cb,
                                    int method, int level,
                              const upx_compress_config_t *cconf,
                                    upx_compress_result_t *cresult );
@@ -121,13 +118,12 @@ unsigned upx_ucl_adler32(const void *buf, unsigned len, unsigned adler);
 unsigned upx_ucl_crc32  (const void *buf, unsigned len, unsigned crc);
 #endif
 
-
 #if (WITH_ZLIB)
 int upx_zlib_init(void);
 const char *upx_zlib_version_string(void);
 int upx_zlib_compress      ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned *dst_len,
-                                   upx_callback_p cb,
+                                   upx_callback_t *cb,
                                    int method, int level,
                              const upx_compress_config_t *cconf,
                                    upx_compress_result_t *cresult );
@@ -145,13 +141,12 @@ unsigned upx_zlib_adler32(const void *buf, unsigned len, unsigned adler);
 unsigned upx_zlib_crc32  (const void *buf, unsigned len, unsigned crc);
 #endif
 
-
 #if (WITH_ZSTD)
 int upx_zstd_init(void);
 const char *upx_zstd_version_string(void);
 int upx_zstd_compress      ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned *dst_len,
-                                   upx_callback_p cb,
+                                   upx_callback_t *cb,
                                    int method, int level,
                              const upx_compress_config_t *cconf,
                                    upx_compress_result_t *cresult );
@@ -167,7 +162,4 @@ int upx_zstd_test_overlap  ( const upx_bytep buf,
                              const upx_compress_result_t *cresult );
 #endif
 
-
-#endif /* already included */
-
 /* vim:set ts=4 sw=4 et: */

src/compress/compress_bzip2.cpp

@@ -0,0 +1,211 @@
+/* compress_bzip2.cpp --
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   All Rights Reserved.
+
+   UPX and the UCL library are free software; you can redistribute them
+   and/or modify them under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus@oberhumer.com>
+ */
+
+#include "../util/system_headers.h"
+#if WITH_BZIP2
+#include <bzip2/bzlib.h>
+#endif
+#include "../conf.h"
+
+void bzip2_compress_config_t::reset() noexcept { mem_clear(this); }
+
+#if WITH_BZIP2
+#include "compress.h"
+#include "../util/membuffer.h"
+
+#if defined(BZ_NO_STDIO) || 1
+// we need to supply bz_internal_error() when building with BZ_NO_STDIO
+extern "C" {
+extern void bz_internal_error(int);
+void bz_internal_error(int errcode) { throwInternalError("bz_internal_error %d", errcode); }
+}
+#endif // BZ_NO_STDIO
+
+static int convert_errno_from_bzip2(int r) {
+    switch (r) {
+    case BZ_OK:
+        return UPX_E_OK;
+    case BZ_MEM_ERROR:
+        return UPX_E_OUT_OF_MEMORY;
+    // TODO later: convert to UPX_E_INPUT_OVERRUN, UPX_E_OUTPUT_OVERRUN
+    default:
+        break;
+    }
+    return UPX_E_ERROR;
+}
+
+/*************************************************************************
+//
+**************************************************************************/
+
+int upx_bzip2_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigned *dst_len,
+                       upx_callback_t *cb_parm, int method, int level,
+                       const upx_compress_config_t *cconf_parm, upx_compress_result_t *cresult) {
+    assert(method == M_BZIP2);
+    assert(level > 0);
+    assert(cresult != nullptr);
+    UNUSED(cb_parm);
+    int r = UPX_E_ERROR;
+    const bzip2_compress_config_t *const lcconf = cconf_parm ? &cconf_parm->conf_bzip2 : nullptr;
+    bzip2_compress_result_t *const res = &cresult->result_bzip2;
+    res->reset();
+
+    int blockSize100k = (src_len + 100000 - 1) / 100000;
+    if (blockSize100k < 1)
+        blockSize100k = 1;
+    if (blockSize100k > 9)
+        blockSize100k = 9;
+    // idea for later: could enhance lcconf to allow setting blockSize100k
+    UNUSED(lcconf);
+    if (level <= 3 && blockSize100k > level)
+        blockSize100k = level;
+
+    char *dest = (char *) dst;
+    char *source = (char *) const_cast<byte *>(src);
+    r = BZ2_bzBuffToBuffCompress(dest, dst_len, source, src_len, blockSize100k, 0, 0);
+    return convert_errno_from_bzip2(r);
+}
+
+/*************************************************************************
+//
+**************************************************************************/
+
+int upx_bzip2_decompress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigned *dst_len,
+                         int method, const upx_compress_result_t *cresult) {
+    assert(method == M_BZIP2);
+    UNUSED(method);
+    UNUSED(cresult);
+    char *dest = (char *) dst;
+    char *source = (char *) const_cast<byte *>(src);
+    int small = 0;
+    int r = BZ2_bzBuffToBuffDecompress(dest, dst_len, source, src_len, small, 0);
+    return convert_errno_from_bzip2(r);
+}
+
+/*************************************************************************
+// test_overlap - see <ucl/ucl.h> for semantics
+**************************************************************************/
+
+int upx_bzip2_test_overlap(const upx_bytep buf, const upx_bytep tbuf, unsigned src_off,
+                           unsigned src_len, unsigned *dst_len, int method,
+                           const upx_compress_result_t *cresult) {
+    assert(method == M_BZIP2);
+
+    MemBuffer b(src_off + src_len);
+    memcpy(b + src_off, buf + src_off, src_len);
+    unsigned saved_dst_len = *dst_len;
+    int r = upx_bzip2_decompress(raw_index_bytes(b, src_off, src_len), src_len,
+                                 raw_bytes(b, *dst_len), dst_len, method, cresult);
+    if (r != UPX_E_OK)
+        return r;
+    if (*dst_len != saved_dst_len)
+        return UPX_E_ERROR;
+    // NOTE: there is a very tiny possibility that decompression has
+    //   succeeded but the data is not restored correctly because of
+    //   in-place buffer overlapping, so we use an extra memcmp().
+    if (tbuf != nullptr && memcmp(tbuf, b, *dst_len) != 0)
+        return UPX_E_ERROR;
+    return UPX_E_OK;
+}
+
+/*************************************************************************
+// misc
+**************************************************************************/
+
+int upx_bzip2_init(void) { return 0; }
+
+const char *upx_bzip2_version_string(void) { return BZ2_bzlibVersion(); }
+
+/*************************************************************************
+// doctest checks
+**************************************************************************/
+
+#if DEBUG && !defined(DOCTEST_CONFIG_DISABLE) && 1
+
+static bool check_bzip2(const int method, const int level, const unsigned expected_c_len) {
+    const unsigned u_len = 16384;
+    const unsigned c_extra = 4096;
+    MemBuffer u_buf, c_buf, d_buf;
+    unsigned c_len, d_len;
+    upx_compress_result_t cresult;
+    int r;
+
+    u_buf.alloc(u_len);
+    memset(u_buf, 0, u_len);
+    c_buf.allocForCompression(u_len, c_extra);
+    d_buf.allocForDecompression(u_len);
+
+    c_len = c_buf.getSize() - c_extra;
+    r = upx_bzip2_compress(raw_bytes(u_buf, u_len), u_len, raw_index_bytes(c_buf, c_extra, c_len),
+                           &c_len, nullptr, method, level, NULL_cconf, &cresult);
+    if (r != 0 || c_len != expected_c_len)
+        return false;
+
+    d_len = d_buf.getSize();
+    r = upx_bzip2_decompress(raw_index_bytes(c_buf, c_extra, c_len), c_len, raw_bytes(d_buf, d_len),
+                             &d_len, method, nullptr);
+    if (r != 0 || d_len != u_len || memcmp(u_buf, d_buf, u_len) != 0)
+        return false;
+
+    d_len = u_len - 1;
+    r = upx_bzip2_decompress(raw_index_bytes(c_buf, c_extra, c_len), c_len, raw_bytes(d_buf, d_len),
+                             &d_len, method, nullptr);
+    if (r == 0)
+        return false;
+
+    // TODO: rewrite Packer::findOverlapOverhead() so that we can test it here
+    // unsigned x_len = d_len;
+    // r = upx_bzip2_test_overlap(c_buf, u_buf, c_extra, c_len, &x_len, method, nullptr);
+    return true;
+}
+
+TEST_CASE("compress_bzip2") { CHECK(check_bzip2(M_BZIP2, 9, 46)); }
+
+#endif // DEBUG
+
+TEST_CASE("upx_bzip2_decompress") {
+#if 0  // TODO later, see above
+    const byte *c_data;
+    byte d_buf[32];
+    unsigned d_len;
+    int r;
+
+    c_data = (const byte *) "\x28\xb5\x2f\xfd\x20\x20\x3d\x00\x00\x08\xff\x01\x00\x34\x4e\x08";
+    d_len = 32;
+    r = upx_bzip2_decompress(c_data, 16, d_buf, &d_len, M_BZIP2, nullptr);
+    CHECK((r == 0 && d_len == 32));
+    r = upx_bzip2_decompress(c_data, 15, d_buf, &d_len, M_BZIP2, nullptr);
+    CHECK(r == UPX_E_INPUT_OVERRUN);
+    d_len = 31;
+    r = upx_bzip2_decompress(c_data, 16, d_buf, &d_len, M_BZIP2, nullptr);
+    CHECK(r == UPX_E_OUTPUT_OVERRUN);
+    UNUSED(r);
+#endif // TODO
+}
+
+#endif // WITH_BZIP2
+
+/* vim:set ts=4 sw=4 et: */

src/compress/compress_lzma.cpp

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -30,16 +30,11 @@
 
 #if (ACC_CC_CLANG)
 #pragma clang diagnostic ignored "-Wshadow"
-#endif
-#if (ACC_CC_GNUC >= 0x040200)
+#elif (ACC_CC_GNUC >= 0x040200)
 #pragma GCC diagnostic ignored "-Wshadow"
-#endif
-#if (ACC_CC_MSC)
+#elif (ACC_CC_MSC)
 #pragma warning(disable : 4456) // -Wno-shadow
 #endif
-#if (ACC_CC_MSC && (_MSC_VER < 1900))
-#pragma warning(disable : 4127) // warning C4127: conditional expression is constant
-#endif
 
 void lzma_compress_config_t::reset() noexcept {
     pos_bits.reset();
@@ -53,41 +48,15 @@ void lzma_compress_config_t::reset() noexcept {
     max_num_probs = 0;
 }
 
-// INFO: the LZMA SDK is covered by a permissive license which allows
-//   using unmodified LZMA source code in UPX and the UPX stubs.
-//   See SPECIAL EXCEPTION below.
+// INFO: LZMA SDK is placed in the public domain.
 //
-// Quoting from lzma-4.43/lzma.txt:
+// Anyone is free to copy, modify, publish, use, compile, sell, or
+// distribute the original LZMA SDK code, either in source code form
+// or as a compiled binary, for any purpose, commercial or non-commercial,
+// and by any means.
 //
-//   LICENSE
-//   -------
-//
-//   LZMA SDK is available under any of the following licenses:
-//
-//   1) GNU Lesser General Public License (GNU LGPL)
-//   2) Common Public License (CPL)
-//   3) Simplified license for unmodified code (read SPECIAL EXCEPTION)
-//   4) Proprietary license
-//
-//   It means that you can select one of these four options and follow rules
-//   of that license.
-//
-//   1,2) GNU LGPL and CPL licenses are pretty similar and both these
-//   licenses are classified as
-//    - "Free software licenses" at http://www.gnu.org/
-//    - "OSI-approved" at http://www.opensource.org/
-//
-//   3) SPECIAL EXCEPTION
-//
-//   Igor Pavlov, as the author of this code, expressly permits you
-//   to statically or dynamically link your code (or bind by name)
-//   to the files from LZMA SDK without subjecting your linked
-//   code to the terms of the CPL or GNU LGPL.
-//   Any modifications or additions to files from LZMA SDK, however,
-//   are subject to the GNU LGPL or CPL terms.
-//
-//   SPECIAL EXCEPTION allows you to use LZMA SDK in applications with closed code,
-//   while you keep LZMA SDK code unmodified.
+// https://www.7-zip.org/sdk.html
+// https://sourceforge.net/p/sevenzip/discussion/45797/thread/685169cf/
 
 /*************************************************************************
 // compress defaults
@@ -158,11 +127,11 @@ static bool prepare_result(lzma_compress_result_t *res, unsigned src_len, int me
 
     // cconf overrides
     if (lcconf) {
-        oassign(res->pos_bits, lcconf->pos_bits);
-        oassign(res->lit_pos_bits, lcconf->lit_pos_bits);
-        oassign(res->lit_context_bits, lcconf->lit_context_bits);
-        oassign(res->dict_size, lcconf->dict_size);
-        oassign(res->num_fast_bytes, lcconf->num_fast_bytes);
+        upx::oassign(res->pos_bits, lcconf->pos_bits);
+        upx::oassign(res->lit_pos_bits, lcconf->lit_pos_bits);
+        upx::oassign(res->lit_context_bits, lcconf->lit_context_bits);
+        upx::oassign(res->dict_size, lcconf->dict_size);
+        upx::oassign(res->num_fast_bytes, lcconf->num_fast_bytes);
     }
 
     // limit dictionary size
@@ -206,15 +175,12 @@ error:
 // compress - cruft because of pseudo-COM layer
 **************************************************************************/
 
-// ensure proper nullptr usage
-// TODO later: examine why we need this in the first place
-#undef NULL
-// NOLINTBEGIN(clang-analyzer-optin.cplusplus.*)
-#define NULL nullptr
-// NOLINTEND(clang-analyzer-optin.cplusplus.*)
-#if defined(__GNUC__)
-#undef __null
-#define __null nullptr
+#if (ACC_CC_CLANG >= 0x080000)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#elif (ACC_CC_GNUC >= 0x040700)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif
 
 #undef MSDOS
@@ -293,7 +259,7 @@ struct ProgressInfo final : public ICompressProgressInfo, public CMyUnknownImp {
     virtual ~ProgressInfo() {}
     MY_UNKNOWN_IMP
     STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize) override;
-    upx_callback_p cb = nullptr;
+    upx_callback_t *cb = nullptr;
 };
 
 STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize) {
@@ -316,8 +282,14 @@ STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outS
 #include <lzma-sdk/C/7zip/Compress/RangeCoder/RangeCoderBit.cpp>
 #undef RC_NORMALIZE
 
+#if (ACC_CC_CLANG >= 0x080000)
+#pragma clang diagnostic pop
+#elif (ACC_CC_GNUC >= 0x040700)
+#pragma GCC diagnostic pop
+#endif
+
 int upx_lzma_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigned *dst_len,
-                      upx_callback_p cb, int method, int level,
+                      upx_callback_t *cb, int method, int level,
                       const upx_compress_config_t *cconf_parm, upx_compress_result_t *cresult) {
     assert(M_IS_LZMA(method));
     assert(level > 0);
@@ -327,6 +299,7 @@ int upx_lzma_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
     HRESULT rh;
     const lzma_compress_config_t *const lcconf = cconf_parm ? &cconf_parm->conf_lzma : nullptr;
     lzma_compress_result_t *const res = &cresult->result_lzma;
+    res->reset();
 
     MyLzma::InStream is;
     is.AddRef();
@@ -339,7 +312,8 @@ int upx_lzma_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
     progress.cb = cb; // progress.Init()
 
     NCompress::NLZMA::CEncoder enc;
-    const PROPID propIDs[8] = {
+    constexpr unsigned NPROPS = 8;
+    static const PROPID propIDs[NPROPS] = {
         NCoderPropID::kPosStateBits,      // 0  pb    _posStateBits(2)
         NCoderPropID::kLitPosBits,        // 1  lp    _numLiteralPosStateBits(0)
         NCoderPropID::kLitContextBits,    // 2  lc    _numLiteralContextBits(3)
@@ -349,8 +323,7 @@ int upx_lzma_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
         NCoderPropID::kMatchFinderCycles, // 6  mfc   _matchFinderCycles, _cutValue
         NCoderPropID::kMatchFinder        // 7  mf
     };
-    PROPVARIANT pr[8];
-    const unsigned nprops = 8;
+    PROPVARIANT pr[NPROPS];
     if (!prepare_result(res, src_len, method, level, lcconf))
         goto error;
     pr[0].vt = pr[1].vt = pr[2].vt = pr[3].vt = pr[4].vt = pr[5].vt = pr[6].vt = VT_UI4;
@@ -367,7 +340,7 @@ int upx_lzma_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
     pr[7].bstrVal = ACC_PCAST(BSTR, ACC_UNCONST_CAST(wchar_t *, matchfinder));
 
     try {
-        if (enc.SetCoderProperties(propIDs, pr, nprops) != S_OK)
+        if (enc.SetCoderProperties(propIDs, pr, NPROPS) != S_OK)
             goto error;
         // encode properties in LZMA-style (5 bytes)
         if (enc.WriteCoderProperties(&os) != S_OK)
@@ -547,6 +520,7 @@ TEST_CASE("upx_lzma_decompress") {
     d_len = 15;
     r = upx_lzma_decompress(c_data, 9, d_buf, &d_len, M_LZMA, nullptr);
     CHECK(r == UPX_E_OUTPUT_OVERRUN);
+    UNUSED(r);
 }
 
 /* vim:set ts=4 sw=4 et: */

src/compress/compress_ucl.cpp

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -66,7 +66,7 @@ extern "C" {
 static void __UCL_CDECL wrap_nprogress_ucl(ucl_uint a, ucl_uint b, int state, ucl_voidp user) {
     if (state != -1 && state != 3)
         return;
-    upx_callback_p cb = (upx_callback_p) user;
+    upx_callback_t *cb = (upx_callback_t *) user;
     if (cb && cb->nprogress)
         cb->nprogress(cb, a, b);
 }
@@ -77,7 +77,7 @@ static void __UCL_CDECL wrap_nprogress_ucl(ucl_uint a, ucl_uint b, int state, uc
 **************************************************************************/
 
 int upx_ucl_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigned *dst_len,
-                     upx_callback_p cb_parm, int method, int level,
+                     upx_callback_t *cb_parm, int method, int level,
                      const upx_compress_config_t *cconf_parm, upx_compress_result_t *cresult) {
     int r;
     assert(level > 0);
@@ -248,8 +248,12 @@ static void __UCL_CDECL my_free(ucl_voidp p) { free(p); }
 } // extern "C"
 
 int upx_ucl_init(void) {
+#if (ACC_CC_MSC && ACC_ARCH_I386) && (_MSC_VER >= 1940)
+    (void) ucl_init(); // TODO later
+#else
     if (ucl_init() != UCL_E_OK)
         return -1;
+#endif
     if (UCL_VERSION != ucl_version() || strcmp(UCL_VERSION_STRING, ucl_version_string()) != 0)
         return -2;
     ucl_set_malloc_hooks(my_malloc, my_free);
@@ -363,6 +367,7 @@ TEST_CASE("upx_ucl_decompress") {
     d_len = 15;
     r = upx_ucl_decompress(c_data, 9, d_buf, &d_len, M_NRV2E_8, nullptr);
     CHECK(r == UPX_E_OUTPUT_OVERRUN);
+    UNUSED(r);
 }
 
 /* vim:set ts=4 sw=4 et: */

src/compress/compress_zlib.cpp

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -25,13 +25,6 @@
  */
 
 #include "../conf.h"
-#include "compress.h"
-#include "../util/membuffer.h"
-// NOLINTBEGIN(clang-analyzer-optin.performance.Padding)
-#define ZLIB_CONST 1
-#include <zlib/zlib.h>
-#include <zlib/deflate.h>
-// NOLINTEND(clang-analyzer-optin.performance.Padding)
 
 void zlib_compress_config_t::reset() noexcept {
     mem_clear(this);
@@ -40,6 +33,15 @@ void zlib_compress_config_t::reset() noexcept {
     strategy.reset();
 }
 
+#if WITH_ZLIB
+#include "compress.h"
+#include "../util/membuffer.h"
+// NOLINTBEGIN(clang-analyzer-optin.performance.Padding)
+#define ZLIB_CONST 1
+#include <zlib/zlib.h>
+#include <zlib/deflate.h>
+// NOLINTEND(clang-analyzer-optin.performance.Padding)
+
 static int convert_errno_from_zlib(int zr) {
     switch (zr) {
     case Z_OK:
@@ -75,7 +77,7 @@ static int convert_errno_from_zlib(int zr) {
 **************************************************************************/
 
 int upx_zlib_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigned *dst_len,
-                      upx_callback_p cb_parm, int method, int level,
+                      upx_callback_t *cb_parm, int method, int level,
                       const upx_compress_config_t *cconf_parm, upx_compress_result_t *cresult) {
     assert(method == M_DEFLATE);
     assert(level > 0);
@@ -85,6 +87,7 @@ int upx_zlib_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
     int zr;
     const zlib_compress_config_t *const lcconf = cconf_parm ? &cconf_parm->conf_zlib : nullptr;
     zlib_compress_result_t *const res = &cresult->result_zlib;
+    res->reset();
 
     if (level == 10)
         level = 9;
@@ -94,13 +97,11 @@ int upx_zlib_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
     zlib_compress_config_t::strategy_t strategy;
     // cconf overrides
     if (lcconf) {
-        oassign(mem_level, lcconf->mem_level);
-        oassign(window_bits, lcconf->window_bits);
-        oassign(strategy, lcconf->strategy);
+        upx::oassign(mem_level, lcconf->mem_level);
+        upx::oassign(window_bits, lcconf->window_bits);
+        upx::oassign(strategy, lcconf->strategy);
     }
 
-    res->dummy = 0;
-
     z_stream s;
     s.zalloc = (alloc_func) nullptr;
     s.zfree = (free_func) nullptr;
@@ -305,6 +306,9 @@ TEST_CASE("upx_zlib_decompress") {
     d_len = 15;
     r = upx_zlib_decompress(c_data, 6, d_buf, &d_len, M_DEFLATE, nullptr);
     CHECK(r == UPX_E_OUTPUT_OVERRUN);
+    UNUSED(r);
 }
 
+#endif // WITH_ZLIB
+
 /* vim:set ts=4 sw=4 et: */

src/compress/compress_zstd.cpp

@@ -2,7 +2,7 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -24,6 +24,12 @@
    <markus@oberhumer.com>
  */
 
+#include "../util/system_headers.h"
+#if WITH_ZSTD
+#include <zstd/lib/zstd.h>
+#include <zstd/lib/zstd_errors.h>
+#include <zstd/lib/compress/hist.h>
+#endif
 #include "../conf.h"
 
 void zstd_compress_config_t::reset() noexcept { mem_clear(this); }
@@ -31,9 +37,6 @@ void zstd_compress_config_t::reset() noexcept { mem_clear(this); }
 #if WITH_ZSTD
 #include "compress.h"
 #include "../util/membuffer.h"
-#include <zstd/lib/zstd.h>
-#include <zstd/lib/zstd_errors.h>
-#include <zstd/lib/compress/hist.h>
 
 static int convert_errno_from_zstd(size_t zr) {
     const ZSTD_ErrorCode ze = ZSTD_getErrorCode(zr);
@@ -55,7 +58,7 @@ static int convert_errno_from_zstd(size_t zr) {
 **************************************************************************/
 
 int upx_zstd_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsigned *dst_len,
-                      upx_callback_p cb_parm, int method, int level,
+                      upx_callback_t *cb_parm, int method, int level,
                       const upx_compress_config_t *cconf_parm, upx_compress_result_t *cresult) {
     assert(method == M_ZSTD);
     assert(level > 0);
@@ -65,6 +68,7 @@ int upx_zstd_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
     size_t zr;
     const zstd_compress_config_t *const lcconf = cconf_parm ? &cconf_parm->conf_zstd : nullptr;
     zstd_compress_result_t *const res = &cresult->result_zstd;
+    res->reset();
 
     // TODO later: map level 1..10 to zstd-level 1..22
     if (level == 10)
@@ -75,8 +79,6 @@ int upx_zstd_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
         UNUSED(lcconf);
     }
 
-    res->dummy = 0;
-
     zr = ZSTD_compress(dst, *dst_len, src, src_len, level);
     if (ZSTD_isError(zr)) {
         *dst_len = 0; // TODO ???
@@ -221,6 +223,7 @@ TEST_CASE("upx_zstd_decompress") {
     d_len = 31;
     r = upx_zstd_decompress(c_data, 16, d_buf, &d_len, M_ZSTD, nullptr);
     CHECK(r == UPX_E_OUTPUT_OVERRUN);
+    UNUSED(r);
 }
 
 #endif // WITH_ZSTD

src/conf.h

@@ -1,9 +1,9 @@
-/* conf.h --
+/* conf.h -- primary configuration
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -31,25 +31,52 @@
 // init
 **************************************************************************/
 
-#include "headers.h"
+#include "util/system_headers.h"
+#include "util/system_undefs.h"
 #include "version.h"
 
-ACC_COMPILE_TIME_ASSERT_HEADER(CHAR_BIT == 8)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(short) == 2)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 4)
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(long long) == 8)
+#if !defined(__has_attribute)
+#define __has_attribute(x) 0
+#endif
+#if !defined(__has_builtin)
+#define __has_builtin(x) 0
+#endif
+#if !defined(__has_declspec_attribute)
+#define __has_declspec_attribute(x) 0
+#endif
+#if !defined(__has_feature)
+#define __has_feature(x) 0
+#endif
+#if !defined(__has_include)
+#define __has_include(x) 0
+#endif
+#if !defined(__has_warning)
+#define __has_warning(x) 0
+#endif
+
+// reserve name "upx" for namespace
+namespace upx {}
+
+// check compiler core
+static_assert(CHAR_BIT == 8);
+static_assert(sizeof(short) == 2);
+static_assert(sizeof(int) == 4);
+static_assert(sizeof(long long) == 8);
 // check sane compiler mandatory flags
-ACC_COMPILE_TIME_ASSERT_HEADER(-1 == ~0) // two's complement - see http://wg21.link/P0907R4
-ACC_COMPILE_TIME_ASSERT_HEADER(0u-1 == ~0u) // two's complement - see http://wg21.link/P0907R4
-ACC_COMPILE_TIME_ASSERT_HEADER((1u << 31) << 1 == 0)
-ACC_COMPILE_TIME_ASSERT_HEADER(((int)(1u << 31)) >> 31 == -1) // arithmetic right shift
-ACC_COMPILE_TIME_ASSERT_HEADER((-1) >> 31 == -1) // arithmetic right shift
-ACC_COMPILE_TIME_ASSERT_HEADER(CHAR_MAX == 255) // -funsigned-char
-ACC_COMPILE_TIME_ASSERT_HEADER((char)(-1) == 255) // -funsigned-char
+static_assert(-1 == ~0);      // two's complement - see https://wg21.link/P0907R4
+static_assert(0u - 1 == ~0u); // two's complement - see https://wg21.link/P0907R4
+static_assert((1u << 31) << 1 == 0);
+static_assert(((int) (1u << 31)) >> 31 == -1); // arithmetic right shift
+static_assert((-1) >> 31 == -1);               // arithmetic right shift
+static_assert(CHAR_MAX == 255);                // -funsigned-char
+static_assert((char) (-1) == 255);             // -funsigned-char
 
 // enable some more strict warnings for Git developer builds
 #if defined(UPX_CONFIG_DISABLE_WSTRICT) && (UPX_CONFIG_DISABLE_WSTRICT + 0 == 0)
 #if defined(UPX_CONFIG_DISABLE_WERROR) && (UPX_CONFIG_DISABLE_WERROR + 0 == 0)
+#if (ACC_CC_MSC)
+#pragma warning(error : 4714) // W4: function marked as __forceinline not inlined
+#endif
 #if (ACC_CC_CLANG >= 0x0b0000)
 #pragma clang diagnostic error "-Wsuggest-override"
 #elif (ACC_CC_GNUC >= 0x0a0000)
@@ -57,7 +84,7 @@ ACC_COMPILE_TIME_ASSERT_HEADER((char)(-1) == 255) // -funsigned-char
 #pragma GCC diagnostic error "-Wsuggest-override"
 #endif
 #if (ACC_CC_CLANG >= 0x080000)
-   // don't enable before clang-8 because of stddef.h issues
+// don't enable before clang-8 because of <stddef.h> issues
 #pragma clang diagnostic error "-Wzero-as-null-pointer-constant"
 #elif (ACC_CC_GNUC >= 0x040700) && defined(__GLIBC__)
 // Some non-GLIBC toolchains do not use 'nullptr' everywhere when C++:
@@ -69,6 +96,14 @@ ACC_COMPILE_TIME_ASSERT_HEADER((char)(-1) == 255) // -funsigned-char
 #endif // UPX_CONFIG_DISABLE_WERROR
 #endif // UPX_CONFIG_DISABLE_WSTRICT
 
+#if __cplusplus >= 202002L // C++20
+#define upx_is_constant_evaluated std::is_constant_evaluated
+#elif __has_builtin(__builtin_is_constant_evaluated) // clang-9, gcc-10
+#define upx_is_constant_evaluated __builtin_is_constant_evaluated
+#elif (ACC_CC_GNUC >= 0x090000) && 1 // gcc-9
+#define upx_is_constant_evaluated __builtin_is_constant_evaluated
+#endif
+
 // multithreading (UPX currently does not use multithreading)
 #if (WITH_THREADS)
 #define upx_thread_local     thread_local
@@ -81,40 +116,31 @@ ACC_COMPILE_TIME_ASSERT_HEADER((char)(-1) == 255) // -funsigned-char
 #define upx_std_once_flag    upx_std_atomic(size_t)
 template <class NoexceptCallable>
 inline void upx_std_call_once(upx_std_once_flag &flag, NoexceptCallable &&f) {
-    if (__acc_unlikely(!flag)) { flag = 1; f(); }
+    if (__acc_unlikely(!flag)) {
+        flag = 1;
+        f();
+    }
 }
 #endif // WITH_THREADS
 
-// <type_traits> upx_std_is_bounded_array: same as C++20 std::is_bounded_array
-template <class T>
-struct upx_std_is_bounded_array : public std::false_type {};
-template <class T, size_t N>
-struct upx_std_is_bounded_array<T[N]> : public std::true_type {};
-template <class T>
-inline constexpr bool upx_std_is_bounded_array_v = upx_std_is_bounded_array<T>::value;
-
 // <type_traits> upx_is_integral is overloaded for BE16 & friends; see bele.h
 template <class T>
 struct upx_is_integral : public std::is_integral<T> {};
 template <class T>
 inline constexpr bool upx_is_integral_v = upx_is_integral<T>::value;
 
-// <type_traits> util: is_same_all and is_same_any means std::is_same for multiple types
-template <class T, class... Ts>
-struct is_same_all : public std::conjunction<std::is_same<T, Ts>...> {};
-template <class T, class... Ts>
-inline constexpr bool is_same_all_v = is_same_all<T, Ts...>::value;
-template <class T, class... Ts>
-struct is_same_any : public std::disjunction<std::is_same<T, Ts>...> {};
-template <class T, class... Ts>
-inline constexpr bool is_same_any_v = is_same_any<T, Ts...>::value;
-
 #if (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC) && defined(__MINT__)
-// horrible hack for broken compiler
+// horrible hack for broken compiler / ABI
 #define upx_fake_alignas_1    __attribute__((__aligned__(1), __packed__))
+#define upx_fake_alignas_2    __attribute__((__aligned__(2)))
+#define upx_fake_alignas_4    __attribute__((__aligned__(2))) // object file maximum 2 ???
 #define upx_fake_alignas_16   __attribute__((__aligned__(2))) // object file maximum 2 ???
 #define upx_fake_alignas__(x) upx_fake_alignas_##x
 #define alignas(x)            upx_fake_alignas__(x)
+#define upx_alignas_max       upx_fake_alignas_4
+#endif
+#ifndef upx_alignas_max
+#define upx_alignas_max alignas(std::max_align_t)
 #endif
 
 /*************************************************************************
@@ -123,6 +149,8 @@ inline constexpr bool is_same_any_v = is_same_any<T, Ts...>::value;
 
 // protect against integer overflows and malicious header fields
 // see C 11 standard, Annex K
+//
+// this limits uncompressed_size to about 682 MiB (715_128_832 bytes)
 typedef size_t upx_rsize_t;
 #define UPX_RSIZE_MAX     UPX_RSIZE_MAX_MEM
 #define UPX_RSIZE_MAX_MEM (768 * 1024 * 1024) // DO NOT CHANGE !!!
@@ -137,25 +165,42 @@ typedef acc_int32_t     upx_int32_t;
 typedef acc_uint32_t upx_uint32_t;
 typedef acc_int64_t upx_int64_t;
 typedef acc_uint64_t upx_uint64_t;
+#if (__SIZEOF_INT128__ == 16)
+typedef __int128 upx_int128_t;
+typedef unsigned __int128 upx_uint128_t;
+#endif
 typedef acc_uintptr_t upx_uintptr_t;
+#if defined(__PTRADDR_TYPE__) // CHERI
+typedef __PTRADDR_TYPE__ upx_ptraddr_t;
+#else
+typedef upx_uintptr_t upx_ptraddr_t;
+#endif
+typedef std::make_signed_t<upx_ptraddr_t> upx_sptraddr_t; // signed ptraddr_t
+typedef std::make_unsigned_t<ptrdiff_t> upx_uptrdiff_t;   // unsigned ptrdiff_t
+typedef std::make_signed_t<size_t> upx_ssize_t;           // signed size_t
 
-// convention: use "byte" when dealing with data; use "char/uchar" when dealing
+// UPX convention: use "byte" when dealing with data; use "char/uchar" when dealing
 // with strings; use "upx_uint8_t" when dealing with small integers
 typedef unsigned char byte;
 #define upx_byte  byte
 #define upx_bytep byte *
 typedef unsigned char uchar;
-// convention: use "charptr" when dealing with abstract pointer arithmetics
+// UPX convention: use "charptr" when dealing with abstract pointer arithmetics
 #define charptr upx_charptr_unit_type *
 // upx_charptr_unit_type is some opaque type with sizeof(type) == 1
-struct alignas(1) upx_charptr_unit_type { char hidden__; };
-ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(upx_charptr_unit_type) == 1)
+//// typedef char upx_charptr_unit_type; // also works
+struct alignas(1) upx_charptr_unit_type final { char hidden__; };
+static_assert(sizeof(upx_charptr_unit_type) == 1);
 
 // using the system off_t was a bad idea even back in 199x...
-typedef upx_int64_t upx_off_t;
+#if (__SIZEOF_INT128__ == 16) && 0
+typedef upx_int128_t upx_off_t;
+#else
+typedef long long upx_off_t;
+#endif
 #undef off_t
 #if 0
-// TODO cleanup: at some future point we can do this:
+// TODO later cleanup: at some future point we can do this:
 #define off_t DO_NOT_USE_off_t
 #else
 #define off_t upx_off_t
@@ -163,49 +208,50 @@ typedef upx_int64_t upx_off_t;
 
 // shortcuts
 #define forceinline __acc_forceinline
-#if _MSC_VER
+#if (ACC_CC_MSC)
 #define noinline __declspec(noinline)
 #undef __acc_noinline
 #define __acc_noinline noinline
 #else
 #define noinline __acc_noinline
 #endif
+#if defined(__clang__) || defined(__GNUC__)
+#define noreturn noinline __attribute__((__noreturn__))
+#elif (ACC_CC_MSC)
+// do not use, triggers annoying "warning C4702: unreachable code"
+////#define noreturn noinline __declspec(noreturn)
+#define noreturn noinline
+#else
+#define noreturn noinline
+#endif
+#define forceinline_constexpr forceinline constexpr
 #define likely                __acc_likely
 #define unlikely              __acc_unlikely
 #define very_likely           __acc_very_likely
 #define very_unlikely         __acc_very_unlikely
+
+// cosmetic: explicitly annotate some functions which may throw exceptions
+//   note that noexcept(false) is the default for all C++ functions anyway
 #define may_throw noexcept(false)
 
 #define COMPILE_TIME_ASSERT(e) ACC_COMPILE_TIME_ASSERT(e)
 #define DELETED_FUNCTION       = delete
 #define UNUSED(var)            ACC_UNUSED(var)
 
-
 /*************************************************************************
 // portab
 **************************************************************************/
 
-// just in case
-#undef _
-#undef __
-#undef ___
-#undef dos
-#undef linux
-#undef small
-#undef tos
-#undef unix
-#if defined(__linux__) && !defined(__unix__)
+#if (ACC_OS_POSIX) && !defined(__unix__)
 #define __unix__ 1
 #endif
-#if (ACC_OS_DOS32) && defined(__DJGPP__)
-#  undef sopen
+#if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 ||  \
+     ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
 #undef __unix
 #undef __unix__
 #endif
-
-#if defined(HAVE_DUP) && (HAVE_DUP + 0 == 0)
-#  undef dup
-#  define dup(x)            (-1)
+#if (ACC_OS_DOS32) && defined(__DJGPP__)
+#undef sopen
 #endif
 
 #ifndef STDIN_FILENO
@@ -264,6 +310,14 @@ typedef upx_int64_t upx_off_t;
 #endif
 #endif
 
+// some platforms may provide their own system bswapXX() functions, so rename to avoid conflicts
+#undef bswap16
+#undef bswap32
+#undef bswap64
+#define bswap16 upx_bswap16
+#define bswap32 upx_bswap32
+#define bswap64 upx_bswap64
+
 // avoid warnings about shadowing global symbols
 #undef _base
 #undef basename
@@ -274,11 +328,9 @@ typedef upx_int64_t upx_off_t;
 #define index    upx_renamed_index
 #define outp     upx_renamed_outp
 
-#undef PAGE_MASK
-#undef PAGE_SIZE
-
 #if !defined(O_BINARY) || (O_BINARY + 0 == 0)
-#  if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+#if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 ||  \
+     ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
 #error "missing O_BINARY"
 #endif
 #endif
@@ -286,7 +338,6 @@ typedef upx_int64_t upx_off_t;
 #define O_BINARY 0
 #endif
 
-
 /*************************************************************************
 // util
 **************************************************************************/
@@ -310,9 +361,10 @@ typedef upx_int64_t upx_off_t;
 #define VALGRIND_MAKE_MEM_UNDEFINED(addr, len) 0
 #endif
 
+// TODO later: check __MINGW_PRINTF_FORMAT
 #if defined(_WIN32) && defined(__MINGW32__) && defined(__GNUC__) && !defined(__clang__)
 #define attribute_format(a, b) __attribute__((__format__(__gnu_printf__, a, b)))
-#elif (ACC_CC_CLANG || ACC_CC_GNUC)
+#elif defined(__clang__) || defined(__GNUC__)
 #define attribute_format(a, b) __attribute__((__format__(__printf__, a, b)))
 #else
 #define attribute_format(a, b) /*empty*/
@@ -320,27 +372,32 @@ typedef upx_int64_t upx_off_t;
 
 // for no-op debug output
 inline void NO_printf(const char *, ...) noexcept attribute_format(1, 2);
-inline void NO_fprintf(FILE *, const char *, ...) noexcept attribute_format(2, 3);
 inline void NO_printf(const char *, ...) noexcept {}
+inline void NO_fprintf(FILE *, const char *, ...) noexcept attribute_format(2, 3);
 inline void NO_fprintf(FILE *, const char *, ...) noexcept {}
 
-#if !defined(__has_builtin)
-#  define __has_builtin(x)      0
+#if __has_builtin(__builtin_memcmp)
+#define upx_memcmp_inline __builtin_memcmp
+#elif defined(__clang__) || defined(__GNUC__)
+#define upx_memcmp_inline __builtin_memcmp
+#else
+#define upx_memcmp_inline memcmp
 #endif
-
-#if __has_builtin(__builtin_memcpy_inline)
+#if __has_builtin(__builtin_memcpy_inline) && 0 // TODO later: clang constexpr limitation?
 #define upx_memcpy_inline __builtin_memcpy_inline
 #elif __has_builtin(__builtin_memcpy)
 #define upx_memcpy_inline __builtin_memcpy
-#elif defined(__GNUC__)
+#elif defined(__clang__) || defined(__GNUC__)
 #define upx_memcpy_inline __builtin_memcpy
 #else
 #define upx_memcpy_inline memcpy
 #endif
 
-#if __has_builtin(__builtin_return_address)
+#if defined(__wasi__)
+#define upx_return_address() nullptr
+#elif __has_builtin(__builtin_return_address)
 #define upx_return_address() __builtin_return_address(0)
-#elif defined(__GNUC__)
+#elif defined(__clang__) || defined(__GNUC__)
 #define upx_return_address() __builtin_return_address(0)
 #elif (ACC_CC_MSC)
 #define upx_return_address() _ReturnAddress()
@@ -348,15 +405,25 @@ inline void NO_fprintf(FILE *, const char *, ...) noexcept {}
 #define upx_return_address() nullptr
 #endif
 
-// TODO cleanup: we now require C++17, so remove all __packed_struct usage
-#define __packed_struct(s)      struct alignas(1) s {
-#define __packed_struct_end()   };
+// TODO later cleanup: we now require C++17, so remove all packed_struct usage
+#define packed_struct(s) struct alignas(1) s
 
-#define COMPILE_TIME_ASSERT_ALIGNOF_USING_SIZEOF__(a,b) { \
-     typedef a acc_tmp_a_t; typedef b acc_tmp_b_t; \
-     struct alignas(1) acc_tmp_t { acc_tmp_b_t x; acc_tmp_a_t y; acc_tmp_b_t z; }; \
+// TODO later cleanup: this was needed in the old days to catch compiler problems/bugs;
+//   we now require C++17, so remove this
+#define COMPILE_TIME_ASSERT_ALIGNOF_USING_SIZEOF__(a, b)                                           \
+    {                                                                                              \
+        typedef a acc_tmp_a_t;                                                                     \
+        typedef b acc_tmp_b_t;                                                                     \
+        struct alignas(1) acc_tmp_t {                                                              \
+            acc_tmp_b_t x;                                                                         \
+            acc_tmp_a_t y;                                                                         \
+            acc_tmp_b_t z;                                                                         \
+        };                                                                                         \
         COMPILE_TIME_ASSERT(sizeof(struct acc_tmp_t) == 2 * sizeof(b) + sizeof(a))                 \
-     COMPILE_TIME_ASSERT(sizeof(((acc_tmp_t*)nullptr)->x)+sizeof(((acc_tmp_t*)nullptr)->y)+sizeof(((acc_tmp_t*)nullptr)->z) == 2*sizeof(b)+sizeof(a)) \
+        COMPILE_TIME_ASSERT(sizeof(((acc_tmp_t *) nullptr)->x) +                                   \
+                                sizeof(((acc_tmp_t *) nullptr)->y) +                               \
+                                sizeof(((acc_tmp_t *) nullptr)->z) ==                              \
+                            2 * sizeof(b) + sizeof(a))                                             \
     }
 #define COMPILE_TIME_ASSERT_ALIGNOF__(a, b)                                                        \
     COMPILE_TIME_ASSERT_ALIGNOF_USING_SIZEOF__(a, b)                                               \
@@ -366,26 +433,6 @@ inline void NO_fprintf(FILE *, const char *, ...) noexcept {}
 
 #define TABLESIZE(table) ((sizeof(table) / sizeof((table)[0])))
 
-
-template <class T>
-inline T ALIGN_DOWN(const T& a, const T& b) { T r; r = (a / b) * b; return r; }
-template <class T>
-inline T ALIGN_UP  (const T& a, const T& b) { T r; r = ((a + b - 1) / b) * b; return r; }
-template <class T>
-inline T ALIGN_GAP (const T& a, const T& b) { T r; r = ALIGN_UP(a, b) - a; return r; }
-
-template <class T>
-inline const T& UPX_MAX(const T& a, const T& b) { if (a < b) return b; return a; }
-template <class T>
-inline const T& UPX_MIN(const T& a, const T& b) { if (a < b) return a; return b; }
-
-template <size_t Size>
-struct UnsignedSizeOf {
-    static_assert(Size >= 1 && Size <= UPX_RSIZE_MAX_MEM);
-    static constexpr unsigned value = unsigned(Size);
-};
-#define usizeof(expr)   (UnsignedSizeOf<sizeof(expr)>::value)
-
 template <class T>
 inline void mem_clear(T *object) noexcept {
     static_assert(std::is_class_v<T>); // UPX convention
@@ -395,6 +442,7 @@ inline void mem_clear(T *object) noexcept {
     static_assert(size >= 1 && size <= UPX_RSIZE_MAX_MEM);
     memset((void *) object, 0, size);
 }
+// disable some overloads
 #if defined(__clang__) || __GNUC__ != 7
 template <class T>
 inline void mem_clear(T (&array)[]) noexcept DELETED_FUNCTION;
@@ -411,57 +459,34 @@ inline void mem_clear(T (&array)[N]) noexcept DELETED_FUNCTION;
 #define ByteArray(var, n) Array(byte, var, (n))
 
 // assert_noexcept()
-noinline void assertFailed(const char *expr, const char *file, int line, const char *func) noexcept;
-noinline void throwAssertFailed(const char *expr, const char *file, int line, const char *func);
-#if defined(__GNUC__)
+noreturn void assertFailed(const char *expr, const char *file, int line, const char *func) noexcept;
+noreturn void throwAssertFailed(const char *expr, const char *file, int line, const char *func);
+#if defined(__clang__) || defined(__GNUC__)
 #undef assert
 #if DEBUG || 0
-// generate a warning if assert() is used inside a "noexcept" context
-#define assert(e)          ((void)(__acc_cte(e) || (assertFailed(#e, __FILE__, __LINE__, __func__), throw 1, 0)))
+// trigger a warning if assert() is used inside a "noexcept" context
+#define assert(e)                                                                                  \
+    ((void) (__acc_cte(e) || (assertFailed(#e, __FILE__, __LINE__, __func__), throw 1, 0)))
 #else
 // turn assertion failures into exceptions
-#define assert(e)          ((void)(__acc_cte(e) || (throwAssertFailed(#e, __FILE__, __LINE__, __func__), throw 1, 0)))
+#define assert(e)                                                                                  \
+    ((void) (__acc_cte(e) || (throwAssertFailed(#e, __FILE__, __LINE__, __func__), throw 1, 0)))
 #endif
-#define assert_noexcept(e) ((void)(__acc_cte(e) || (assertFailed(#e, __FILE__, __LINE__, __func__), 0)))
+#define assert_noexcept(e)                                                                         \
+    ((void) (__acc_cte(e) || (assertFailed(#e, __FILE__, __LINE__, __func__), 0)))
 #else
 #define assert_noexcept assert
 #endif
 
-class noncopyable {
-protected:
-    inline noncopyable() noexcept {}
-    inline ~noncopyable() noexcept = default;
-private:
-    noncopyable(const noncopyable &) noexcept DELETED_FUNCTION; // copy constructor
-    noncopyable& operator=(const noncopyable &) noexcept DELETED_FUNCTION; // copy assignment
-    noncopyable(noncopyable &&) noexcept DELETED_FUNCTION; // move constructor
-    noncopyable& operator=(noncopyable &&) noexcept DELETED_FUNCTION; // move assignment
-};
-
-
-namespace compile_time {
-constexpr size_t string_len(const char *a) {
-    return *a == '\0' ? 0 : 1 + string_len(a + 1);
-}
-constexpr bool string_eq(const char *a, const char *b) {
-    return *a == *b && (*a == '\0' || string_eq(a + 1, b + 1));
-}
-constexpr bool string_lt(const char *a, const char *b) {
-    return (uchar)*a < (uchar)*b || (*a != '\0' && *a == *b && string_lt(a + 1, b + 1));
-}
-constexpr bool string_ne(const char *a, const char *b) {
-    return !string_eq(a, b);
-}
-constexpr bool string_gt(const char *a, const char *b) {
-    return string_lt(b, a);
-}
-constexpr bool string_le(const char *a, const char *b) {
-    return !string_lt(b, a);
-}
-constexpr bool string_ge(const char *a, const char *b) {
-    return !string_lt(a, b);
-}
-} // namespace compile_time
+// C++ support library
+#include "util/cxxlib.h"
+using upx::tribool;
+#define usizeof(expr)      (upx::UnsignedSizeOf<sizeof(expr)>::value)
+#define ALIGN_DOWN(a, b)   (upx::align_down((a), (b)))
+#define ALIGN_UP(a, b)     (upx::align_up((a), (b)))
+#define ALIGN_UP_GAP(a, b) (upx::align_up_gap((a), (b)))
+#define UPX_MAX(a, b)      (upx::max((a), (b)))
+#define UPX_MIN(a, b)      (upx::min((a), (b)))
 
 /*************************************************************************
 // constants
@@ -471,7 +496,7 @@ constexpr bool string_ge(const char *a, const char *b) {
 #define EXIT_OK         0
 #define EXIT_ERROR      1
 #define EXIT_WARN       2
-
+//
 #define EXIT_USAGE      1
 #define EXIT_FILE_READ  1
 #define EXIT_FILE_WRITE 1
@@ -480,12 +505,10 @@ constexpr bool string_ge(const char *a, const char *b) {
 #define EXIT_INIT       1
 #define EXIT_INTERNAL   1
 
-
 // magic constants for patching
 #define UPX_MAGIC_LE32  0x21585055 /* "UPX!" */
 #define UPX_MAGIC2_LE32 0xD5D0D8A1
 
-
 // upx_compress() error codes
 #define UPX_E_OK                  (0)
 #define UPX_E_ERROR               (-1)
@@ -499,7 +522,6 @@ constexpr bool string_ge(const char *a, const char *b) {
 #define UPX_E_NOT_YET_IMPLEMENTED (-9)
 #define UPX_E_INVALID_ARGUMENT    (-10)
 
-
 // Executable formats (info: big endian types are >= 128); DO NOT CHANGE
 #define UPX_F_DOS_COM             1
 #define UPX_F_DOS_SYS             2
@@ -575,8 +597,9 @@ constexpr bool string_ge(const char *a, const char *b) {
 // #define M_CL1B_8      12
 // #define M_CL1B_LE16   13
 #define M_LZMA        14
-#define M_DEFLATE       15      // zlib
-#define M_ZSTD          16
+#define M_DEFLATE     15 // NOT YET USED
+#define M_ZSTD        16 // NOT YET USED
+#define M_BZIP2       17 // NOT YET USED
 // compression methods internal usage
 #define M_ALL         (-1)
 #define M_END         (-2)
@@ -591,7 +614,7 @@ constexpr bool string_ge(const char *a, const char *b) {
 #define M_IS_LZMA(x)    (((x) &255) == M_LZMA)
 #define M_IS_DEFLATE(x) ((x) == M_DEFLATE)
 #define M_IS_ZSTD(x)    ((x) == M_ZSTD)
-
+#define M_IS_BZIP2(x)   ((x) == M_BZIP2)
 
 // filters internal usage
 #define FT_END         (-1)
@@ -599,14 +622,15 @@ constexpr bool string_ge(const char *a, const char *b) {
 #define FT_SKIP        (-3)
 #define FT_ULTRA_BRUTE (-4)
 
-
 /*************************************************************************
 // compression - setup and callback_t
 **************************************************************************/
 
 #define WITH_LZMA 1
 #define WITH_UCL  1
+#ifndef WITH_ZLIB
 #define WITH_ZLIB 1
+#endif
 #if (WITH_UCL)
 #define ucl_compress_config_t REAL_ucl_compress_config_t
 #include <ucl/include/ucl/uclconf.h>
@@ -616,74 +640,31 @@ constexpr bool string_ge(const char *a, const char *b) {
 #endif
 
 struct upx_callback_t;
-typedef upx_callback_t *upx_callback_p;
-typedef void (__acc_cdecl *upx_progress_func_t)
-    (upx_callback_p, unsigned, unsigned);
+typedef void(__acc_cdecl *upx_progress_func_t)(upx_callback_t *, unsigned, unsigned);
 
-struct upx_callback_t {
+struct upx_callback_t final {
     upx_progress_func_t nprogress;
     void *user;
 
     void reset() noexcept { mem_clear(this); }
 };
 
-
 /*************************************************************************
 // compression - config_t
 **************************************************************************/
 
-template <class T, T default_value_, T min_value_, T max_value_>
-struct OptVar final {
-    static_assert(std::is_integral_v<T>);
-    typedef T value_type;
-    static constexpr T default_value = default_value_;
-    static constexpr T min_value = min_value_;
-    static constexpr T max_value = max_value_;
-    static_assert(min_value <= default_value && default_value <= max_value);
+struct bzip2_compress_config_t final {
+    unsigned dummy;
 
-    static void assertValue(const T &v) noexcept {
-        // info: this generates annoying warnings "unsigned >= 0 is always true"
-        //assert_noexcept(v >= min_value);
-        assert_noexcept(v == min_value || v >= min_value + 1);
-        assert_noexcept(v <= max_value);
-    }
-    void assertValue() const noexcept {
-        assertValue(v);
-    }
-
-    OptVar() noexcept : v(default_value), is_set(false) { }
-    OptVar& operator= (const T &other) noexcept {
-        assertValue(other);
-        v = other;
-        is_set = true;
-        return *this;
-    }
-
-    void reset() noexcept { v = default_value; is_set = false; }
-    operator T () const noexcept { return v; }
-
-    T v;
-    bool is_set;
+    void reset() noexcept;
 };
 
-
-// optional assignments
-template <class T, T a, T b, T c>
-inline void oassign(OptVar<T,a,b,c> &self, const OptVar<T,a,b,c> &other) noexcept {
-    if (other.is_set) { self.v = other.v; self.is_set = true; }
-}
-template <class T, T a, T b, T c>
-inline void oassign(T &v, const OptVar<T,a,b,c> &other) noexcept {
-    if (other.is_set) { v = other.v; }
-}
-
-
-struct lzma_compress_config_t {
-    typedef OptVar<unsigned,  2u, 0u,   4u> pos_bits_t;             // pb
-    typedef OptVar<unsigned,  0u, 0u,   4u> lit_pos_bits_t;         // lp
-    typedef OptVar<unsigned,  3u, 0u,   8u> lit_context_bits_t;     // lc
-    typedef OptVar<unsigned, (1u<<22), 1u, (1u<<30) > dict_size_t;
-    typedef OptVar<unsigned, 64u, 5u, 273u> num_fast_bytes_t;
+struct lzma_compress_config_t final {
+    typedef upx::OptVar<unsigned, 2u, 0u, 4u> pos_bits_t;         // pb
+    typedef upx::OptVar<unsigned, 0u, 0u, 4u> lit_pos_bits_t;     // lp
+    typedef upx::OptVar<unsigned, 3u, 0u, 8u> lit_context_bits_t; // lc
+    typedef upx::OptVar<unsigned, (1u << 22), 1u, (1u << 30)> dict_size_t;
+    typedef upx::OptVar<unsigned, 64u, 5u, 273u> num_fast_bytes_t;
 
     pos_bits_t pos_bits;                 // pb
     lit_pos_bits_t lit_pos_bits;         // lp
@@ -698,14 +679,14 @@ struct lzma_compress_config_t {
     void reset() noexcept;
 };
 
-struct ucl_compress_config_t : public REAL_ucl_compress_config_t {
+struct ucl_compress_config_t final : public REAL_ucl_compress_config_t {
     void reset() noexcept { memset(this, 0xff, sizeof(*this)); }
 };
 
-struct zlib_compress_config_t {
-    typedef OptVar<unsigned,  8u, 1u,   9u> mem_level_t;            // ml
-    typedef OptVar<unsigned, 15u, 9u,  15u> window_bits_t;          // wb
-    typedef OptVar<unsigned,  0u, 0u,   4u> strategy_t;             // st
+struct zlib_compress_config_t final {
+    typedef upx::OptVar<unsigned, 8u, 1u, 9u> mem_level_t;     // ml
+    typedef upx::OptVar<unsigned, 15u, 9u, 15u> window_bits_t; // wb
+    typedef upx::OptVar<unsigned, 0u, 0u, 4u> strategy_t;      // st
 
     mem_level_t mem_level;     // ml
     window_bits_t window_bits; // wb
@@ -714,29 +695,41 @@ struct zlib_compress_config_t {
     void reset() noexcept;
 };
 
-struct zstd_compress_config_t {
+struct zstd_compress_config_t final {
     unsigned dummy;
 
     void reset() noexcept;
 };
 
-struct upx_compress_config_t {
+struct upx_compress_config_t final {
+    bzip2_compress_config_t conf_bzip2;
     lzma_compress_config_t conf_lzma;
     ucl_compress_config_t conf_ucl;
     zlib_compress_config_t conf_zlib;
     zstd_compress_config_t conf_zstd;
 
-    void reset() noexcept { conf_lzma.reset(); conf_ucl.reset(); conf_zlib.reset(); conf_zstd.reset(); }
+    void reset() noexcept {
+        conf_bzip2.reset();
+        conf_lzma.reset();
+        conf_ucl.reset();
+        conf_zlib.reset();
+        conf_zstd.reset();
+    }
 };
 
-#define NULL_cconf  ((upx_compress_config_t *) nullptr)
-
+#define NULL_cconf ((const upx_compress_config_t *) nullptr)
 
 /*************************************************************************
 // compression - result_t
 **************************************************************************/
 
-struct lzma_compress_result_t {
+struct bzip2_compress_result_t final {
+    unsigned dummy;
+
+    void reset() noexcept { mem_clear(this); }
+};
+
+struct lzma_compress_result_t final {
     unsigned pos_bits;         // pb
     unsigned lit_pos_bits;     // lp
     unsigned lit_context_bits; // lc
@@ -749,25 +742,25 @@ struct lzma_compress_result_t {
     void reset() noexcept { mem_clear(this); }
 };
 
-struct ucl_compress_result_t {
+struct ucl_compress_result_t final {
     ucl_uint result[16];
 
     void reset() noexcept { mem_clear(this); }
 };
 
-struct zlib_compress_result_t {
+struct zlib_compress_result_t final {
     unsigned dummy;
 
     void reset() noexcept { mem_clear(this); }
 };
 
-struct zstd_compress_result_t {
+struct zstd_compress_result_t final {
     unsigned dummy;
 
     void reset() noexcept { mem_clear(this); }
 };
 
-struct upx_compress_result_t {
+struct upx_compress_result_t final {
     // debugging aid
     struct Debug {
         int method, level;
@@ -776,6 +769,7 @@ struct upx_compress_result_t {
     };
     Debug debug;
 
+    bzip2_compress_result_t result_bzip2;
     lzma_compress_result_t result_lzma;
     ucl_compress_result_t result_ucl;
     zlib_compress_result_t result_zlib;
@@ -783,36 +777,39 @@ struct upx_compress_result_t {
 
     void reset() noexcept {
         debug.reset();
-        result_lzma.reset(); result_ucl.reset(); result_zlib.reset(); result_zstd.reset();
+        result_bzip2.reset();
+        result_lzma.reset();
+        result_ucl.reset();
+        result_zlib.reset();
+        result_zstd.reset();
     }
 };
 
-
 /*************************************************************************
 // globals
 **************************************************************************/
 
 // classes
 class ElfLinker;
-typedef ElfLinker Linker;
+typedef ElfLinker Linker; // shortcut
 class Throwable;
 
+// check/dt_check.cpp
+noinline void upx_compiler_sanity_check() noexcept;
+noinline int upx_doctest_check(int argc, char **argv);
+int upx_doctest_check();
+
 // util/membuffer.h
 class MemBuffer;
 void *membuffer_get_void_ptr(MemBuffer &mb) noexcept;
 unsigned membuffer_get_size(MemBuffer &mb) noexcept;
 
-// util/dt_check.cpp
-noinline void upx_compiler_sanity_check() noexcept;
-noinline int upx_doctest_check(int argc, char **argv);
-int upx_doctest_check();
-
 // main.cpp
 extern const char *progname;
 bool main_set_exit_code(int ec);
 int main_get_options(int argc, char **argv);
 void main_get_envoptions();
-int upx_main(int argc, char *argv[]);
+int upx_main(int argc, char *argv[]) may_throw;
 
 // msg.cpp
 void printSetNl(int need_nl) noexcept;
@@ -829,24 +826,26 @@ void infoHeader();
 void infoWriting(const char *what, upx_int64_t size);
 
 // work.cpp
-void do_one_file(const char *iname, char *oname);
-int do_files(int i, int argc, char *argv[]);
+void do_one_file(const char *iname, char *oname) may_throw;
+int do_files(int i, int argc, char *argv[]) may_throw;
 
 // help.cpp
 extern const char gitrev[];
 void show_header();
-void show_help(int verbose=0);
+void show_help(int verbose);
 void show_license();
+void show_sysinfo(const char *options_var);
 void show_usage();
 void show_version(bool one_line = false);
 
 // compress/compress.cpp
+// clang-format off
 unsigned upx_adler32(const void *buf, unsigned len, unsigned adler = 1);
 unsigned upx_crc32  (const void *buf, unsigned len, unsigned crc = 0);
 
 int upx_compress           ( const upx_bytep src, unsigned  src_len,
                                    upx_bytep dst, unsigned *dst_len,
-                                   upx_callback_p cb,
+                                   upx_callback_t *cb,
                                    int method, int level,
                              const upx_compress_config_t *cconf,
                                    upx_compress_result_t *cresult );
@@ -860,17 +859,18 @@ int upx_test_overlap       ( const upx_bytep buf,
                                    unsigned *dst_len,
                                    int method,
                              const upx_compress_result_t *cresult );
-
+// clang-format on
 
 #include "util/snprintf.h" // must get included first!
+#include "util/util.h"
 #include "options.h"
 #include "except.h"
 #include "bele.h"
 #include "console/console.h"
-#include "util/util.h"
 // xspan
 #include "util/raw_bytes.h"
 #include "util/xspan.h"
-
+//
+#include "util/system_check_predefs.h"
 
 /* vim:set ts=4 sw=4 et: */

src/console/c_file.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/console/c_init.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/console/c_none.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/console/c_screen.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/console/console.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/console/s_djgpp2.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/console/s_object.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/console/s_vcsa.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/console/s_win32.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -25,10 +25,19 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
+#define WANT_WINDOWS_LEAN_H 1
+#include "../util/system_headers.h"
+#if (HAVE_CONIO_H)
+#include <conio.h>
+#endif
 #include "../conf.h"
 
 #if (USE_SCREEN_WIN32)
 
+/*************************************************************************
+// direct screen access
+**************************************************************************/
+
 #include "screen.h"
 
 #define this self
@@ -36,24 +45,6 @@
 #define mask_fg 0x0f
 #define mask_bg 0xf0
 
-/*************************************************************************
-// direct screen access
-**************************************************************************/
-
-#if (ACC_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1200))
-/* avoid -W4 warnings in <conio.h> */
-#pragma warning(disable : 4032)
-/* avoid -W4 warnings in <windows.h> */
-#pragma warning(disable : 4201 4214 4514)
-#endif
-#if defined(__RSXNT__)
-#define timeval win32_timeval /* struct timeval already in <sys/time.h> */
-#endif
-#include <windows.h>
-#if (HAVE_CONIO_H)
-#include <conio.h>
-#endif
-
 struct screen_data_t {
     HANDLE hi;
     HANDLE ho;

src/console/screen.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -26,8 +26,6 @@
  */
 
 #pragma once
-#ifndef UPX_SCREEN_H__
-#define UPX_SCREEN_H__ 1
 
 #if (USE_SCREEN)
 
@@ -100,6 +98,4 @@ void screen_show_frames(screen_t *);
 
 #endif /* USE_SCREEN */
 
-#endif /* already included */
-
 /* vim:set ts=4 sw=4 et: */

src/except.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -31,39 +31,41 @@
 //
 **************************************************************************/
 
-/*static*/ upx_std_atomic(size_t) Throwable::debug_counter;
+/*static*/ Throwable::Stats Throwable::stats;
 
 Throwable::Throwable(const char *m, int e, bool w) noexcept : super(),
                                                               msg(nullptr),
                                                               err(e),
                                                               is_warning(w) {
-    if (m)
+    if (m != nullptr) {
         msg = strdup(m);
-#if 0
-    fprintf(stderr, "construct exception: %s %zu\n", msg, debug_counter);
-    debug_counter += 1;
-#endif
+        assert_noexcept(msg != nullptr);
+    }
+    NO_fprintf(stderr, "construct exception: %zu %zu %s\n", size_t(stats.counter_current),
+               size_t(stats.counter_total), (const char *) msg);
+    stats.counter_current += 1;
+    stats.counter_total += 1;
 }
 
 Throwable::Throwable(const Throwable &other) noexcept : super(other),
                                                         msg(nullptr),
                                                         err(other.err),
                                                         is_warning(other.is_warning) {
-    if (other.msg)
+    if (other.msg != nullptr) {
         msg = strdup(other.msg);
-#if 0
-    fprintf(stderr, "copy exception: %s %zu\n", msg, debug_counter);
-    debug_counter += 1;
-#endif
+        assert_noexcept(msg != nullptr);
+    }
+    NO_fprintf(stderr, "copy construct exception: %zu %zu %s\n", size_t(stats.counter_current),
+               size_t(stats.counter_total), (const char *) msg);
+    stats.counter_current += 1;
+    stats.counter_total += 1;
 }
 
 Throwable::~Throwable() noexcept {
-#if 0
-    debug_counter -= 1;
-    fprintf(stderr, "destruct exception: %s %zu\n", msg, debug_counter);
-#endif
-    if (msg)
-        free(msg);
+    stats.counter_current -= 1;
+    NO_fprintf(stderr, "destruct exception: %zu %zu %s\n", size_t(stats.counter_current),
+               size_t(stats.counter_total), (const char *) msg);
+    upx::owner_free(msg);
 }
 
 /*************************************************************************
@@ -142,7 +144,7 @@ void throwEOFException(const char *msg, int e) {
 }
 
 /*************************************************************************
-//
+// varargs overloads
 **************************************************************************/
 
 template <>
@@ -150,7 +152,7 @@ void throwCantPack(const char *format, ...) {
     char msg[1024];
     va_list ap;
     va_start(ap, format);
-    (void) upx_safe_vsnprintf(msg, sizeof(msg), format, ap);
+    upx_safe_vsnprintf_noexcept(msg, sizeof(msg), format, ap);
     va_end(ap);
     throwCantPack(msg);
 }
@@ -160,13 +162,23 @@ void throwCantUnpack(const char *format, ...) {
     char msg[1024];
     va_list ap;
     va_start(ap, format);
-    (void) upx_safe_vsnprintf(msg, sizeof(msg), format, ap);
+    upx_safe_vsnprintf_noexcept(msg, sizeof(msg), format, ap);
     va_end(ap);
     throwCantUnpack(msg);
 }
 
+template <>
+void throwInternalError(const char *format, ...) {
+    char msg[1024];
+    va_list ap;
+    va_start(ap, format);
+    upx_safe_vsnprintf_noexcept(msg, sizeof(msg), format, ap);
+    va_end(ap);
+    throwInternalError(msg);
+}
+
 /*************************************************************************
-//
+// util
 **************************************************************************/
 
 void assertFailed(const char *expr, const char *file, int line, const char *func) noexcept {
@@ -183,7 +195,7 @@ void throwAssertFailed(const char *expr, const char *file, int line, const char
     }
 }
 
-const char *prettyName(const char *n) noexcept {
+const char *prettyExceptionName(const char *n) noexcept {
     if (n == nullptr)
         return "(null)";
     while (*n) {
@@ -191,7 +203,7 @@ const char *prettyName(const char *n) noexcept {
             n++;
         else if (*n == ' ')
             n++;
-        else if (strncmp(n, "class ", 6) == 0) // Visual C++
+        else if (strncmp(n, "class ", 6) == 0) // Visual C++ (MSVC)
             n += 6;
         else
             break;

src/except.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -27,11 +27,6 @@
 
 #pragma once
 
-const char *prettyName(const char *n) noexcept;
-
-noinline void assertFailed(const char *expr, const char *file, int line, const char *func) noexcept;
-noinline void throwAssertFailed(const char *expr, const char *file, int line, const char *func);
-
 /*************************************************************************
 // exceptions
 **************************************************************************/
@@ -43,31 +38,35 @@ protected:
     Throwable(const char *m = nullptr, int e = 0, bool w = false) noexcept;
 
 public:
-    Throwable(const Throwable &) noexcept;
+    Throwable(const Throwable &) noexcept; // copy constructor
     virtual ~Throwable() noexcept;
     const char *getMsg() const noexcept { return msg; }
     int getErrno() const noexcept { return err; }
     bool isWarning() const noexcept { return is_warning; }
 
 private:
-    char *msg = nullptr;
+    OwningPointer(char) msg = nullptr;
     int err = 0;
 protected:
     bool is_warning = false; // can be set by subclasses
 
 private:
     // disable copy assignment and move
-    Throwable &operator=(const Throwable &) DELETED_FUNCTION;
-    Throwable(Throwable &&) noexcept DELETED_FUNCTION;
-    Throwable &operator=(Throwable &&) noexcept DELETED_FUNCTION;
+    Throwable &operator=(const Throwable &) noexcept DELETED_FUNCTION; // copy assignment
+    UPX_CXX_DISABLE_MOVE(Throwable)
     // disable dynamic allocation => force throwing by value
-    ACC_CXX_DISABLE_NEW_DELETE
+    UPX_CXX_DISABLE_NEW_DELETE(Throwable)
     // disable taking the address => force passing by reference
     // [I'm not too sure about this design decision, but we can always allow it if needed]
-    Throwable *operator&() const noexcept DELETED_FUNCTION;
+    UPX_CXX_DISABLE_ADDRESS(Throwable)
 
 private:
-    static upx_std_atomic(size_t) debug_counter; // for debugging
+    // static debug stats
+    struct Stats {
+        upx_std_atomic(size_t) counter_total;
+        upx_std_atomic(size_t) counter_current;
+    };
+    static Stats stats;
 };
 
 // Exceptions can/should be caught
@@ -85,7 +84,7 @@ public:
 };
 
 /*************************************************************************
-// system exception
+// system exceptions
 **************************************************************************/
 
 class OutOfMemoryException final : public Exception {
@@ -134,7 +133,7 @@ public:
     CantPackException(const char *m = nullptr, bool w = false) noexcept : super(m, 0, w) {}
 };
 
-class UnknownExecutableFormatException : public CantPackException {
+class UnknownExecutableFormatException final : public CantPackException {
     typedef CantPackException super;
 public:
     UnknownExecutableFormatException(const char *m = nullptr, bool w = false) noexcept
@@ -179,40 +178,37 @@ public:
 // util
 **************************************************************************/
 
-#undef NORET
-#if 1 && defined(__GNUC__)
-#define NORET noinline __attribute__((__noreturn__))
-#else
-#define NORET noinline
-#endif
+const char *prettyExceptionName(const char *n) noexcept;
 
-NORET void throwCantPack(const char *msg);
-NORET void throwCantPackExact();
-NORET void throwUnknownExecutableFormat(const char *msg = nullptr, bool warn = false);
-NORET void throwNotCompressible(const char *msg = nullptr);
-NORET void throwAlreadyPacked(const char *msg = nullptr);
-NORET void throwAlreadyPackedByUPX(const char *msg = nullptr);
-NORET void throwCantUnpack(const char *msg);
-NORET void throwNotPacked(const char *msg = nullptr);
-NORET void throwFilterException();
-NORET void throwBadLoader();
-NORET void throwChecksumError();
-NORET void throwCompressedDataViolation();
-NORET void throwInternalError(const char *msg);
-NORET void throwOutOfMemoryException(const char *msg = nullptr);
-NORET void throwIOException(const char *msg = nullptr, int e = 0);
-NORET void throwEOFException(const char *msg = nullptr, int e = 0);
+noreturn void throwCantPack(const char *msg) may_throw;
+noreturn void throwCantPackExact() may_throw;
+noreturn void throwUnknownExecutableFormat(const char *msg = nullptr, bool warn = false) may_throw;
+noreturn void throwNotCompressible(const char *msg = nullptr) may_throw;
+noreturn void throwAlreadyPacked(const char *msg = nullptr) may_throw;
+noreturn void throwAlreadyPackedByUPX(const char *msg = nullptr) may_throw;
+noreturn void throwCantUnpack(const char *msg) may_throw;
+noreturn void throwNotPacked(const char *msg = nullptr) may_throw;
+noreturn void throwFilterException() may_throw;
+noreturn void throwBadLoader() may_throw;
+noreturn void throwChecksumError() may_throw;
+noreturn void throwCompressedDataViolation() may_throw;
+noreturn void throwInternalError(const char *msg) may_throw;
+noreturn void throwOutOfMemoryException(const char *msg = nullptr) may_throw;
+noreturn void throwIOException(const char *msg = nullptr, int e = 0) may_throw;
+noreturn void throwEOFException(const char *msg = nullptr, int e = 0) may_throw;
 
 // some C++ template wizardry is needed to overload throwCantPack() for varargs
 template <class T>
 void throwCantPack(const T *, ...) DELETED_FUNCTION;
 template <>
-NORET void throwCantPack(const char *format, ...) attribute_format(1, 2);
+noreturn void throwCantPack(const char *format, ...) may_throw attribute_format(1, 2);
 template <class T>
 void throwCantUnpack(const T *, ...) DELETED_FUNCTION;
 template <>
-NORET void throwCantUnpack(const char *format, ...) attribute_format(1, 2);
-
-#undef NORET
+noreturn void throwCantUnpack(const char *format, ...) may_throw attribute_format(1, 2);
+template <class T>
+void throwInternalError(const T *, ...) DELETED_FUNCTION;
+template <>
+noreturn void throwInternalError(const char *format, ...) may_throw attribute_format(1, 2);
 
 /* vim:set ts=4 sw=4 et: */

src/file.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -33,12 +33,14 @@
 **************************************************************************/
 
 /*static*/ void FileBase::chmod(const char *name, int mode) {
+    assert(name != nullptr && name[0] != 0);
 #if HAVE_CHMOD
     if (::chmod(name, mode) != 0)
         throwIOException(name, errno);
 #else
     UNUSED(name);
     UNUSED(mode);
+    // no error
 #endif
 }
 
@@ -51,13 +53,23 @@
         throwIOException("rename error", errno);
 }
 
+/*static*/ bool FileBase::unlink_noexcept(const char *name) noexcept {
+    assert_noexcept(name != nullptr && name[0] != 0);
+    bool success = ::unlink(name) == 0;
+#if HAVE_CHMOD
+    if (!success)
+        success = (::chmod(name, 0666) == 0 && ::unlink(name) == 0);
+#endif
+    return success;
+}
+
 /*static*/ void FileBase::unlink(const char *name) {
-    if (::unlink(name) != 0)
+    if (!unlink_noexcept(name))
         throwIOException(name, errno);
 }
 
 /*************************************************************************
-//
+// FileBase
 **************************************************************************/
 
 FileBase::~FileBase() may_throw {
@@ -65,10 +77,10 @@ FileBase::~FileBase() may_throw {
     if (isOpen())
         fprintf(stderr, "%s: %s\n", _name, __PRETTY_FUNCTION__);
 #endif
-
-    // FIXME: we should use close() during exception unwinding but
-    //        closex() otherwise
-    closex();
+    if (std::uncaught_exceptions() == 0)
+        closex(); // may_throw
+    else
+        close_noexcept(); // currently in exception unwinding, use noexcept variant
 }
 
 bool FileBase::do_sopen() {
@@ -77,7 +89,7 @@ bool FileBase::do_sopen() {
     else {
 #if (ACC_OS_DOS32) && defined(__DJGPP__)
         _fd = ::open(_name, _flags | _shflags, _mode);
-#elif defined(__MINT__)
+#elif (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC) && defined(__MINT__)
         _fd = ::open(_name, _flags | (_shflags & O_SHMODE), _mode);
 #elif defined(SH_DENYRW)
         _fd = ::sopen(_name, _flags, _shflags, _mode);
@@ -87,13 +99,14 @@ bool FileBase::do_sopen() {
     }
     if (_fd < 0)
         return false;
+    st.st_size = 0;
     if (::fstat(_fd, &st) != 0)
         throwIOException(_name, errno);
     _length = st.st_size;
     return true;
 }
 
-bool FileBase::close() noexcept {
+bool FileBase::close_noexcept() noexcept {
     bool ok = true;
     if (isOpen() && _fd != STDIN_FILENO && _fd != STDOUT_FILENO && _fd != STDERR_FILENO)
         if (::close(_fd) == -1)
@@ -108,7 +121,7 @@ bool FileBase::close() noexcept {
 }
 
 void FileBase::closex() may_throw {
-    if (!close())
+    if (!close_noexcept())
         throwIOException("close failed", errno);
 }
 
@@ -121,14 +134,14 @@ upx_off_t FileBase::seek(upx_off_t off, int whence) {
         if (off < 0)
             throwIOException("bad seek 2");
         off += _offset;
-    }
-    if (whence == SEEK_END) {
+    } else if (whence == SEEK_END) {
         if (off > 0)
             throwIOException("bad seek 3");
         off += _offset + _length;
         whence = SEEK_SET;
-    }
-    // SEEK_CUR falls through to here
+    } else if (whence == SEEK_CUR) {
+    } else
+        throwInternalError("bad seek: whence");
     upx_off_t l = ::lseek(_fd, off, whence);
     if (l < 0)
         throwIOException("seek error", errno);
@@ -152,11 +165,11 @@ void FileBase::set_extent(upx_off_t offset, upx_off_t length) {
 upx_off_t FileBase::st_size() const { return _length; }
 
 /*************************************************************************
-//
+// InputFile
 **************************************************************************/
 
 void InputFile::sopen(const char *name, int flags, int shflags) {
-    close();
+    closex();
     _name = name;
     _flags = flags;
     _shflags = shflags;
@@ -201,12 +214,26 @@ upx_off_t InputFile::seek(upx_off_t off, int whence) {
 
 upx_off_t InputFile::st_size_orig() const { return _length_orig; }
 
+int InputFile::dupFd() may_throw {
+    if (!isOpen())
+        throwIOException("bad dup");
+#if defined(HAVE_DUP) && (HAVE_DUP + 0 == 0)
+    errno = ENOSYS;
+    int r = -1;
+#else
+    int r = ::dup(getFd());
+#endif
+    if (r < 0)
+        throwIOException("dup", errno);
+    return r;
+}
+
 /*************************************************************************
-//
+// OutputFile
 **************************************************************************/
 
 void OutputFile::sopen(const char *name, int flags, int shflags, int mode) {
-    close();
+    closex();
     _name = name;
     _flags = flags;
     _shflags = shflags;
@@ -228,7 +255,7 @@ void OutputFile::sopen(const char *name, int flags, int shflags, int mode) {
 }
 
 bool OutputFile::openStdout(int flags, bool force) {
-    close();
+    closex();
     int fd = STDOUT_FILENO;
     if (!force && acc_isatty(fd))
         return false;
@@ -294,23 +321,21 @@ upx_off_t OutputFile::seek(upx_off_t off, int whence) {
     mem_size_assert(1, off >= 0 ? off : -off); // sanity check
     assert(!opt->to_stdout);
     switch (whence) {
-    case SEEK_SET: {
-        if (bytes_written < off) {
+    case SEEK_SET:
+        if (bytes_written < off)
             bytes_written = off;
-        }
         _length = bytes_written; // cheap, lazy update; needed?
-    } break;
-    case SEEK_END: {
+        break;
+    case SEEK_END:
         _length = bytes_written; // necessary
-    } break;
+        break;
     }
     return super::seek(off, whence);
 }
 
 // WARNING: fsync() does not exist in some Windows environments.
 // This trick works only on UNIX-like systems.
-// int OutputFile::read(void *buf, int len)
-//{
+// int OutputFile::read(void *buf, int len) {
 //    fsync(_fd);
 //    InputFile infile;
 //    infile.open(this->getName(), O_RDONLY | O_BINARY);
@@ -322,6 +347,7 @@ void OutputFile::set_extent(upx_off_t offset, upx_off_t length) {
     super::set_extent(offset, length);
     bytes_written = 0;
     if (0 == offset && 0xffffffffLL == length) { // TODO: check all callers of this method
+        st.st_size = 0;
         if (::fstat(_fd, &st) != 0)
             throwIOException(_name, errno);
         _length = st.st_size - offset;

src/file.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -37,11 +37,11 @@ protected:
     virtual ~FileBase() may_throw;
 
 public:
-    bool close() noexcept;
+    bool close_noexcept() noexcept;
     void closex() may_throw;
-    bool isOpen() const { return _fd >= 0; }
-    int getFd() const { return _fd; }
-    const char *getName() const { return _name; }
+    bool isOpen() const noexcept { return _fd >= 0; }
+    int getFd() const noexcept { return _fd; }
+    const char *getName() const noexcept { return _name; }
 
     virtual upx_off_t seek(upx_off_t off, int whence);
     upx_off_t tell() const;
@@ -50,9 +50,10 @@ public:
 
 public:
     // static file-related util functions; will throw on error
-    static void chmod(const char *name, int mode);
-    static void rename(const char *old_, const char *new_);
-    static void unlink(const char *name);
+    static void chmod(const char *name, int mode) may_throw;
+    static void rename(const char *old_, const char *new_) may_throw;
+    static void unlink(const char *name) may_throw;
+    static bool unlink_noexcept(const char *name) noexcept;
 
 protected:
     bool do_sopen();
@@ -87,6 +88,8 @@ public:
     virtual upx_off_t seek(upx_off_t off, int whence) override;
     upx_off_t st_size_orig() const;
 
+    noinline int dupFd() may_throw;
+
 protected:
     upx_off_t _length_orig = 0;
 };

src/filter.cpp

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them

src/filter.h

@@ -2,8 +2,8 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2025 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2025 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -96,7 +96,7 @@ private:
 // This class is private to Filter - don't look.
 **************************************************************************/
 
-class FilterImpl {
+class FilterImpl final {
     friend class Filter;
 
 private: