all: prepare for release

Use 5-byte entries instead of 4-byte entries to fully preserve "pos".

And add some symbolic constants.

Partially based on a patch by John.

.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,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: >
   -*,

.clangd

@@ -0,0 +1,43 @@
+# 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 clang >= 10.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,3 +1,4 @@
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
 # see https://github.com/github-linguist/linguist
 #
 # HINT: check settings with
@@ -14,6 +15,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

@@ -9,11 +9,15 @@ 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
+  UPX_CMAKE_CONFIG_FLAGS: -Wdev --warn-uninitialized
-  ZIG_DIST_VERSION: 0.11.0-dev.4320+6f0a613b6
+  UPX_DEBUG_TEST_FLOAT_DIVISION_BY_ZERO: 1
+  # 2024-03-23
+  ZIG_DIST_VERSION: 0.12.0-dev.3429+13a9d94a8
 
 jobs:
   job-rebuild-and-verify-stubs:
@@ -27,8 +31,8 @@ jobs:
           if ! test -e /usr/bin/python2; then
             ####sudo apt-get update && sudo apt-get install -y --no-install-recommends python2-minimal
             # 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/libpython2.7-minimal_2.7.18-8+deb11u1_amd64.deb'
-            wget -q 'https://ftp.debian.org/debian/pool/main/p/python2.7/python2.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+deb11u1_amd64.deb'
             sudo dpkg -i ./*python2*.deb && rm ./*python2*.deb && sudo ldconfig
             sudo ln -s -v python2.7 /usr/bin/python2
           fi
@@ -41,7 +45,7 @@ jobs:
           # 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
+        uses: actions/checkout@v4
         with: { submodules: true }
       - name: 'Rebuild and verify stubs'
         run: |
@@ -50,23 +54,25 @@ jobs:
           git status || true
           make -C src/stub extra-all all
           if ! git diff --quiet; then git diff; exit 1; fi
+      - 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
           if ! git diff --quiet; then git diff; exit 1; fi
 
   job-linux-cmake: # uses cmake + make
-    if: ${{ true }}
+    if: true
     needs: [ job-rebuild-and-verify-stubs ]
-    name: ${{ format('{0} cmake', matrix.os) }}
+    name: ${{ format('{0}', 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_m32: true } # use_m32 also works here, but save some CI time
+    env:
+      UPX_CONFIG_EXPECT_THREADS: 'ON'
     steps:
       - name: 'Install extra 32-bit and Windows packages'
         if: ${{ matrix.use_m32 }}
@@ -74,30 +80,35 @@ jobs:
           sudo dpkg --add-architecture i386
           sudo apt-get update
           sudo apt-get install -y g++-multilib g++-mingw-w64-i686 g++-mingw-w64-x86-64
+          # 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
+          done
+          sudo apt-get install libc6-dbg:i386 valgrind
       - name: 'Check out code'
-        uses: actions/checkout@v3
+        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'
+      - name: 'Build extra/gcc/debug'
         run:  'make build/extra/gcc/debug'
-      - name: 'Build cmake extra/gcc/release'
+      - name: 'Build extra/gcc/release'
         run:  'make build/extra/gcc/release'
-      - name: 'Build cmake extra/clang/debug'
+      - name: 'Build extra/clang/debug'
         run:  'make build/extra/clang/debug'
-      - name: 'Build cmake extra/clang/release'
+      - name: 'Build extra/clang/release'
         run:  'make build/extra/clang/release'
-      - name: 'Build cmake extra/gcc-m32/debug'
+      - name: 'Build extra/gcc-m32/debug'
         if: ${{ matrix.use_m32 }}
         run:  'make build/extra/gcc-m32/debug'
-      - name: 'Build cmake extra/gcc-m32/release'
+      - name: 'Build extra/gcc-m32/release'
-        if: ${{ matrix.use_m32 }}
+        if: ${{ matrix.use_m32 && (success() || failure()) }} # run this step even if the previous step failed
         run:  'make build/extra/gcc-m32/release'
-      - name: 'Build cmake extra/cross-windows-mingw32/release'
+      - name: 'Build extra/cross-windows-mingw32/release'
-        if: ${{ matrix.use_m32 }}
+        if: ${{ matrix.use_m32 && (success() || failure()) }} # run this step even if the previous step failed
         run:  'make build/extra/cross-windows-mingw32/release'
-      - name: 'Build cmake extra/cross-windows-mingw64/release'
+      - name: 'Build extra/cross-windows-mingw64/release'
-        if: ${{ matrix.use_m32 }}
+        if: ${{ matrix.use_m32 && (success() || failure()) }} # run this step even if the previous step failed
         run:  'make build/extra/cross-windows-mingw64/release'
       - name: 'Make artifact'
         run: |
@@ -108,124 +119,190 @@ jobs:
           # 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
+        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 cmake" cmake --install .)
-          (cd build/extra/gcc/release && DESTDIR=$PWD/Install-with-make  make install)
+          (cd build/extra/gcc/release && DESTDIR="$PWD/Install with make"  make install)
-      - name: 'Run basic tests'
+      - 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'
+      - name: 'Run ctest tests 32-bit'
         if: ${{ matrix.use_m32 }}
         run: |
           make -C build/extra/gcc-m32/debug test
           make -C build/extra/gcc-m32/release test
+      - name: 'Mimic ctest tests'
+        run: |
+          env -C build/extra/gcc/debug     bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          env -C build/extra/gcc/release   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          env -C build/extra/clang/debug   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          env -C build/extra/clang/release bash "$PWD"/misc/testsuite/mimic_ctest.sh
+      - name: 'Mimic ctest tests 32-bit'
+        if: ${{ matrix.use_m32 }}
+        run: |
+          env -C build/extra/gcc-m32/debug   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          env -C build/extra/gcc-m32/release bash "$PWD"/misc/testsuite/mimic_ctest.sh
+      - name: 'Mimic ctest tests with Valgrind'
+        run: |
+          if command -v valgrind >/dev/null; then
+            export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet --gen-suppressions=all"
+            env -C build/extra/gcc/debug     bash "$PWD"/misc/testsuite/mimic_ctest.sh
+            env -C build/extra/gcc/release   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+            # clang/debug does not work before valgrind-3.20, see https://bugs.kde.org/show_bug.cgi?id=452758
+            ##env -C build/extra/clang/debug   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+            env -C build/extra/clang/release bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          fi
+      - name: 'Mimic ctest tests 32-bit with Valgrind'
+        if: ${{ matrix.use_m32 }}
+        run: |
+          if command -v valgrind >/dev/null; then
+            export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet --gen-suppressions=all"
+            env -C build/extra/gcc-m32/debug   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+            env -C build/extra/gcc-m32/release bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          fi
+      - name: 'Run file system test suite'
+        run: |
+          env -C build/extra/gcc/release bash "$PWD"/misc/testsuite/test_symlinks.sh
+      - name: 'Run file system test suite with Valgrind'
+        run: |
+          if command -v valgrind >/dev/null; then
+            export upx_exe_runner="valgrind --leak-check=no --error-exitcode=1 --quiet --gen-suppressions=all"
+            env -C build/extra/gcc/release bash "$PWD"/misc/testsuite/test_symlinks.sh
+          fi
       - name: 'Run test suite build/extra/gcc/release'
         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 bash "$PWD"/misc/testsuite/upx_testsuite_1.sh
-          env -C build/extra/gcc/release upx_exe=./upx bash "$testsuite_1"
 
   job-macos-cmake: # uses cmake + make
-    if: ${{ true }}
+    if: true
     needs: [ job-rebuild-and-verify-stubs ]
-    name: ${{ format('{0} cmake', matrix.os) }}
+    name: ${{ format('{0} {1}', matrix.os, matrix.xcode_version) }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
+          # NOTE: macos does not have "env -C"; only with brew coreutils
+          # NOTE: macos-11 does not have "readlink -f"; only on macos >= 12 or with brew coreutils
           - { 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 }
+          - { os: macos-13, gcc: gcc-12, gxx: 'g++-12', testsuite: true, xcode_version: 14.3.1 }
+          - { os: macos-13, testsuite: true } # use default Xcode-15
+          # { os: macos-14, gcc: gcc-13, gxx: 'g++-13', testsuite: true }                        # gcc-13: INTERNAL ERROR in ld64
+          # { os: macos-14, gcc: gcc-13, gxx: 'g++-13', testsuite: true, xcode_version: 14.3.1 } # gcc-13: MISSING HEADER FILES
+          - { os: macos-14, gcc: gcc-12, gxx: 'g++-12', testsuite: true } # => use gcc-12 for now
+    env:
+      UPX_CONFIG_EXPECT_THREADS: 'ON'
     steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        if: matrix.xcode_version # NOTE: gcc-12 on macos-13 does not work with Xcode-15
+        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
+          if ! test -e "$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin/readlink"; then
-            echo "===== brew leaves:"; brew leaves; echo "===== brew list:"; brew list
+            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
           fi
+          case "${{ matrix.os }}" in
+            macos-11 | macos-12) echo "UPX_DEBUG_FORCE_PACK_MACOS=1" >> $GITHUB_ENV ;;
+            # FIXME: UPX on macos-13+ is broken => disable self-test for now
+            macos-13 | macos-14) echo "UPX_CONFIG_DISABLE_SELF_PACK_TEST=ON" >> $GITHUB_ENV ;;
+          esac
       - name: 'Check out code'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: { submodules: true }
       - 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'
+      - name: 'Build extra/clang/debug'
         run:  'make build/extra/clang/debug'
-      - name: 'Build cmake extra/clang/release'
+      - name: 'Build extra/clang/release'
         run:  'make build/extra/clang/release'
-      - name: 'Build cmake extra/gcc/debug'
+      - name: 'Build 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'
+      - name: 'Build 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'
+      - name: 'Build xtarget/cross-darwin-arm64/debug'
         run: |
-          CC="clang -target arm64-apple-darwin" CXX="clang++ -target arm64-apple-darwin" \
+          make UPX_XTARGET=xtarget/cross-darwin-arm64 xtarget/debug \
-          make UPX_XTARGET=cross-darwin-arm64 xtarget/debug
+            CC="clang -target arm64-apple-darwin" CXX="clang++ -target arm64-apple-darwin"
-      - name: 'Build cmake xtarget/cross-darwin-arm64/release'
+      - name: 'Build xtarget/cross-darwin-arm64/release'
         run: |
-          CC="clang -target arm64-apple-darwin" CXX="clang++ -target arm64-apple-darwin" \
+          make UPX_XTARGET=xtarget/cross-darwin-arm64 xtarget/release \
-          make UPX_XTARGET=cross-darwin-arm64 xtarget/release
+            CC="clang -target arm64-apple-darwin" CXX="clang++ -target arm64-apple-darwin"
       - 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"
           (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
+        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 cmake" cmake --install .)
-          (cd build/extra/clang/release && DESTDIR=$PWD/Install-with-make  make install)
+          (cd build/extra/clang/release && DESTDIR="$PWD/Install with make"  make install)
-      - name: 'Run basic tests'
+      - name: 'Run ctest tests'
-        if: ${{ !contains(matrix.os, 'macos-13') }} # FIXME: UPX on macos-13 is broken => disable self-test for now
         run: |
           make -C build/extra/clang/debug test
           make -C build/extra/clang/release test
+          for f in ./build/extra/*/*/upx; do echo "===== $f"; $f --sysinfo -v; done
+      - name: 'Mimic ctest tests'
+        run: |
+          export PATH="$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin:$PATH"
+          env -C build/extra/clang/debug   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          env -C build/extra/clang/release bash "$PWD"/misc/testsuite/mimic_ctest.sh
+      - name: 'Run file system test suite'
+        if: ${{ matrix.testsuite }} # for coreutils readlink
+        run: |
+          export PATH="$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin:$PATH"
+          env -C build/extra/clang/release bash "$PWD"/misc/testsuite/test_symlinks.sh
       - name: 'Run test suite build/extra/clang/release'
         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 bash "$PWD"/misc/testsuite/upx_testsuite_1.sh
-          env -C build/extra/clang/release upx_exe=./upx bash "$testsuite_1"
 
   job-windows-cmake: # uses cmake + msbuild
-    if: ${{ true }}
+    if: true
     needs: [ job-rebuild-and-verify-stubs ]
-    name: ${{ format('{0} cmake', matrix.name) }}
+    name: ${{ format('{0}', 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
+          - { name: windows-2019-amd64, os: windows-2019, vsversion: 2019, arch: amd64 }
-          # 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 }
+    env:
+      UPX_CONFIG_EXPECT_THREADS: 'ON'
     steps:
+      - run: git config --global core.autocrlf false
       - name: 'Check out code'
-        uses: actions/checkout@v3
+        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'
@@ -234,9 +311,9 @@ jobs:
         with:
           vsversion: ${{ matrix.vsversion }}
           arch: ${{ matrix.arch }}
-      - name: 'Build cmake debug'
+      - name: 'Build debug'
         run:  'make build/debug'
-      - name: 'Build cmake release'
+      - name: 'Build release'
         run:  'make build/release'
       - name: 'Make artifact'
         shell: bash
@@ -247,11 +324,11 @@ jobs:
           # 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
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: tmp/artifact
-      - name: 'Run basic tests'
+      - name: 'Run ctest tests'
         if: ${{ matrix.arch != 'amd64_arm64' }}
         run: |
           ctest --test-dir build/debug   -C Debug
@@ -261,18 +338,16 @@ jobs:
         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 bash "$PWD"/misc/testsuite/upx_testsuite_1.sh
-          env -C build/release/Release upx_exe=./upx bash "$testsuite_1"
 
   job-windows-toolchains: # build "by hand" using cmd.exe
-    if: ${{ true }}
+    if: github.repository_owner == 'upx'
     needs: [ job-rebuild-and-verify-stubs ]
     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:
@@ -286,14 +361,17 @@ jobs:
           - { 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:
+      - run: git config --global core.autocrlf false
       - name: 'Check out code'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with: { submodules: true }
       - 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}
+          repository_name="${GITHUB_REPOSITORY##*/}" # basename
+          echo "H=d:\\a\\$repository_name\\$repository_name" >> $GITHUB_ENV
       - name: 'Set up Developer Command Prompt'
         uses: ilammy/msvc-dev-cmd@v1
         with:
@@ -306,12 +384,13 @@ jobs:
           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
@@ -332,7 +411,7 @@ 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
@@ -346,7 +425,7 @@ jobs:
           # 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
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: tmp/artifact
@@ -358,6 +437,7 @@ jobs:
           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
@@ -368,44 +448,48 @@ jobs:
         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 "$PWD"/misc/testsuite/upx_testsuite_1.sh
-          env -C build/$C/$B/upx upx_exe=./upx.exe bash "$testsuite_1"
 
   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
+    container: 'alpine:3.19'
     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, qemu: qemu-aarch64 }
-          # { zig_target: aarch64-linux-musl, zig_pic: -fPIE }
+          # { zig_target: aarch64-linux-musl, qemu: qemu-aarch64, 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, qemu: qemu-arm }
-          # { zig_target: arm-linux-musleabihf, zig_pic: -fPIE }
+          # { zig_target: arm-linux-musleabihf, qemu: qemu-arm, zig_pic: -fPIE }
-          # { zig_target: i386-linux-musl }
+          - { zig_target: i386-linux-musl, qemu: qemu-i386 -cpu Conroe }
+          # { zig_target: i386-linux-musl, qemu: qemu-i386 -cpu Conroe, zig_pic: -fPIE }
           - { zig_target: i386-windows-gnu }
-          # { zig_target: mips-linux-musl }
+          # mips and mipsel: bad hard-float code generation(??); or QEMU bug; or UPX bug; see https://github.com/upx/upx/issues/788
-          # { zig_target: mipsel-linux-musl }
+          - { zig_target: mips-linux-musl, zig_flags: -msoft-float, qemu: qemu-mips }
-          # { zig_target: powerpc-linux-musl }
+          - { zig_target: mipsel-linux-musl, zig_flags: -msoft-float, qemu: qemu-mipsel }
-          # { zig_target: powerpc64-linux-musl }
+          - { zig_target: powerpc-linux-musl, qemu: qemu-ppc }
-          # { zig_target: powerpc64le-linux-musl }
+          - { zig_target: powerpc64-linux-musl, qemu: qemu-ppc64 }
-          - { zig_target: x86_64-linux-musl }
+          - { zig_target: powerpc64le-linux-musl, qemu: qemu-ppc64le }
-          # { zig_target: x86_64-linux-musl, zig_pic: -fPIE }
+          - { zig_target: x86_64-linux-musl, qemu: qemu-x86_64 }
+          # { zig_target: x86_64-linux-musl, qemu: qemu-x86_64, 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:
+      ##UPX_CONFIG_EXPECT_THREADS: 'ON'
+      # zig is currently missing winpthreads; see https://github.com/ziglang/zig/issues/10989
+      UPX_CONFIG_EXPECT_THREADS: ${{ contains(matrix.zig_target, '-windows-') && 'OFF' || 'ON' }}
       # for zig-cc wrapper scripts (see below):
       ZIG_CPPFLAGS: -DUPX_DOCTEST_CONFIG_MULTITHREADING
       ZIG_FLAGS: ${{ matrix.zig_flags }}
@@ -422,7 +506,7 @@ jobs:
           # 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
+        uses: actions/checkout@v4
         with: { submodules: true }
       - name: ${{ format('Install Zig {0}', env.ZIG_DIST_VERSION) }}
         shell: bash
@@ -453,18 +537,14 @@ jobs:
           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
+          make UPX_XTARGET=zig/${ZIG_TARGET}${ZIG_PIC} xtarget/release \
-          cd       build/zig/${ZIG_TARGET}${ZIG_PIC}/release
+            CC="zig-cc" CXX="zig-cxx" CMAKE_AR="$HOME/.local/bin/zig-ar" CMAKE_RANLIB="$HOME/.local/bin/zig-ranlib"
-          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
+          file build/zig/${ZIG_TARGET}${ZIG_PIC}/release/upx*
-          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
+          make UPX_XTARGET=zig/${ZIG_TARGET}${ZIG_PIC} xtarget/debug \
-          cd       build/zig/${ZIG_TARGET}${ZIG_PIC}/debug
+           CC="zig-cc" CXX="zig-cxx" CMAKE_AR="$HOME/.local/bin/zig-ar" CMAKE_RANLIB="$HOME/.local/bin/zig-ranlib"
-          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
+          file build/zig/${ZIG_TARGET}${ZIG_PIC}/debug/upx*
-          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: |
@@ -475,14 +555,39 @@ jobs:
           # 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
+        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 cmake" cmake --install .)
-          (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-make  make install)
+          (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR="$PWD/Install with make"  make install)
-
+      - name: 'Run ctest tests'
-# vim:set ts=2 sw=2 et:
+        if: ${{ matrix.zig_target == 'i386-linux-musl' || matrix.zig_target == 'x86_64-linux-musl' }}
+        run: |
+          make -C build/zig/${ZIG_TARGET}${ZIG_PIC}/debug test
+          make -C build/zig/${ZIG_TARGET}${ZIG_PIC}/release test
+      - name: 'Mimic ctest tests'
+        if: ${{ matrix.zig_target == 'i386-linux-musl' || matrix.zig_target == 'x86_64-linux-musl' }}
+        run: |
+          apk add coreutils
+          env -C build/zig/${ZIG_TARGET}${ZIG_PIC}/debug   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          env -C build/zig/${ZIG_TARGET}${ZIG_PIC}/release bash "$PWD"/misc/testsuite/mimic_ctest.sh
+      - name: ${{ format('Mimic ctest tests with QEMU {0}', matrix.qemu) }}
+        if: ${{ matrix.qemu }}
+        run: |
+          qemu="${{ matrix.qemu }}"
+          apk add coreutils "${qemu%% *}"
+          export upx_exe_runner="$qemu"
+          env -C build/zig/${ZIG_TARGET}${ZIG_PIC}/debug   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          env -C build/zig/${ZIG_TARGET}${ZIG_PIC}/release bash "$PWD"/misc/testsuite/mimic_ctest.sh
+      - name: 'Mimic ctest tests with Valgrind'
+        if: ${{ matrix.zig_target == 'x86_64-linux-musl' }}
+        run: |
+          apk add coreutils valgrind
+          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"
+          env -C build/zig/${ZIG_TARGET}${ZIG_PIC}/debug   bash "$PWD"/misc/testsuite/mimic_ctest.sh
+          env -C build/zig/${ZIG_TARGET}${ZIG_PIC}/release bash "$PWD"/misc/testsuite/mimic_ctest.sh

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

@@ -1,38 +0,0 @@
-# Copyright (C) Markus Franz Xaver Johannes Oberhumer
-
-# see https://docs.github.com/en/actions/managing-issues-and-pull-requests/closing-inactive-issues
-# see https://github.com/actions/stale
-
-# Automatically closing issues is far from perfect, but then we only
-# have limited resources and this approach favors issues that people
-# actually care about.
-#
-# also see:
-#   "Should I Stale or Should I Close? An Analysis of a Bot that Closes
-#    Abandoned Issues and Pull Request".
-#   https://igorwiese.com/images/papers/Paper_BotSE_19.pdf
-
-name: 'GitHub - Close inactive issues'
-on:
-  schedule: [cron: '50 3 * * 3'] # run weekly Wednesday 03:50 UTC
-  workflow_dispatch:
-jobs:
-  close-issues:
-    name: 'Close inactive issues'
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - uses: actions/stale@v8
-        with:
-          operations-per-run: 300
-          exempt-all-milestones: true
-          exempt-issue-labels: 'blocker,bug,enhancement,help wanted,regression'
-          days-before-stale: 60
-          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.'
-          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/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/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,22 @@
 /.hg*
 /.vscode*
-/Makevars.global*
+/Makevars[.-]global*
 /Testing*
 /build*
 /maint*
 /vendor*
 
-GNUmakefile
+GNUmakefile*
-MMakefile
+MMakefile*
-Makevars.local*
+Makevars[.-]local*
-compile_flags.txt
+compile_flags*.txt
 Tmp*
 tmp*
 
 *.a
 *.bz2
 *.d
+*.diff
 *.dll
 *.dylib
 *.exe

CMakeLists.txt

@@ -7,15 +7,35 @@
 #   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)
 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
+include("${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/functions.cmake")
+
+#***********************************************************************
+# options
+#***********************************************************************
+
+upx_cmake_include_hook(1_options)
+
 # compilation config options
-if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/misc/cmake/use_strict_defaults.cmake")
     # 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)
@@ -38,45 +58,18 @@ option(UPX_CONFIG_DISABLE_SELF_PACK_TEST "Do not test packing UPX with itself" O
 # init
 #***********************************************************************
 
-# Disallow in-source builds. Note that you will still have to manually
+set(UPX_VERSION_STRING "4.2.3") # this should match src/version.h
+
+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.
 if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-    set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+    upx_disallow_in_source_build()
-    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()
-
-# 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()
 
 # 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()
@@ -90,7 +83,9 @@ 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_EXPECT_THREADS UPX_CONFIG_REQUIRE_THREADS
 )
+upx_print_env_var(CC CXX)
 
 # determine Git revision
 set(GITREV_SHORT "")
@@ -134,38 +129,50 @@ 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()
 
-# set the default multi-config build type to "Release"
+# set MSVC_FRONTEND and MINGW
-if(is_multi_config)
+if(NOT DEFINED MSVC_FRONTEND AND (MSVC OR CMAKE_C_COMPILER_FRONTEND_VARIANT MATCHES "^MSVC"))
-    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}")
-    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)
 endif()
+if(NOT DEFINED MINGW AND CMAKE_C_PLATFORM_ID MATCHES "^MinGW")
+    set(MINGW 1)
+endif()
 
 #***********************************************************************
 # common compilation flags
 #***********************************************************************
 
 include(CheckCCompilerFlag)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckStructHasMember)
+include(CheckSymbolExists)
+
+upx_cmake_include_hook(3_common_compilation_flags)
+
+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 +192,10 @@ else()
     set(warn_Werror -Werror)
     set(warn_WX -WX)
 endif()
-
+if(MSVC_FRONTEND)
-function(upx_add_definitions_with_prefix)
+    # disable warning C5105 which may get triggered by some older versions of <windows.h>
-    set(flag_prefix "${ARGV0}")
+    set(warn_WX -wd5105 ${warn_WX})
-    if(flag_prefix MATCHES "^dummy$") # need dummy 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 "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 +204,16 @@ 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(-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 +232,76 @@ if(NOT CMAKE_C_COMPILER_ID MATCHES "^MSVC")
     endif()
 endif()
 
-# compile a target with -O2 even in Debug build
+# examine MinGW/Cygwin compiler configuration
-function(upx_compile_target_debug_with_O2)
+if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-    foreach(t ${ARGV})
+    upx_print_mingw_symbols()
-        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()
-
-# 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
+# internal settings; these may change in a future versions
 set(UPX_CONFIG_DISABLE_THREADS ON) # multithreading is currently not used; maybe in UPX version 5
 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
 
+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)
+        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
+            #message(STATUS "Threads FAILED: ${output}") # debug output from try_compile
+            set(Threads_FOUND OFF)
+            break()
+        endif()
+    endforeach()
+endif()
 
 if(NOT UPX_CONFIG_DISABLE_BZIP2)
-file(GLOB bzip2_SOURCES "vendor/bzip2/*.c")
+upx_add_glob_files(bzip2_SOURCES "vendor/bzip2/*.c")
-list(SORT bzip2_SOURCES)
 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")
+upx_add_glob_files(ucl_SOURCES "vendor/ucl/src/*.c")
-list(SORT ucl_SOURCES)
 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")
+upx_add_glob_files(zlib_SOURCES "vendor/zlib/*.c")
-list(SORT zlib_SOURCES)
 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")
+upx_add_glob_files(zstd_SOURCES "vendor/zstd/lib/*/*.c")
-list(SORT zstd_SOURCES)
 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")
+upx_add_glob_files(upx_SOURCES "src/*.cpp" "src/[cfu]*/*.cpp")
-list(SORT upx_SOURCES)
 add_executable(upx ${upx_SOURCES})
 if(NOT UPX_CONFIG_DISABLE_CXX_STANDARD)
     set_property(TARGET upx PROPERTY CXX_STANDARD 17)
@@ -347,15 +321,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})
+    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)
@@ -367,18 +345,21 @@ if(MSVC_FRONTEND)
 else()
     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)
 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 ${warn_Wall} -Wno-cast-align -Wno-cast-qual ${warn_Werror})
-    target_compile_options(${t} PRIVATE -Wall ${warn_Werror})
-    ##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)
@@ -390,6 +371,7 @@ if(MSVC_FRONTEND)
 else()
     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,11 +393,20 @@ 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)
@@ -423,52 +414,58 @@ if(MSVC_FRONTEND)
 else()
     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)
 
 include(CTest)
-if(NOT CMAKE_CROSSCOMPILING)
+if(NOT CMAKE_CROSSCOMPILING OR CMAKE_CROSSCOMPILING_EMULATOR)
     add_test(NAME upx-version COMMAND upx --version)
     add_test(NAME upx-help    COMMAND upx --help)
-endif()
+    add_test(NAME upx-sysinfo COMMAND upx --sysinfo -v)
-if(NOT CMAKE_CROSSCOMPILING AND NOT UPX_CONFIG_DISABLE_SELF_PACK_TEST)
+if(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(emu "")
-        set(name "${ARGV0}")
+    if(DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
-        list(REMOVE_AT ARGV 0)
+        set(emu "${CMAKE_CROSSCOMPILING_EMULATOR}")
-        add_test(NAME "${name}" COMMAND ${ARGV})
+    endif()
-        set_tests_properties("${name}" PROPERTIES RUN_SERIAL TRUE) # run these tests sequentially
+    set(exe "${CMAKE_EXECUTABLE_SUFFIX}")
-    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_serial_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_serial_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_serial_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_serial_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_serial_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_serial_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_serial_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_serial_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_serial_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_serial_test(upx-run-unpacked   ${emu} ./upx-unpacked${exe} --version-short)
-    upx_add_test(upx-run-packed     ./upx-packed${exe} --version-short)
+    upx_add_serial_test(upx-run-packed     ${emu} ./upx-packed${exe} --version-short)
+endif() # UPX_CONFIG_DISABLE_SELF_PACK_TEST
 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
@@ -479,6 +476,7 @@ endif()
 if(CMAKE_INSTALL_PREFIX)
     include(GNUInstallDirs)
 endif()
+# install files
 if(CMAKE_INSTALL_PREFIX AND DEFINED CMAKE_INSTALL_FULL_BINDIR)
     install(TARGETS upx DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
     install(FILES
@@ -491,46 +489,46 @@ 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)
+upx_cmake_include_hook(8_summary)
-    foreach(var ${ARGV})
-        if(${var})
-            message(STATUS "${var} = ${${var}}")
-        endif()
-    endforeach()
-endfunction()
 
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/maint/make/CMakeLists.maint.txt")
+upx_print_var(CMAKE_VERSION UPX_CONFIG_CMAKE_MINIMUM_REQUIRED_VERSION CMAKE_GENERATOR)
-include("${CMAKE_CURRENT_SOURCE_DIR}/maint/make/CMakeLists.maint.txt")
-endif()
-
-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)
+if(NOT ",${CMAKE_BINARY_DIR}," STREQUAL ",${CMAKE_CURRENT_BINARY_DIR}," OR NOT ",${CMAKE_SOURCE_DIR}," STREQUAL ",${CMAKE_CURRENT_SOURCE_DIR},")
-print_var(CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION CMAKE_CROSSCOMPILING)
+    upx_print_var(CMAKE_BINARY_DIR CMAKE_SOURCE_DIR CMAKE_CURRENT_BINARY_DIR CMAKE_CURRENT_SOURCE_DIR)
-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)
+endif()
-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)
+upx_print_var(CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_VERSION CMAKE_HOST_SYSTEM_PROCESSOR CMAKE_APPLE_SILICON_PROCESSOR)
-print_var(CMAKE_POSITION_INDEPENDENT_CODE)
+upx_print_var(CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION CMAKE_SYSTEM_PROCESSOR CMAKE_CROSSCOMPILING CMAKE_CROSSCOMPILING_EMULATOR)
-print_var(CYGWIN GNUC MINGW MSVC MSVC_FRONTEND MSVC_IDE WIN32 WIN64)
+upx_print_var(CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT)
+upx_print_var(CMAKE_C_COMPILER CMAKE_CXX_COMPILER CMAKE_AR CMAKE_RANLIB)
+upx_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)
+upx_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)
+upx_print_var(CMAKE_INTERPROCEDURAL_OPTIMIZATION CMAKE_POSITION_INDEPENDENT_CODE CMAKE_TRY_COMPILE_CONFIGURATION)
+upx_print_var(APPLE CYGWIN GNUC MINGW MSVC MSVC_FRONTEND MSVC_IDE UNIX WIN32 WIN64)
 endif() # UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO
-print_var(CMAKE_INSTALL_PREFIX CMAKE_CONFIGURATION_TYPES CMAKE_BUILD_TYPE)
+upx_print_var(CMAKE_INSTALL_PREFIX CMAKE_CONFIGURATION_TYPES 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")
+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},")
+    upx_platform_check_mismatch(CMAKE_C_PLATFORM_ID CMAKE_CXX_PLATFORM_ID)
-    message(FATAL_ERROR "ERROR: CMAKE_C_PLATFORM_ID CMAKE_CXX_PLATFORM_ID mismatch")
+    upx_platform_check_mismatch(CMAKE_C_COMPILER_ABI CMAKE_CXX_COMPILER_ABI)
-endif()
+    upx_platform_check_mismatch(CMAKE_C_COMPILER_FRONTEND_VARIANT CMAKE_CXX_COMPILER_FRONTEND_VARIANT)
-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 ../..
+#   cmake ../..         # run config
-#   make -j     (or use "cmake --build . --parallel")
+#   make -j             # 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
+# avoid re-running run_cmake_config if .upx_cmake_config_done.txt already exists
-run_config       = $(if $(wildcard $1/CMakeCache.txt),,$(call run_cmake_config,$1,$2))
+run_config       = $(if $(wildcard $1/CMakeFiles/.upx_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,33 @@ 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:
 
+# 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 ;
+
 #
-# END of Makefile; extra stuff follows
+# END of Makefile
 #
 
-#***********************************************************************
+# extra pre-defined build configurations and some utility; optional
-# extra builds: some pre-defined build configurations
+ifneq ($(MAKEFILE_LIST),)
-#***********************************************************************
+include $(dir $(lastword $(MAKEFILE_LIST)))/misc/make/Makefile-extra.mk
-
+else
-define run_config_and_build
+include ./misc/make/Makefile-extra.mk
-	$(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++ -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
-
-endif
-endif
 endif
 
-#***********************************************************************
+# developer convenience
-# check git submodules
+test:: build/all+test PHONY
-#***********************************************************************
+ifneq ($(wildcard /usr/bin/env),) # need Unix utils like bash, perl, sed, xargs, etc.
-
+ifneq ($(wildcard ./misc/scripts/.),)
-SUBMODULES = doctest lzma-sdk ucl valgrind zlib
+check-whitespace clang-format run-testsuite run-testsuite-debug run-testsuite-release: src/Makefile PHONY
-
+	$(MAKE) -C src $@
-dummy := $(foreach m,$(SUBMODULES),$(if $(wildcard vendor/$m/[CL]*),$m,\
+endif
-    $(error ERROR: missing git submodule '$m'; run 'git submodule update --init')))
+endif

NEWS

@@ -2,6 +2,27 @@
 User visible changes for UPX
 ==================================================================
 
+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-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-Copyright (C) 1996-2023 Laszlo Molnar
+Copyright (C) 1996-2024 Laszlo Molnar
-Copyright (C) 2000-2023 John F. Reiser
+Copyright (C) 2000-2024 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-2024 Markus Oberhumer, Laszlo Molnar & John Reiser
                            https://upx.github.io
 
 

doc/Makefile

@@ -1,5 +1,6 @@
 #
-# 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
@@ -24,6 +25,9 @@ DETAB2 := sed -e 's/$(tab)/  /g'
 #***********************************************************************
 
 .DEFAULT_GOAL = all
+.PHONY: PHONY
+.SECONDEXPANSION:
+.SUFFIXES:
 
 all: $(BUILT_SOURCES) PHONY
 
@@ -34,7 +38,6 @@ mostlyclean clean distclean maintainer-clean: PHONY
 # rules
 #***********************************************************************
 
-.SUFFIXES:
 .SUFFIXES: .1 .html .man .pod .ps .tex .txt
 
 %.1 : %.pod
@@ -68,4 +71,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-2024 Markus Oberhumer, Laszlo Molnar & John Reiser
                            https://upx.github.io
 
 

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-2024 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
+script src/stub/src/i386-linux.elf-entry.lds arranges the SECTIONS
-of the decompressor into the same PT_LOAD at 0x00401000.  The
+so that PackLinuxElf32x86::buildLoader() and buildLinuxLoader()
-compressor includes the compressed bytes of the original executable
+generate the desired stub code, which goes into PT_LOAD[1].
-at the end of this first PT_LOAD.
 
-At runtime, the decompressed stub lives at 0x00400000.  In order for the
+At runtime, the decompressed stub lives close beyond the brk().
-decompressed stub to work properly at an address that is different
+In order for the decompressed stub to work properly at an address
-from its link-time address, the compiled code must contain no absolute
+that is different from its link-time address, the compiled code must
-addresses.  So, the data items in l_lx_elf.c must be only parameters
+contain no absolute addresses.  So, the data items in stub code
-and automatic (on-stack) local variables; no global data, no static data,
+must be only parameters and automatic (on-stack) local variables;
-and no string constants.  Use "size l_le_n2b.o l_6e_n2b.o" to check
+no global data, no static data, and no string constants.  Also,
-that both data and bss have length zero.  Also, the '&' operator
+the '&' operator may not be used to take the address of a function.
-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.
 
 Decompression of the executable begins by decompressing the Elf32_Ehdr
-and Elf32_Phdr, and then uses the Ehdr and Phdrs to control decompression
+and Elf32_Phdr, and then uses those Ehdr and Phdrs to control decompression
-of the PT_LOAD segments.
+of the PT_LOAD segments.  Subroutine do_xmap() of src/stub/src/
-Subroutine do_xmap() of src/stub/l_lx_elf.c performs the
+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
+All of the above documentation refers to ET_EXEC main programs,
-page of the compressed executable.  Pages below the usual .p_vaddr
+which always use the same virtual addresses.  An ET_DYN executable
-0x8000 (32KiB) are rejected by the kernel.  Using a page above the
+(main program or shared library) follows much the same scheme,
-original uncompressed brk(0) would require placing the entire initial
+re-using the address space that the kernel chose originally.
-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.]
 
 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
+On any page, then SELinux in strictest enforcing mode prohibits
-spaces] which saves the results of readlink("/proc/self/exe",,) before
+simultaneous PROT_EXEC and PROT_WRITE, and also prohibits adding
-the runtime stub unmaps all its pages.  As of 2006-10-03 this works
+PROT_EXEC if the kernel VMA struct (Virtual Memory Area struct)
-for linux/elf386 and linux/ElfAMD.
+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-2024 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>
@@ -785,13 +785,13 @@ Jens Medoch &lt;jssg@users.sourceforge.net&gt;</code></pre>
 
 <h1 id="COPYRIGHT">COPYRIGHT</h1>
 
-<p>Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer</p>
+<p>Copyright (C) 1996-2024 Markus Franz Xaver Johannes Oberhumer</p>
 
-<p>Copyright (C) 1996-2023 Laszlo Molnar</p>
+<p>Copyright (C) 1996-2024 Laszlo Molnar</p>
 
-<p>Copyright (C) 2000-2023 John F. Reiser</p>
+<p>Copyright (C) 2000-2024 John F. Reiser</p>
 
-<p>Copyright (C) 2002-2023 Jens Medoch</p>
+<p>Copyright (C) 2002-2024 Jens Medoch</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-2024 Markus Oberhumer, Laszlo Molnar & John Reiser
                                https://upx.github.io
 
     UPX is a portable, extendable, high-performance executable packer for
@@ -818,13 +818,13 @@ AUTHORS
      Jens Medoch <jssg@users.sourceforge.net>
 
 COPYRIGHT
-    Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+    Copyright (C) 1996-2024 Markus Franz Xaver Johannes Oberhumer
 
-    Copyright (C) 1996-2023 Laszlo Molnar
+    Copyright (C) 1996-2024 Laszlo Molnar
 
-    Copyright (C) 2000-2023 John F. Reiser
+    Copyright (C) 2000-2024 John F. Reiser
 
-    Copyright (C) 2002-2023 Jens Medoch
+    Copyright (C) 2002-2024 Jens Medoch
 
     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

@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "UPX 1"
-.TH UPX 1 "2023-08-08" "upx 4.1.0" " "
+.TH UPX 1 "2024-03-27" "upx 4.2.3" " "
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -147,7 +147,7 @@ upx \- compress or expand executable files
 .IX Header "ABSTRACT"
 .Vb 3
 \&                    The Ultimate Packer for eXecutables
-\&   Copyright (c) 1996\-2023 Markus Oberhumer, Laszlo Molnar & John Reiser
+\&   Copyright (c) 1996\-2024 Markus Oberhumer, Laszlo Molnar & John Reiser
 \&                           https://upx.github.io
 .Ve
 .PP
@@ -1019,13 +1019,13 @@ Please report all bugs immediately to the authors.
 .Ve
 .SH "COPYRIGHT"
 .IX Header "COPYRIGHT"
-Copyright (C) 1996\-2023 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996\-2024 Markus Franz Xaver Johannes Oberhumer
 .PP
-Copyright (C) 1996\-2023 Laszlo Molnar
+Copyright (C) 1996\-2024 Laszlo Molnar
 .PP
-Copyright (C) 2000\-2023 John F. Reiser
+Copyright (C) 2000\-2024 John F. Reiser
 .PP
-Copyright (C) 2002\-2023 Jens Medoch
+Copyright (C) 2002\-2024 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

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-2024 Markus Oberhumer, Laszlo Molnar & John Reiser
                            https://upx.github.io
 
 
@@ -932,13 +932,13 @@ Please report all bugs immediately to the authors.
 
 =head1 COPYRIGHT
 
-Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+Copyright (C) 1996-2024 Markus Franz Xaver Johannes Oberhumer
 
-Copyright (C) 1996-2023 Laszlo Molnar
+Copyright (C) 1996-2024 Laszlo Molnar
 
-Copyright (C) 2000-2023 John F. Reiser
+Copyright (C) 2000-2024 John F. Reiser
 
-Copyright (C) 2002-2023 Jens Medoch
+Copyright (C) 2002-2024 Jens Medoch
 
 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,4 @@
-# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
+# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
 ---
 Checks: >
   -*,

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

@@ -1,4 +1,4 @@
-# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
+# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
 ---
 Checks: >
   -*,

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

@@ -1,4 +1,4 @@
-# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
+# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
 ---
 Checks: >
   -*,

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

@@ -1,4 +1,4 @@
-# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
+# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
 ---
 Checks: >
   -*,

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, "
+            help="A directory or a yaml file to store suggested fixes in, "
-            "which can be applied with clang-apply-replacements.",
+            "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:
+        if delete_fixes_dir:
-            shutil.rmtree(tmpdir)
+            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:
+        if delete_fixes_dir:
-            shutil.rmtree(tmpdir)
+            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:
+    if delete_fixes_dir:
-        shutil.rmtree(tmpdir)
+        shutil.rmtree(export_fixes_dir)
     sys.exit(return_code)
 
 

misc/cmake/functions.cmake

@@ -0,0 +1,316 @@
+#
+# UPX "CMake" build file; see https://cmake.org/
+# Copyright (C) Markus Franz Xaver Johannes Oberhumer
+#
+
+#***********************************************************************
+# 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()
+
+# 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()
+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()
+
+#***********************************************************************
+# util
+#***********************************************************************
+
+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)
+    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}")
+        endif()
+    endforeach()
+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 _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)
+    file(GLOB files ${ARGV})
+    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)$")
+                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()
+
+#***********************************************************************
+# 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
+    foreach(t ${ARGV})
+        if(UPX_CONFIG_DISABLE_SANITIZE)
+            # no-op
+        elseif(MSVC_FRONTEND)
+            # MSVC uses -GS (similar to -fstack-protector) by default
+        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 "^GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "8.0")
+            # unsupported compiler; unreliable/broken sanitize implementation
+        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()
+
+#***********************************************************************
+# test
+#***********************************************************************
+
+function(upx_add_serial_test) # ARGV
+    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()
+
+# 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/make/Makefile-extra.mk

@@ -0,0 +1,333 @@
+#
+# 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
+
+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)))
+$(call check_defined,run_config run_build)
+$(call check_undefined,run_config_and_build)
+
+#***********************************************************************
+# build and test
+#***********************************************************************
+
+CTEST = ctest
+
+build/debug+test:     $$(dir $$@)debug PHONY; cd "$(dir $@)debug" && $(CTEST)
+build/%/debug+test:   $$(dir $$@)debug PHONY; cd "$(dir $@)debug" && $(CTEST)
+build/release+test:   $$(dir $$@)release PHONY; cd "$(dir $@)release" && $(CTEST)
+build/%/release+test: $$(dir $$@)release PHONY; cd "$(dir $@)release" && $(CTEST)
+build/%/all+test:     $$(dir $$@)debug+test $$(dir $$@)release+test PHONY ;
+
+# shortcuts
+debug+test:   build/debug+test PHONY
+release+test: build/release+test PHONY
+all+test build/all+test: build/debug+test build/release+test PHONY
+
+#***********************************************************************
+# extra builds: some pre-defined build configurations
+#***********************************************************************
+
+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++ -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 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
+
+# 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
+
+# force building with clang/clang++ C17/C++20
+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++ C23/C++23
+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
+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++ -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
+
+# 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
+
+# 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
+
+# force building with gcc/g++ C17/C++20
+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++ C23/C++23
+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
+
+# 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 ?= wine64
+
+# 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
+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 [deprecated]
+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/$(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/all:     xtarget/debug xtarget/release PHONY
+xtarget/debug:   build/$(UPX_XTARGET)/debug PHONY
+xtarget/release: build/$(UPX_XTARGET)/release PHONY
+xtarget/all+test:     xtarget/debug+test xtarget/release+test PHONY
+xtarget/debug+test:   build/$(UPX_XTARGET)/debug+test PHONY
+xtarget/release+test: build/$(UPX_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
+#***********************************************************************
+
+ifneq ($(origin UPX_CMAKE_CONFIG_FLAGS),command line) # GNU make bug work-around
+# GNU make bug, see https://savannah.gnu.org/bugs/index.php?64822
+# and commit https://git.savannah.gnu.org/cgit/make.git/commit/?id=07187db947ba25e6c59b55f10660a04f8e9c5229
+
+$(call check_undefined,__add_cmake_config)
+__add_cmake_config = $(and $($1),-D$1="$($1)")
+# pass common CMake settings from environment/make to cmake
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_VERBOSE_MAKEFILE)
+# pass common CMake toolchain settings from environment/make to cmake
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_ADDR2LINE)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_AR)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_DLLTOOL)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_LINKER)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_NM)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_OBJCOPY)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_OBJDUMP)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_RANLIB)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_READELF)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_STRIP)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_TAPI)
+# pass common CMake LTO toolchain settings from environment/make to cmake (for use with "-flto")
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_C_COMPILER_AR)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_C_COMPILER_RANLIB)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_CXX_COMPILER_AR)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_CXX_COMPILER_RANLIB)
+# pass common CMake cross compilation settings from environment/make to cmake
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_SYSTEM_NAME)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_SYSTEM_PROCESSOR)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_CROSSCOMPILING_EMULATOR)
+# pass UPX config options from environment/make to cmake; see CMakeLists.txt
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_GITREV)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_SANITIZE)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_WSTRICT)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_WERROR)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_DISABLE_SELF_PACK_TEST)
+# pass UPX extra compile options from environment/make to cmake; see CMakeLists.txt
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_BZIP2)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UCL)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UPX)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZLIB)
+build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZSTD)
+
+endif # GNU make bug work-around
+
+#***********************************************************************
+# 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

@@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
 # create the image from Dockerfile
 # using a rootless Podman container
 
-image=upx-stubtools-20221212-v6
+image=upx-stubtools-20221212-v7
 [[ $1 == --print-image ]] && echo "$image" && exit 0
 
 podman build -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"

misc/podman/rebuild-stubs/Dockerfile

@@ -15,9 +15,10 @@ RUN dpkg --add-architecture i386 \
         # 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 \
+        mksh moreutils ninja-build p7zip parallel patch patchelf patchutils pax-utils paxctl \
+        python3 python3-pyasn1 python3-pycryptodome python3-zstd \
         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":
+        # extra packages for compiling with "gcc -m32" and "gcc -mx32":
         g++-multilib gcc-multilib \
     && true
 
@@ -44,9 +45,10 @@ 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 \
+    && xzlist="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" \
+    && for v in $xzlist; do wget -q 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 $xzlist; 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
 

misc/podman/rebuild-stubs/packages.txt

@@ -3,16 +3,16 @@ Packages:
 Desired=Unknown/Install/Remove/Purge/Hold
 ii  7zip                        21.07+dfsg-4                            amd64        7-Zip file archiver with a high compression ratio
 ii  adduser                     3.118ubuntu5                            all          add and remove users and groups
-ii  apt                         2.4.9                                   amd64        commandline package manager
+ii  apt                         2.4.11                                  amd64        commandline package manager
 ii  aria2                       1.36.0-1                                amd64        High speed download utility
-ii  base-files                  12ubuntu4.3                             amd64        Debian base system miscellaneous files
+ii  base-files                  12ubuntu4.6                             amd64        Debian base system miscellaneous files
 ii  base-passwd                 3.5.52build1                            amd64        Debian base system master password and group files
 ii  bash                        5.1-6ubuntu1                            amd64        GNU Bourne Again SHell
 ii  bash-completion             1:2.11-5ubuntu1                         all          programmable completion for the bash shell
 ii  bfs                         2.3.1-1                                 amd64        Breadth-first version of find(1)
-ii  binutils                    2.38-4ubuntu2.2                         amd64        GNU assembler, linker and binary utilities
+ii  binutils                    2.38-4ubuntu2.6                         amd64        GNU assembler, linker and binary utilities
-ii  binutils-common:amd64       2.38-4ubuntu2.2                         amd64        Common files for the GNU assembler, linker and binary utilities
+ii  binutils-common:amd64       2.38-4ubuntu2.6                         amd64        Common files for the GNU assembler, linker and binary utilities
-ii  binutils-x86-64-linux-gnu   2.38-4ubuntu2.2                         amd64        GNU binary utilities, for x86-64-linux-gnu target
+ii  binutils-x86-64-linux-gnu   2.38-4ubuntu2.6                         amd64        GNU binary utilities, for x86-64-linux-gnu target
 ii  bsdutils                    1:2.37.2-4ubuntu3                       amd64        basic utilities from 4.4BSD-Lite
 ii  busybox                     1:1.30.1-7ubuntu3                       amd64        Tiny utilities for small and embedded systems
 ii  bzip2                       1.0.8-5build1                           amd64        high-quality block-sorting file compressor - utilities
@@ -20,42 +20,42 @@ ii  ca-certificates             20230311ubuntu0.22.04.1                 all
 ii  cabextract                  1.9-3                                   amd64        Microsoft Cabinet file unpacker
 ii  ccache                      4.5.1-1                                 amd64        Compiler cache for fast recompilation of C/C++ code
 ii  chrpath                     0.16-2                                  amd64        Tool to edit the rpath in ELF binaries
-ii  cmake                       3.22.1-1ubuntu1.22.04.1                 amd64        cross-platform, open-source make system
+ii  cmake                       3.22.1-1ubuntu1.22.04.2                 amd64        cross-platform, open-source make system
-ii  cmake-data                  3.22.1-1ubuntu1.22.04.1                 all          CMake data files (modules, templates and documentation)
+ii  cmake-data                  3.22.1-1ubuntu1.22.04.2                 all          CMake data files (modules, templates and documentation)
-ii  coreutils                   8.32-4.1ubuntu1                         amd64        GNU core utilities
+ii  coreutils                   8.32-4.1ubuntu1.1                       amd64        GNU core utilities
 ii  cpio                        2.13+dfsg-7                             amd64        GNU cpio -- a program to manage archives of files
 ii  cpp                         4:11.2.0-1ubuntu1                       amd64        GNU C preprocessor (cpp)
-ii  cpp-11                      11.3.0-1ubuntu1~22.04.1                 amd64        GNU C preprocessor
+ii  cpp-11                      11.4.0-1ubuntu1~22.04                   amd64        GNU C preprocessor
-ii  curl                        7.81.0-1ubuntu1.13                      amd64        command line tool for transferring data with URL syntax
+ii  curl                        7.81.0-1ubuntu1.15                      amd64        command line tool for transferring data with URL syntax
 ii  dash                        0.5.11+git20210903+057cd650a4ed-3build1 amd64        POSIX-compliant shell
 ii  debconf                     1.5.79ubuntu1                           all          Debian configuration management system
 ii  debianutils                 5.5-1ubuntu2                            amd64        Miscellaneous utilities specific to Debian
 ii  dh-elpa-helper              2.0.9ubuntu1                            all          helper package for emacs lisp extensions
 ii  diffutils                   1:3.8-0ubuntu2                          amd64        File comparison utilities
-ii  distro-info-data            0.52ubuntu0.4                           all          information about the distributions' releases (data files)
+ii  distro-info-data            0.52ubuntu0.6                           all          information about the distributions' releases (data files)
-ii  dpkg                        1.21.1ubuntu2.2                         amd64        Debian package management system
+ii  dpkg                        1.21.1ubuntu2.3                         amd64        Debian package management system
 ii  e2fsprogs                   1.46.5-2ubuntu1.1                       amd64        ext2/ext3/ext4 file system utilities
 ii  elfutils                    0.186-1build1                           amd64        collection of utilities to handle ELF objects
 ii  emacsen-common              3.0.4                                   all          Common facilities for all emacsen
 ii  fd-find                     8.3.1-1ubuntu0.1                        amd64        Simple, fast and user-friendly alternative to find
-ii  file                        1:5.41-3                                amd64        Recognize the type of data in a file using "magic" numbers
+ii  file                        1:5.41-3ubuntu0.1                       amd64        Recognize the type of data in a file using "magic" numbers
 ii  findutils                   4.8.0-1ubuntu3                          amd64        utilities for finding files--find, xargs
 ii  fzf                         0.29.0-1                                amd64        general-purpose command-line fuzzy finder
 ii  g++                         4:11.2.0-1ubuntu1                       amd64        GNU C++ compiler
-ii  g++-11                      11.3.0-1ubuntu1~22.04.1                 amd64        GNU C++ compiler
+ii  g++-11                      11.4.0-1ubuntu1~22.04                   amd64        GNU C++ compiler
-ii  g++-11-multilib             11.3.0-1ubuntu1~22.04.1                 amd64        GNU C++ compiler (multilib support)
+ii  g++-11-multilib             11.4.0-1ubuntu1~22.04                   amd64        GNU C++ compiler (multilib support)
 ii  g++-multilib                4:11.2.0-1ubuntu1                       amd64        GNU C++ compiler (multilib files)
-ii  gawk                        1:5.1.0-1build3                         amd64        GNU awk, a pattern scanning and processing language
+ii  gawk                        1:5.1.0-1ubuntu0.1                      amd64        GNU awk, a pattern scanning and processing language
 ii  gcc                         4:11.2.0-1ubuntu1                       amd64        GNU C compiler
-ii  gcc-11                      11.3.0-1ubuntu1~22.04.1                 amd64        GNU C compiler
+ii  gcc-11                      11.4.0-1ubuntu1~22.04                   amd64        GNU C compiler
-ii  gcc-11-base:amd64           11.3.0-1ubuntu1~22.04.1                 amd64        GCC, the GNU Compiler Collection (base package)
+ii  gcc-11-base:amd64           11.4.0-1ubuntu1~22.04                   amd64        GCC, the GNU Compiler Collection (base package)
-ii  gcc-11-multilib             11.3.0-1ubuntu1~22.04.1                 amd64        GNU C compiler (multilib support)
+ii  gcc-11-multilib             11.4.0-1ubuntu1~22.04                   amd64        GNU C compiler (multilib support)
-ii  gcc-12-base:amd64           12.1.0-2ubuntu1~22.04                   amd64        GCC, the GNU Compiler Collection (base package)
+ii  gcc-12-base:amd64           12.3.0-1ubuntu1~22.04                   amd64        GCC, the GNU Compiler Collection (base package)
-ii  gcc-12-base:i386            12.1.0-2ubuntu1~22.04                   i386         GCC, the GNU Compiler Collection (base package)
+ii  gcc-12-base:i386            12.3.0-1ubuntu1~22.04                   i386         GCC, the GNU Compiler Collection (base package)
 ii  gcc-multilib                4:11.2.0-1ubuntu1                       amd64        GNU C compiler (multilib files)
 ii  gdb                         12.1-0ubuntu1~22.04                     amd64        GNU Debugger
-ii  git                         1:2.34.1-1ubuntu1.9                     amd64        fast, scalable, distributed revision control system
+ii  git                         1:2.34.1-1ubuntu1.10                    amd64        fast, scalable, distributed revision control system
-ii  git-man                     1:2.34.1-1ubuntu1.9                     all          fast, scalable, distributed revision control system (manual pages)
+ii  git-man                     1:2.34.1-1ubuntu1.10                    all          fast, scalable, distributed revision control system (manual pages)
 ii  gojq                        0.12.6-1                                amd64        pure Go implementation of jq (program)
 ii  gpgv                        2.2.27-3ubuntu2.1                       amd64        GNU privacy guard - signature verification tool
 ii  grep                        3.7-1build1                             amd64        GNU grep, egrep and fgrep
@@ -66,55 +66,55 @@ ii  htop                        3.0.5-7build2                           amd64
 ii  hyperfine                   1.12.0-3ubuntu0.1                       amd64        Command-line benchmarking tool
 ii  init-system-helpers         1.62                                    all          helper tools for all init systems
 ii  jq                          1.6-2.1ubuntu3                          amd64        lightweight and flexible command-line JSON processor
-ii  less                        590-1ubuntu0.22.04.1                    amd64        pager program similar to more
+ii  less                        590-1ubuntu0.22.04.2                    amd64        pager program similar to more
-ii  lib32asan6                  11.3.0-1ubuntu1~22.04.1                 amd64        AddressSanitizer -- a fast memory error detector (32bit)
+ii  lib32asan6                  11.4.0-1ubuntu1~22.04                   amd64        AddressSanitizer -- a fast memory error detector (32bit)
-ii  lib32atomic1                12.1.0-2ubuntu1~22.04                   amd64        support library providing __atomic built-in functions (32bit)
+ii  lib32atomic1                12.3.0-1ubuntu1~22.04                   amd64        support library providing __atomic built-in functions (32bit)
-ii  lib32gcc-11-dev             11.3.0-1ubuntu1~22.04.1                 amd64        GCC support library (32 bit development files)
+ii  lib32gcc-11-dev             11.4.0-1ubuntu1~22.04                   amd64        GCC support library (32 bit development files)
-ii  lib32gcc-s1                 12.1.0-2ubuntu1~22.04                   amd64        GCC support library (32 bit Version)
+ii  lib32gcc-s1                 12.3.0-1ubuntu1~22.04                   amd64        GCC support library (32 bit Version)
-ii  lib32gomp1                  12.1.0-2ubuntu1~22.04                   amd64        GCC OpenMP (GOMP) support library (32bit)
+ii  lib32gomp1                  12.3.0-1ubuntu1~22.04                   amd64        GCC OpenMP (GOMP) support library (32bit)
-ii  lib32itm1                   12.1.0-2ubuntu1~22.04                   amd64        GNU Transactional Memory Library (32bit)
+ii  lib32itm1                   12.3.0-1ubuntu1~22.04                   amd64        GNU Transactional Memory Library (32bit)
-ii  lib32quadmath0              12.1.0-2ubuntu1~22.04                   amd64        GCC Quad-Precision Math Library (32bit)
+ii  lib32quadmath0              12.3.0-1ubuntu1~22.04                   amd64        GCC Quad-Precision Math Library (32bit)
-ii  lib32stdc++-11-dev          11.3.0-1ubuntu1~22.04.1                 amd64        GNU Standard C++ Library v3 (development files)
+ii  lib32stdc++-11-dev          11.4.0-1ubuntu1~22.04                   amd64        GNU Standard C++ Library v3 (development files)
-ii  lib32stdc++6                12.1.0-2ubuntu1~22.04                   amd64        GNU Standard C++ Library v3 (32 bit Version)
+ii  lib32stdc++6                12.3.0-1ubuntu1~22.04                   amd64        GNU Standard C++ Library v3 (32 bit Version)
-ii  lib32ubsan1                 12.1.0-2ubuntu1~22.04                   amd64        UBSan -- undefined behaviour sanitizer (32bit)
+ii  lib32ubsan1                 12.3.0-1ubuntu1~22.04                   amd64        UBSan -- undefined behaviour sanitizer (32bit)
 ii  libacl1:amd64               2.3.1-1                                 amd64        access control list - shared library
-ii  libapt-pkg6.0:amd64         2.4.9                                   amd64        package management runtime library
+ii  libapt-pkg6.0:amd64         2.4.11                                  amd64        package management runtime library
 ii  libarchive13:amd64          3.6.0-1ubuntu1                          amd64        Multi-format archive and compression library (shared library)
 ii  libaria2-0:amd64            1.36.0-1                                amd64        C++ library interface to aria2
-ii  libasan6:amd64              11.3.0-1ubuntu1~22.04.1                 amd64        AddressSanitizer -- a fast memory error detector
+ii  libasan6:amd64              11.4.0-1ubuntu1~22.04                   amd64        AddressSanitizer -- a fast memory error detector
 ii  libasm1:amd64               0.186-1build1                           amd64        library with a programmable assembler interface
-ii  libatomic1:amd64            12.1.0-2ubuntu1~22.04                   amd64        support library providing __atomic built-in functions
+ii  libatomic1:amd64            12.3.0-1ubuntu1~22.04                   amd64        support library providing __atomic built-in functions
 ii  libattr1:amd64              1:2.5.1-1build1                         amd64        extended attribute handling - shared library
 ii  libaudit-common             1:3.0.7-1build1                         all          Dynamic library for security auditing - common files
 ii  libaudit1:amd64             1:3.0.7-1build1                         amd64        Dynamic library for security auditing
 ii  libbabeltrace1:amd64        1.5.8-2build1                           amd64        Babeltrace conversion libraries
-ii  libbinutils:amd64           2.38-4ubuntu2.2                         amd64        GNU binary utilities (private shared library)
+ii  libbinutils:amd64           2.38-4ubuntu2.6                         amd64        GNU binary utilities (private shared library)
 ii  libblkid1:amd64             2.37.2-4ubuntu3                         amd64        block device ID library
 ii  libboost-regex1.74.0:amd64  1.74.0-14ubuntu3                        amd64        regular expression library for C++
 ii  libbrotli1:amd64            1.0.9-2build6                           amd64        library implementing brotli encoder and decoder (shared libraries)
 ii  libbsd0:amd64               0.11.5-1                                amd64        utility functions from BSD systems - shared library
 ii  libbz2-1.0:amd64            1.0.8-5build1                           amd64        high-quality block-sorting file compressor library - runtime
-ii  libc-ares2:amd64            1.18.1-1ubuntu0.22.04.2                 amd64        asynchronous name resolver
+ii  libc-ares2:amd64            1.18.1-1ubuntu0.22.04.3                 amd64        asynchronous name resolver
-ii  libc-bin                    2.35-0ubuntu3.1                         amd64        GNU C Library: Binaries
+ii  libc-bin                    2.35-0ubuntu3.6                         amd64        GNU C Library: Binaries
-ii  libc-dev-bin                2.35-0ubuntu3.1                         amd64        GNU C Library: Development binaries
+ii  libc-dev-bin                2.35-0ubuntu3.6                         amd64        GNU C Library: Development binaries
-ii  libc6-dev-i386              2.35-0ubuntu3.1                         amd64        GNU C Library: 32-bit development libraries for AMD64
+ii  libc6-dev-i386              2.35-0ubuntu3.6                         amd64        GNU C Library: 32-bit development libraries for AMD64
-ii  libc6-dev-x32               2.35-0ubuntu3.1                         amd64        GNU C Library: X32 ABI Development Libraries for AMD64
+ii  libc6-dev-x32               2.35-0ubuntu3.6                         amd64        GNU C Library: X32 ABI Development Libraries for AMD64
-ii  libc6-dev:amd64             2.35-0ubuntu3.1                         amd64        GNU C Library: Development Libraries and Header Files
+ii  libc6-dev:amd64             2.35-0ubuntu3.6                         amd64        GNU C Library: Development Libraries and Header Files
-ii  libc6-i386                  2.35-0ubuntu3.1                         amd64        GNU C Library: 32-bit shared libraries for AMD64
+ii  libc6-i386                  2.35-0ubuntu3.6                         amd64        GNU C Library: 32-bit shared libraries for AMD64
-ii  libc6-x32                   2.35-0ubuntu3.1                         amd64        GNU C Library: X32 ABI Shared libraries for AMD64
+ii  libc6-x32                   2.35-0ubuntu3.6                         amd64        GNU C Library: X32 ABI Shared libraries for AMD64
-ii  libc6:amd64                 2.35-0ubuntu3.1                         amd64        GNU C Library: Shared libraries
+ii  libc6:amd64                 2.35-0ubuntu3.6                         amd64        GNU C Library: Shared libraries
-ii  libc6:i386                  2.35-0ubuntu3.1                         i386         GNU C Library: Shared libraries
+ii  libc6:i386                  2.35-0ubuntu3.6                         i386         GNU C Library: Shared libraries
 ii  libcap-ng0:amd64            0.7.9-2.2build3                         amd64        An alternate POSIX capabilities library
 ii  libcap2:amd64               1:2.44-1ubuntu0.22.04.1                 amd64        POSIX 1003.1e capabilities (library)
-ii  libcc1-0:amd64              12.1.0-2ubuntu1~22.04                   amd64        GCC cc1 plugin for GDB
+ii  libcc1-0:amd64              12.3.0-1ubuntu1~22.04                   amd64        GCC cc1 plugin for GDB
 ii  libcom-err2:amd64           1.46.5-2ubuntu1.1                       amd64        common error description library
 ii  libcrypt-dev:amd64          1:4.4.27-1                              amd64        libcrypt development files
 ii  libcrypt1:amd64             1:4.4.27-1                              amd64        libcrypt shared library
 ii  libcrypt1:i386              1:4.4.27-1                              i386         libcrypt shared library
-ii  libctf-nobfd0:amd64         2.38-4ubuntu2.2                         amd64        Compact C Type Format library (runtime, no BFD dependency)
+ii  libctf-nobfd0:amd64         2.38-4ubuntu2.6                         amd64        Compact C Type Format library (runtime, no BFD dependency)
-ii  libctf0:amd64               2.38-4ubuntu2.2                         amd64        Compact C Type Format library (runtime, BFD dependency)
+ii  libctf0:amd64               2.38-4ubuntu2.6                         amd64        Compact C Type Format library (runtime, BFD dependency)
-ii  libcurl3-gnutls:amd64       7.81.0-1ubuntu1.13                      amd64        easy-to-use client-side URL transfer library (GnuTLS flavour)
+ii  libcurl3-gnutls:amd64       7.81.0-1ubuntu1.15                      amd64        easy-to-use client-side URL transfer library (GnuTLS flavour)
-ii  libcurl4:amd64              7.81.0-1ubuntu1.13                      amd64        easy-to-use client-side URL transfer library (OpenSSL flavour)
+ii  libcurl4:amd64              7.81.0-1ubuntu1.15                      amd64        easy-to-use client-side URL transfer library (OpenSSL flavour)
 ii  libdb5.3:amd64              5.3.28+dfsg1-0.8ubuntu3                 amd64        Berkeley v5.3 Database Libraries [runtime]
 ii  libdebconfclient0:amd64     0.261ubuntu1                            amd64        Debian Configuration Management System (C-implementation library)
 ii  libdebuginfod-common        0.186-1build1                           all          configuration to enable the Debian debug info server
@@ -122,22 +122,22 @@ ii  libdebuginfod1:amd64        0.186-1build1                           amd64
 ii  libdw1:amd64                0.186-1build1                           amd64        library that provides access to the DWARF debug information
 ii  libelf1:amd64               0.186-1build1                           amd64        library to read and write ELF files
 ii  liberror-perl               0.17029-1                               all          Perl module for error/exception handling in an OO-ish way
-ii  libexpat1:amd64             2.4.7-1ubuntu0.2                        amd64        XML parsing C library - runtime library
+ii  libexpat1:amd64             2.4.7-1ubuntu0.3                        amd64        XML parsing C library - runtime library
 ii  libext2fs2:amd64            1.46.5-2ubuntu1.1                       amd64        ext2/ext3/ext4 file system libraries
 ii  libffi8:amd64               3.4.2-4                                 amd64        Foreign Function Interface library runtime
-ii  libgcc-11-dev:amd64         11.3.0-1ubuntu1~22.04.1                 amd64        GCC support library (development files)
+ii  libgcc-11-dev:amd64         11.4.0-1ubuntu1~22.04                   amd64        GCC support library (development files)
-ii  libgcc-s1:amd64             12.1.0-2ubuntu1~22.04                   amd64        GCC support library
+ii  libgcc-s1:amd64             12.3.0-1ubuntu1~22.04                   amd64        GCC support library
-ii  libgcc-s1:i386              12.1.0-2ubuntu1~22.04                   i386         GCC support library
+ii  libgcc-s1:i386              12.3.0-1ubuntu1~22.04                   i386         GCC support library
 ii  libgcrypt20:amd64           1.9.4-3ubuntu3                          amd64        LGPL Crypto library - runtime library
 ii  libgdbm-compat4:amd64       1.23-1                                  amd64        GNU dbm database routines (legacy support runtime version)
 ii  libgdbm6:amd64              1.23-1                                  amd64        GNU dbm database routines (runtime version)
 ii  libglib2.0-0:amd64          2.72.4-0ubuntu2.2                       amd64        GLib library of C routines
 ii  libgmp10:amd64              2:6.2.1+dfsg-3ubuntu1                   amd64        Multiprecision arithmetic library
-ii  libgnutls30:amd64           3.7.3-4ubuntu1.2                        amd64        GNU TLS library - main runtime library
+ii  libgnutls30:amd64           3.7.3-4ubuntu1.4                        amd64        GNU TLS library - main runtime library
-ii  libgomp1:amd64              12.1.0-2ubuntu1~22.04                   amd64        GCC OpenMP (GOMP) support library
+ii  libgomp1:amd64              12.3.0-1ubuntu1~22.04                   amd64        GCC OpenMP (GOMP) support library
 ii  libgpg-error0:amd64         1.43-3                                  amd64        GnuPG development runtime library
 ii  libgpm2:amd64               1.20.7-10build1                         amd64        General Purpose Mouse - shared library
-ii  libgssapi-krb5-2:amd64      1.19.2-2ubuntu0.2                       amd64        MIT Kerberos runtime libraries - krb5 GSS-API Mechanism
+ii  libgssapi-krb5-2:amd64      1.19.2-2ubuntu0.3                       amd64        MIT Kerberos runtime libraries - krb5 GSS-API Mechanism
 ii  libhiredis0.14:amd64        0.14.1-2                                amd64        minimalistic C client library for Redis
 ii  libhogweed6:amd64           3.7.3-1build2                           amd64        low level cryptographic library (public-key cryptos)
 ii  libicu70:amd64              70.1-2                                  amd64        International Components for Unicode
@@ -146,21 +146,21 @@ ii  libio-pty-perl              1:1.15-2build2                          amd64
 ii  libipc-run-perl             20200505.0-1                            all          Perl module for running processes
 ii  libipt2                     2.0.5-1                                 amd64        Intel Processor Trace Decoder Library
 ii  libisl23:amd64              0.24-2build1                            amd64        manipulating sets and relations of integer points bounded by linear constraints
-ii  libitm1:amd64               12.1.0-2ubuntu1~22.04                   amd64        GNU Transactional Memory Library
+ii  libitm1:amd64               12.3.0-1ubuntu1~22.04                   amd64        GNU Transactional Memory Library
 ii  libjansson4:amd64           2.13.1-1.1build3                        amd64        C library for encoding, decoding and manipulating JSON data
 ii  libjq1:amd64                1.6-2.1ubuntu3                          amd64        lightweight and flexible command-line JSON processor - shared library
 ii  libjsoncpp25:amd64          1.9.5-3                                 amd64        library for reading and writing JSON for C++
-ii  libk5crypto3:amd64          1.19.2-2ubuntu0.2                       amd64        MIT Kerberos runtime libraries - Crypto Library
+ii  libk5crypto3:amd64          1.19.2-2ubuntu0.3                       amd64        MIT Kerberos runtime libraries - Crypto Library
 ii  libkeyutils1:amd64          1.6.1-2ubuntu3                          amd64        Linux Key Management Utilities (library)
-ii  libkrb5-3:amd64             1.19.2-2ubuntu0.2                       amd64        MIT Kerberos runtime libraries
+ii  libkrb5-3:amd64             1.19.2-2ubuntu0.3                       amd64        MIT Kerberos runtime libraries
-ii  libkrb5support0:amd64       1.19.2-2ubuntu0.2                       amd64        MIT Kerberos runtime libraries - Support library
+ii  libkrb5support0:amd64       1.19.2-2ubuntu0.3                       amd64        MIT Kerberos runtime libraries - Support library
-ii  libldap-2.5-0:amd64         2.5.14+dfsg-0ubuntu0.22.04.2            amd64        OpenLDAP libraries
+ii  libldap-2.5-0:amd64         2.5.17+dfsg-0ubuntu0.22.04.1            amd64        OpenLDAP libraries
-ii  liblsan0:amd64              12.1.0-2ubuntu1~22.04                   amd64        LeakSanitizer -- a memory leak detector (runtime)
+ii  liblsan0:amd64              12.3.0-1ubuntu1~22.04                   amd64        LeakSanitizer -- a memory leak detector (runtime)
 ii  liblz4-1:amd64              1.9.3-2build2                           amd64        Fast LZ compression algorithm library - runtime
 ii  liblzma5:amd64              5.2.5-2ubuntu1                          amd64        XZ-format compression library
 ii  liblzo2-2:amd64             2.10-2build3                            amd64        data compression library
-ii  libmagic-mgc                1:5.41-3                                amd64        File type determination library using "magic" numbers (compiled magic file)
+ii  libmagic-mgc                1:5.41-3ubuntu0.1                       amd64        File type determination library using "magic" numbers (compiled magic file)
-ii  libmagic1:amd64             1:5.41-3                                amd64        Recognize the type of data in a file using "magic" numbers - library
+ii  libmagic1:amd64             1:5.41-3ubuntu0.1                       amd64        Recognize the type of data in a file using "magic" numbers - library
 ii  libmd0:amd64                1.0.4-1build1                           amd64        message digest functions from BSD systems - shared library
 ii  libmount1:amd64             2.37.2-4ubuntu3                         amd64        device mounting library
 ii  libmpc3:amd64               1.2.1-2build1                           amd64        multiple precision complex floating-point library
@@ -171,29 +171,29 @@ ii  libncurses5:amd64           6.3-2ubuntu0.1                          amd64
 ii  libncurses6:amd64           6.3-2ubuntu0.1                          amd64        shared libraries for terminal handling
 ii  libncursesw6:amd64          6.3-2ubuntu0.1                          amd64        shared libraries for terminal handling (wide character support)
 ii  libnettle8:amd64            3.7.3-1build2                           amd64        low level cryptographic library (symmetric and one-way cryptos)
-ii  libnghttp2-14:amd64         1.43.0-1build3                          amd64        library implementing HTTP/2 protocol (shared library)
+ii  libnghttp2-14:amd64         1.43.0-1ubuntu0.1                       amd64        library implementing HTTP/2 protocol (shared library)
 ii  libnl-3-200:amd64           3.5.0-0.1                               amd64        library for dealing with netlink sockets
 ii  libnl-genl-3-200:amd64      3.5.0-0.1                               amd64        library for dealing with netlink sockets - generic netlink
 ii  libnsl-dev:amd64            1.3.0-2build2                           amd64        libnsl development files
 ii  libnsl2:amd64               1.3.0-2build2                           amd64        Public client interface for NIS(YP) and NIS+
 ii  libonig5:amd64              6.9.7.1-2build1                         amd64        regular expressions library
 ii  libp11-kit0:amd64           0.24.0-6build1                          amd64        library for loading and coordinating access to PKCS#11 modules - runtime
-ii  libpam-modules-bin          1.4.0-11ubuntu2.3                       amd64        Pluggable Authentication Modules for PAM - helper binaries
+ii  libpam-modules-bin          1.4.0-11ubuntu2.4                       amd64        Pluggable Authentication Modules for PAM - helper binaries
-ii  libpam-modules:amd64        1.4.0-11ubuntu2.3                       amd64        Pluggable Authentication Modules for PAM
+ii  libpam-modules:amd64        1.4.0-11ubuntu2.4                       amd64        Pluggable Authentication Modules for PAM
-ii  libpam-runtime              1.4.0-11ubuntu2.3                       all          Runtime support for the PAM library
+ii  libpam-runtime              1.4.0-11ubuntu2.4                       all          Runtime support for the PAM library
-ii  libpam0g:amd64              1.4.0-11ubuntu2.3                       amd64        Pluggable Authentication Modules library
+ii  libpam0g:amd64              1.4.0-11ubuntu2.4                       amd64        Pluggable Authentication Modules library
 ii  libpcre2-8-0:amd64          10.39-3ubuntu0.1                        amd64        New Perl Compatible Regular Expression Library- 8 bit runtime files
 ii  libpcre3:amd64              2:8.39-13ubuntu0.22.04.1                amd64        Old Perl 5 Compatible Regular Expression Library - runtime files
-ii  libperl5.34:amd64           5.34.0-3ubuntu1.2                       amd64        shared Perl library
+ii  libperl5.34:amd64           5.34.0-3ubuntu1.3                       amd64        shared Perl library
 ii  libpopt0:amd64              1.18-3build1                            amd64        lib for parsing cmdline parameters
-ii  libprocps8:amd64            2:3.3.17-6ubuntu2                       amd64        library for accessing process information from /proc
+ii  libprocps8:amd64            2:3.3.17-6ubuntu2.1                     amd64        library for accessing process information from /proc
 ii  libpsl5:amd64               0.21.0-1.2build2                        amd64        Library for Public Suffix List (shared libraries)
-ii  libpython2.7-minimal:amd64  2.7.18-13ubuntu1.1                      amd64        Minimal subset of the Python language (version 2.7)
+ii  libpython2.7-minimal:amd64  2.7.18-13ubuntu1.2                      amd64        Minimal subset of the Python language (version 2.7)
 ii  libpython3-stdlib:amd64     3.10.6-1~22.04                          amd64        interactive high-level object-oriented language (default python3 version)
-ii  libpython3.10-minimal:amd64 3.10.6-1~22.04.2ubuntu1.1               amd64        Minimal subset of the Python language (version 3.10)
+ii  libpython3.10-minimal:amd64 3.10.12-1~22.04.3                       amd64        Minimal subset of the Python language (version 3.10)
-ii  libpython3.10-stdlib:amd64  3.10.6-1~22.04.2ubuntu1.1               amd64        Interactive high-level object-oriented language (standard library, version 3.10)
+ii  libpython3.10-stdlib:amd64  3.10.12-1~22.04.3                       amd64        Interactive high-level object-oriented language (standard library, version 3.10)
-ii  libpython3.10:amd64         3.10.6-1~22.04.2ubuntu1.1               amd64        Shared Python runtime library (version 3.10)
+ii  libpython3.10:amd64         3.10.12-1~22.04.3                       amd64        Shared Python runtime library (version 3.10)
-ii  libquadmath0:amd64          12.1.0-2ubuntu1~22.04                   amd64        GCC Quad-Precision Math Library
+ii  libquadmath0:amd64          12.3.0-1ubuntu1~22.04                   amd64        GCC Quad-Precision Math Library
 ii  libreadline8:amd64          8.1.2-1                                 amd64        GNU readline and history libraries, run-time libraries
 ii  librhash0:amd64             1.4.2-1ubuntu1                          amd64        shared library for hash functions computing
 ii  librtmp1:amd64              2.4+20151223.gitfa8646d.1-2build4       amd64        toolkit for RTMP streams (shared library)
@@ -211,14 +211,14 @@ ii  libsmartcols1:amd64         2.37.2-4ubuntu3                         amd64
 ii  libsodium23:amd64           1.0.18-1build2                          amd64        Network communication, cryptography and signaturing library
 ii  libsource-highlight-common  3.1.9-4.1build2                         all          architecture-independent files for source highlighting library
 ii  libsource-highlight4v5      3.1.9-4.1build2                         amd64        source highlighting library
-ii  libsqlite3-0:amd64          3.37.2-2ubuntu0.1                       amd64        SQLite 3 shared library
+ii  libsqlite3-0:amd64          3.37.2-2ubuntu0.3                       amd64        SQLite 3 shared library
 ii  libss2:amd64                1.46.5-2ubuntu1.1                       amd64        command-line interface parsing library
-ii  libssh-4:amd64              0.9.6-2ubuntu0.22.04.1                  amd64        tiny C SSH library (OpenSSL flavor)
+ii  libssh-4:amd64              0.9.6-2ubuntu0.22.04.3                  amd64        tiny C SSH library (OpenSSL flavor)
 ii  libssh2-1:amd64             1.10.0-3                                amd64        SSH2 client-side library
-ii  libssl3:amd64               3.0.2-0ubuntu1.10                       amd64        Secure Sockets Layer toolkit - shared libraries
+ii  libssl3:amd64               3.0.2-0ubuntu1.15                       amd64        Secure Sockets Layer toolkit - shared libraries
-ii  libstdc++-11-dev:amd64      11.3.0-1ubuntu1~22.04.1                 amd64        GNU Standard C++ Library v3 (development files)
+ii  libstdc++-11-dev:amd64      11.4.0-1ubuntu1~22.04                   amd64        GNU Standard C++ Library v3 (development files)
-ii  libstdc++6:amd64            12.1.0-2ubuntu1~22.04                   amd64        GNU Standard C++ Library v3
+ii  libstdc++6:amd64            12.3.0-1ubuntu1~22.04                   amd64        GNU Standard C++ Library v3
-ii  libsystemd0:amd64           249.11-0ubuntu3.9                       amd64        systemd utility library
+ii  libsystemd0:amd64           249.11-0ubuntu3.12                      amd64        systemd utility library
 ii  libtasn1-6:amd64            4.18.0-4build1                          amd64        Manage ASN.1 structures (runtime)
 ii  libtime-duration-perl       1.21-1                                  all          module for rounded or exact English expression of durations
 ii  libtimedate-perl            2.3300-2                                all          collection of modules to manipulate date/time information
@@ -227,35 +227,35 @@ ii  libtinfo6:amd64             6.3-2ubuntu0.1                          amd64
 ii  libtirpc-common             1.3.2-2ubuntu0.1                        all          transport-independent RPC library - common files
 ii  libtirpc-dev:amd64          1.3.2-2ubuntu0.1                        amd64        transport-independent RPC library - development files
 ii  libtirpc3:amd64             1.3.2-2ubuntu0.1                        amd64        transport-independent RPC library
-ii  libtsan0:amd64              11.3.0-1ubuntu1~22.04.1                 amd64        ThreadSanitizer -- a Valgrind-based detector of data races (runtime)
+ii  libtsan0:amd64              11.4.0-1ubuntu1~22.04                   amd64        ThreadSanitizer -- a Valgrind-based detector of data races (runtime)
-ii  libubsan1:amd64             12.1.0-2ubuntu1~22.04                   amd64        UBSan -- undefined behaviour sanitizer (runtime)
+ii  libubsan1:amd64             12.3.0-1ubuntu1~22.04                   amd64        UBSan -- undefined behaviour sanitizer (runtime)
-ii  libudev1:amd64              249.11-0ubuntu3.9                       amd64        libudev shared library
+ii  libudev1:amd64              249.11-0ubuntu3.12                      amd64        libudev shared library
 ii  libunistring2:amd64         1.0-1                                   amd64        Unicode string library for C
 ii  libutempter0:amd64          1.2.1-2build2                           amd64        privileged helper for utmp/wtmp updates (runtime)
 ii  libuuid1:amd64              2.37.2-4ubuntu3                         amd64        Universally Unique ID library
-ii  libuv1:amd64                1.43.0-1                                amd64        asynchronous event notification library - runtime library
+ii  libuv1:amd64                1.43.0-1ubuntu0.1                       amd64        asynchronous event notification library - runtime library
-ii  libx11-6:amd64              2:1.7.5-1ubuntu0.2                      amd64        X11 client-side library
+ii  libx11-6:amd64              2:1.7.5-1ubuntu0.3                      amd64        X11 client-side library
-ii  libx11-data                 2:1.7.5-1ubuntu0.2                      all          X11 client-side library
+ii  libx11-data                 2:1.7.5-1ubuntu0.3                      all          X11 client-side library
-ii  libx32asan6                 11.3.0-1ubuntu1~22.04.1                 amd64        AddressSanitizer -- a fast memory error detector (x32)
+ii  libx32asan6                 11.4.0-1ubuntu1~22.04                   amd64        AddressSanitizer -- a fast memory error detector (x32)
-ii  libx32atomic1               12.1.0-2ubuntu1~22.04                   amd64        support library providing __atomic built-in functions (x32)
+ii  libx32atomic1               12.3.0-1ubuntu1~22.04                   amd64        support library providing __atomic built-in functions (x32)
-ii  libx32gcc-11-dev            11.3.0-1ubuntu1~22.04.1                 amd64        GCC support library (x32 development files)
+ii  libx32gcc-11-dev            11.4.0-1ubuntu1~22.04                   amd64        GCC support library (x32 development files)
-ii  libx32gcc-s1                12.1.0-2ubuntu1~22.04                   amd64        GCC support library (x32)
+ii  libx32gcc-s1                12.3.0-1ubuntu1~22.04                   amd64        GCC support library (x32)
-ii  libx32gomp1                 12.1.0-2ubuntu1~22.04                   amd64        GCC OpenMP (GOMP) support library (x32)
+ii  libx32gomp1                 12.3.0-1ubuntu1~22.04                   amd64        GCC OpenMP (GOMP) support library (x32)
-ii  libx32itm1                  12.1.0-2ubuntu1~22.04                   amd64        GNU Transactional Memory Library (x32)
+ii  libx32itm1                  12.3.0-1ubuntu1~22.04                   amd64        GNU Transactional Memory Library (x32)
-ii  libx32quadmath0             12.1.0-2ubuntu1~22.04                   amd64        GCC Quad-Precision Math Library (x32)
+ii  libx32quadmath0             12.3.0-1ubuntu1~22.04                   amd64        GCC Quad-Precision Math Library (x32)
-ii  libx32stdc++-11-dev         11.3.0-1ubuntu1~22.04.1                 amd64        GNU Standard C++ Library v3 (development files)
+ii  libx32stdc++-11-dev         11.4.0-1ubuntu1~22.04                   amd64        GNU Standard C++ Library v3 (development files)
-ii  libx32stdc++6               12.1.0-2ubuntu1~22.04                   amd64        GNU Standard C++ Library v3 (x32)
+ii  libx32stdc++6               12.3.0-1ubuntu1~22.04                   amd64        GNU Standard C++ Library v3 (x32)
-ii  libx32ubsan1                12.1.0-2ubuntu1~22.04                   amd64        UBSan -- undefined behaviour sanitizer (x32)
+ii  libx32ubsan1                12.3.0-1ubuntu1~22.04                   amd64        UBSan -- undefined behaviour sanitizer (x32)
 ii  libxau6:amd64               1:1.0.9-1build5                         amd64        X11 authorisation library
 ii  libxcb1:amd64               1.14-3ubuntu3                           amd64        X C Binding
 ii  libxdmcp6:amd64             1:1.1.3-0ubuntu5                        amd64        X11 Display Manager Control Protocol library
-ii  libxml2:amd64               2.9.13+dfsg-1ubuntu0.3                  amd64        GNOME XML library
+ii  libxml2:amd64               2.9.13+dfsg-1ubuntu0.4                  amd64        GNOME XML library
 ii  libxxhash0:amd64            0.8.1-1                                 amd64        shared library for xxhash
 ii  libyaml-0-2:amd64           0.2.2-1build2                           amd64        Fast YAML 1.1 parser and emitter library
 ii  libzstd-dev:amd64           1.4.8+dfsg-3build1                      amd64        fast lossless compression algorithm -- development files
 ii  libzstd1:amd64              1.4.8+dfsg-3build1                      amd64        fast lossless compression algorithm
-ii  linux-libc-dev:amd64        5.15.0-76.83                            amd64        Linux Kernel Headers for development
+ii  linux-libc-dev:amd64        5.15.0-100.110                          amd64        Linux Kernel Headers for development
-ii  login                       1:4.8.1-2ubuntu2.1                      amd64        system login tools
+ii  login                       1:4.8.1-2ubuntu2.2                      amd64        system login tools
 ii  logsave                     1.46.5-2ubuntu1.1                       amd64        save the output of a command in a log file
 ii  lsb-base                    11.1.0ubuntu4                           all          Linux Standard Base init script functionality
 ii  lsb-release                 11.1.0ubuntu4                           all          Linux Standard Base version reporting utility
@@ -272,24 +272,28 @@ ii  ncurses-base                6.3-2ubuntu0.1                          all
 ii  ncurses-bin                 6.3-2ubuntu0.1                          amd64        terminal-related programs and man pages
 ii  ncurses-term                6.3-2ubuntu0.1                          all          additional terminal type definitions
 ii  ninja-build                 1.10.1-1                                amd64        small build system closest in spirit to Make
-ii  openssl                     3.0.2-0ubuntu1.10                       amd64        Secure Sockets Layer toolkit - cryptographic utility
+ii  openssl                     3.0.2-0ubuntu1.15                       amd64        Secure Sockets Layer toolkit - cryptographic utility
 ii  p7zip                       16.02+dfsg-8                            amd64        7zr file archiver with high compression ratio
 ii  parallel                    20210822+ds-2                           all          build and execute command lines from standard input in parallel
-ii  passwd                      1:4.8.1-2ubuntu2.1                      amd64        change and administer password and group data
+ii  passwd                      1:4.8.1-2ubuntu2.2                      amd64        change and administer password and group data
 ii  patch                       2.7.6-7build2                           amd64        Apply a diff file to an original
 ii  patchelf                    0.14.3-1                                amd64        modify properties of ELF executables
+ii  patchutils                  0.4.2-1build2                           amd64        Utilities to work with patches
 ii  pax-utils                   1.2.9-1                                 amd64        Security-focused ELF files checking tool
 ii  paxctl                      0.9-1build1                             amd64        new PaX control program for using the PT_PAX_FLAGS marking
-ii  perl                        5.34.0-3ubuntu1.2                       amd64        Larry Wall's Practical Extraction and Report Language
+ii  perl                        5.34.0-3ubuntu1.3                       amd64        Larry Wall's Practical Extraction and Report Language
-ii  perl-base                   5.34.0-3ubuntu1.2                       amd64        minimal Perl system
+ii  perl-base                   5.34.0-3ubuntu1.3                       amd64        minimal Perl system
-ii  perl-modules-5.34           5.34.0-3ubuntu1.2                       all          Core Perl modules
+ii  perl-modules-5.34           5.34.0-3ubuntu1.3                       all          Core Perl modules
-ii  procps                      2:3.3.17-6ubuntu2                       amd64        /proc file system utilities
+ii  procps                      2:3.3.17-6ubuntu2.1                     amd64        /proc file system utilities
 ii  python2-minimal             2.7.18-3                                amd64        minimal subset of the Python2 language
-ii  python2.7-minimal           2.7.18-13ubuntu1.1                      amd64        Minimal subset of the Python language (version 2.7)
+ii  python2.7-minimal           2.7.18-13ubuntu1.2                      amd64        Minimal subset of the Python language (version 2.7)
 ii  python3                     3.10.6-1~22.04                          amd64        interactive high-level object-oriented language (default python3 version)
 ii  python3-minimal             3.10.6-1~22.04                          amd64        minimal subset of the Python language (default python3 version)
-ii  python3.10                  3.10.6-1~22.04.2ubuntu1.1               amd64        Interactive high-level object-oriented language (version 3.10)
+ii  python3-pyasn1              0.4.8-1                                 all          ASN.1 library for Python (Python 3 module)
-ii  python3.10-minimal          3.10.6-1~22.04.2ubuntu1.1               amd64        Minimal subset of the Python language (version 3.10)
+ii  python3-pycryptodome        3.11.0+dfsg1-3ubuntu0.1                 amd64        cryptographic Python library (Python 3)
+ii  python3-zstd                1.5.0.2-1build1                         amd64        python bindings to Yann Collet ZSTD compression library
+ii  python3.10                  3.10.12-1~22.04.3                       amd64        Interactive high-level object-oriented language (version 3.10)
+ii  python3.10-minimal          3.10.12-1~22.04.3                       amd64        Minimal subset of the Python language (version 3.10)
 ii  re2c                        3.0-1                                   amd64        lexer generator for C, C++, Go and Rust
 ii  readline-common             8.1.2-1                                 all          GNU readline and history libraries, common files
 ii  ripgrep                     13.0.0-2ubuntu0.1                       amd64        Recursively searches directories for a regex pattern
@@ -300,19 +304,19 @@ ii  sed                         4.8-1ubuntu2                            amd64
 ii  sensible-utils              0.0.17                                  all          Utilities for sensible alternative selection
 ii  sysstat                     12.5.2-2ubuntu0.2                       amd64        system performance tools for Linux
 ii  sysvinit-utils              3.01-1ubuntu1                           amd64        System-V-like utilities
-ii  tar                         1.34+dfsg-1ubuntu0.1.22.04.1            amd64        GNU version of the tar archiving utility
+ii  tar                         1.34+dfsg-1ubuntu0.1.22.04.2            amd64        GNU version of the tar archiving utility
 ii  time                        1.9-0.1build2                           amd64        GNU time program for measuring CPU resource usage
 ii  ubuntu-keyring              2021.03.26                              all          GnuPG keys of the Ubuntu archive
 ii  ucf                         3.0043                                  all          Update Configuration File(s): preserve user changes to config files
 ii  universal-ctags             5.9.20210829.0-1                        amd64        build tag file indexes of source code definitions
-ii  unzip                       6.0-26ubuntu3.1                         amd64        De-archiver for .zip files
+ii  unzip                       6.0-26ubuntu3.2                         amd64        De-archiver for .zip files
 ii  usrmerge                    25ubuntu2                               all          Convert the system to the merged /usr directories scheme
 ii  util-linux                  2.37.2-4ubuntu3                         amd64        miscellaneous system utilities
-ii  vim                         2:8.2.3995-1ubuntu2.9                   amd64        Vi IMproved - enhanced vi editor
+ii  vim                         2:8.2.3995-1ubuntu2.15                  amd64        Vi IMproved - enhanced vi editor
-ii  vim-common                  2:8.2.3995-1ubuntu2.9                   all          Vi IMproved - Common files
+ii  vim-common                  2:8.2.3995-1ubuntu2.15                  all          Vi IMproved - Common files
-ii  vim-runtime                 2:8.2.3995-1ubuntu2.9                   all          Vi IMproved - Runtime files
+ii  vim-runtime                 2:8.2.3995-1ubuntu2.15                  all          Vi IMproved - Runtime files
 ii  wget                        1.21.2-2ubuntu1                         amd64        retrieves files from the web
-ii  xxd                         2:8.2.3995-1ubuntu2.9                   amd64        tool to make (or reverse) a hex dump
+ii  xxd                         2:8.2.3995-1ubuntu2.15                  amd64        tool to make (or reverse) a hex dump
 ii  xz-utils                    5.2.5-2ubuntu1                          amd64        XZ-format compression utilities
 ii  yash                        2.51-1                                  amd64        yet another shell
 ii  zip                         3.0-12build2                            amd64        Archiver for .zip files
@@ -327,74 +331,75 @@ ii  zstd                        1.4.8+dfsg-3build1                      amd64
 ||/ Name                        Version                                 Architecture Description
 
 Packages sorted by Installed-Size:
-   748809 ===== TOTAL (321 packages)
+   754392 ===== TOTAL (325 packages)
-    52577 gcc-11                                   amd64
+    52747 gcc-11                                   amd64
     34444 libicu70                                 amd64
-    32780 vim-runtime                              all
+    32783 vim-runtime                              all
-    28795 g++-11                                   amd64
+    28891 g++-11                                   amd64
-    28441 libperl5.34                              amd64
+    28445 libperl5.34                              amd64
-    26212 cpp-11                                   amd64
+    26284 cpp-11                                   amd64
     20742 cmake                                    amd64
-    18721 libstdc++-11-dev                         amd64
+    18759 libstdc++-11-dev                         amd64
     18468 git                                      amd64
     17671 perl-modules-5.34                        all
     15293 zsh-common                               all
-    13894 libgcc-11-dev                            amd64
+    13895 libgcc-11-dev                            amd64
-    13592 libc6                                    amd64
+    13597 libc6                                    amd64
-    13037 libc6-dev                                amd64
+    13038 libc6-dev                                amd64
-    12561 libc6-x32                                amd64
+    12562 libc6-x32                                amd64
-    12479 libc6                                    i386
+    12480 libc6                                    i386
-    12200 libc6-i386                               amd64
+    12201 libc6-i386                               amd64
     11311 gdb                                      amd64
-    10876 lib32stdc++-11-dev                       amd64
+    10877 lib32stdc++-11-dev                       amd64
-    10439 binutils-x86-64-linux-gnu                amd64
+    10431 binutils-x86-64-linux-gnu                amd64
-    10391 libx32stdc++-11-dev                      amd64
+    10390 libx32stdc++-11-dev                      amd64
      9866 cmake-data                               all
-     8248 libc6-dev-x32                            amd64
+     8250 libc6-dev-x32                            amd64
-     8040 libpython3.10-stdlib                     amd64
+     8119 libpython3.10-stdlib                     amd64
-     7947 lib32gcc-11-dev                          amd64
+     7948 lib32gcc-11-dev                          amd64
-     7730 perl-base                                amd64
+     7734 perl-base                                amd64
      7518 libasan6                                 amd64
-     7261 libc6-dev-i386                           amd64
+     7263 libc6-dev-i386                           amd64
      7255 libtsan0                                 amd64
-     7127 libmagic-mgc                             amd64
+     7128 libmagic-mgc                             amd64
-     7112 coreutils                                amd64
+     7104 coreutils                                amd64
      6988 libx32gcc-11-dev                         amd64
-     6734 linux-libc-dev                           amd64
+     6858 linux-libc-dev                           amd64
      6733 dpkg                                     amd64
-     6659 lib32asan6                               amd64
+     6667 lib32asan6                               amd64
      6570 libx32asan6                              amd64
-     5902 python3.10-minimal                       amd64
+     5898 python3.10-minimal                       amd64
-     5824 libssl3                                  amd64
+     5833 libssl3                                  amd64
-     5780 libpython3.10                            amd64
+     5768 libpython3.10                            amd64
-     5093 libpython3.10-minimal                    amd64
+     5106 libpython3.10-minimal                    amd64
      4249 ncurses-term                             all
-     4156 apt                                      amd64
      4147 ripgrep                                  amd64
+     4141 apt                                      amd64
      4082 libglib2.0-0                             amd64
-     3923 vim                                      amd64
+     3931 vim                                      amd64
-     3643 python2.7-minimal                        amd64
+     3639 python2.7-minimal                        amd64
+     3552 python3-pycryptodome                     amd64
      3506 re2c                                     amd64
      3487 gojq                                     amd64
      3405 libmpfr6                                 amd64
      3399 util-linux                               amd64
      3347 libaria2-0                               amd64
-     3181 libapt-pkg6.0                            amd64
+     3198 libapt-pkg6.0                            amd64
      3013 libboost-regex1.74.0                     amd64
      2961 liblsan0                                 amd64
      2943 parallel                                 all
      2801 elfutils                                 amd64
      2784 libpython2.7-minimal                     amd64
      2776 libbinutils                              amd64
-     2746 libstdc++6                               amd64
+     2755 libstdc++6                               amd64
-     2675 libubsan1                                amd64
+     2676 libubsan1                                amd64
      2662 lib32stdc++6                             amd64
-     2537 libc-bin                                 amd64
+     2538 libc-bin                                 amd64
      2518 libx32ubsan1                             amd64
      2510 fd-find                                  amd64
-     2500 lib32ubsan1                              amd64
+     2499 lib32ubsan1                              amd64
      2468 zsh                                      amd64
-     2438 libx32stdc++6                            amd64
+     2450 libx32stdc++6                            amd64
      2428 fzf                                      amd64
      2396 7zip                                     amd64
      2325 passwd                                   amd64
@@ -404,7 +409,7 @@ Packages sorted by Installed-Size:
      2097 libxml2                                  amd64
      2053 openssl                                  amd64
      2009 universal-ctags                          amd64
-     1959 git-man                                  all
+     1958 git-man                                  all
      1864 bash                                     amd64
      1854 aria2                                    amd64
      1750 libdb5.3                                 amd64
@@ -417,10 +422,10 @@ Packages sorted by Installed-Size:
      1472 sysstat                                  amd64
      1464 bash-completion                          all
      1445 hyperfine                                amd64
+     1430 libx11-data                              all
      1429 yash                                     amd64
-     1429 libx11-data                              all
      1388 procps                                   amd64
-     1386 libx11-6                                 amd64
+     1387 libx11-6                                 amd64
      1354 libgcrypt20                              amd64
      1343 ccache                                   amd64
      1328 libzstd-dev                              amd64
@@ -428,7 +433,7 @@ Packages sorted by Installed-Size:
      1138 libpam-modules                           amd64
      1052 libkrb5-3                                amd64
      1005 screen                                   amd64
-      995 libsystemd0                              amd64
+      996 libsystemd0                              amd64
       990 p7zip                                    amd64
       984 wget                                     amd64
       960 tar                                      amd64
@@ -440,6 +445,7 @@ Packages sorted by Installed-Size:
       787 libcurl4                                 amd64
       784 libbrotli1                               amd64
       771 libcurl3-gnutls                          amd64
+      743 python3-zstd                             amd64
       735 libsepol2                                amd64
       729 libdw1                                   amd64
       720 libtirpc-dev                             amd64
@@ -447,8 +453,8 @@ Packages sorted by Installed-Size:
       686 lib32quadmath0                           amd64
       683 libpcre3                                 amd64
       646 ncurses-bin                              amd64
+      633 python3.10                               amd64
       621 libpcre2-8-0                             amd64
-      620 python3.10                               amd64
       620 findutils                                amd64
       615 libonig5                                 amd64
       610 libsource-highlight4v5                   amd64
@@ -475,16 +481,17 @@ Packages sorted by Installed-Size:
       402 libsodium23                              amd64
       394 base-files                               amd64
       393 ncurses-base                             all
+      390 python3-pyasn1                           all
       390 ca-certificates                          all
       389 mount                                    amd64
+      382 vim-common                               all
       382 libmount1                                amd64
-      379 vim-common                               all
+      377 unzip                                    amd64
-      376 unzip                                    amd64
       372 xz-utils                                 amd64
       368 libssh2-1                                amd64
       356 libnettle8                               amd64
       350 ninja-build                              amd64
-      347 libudev1                                 amd64
+      348 libudev1                                 amd64
       347 libnsl-dev                               amd64
       347 libjq1                                   amd64
       336 libhogweed6                              amd64
@@ -500,22 +507,22 @@ Packages sorted by Installed-Size:
       320 libgomp1                                 amd64
       320 libcrypt-dev                             amd64
       318 libncurses5                              amd64
+      313 libctf-nobfd0                            amd64
       312 libpam-runtime                           all
-      312 libctf-nobfd0                            amd64
       307 libsource-highlight-common               all
       306 libx32gomp1                              amd64
       300 libsemanage2                             amd64
-      298 libc-dev-bin                             amd64
+      299 libc-dev-bin                             amd64
       296 libquadmath0                             amd64
+      295 libx32quadmath0                          amd64
       292 libk5crypto3                             amd64
-      291 libx32quadmath0                          amd64
       290 pax-utils                                amd64
       290 liblzma5                                 amd64
-      277 xxd                                      amd64
+      280 xxd                                      amd64
-      271 gcc-11-base                              amd64
+      273 gcc-11-base                              amd64
-      266 gcc-12-base                              i386
+      272 gcc-12-base                              i386
-      266 gcc-12-base                              amd64
+      272 gcc-12-base                              amd64
-      252 libuv1                                   amd64
+      253 libuv1                                   amd64
       252 libipc-run-perl                          all
       252 libcrypt1                                i386
       250 libmpdec3                                amd64
@@ -532,10 +539,11 @@ Packages sorted by Installed-Size:
       230 lz4                                      amd64
       229 patch                                    amd64
       229 mawk                                     amd64
-      228 libmagic1                                amd64
+      229 libmagic1                                amd64
       225 libcrypt1                                amd64
       221 bfs                                      amd64
       220 libidn2-0                                amd64
+      219 patchutils                               amd64
       219 libtirpc3                                amd64
       219 librhash0                                amd64
       214 dash                                     amd64
@@ -581,8 +589,8 @@ Packages sorted by Installed-Size:
       114 bzip2                                    amd64
       113 libss2                                   amd64
       113 lib32itm1                                amd64
+      113 binutils                                 amd64
       112 libc-ares2                               amd64
-      112 binutils                                 amd64
       110 libio-pty-perl                           amd64
       105 python2-minimal                          amd64
       105 libx32itm1                               amd64
@@ -600,8 +608,8 @@ Packages sorted by Installed-Size:
        92 libhiredis0.14                           amd64
        91 libjansson4                              amd64
        90 python3                                  amd64
+       84 file                                     amd64
        83 sysvinit-utils                           amd64
-       83 file                                     amd64
        82 cabextract                               amd64
        80 readline-common                          all
        79 libdebconfclient0                        amd64

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/run_cmake_config.sh

@@ -0,0 +1,41 @@
+#! /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=()
+
+__add_cmake_config() {
+    [[ -z "${!1}" ]] || cmake_config_flags+=( -D$1="${!1}" )
+}
+
+# pass common CMake settings from environment to cmake
+for v in CMAKE_VERBOSE_MAKEFILE; do
+    __add_cmake_config $v
+done
+# pass common CMake toolchain settings from environment to cmake
+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 from environment to cmake (for use with "-flto")
+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 from environment to cmake
+for v in CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PROCESSOR CMAKE_CROSSCOMPILING_EMULATOR; do
+    __add_cmake_config $v
+done
+# pass UPX config options from environment to cmake; see CMakeLists.txt
+for v in UPX_CONFIG_DISABLE_GITREV UPX_CONFIG_DISABLE_SANITIZE UPX_CONFIG_DISABLE_WSTRICT UPX_CONFIG_DISABLE_WERROR UPX_CONFIG_DISABLE_SELF_PACK_TEST; do
+    __add_cmake_config $v
+done
+# pass UPX extra compile options from environment to cmake; 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,80 @@
+#! /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
+#
+# 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
+upx_run=()
+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 upx_run <<< "$upx_exe_runner" # split at spaces into array
+elif [[ -n $CMAKE_CROSSCOMPILING_EMULATOR ]]; then
+    IFS=';' read -r -a upx_run <<< "$CMAKE_CROSSCOMPILING_EMULATOR" # split at semicolons into array
+fi
+upx_runner=( "${upx_run[@]}" )
+upx_run+=( "$upx_exe" )
+echo "upx_run='${upx_run[*]}'"
+
+# upx_run sanity check
+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
+
+#***********************************************************************
+# see CMakeLists.txt
+#***********************************************************************
+
+export UPX="--no-color --no-progress"
+
+"${upx_run[@]}" --version
+"${upx_run[@]}" --help
+"${upx_run[@]}" --sysinfo -v
+
+case "$UPX_CONFIG_DISABLE_SELF_PACK_TEST" in
+"" | "0" | "FALSE" | "OFF") ;;
+*) echo "Self-pack test disabled. All done."; exit 0 ;;
+esac
+
+exe=".out"
+upx_self_exe=$upx_exe
+fo="--force-overwrite"
+
+"${upx_run[@]}" -3         "${upx_self_exe}" ${fo} -o upx-packed${exe}
+"${upx_run[@]}" -3 --nrv2b "${upx_self_exe}" ${fo} -o upx-packed-n2b${exe}
+"${upx_run[@]}" -3 --nrv2d "${upx_self_exe}" ${fo} -o upx-packed-n2d${exe}
+"${upx_run[@]}" -3 --nrv2e "${upx_self_exe}" ${fo} -o upx-packed-n2e${exe}
+"${upx_run[@]}" -1 --lzma  "${upx_self_exe}" ${fo} -o upx-packed-lzma${exe}
+
+"${upx_run[@]}" -l         upx-packed${exe} upx-packed-n2b${exe} upx-packed-n2d${exe} upx-packed-n2e${exe} upx-packed-lzma${exe}
+"${upx_run[@]}" --fileinfo upx-packed${exe} upx-packed-n2b${exe} upx-packed-n2d${exe} upx-packed-n2e${exe} upx-packed-lzma${exe}
+"${upx_run[@]}" -t         upx-packed${exe} upx-packed-n2b${exe} upx-packed-n2d${exe} upx-packed-n2e${exe} upx-packed-lzma${exe}
+"${upx_run[@]}" -d upx-packed${exe} ${fo} -o upx-unpacked${exe}
+
+set -x
+"${upx_runner[@]}" ./upx-unpacked${exe} --version-short
+"${upx_runner[@]}" ./upx-packed${exe} --version-short
+
+echo "All done."

misc/testsuite/test_symlinks.sh

@@ -0,0 +1,401 @@
+#! /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")
+#
+
+# IMPORTANT NOTE: do NOT run as user root!!
+# IMPORTANT NOTE: this script only works on Unix!!
+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
+upx_run=()
+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 upx_run <<< "$upx_exe_runner" # split at spaces into array
+elif [[ -n $CMAKE_CROSSCOMPILING_EMULATOR ]]; then
+    IFS=';' read -r -a upx_run <<< "$CMAKE_CROSSCOMPILING_EMULATOR" # split at semicolons into array
+fi
+upx_run+=( "$upx_exe" )
+echo "upx_run='${upx_run[*]}'"
+
+# upx_run sanity check
+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
+
+#***********************************************************************
+# util
+#***********************************************************************
+
+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
+}
+
+#***********************************************************************
+#
+#***********************************************************************
+
+#set -x # debug
+
+export UPX="--prefer-ucl --no-color --no-progress"
+export UPX_DEBUG_DISABLE_GITREV_WARNING=1
+export UPX_DEBUG_DOCTEST_VERBOSE=0
+export NO_COLOR=1
+
+testsuite_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 ..
+}
+
+# create a tmpdir in current directory
+tmpdir="$(mktemp -d tmp-upx-test-XXXXXX)"
+cd "./$tmpdir" || exit 1
+
+if [[ -f /bin/ls ]]; then
+    test_file="$(readlink -fn /bin/ls)"
+else
+    test_file="$(readlink -fn /usr/bin/env)"
+fi
+
+testsuite_header "default"
+flags="-qq -1 --no-filter"
+mkdir default
+cd default
+create_files
+enter_dir z_dir_1
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              && failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      && failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link && failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${upx_run[@]}" $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
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              && failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      && failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link && failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${upx_run[@]}" $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
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              && failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      && failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link && failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${upx_run[@]}" $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
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              && failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      && failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link && failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${upx_run[@]}" $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 ..
+
+testsuite_header "force-overwrite"
+flags="-qq -1 --no-filter --force-overwrite"
+mkdir force-overwrite
+cd force-overwrite
+create_files
+enter_dir z_dir_1
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              || failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       || failed 17
+"${upx_run[@]}" $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
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              || failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       || failed 17
+"${upx_run[@]}" $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
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              || failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${upx_run[@]}" $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
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              || failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${upx_run[@]}" $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 ..
+
+if [[ 1 == 1 ]]; then
+testsuite_header "link"
+flags="-qq -1 --no-filter --link"
+mkdir link
+cd link
+create_files
+enter_dir z_dir_1
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              || failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       || failed 17
+"${upx_run[@]}" $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
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          || failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              && failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       || failed 17
+"${upx_run[@]}" $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
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              || failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       || failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${upx_run[@]}" $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
+"${upx_run[@]}" $flags                 z_symlink_file      && failed 10
+"${upx_run[@]}" $flags "$test_file" -o z_file_new          && failed 11
+"${upx_run[@]}" $flags "$test_file" -o z_dir               && failed 12
+"${upx_run[@]}" $flags "$test_file" -o z_file              && failed 13
+"${upx_run[@]}" $flags "$test_file" -o z_file_link_1       && failed 14
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file      || failed 15
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_file_link || failed 16
+"${upx_run[@]}" $flags "$test_file" -o z_symlink_dir       && failed 17
+"${upx_run[@]}" $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 ..
+fi
+
+# 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
+afd8b4ec4379b013887e2dbb9cb07ed8e19942c6c5b72bd42fa20d2d43e35d52 *amd64-linux.elf/upx-3.91
-d36bff9e6f49c93e4c37ab50e109bd6378128017555f8f819080f02235d48d7e *amd64-linux.elf/upx-3.95
+320f5819d96f575ea4abad04c5a1bac53274a5d4704ff530ee778acfa261376c *amd64-linux.elf/upx-3.95
-9c312f13ddd40a62fed7ee9f6a21fff15cae7517d4ddf55f493101b22d8e43f1 *amd64-win64.pe/upx-3.95.exe
+a8804bce00be8e2f9d3874c8fc884e69c19efc2f0fd07272e7d0749efd36f381 *amd64-win64.pe/upx-3.95.exe
-b138d38c3955697ee0302332c031c996bacacf5e17eea8fce3282c4ea88f7299 *arm-linux.elf/upx-3.95
+80ff4e72220302cdccbdce753981d9a36596941ffcd9231317c5cb53f988ac72 *arm-linux.elf/upx-3.95
-e0436401972603f7fad6c693e96c89c37370113e75b8bdb4d4ecd14dda4cd8fe *arm-wince.pe/upx-3.91.exe
+4e3db49fb086c4293b8a5809c166546d3a33f731b6ef5565cc0566d491f91cf2 *arm-wince.pe/upx-3.91.exe
-22107e27f63c5509f5d1c1312cb8ea1e116811695ee7f4deb765f0aa53b25a51 *arm64-linux.elf/upx-3.95
+71a27b41a763fab594ed953f3bf543489554b509bce488e7c5533e312c953e30 *arm64-linux.elf/upx-3.95
-beae687a0575a65cec981e7cc63fd562d212d7ed64befe5dde2f0b7f92e4838e *armeb-linux.elf/upx-3.91
+8a84b2161d83358c824de200ed480e9cb9cb7557138d710808ec44a19165c898 *armeb-linux.elf/upx-3.91
-55391ffd6bccd2be4e423466d327b9f345371f9941dbb30c003e677b984e8a5e *armeb-linux.elf/upx-3.95
+09b92d07b30b16321301aa2faf46576da2587c1334e7a842742fed36aadef5fa *armeb-linux.elf/upx-3.95
-a467edf8758a5b3e219bc193a9d143cb880f7d1a94771367cda7117129b34cfc *i386-dos32.djgpp2.coff/upx-3.91.exe
+a418a4df498f55e86a7f2788c6e0fe0324d60a9032d4841569c7e4e2694410df *i386-dos32.djgpp2.coff/upx-3.91.exe
-934593ba98f2dfff94197885894e7e56ff452da02a234e70734e2445b27ae8aa *i386-dos32.djgpp2.coff/upx-3.95.exe
+0aecdd97242054dcd390317e97a539a2e35f53a28a71d0148b703141d21345b0 *i386-dos32.djgpp2.coff/upx-3.95.exe
-f26697e9a9fceca98b10c1ab6a834fa6b2bd2826a2285deaafe8cd1c754a2f61 *i386-linux.elf/upx-3.91
+09a748c65d2a26975a5c829dd3d9f36e96607b1d9728d64068731815d8b82c36 *i386-linux.elf/upx-3.91
-f23467fde1af895827e7ad7c46c372802820143620fef2abe657aa8b6e7bdb26 *i386-linux.elf/upx-3.95
+5189d860ddc1edc7e9b524aa09bd9677548d83efb788627cdbac27941f509262 *i386-linux.elf/upx-3.95
-9dd14ff1328b0d501aca10d36623b2b76c754e9677cc0bdd0c5ded740796cecf *i386-win32.pe/upx-3.91.exe
+0b51fd861dd2b574bfed6ab3998b01333ae173fd76b7fd0d30187e75b09ab316 *i386-win32.pe/upx-3.91.exe
-5320b28b44ae1a50ea435ccabf7fe94c8031be7375c425ed618cb1f9a649442f *i386-win32.pe/upx-3.95.exe
+05568f9b47da0c8949080f66437f7a8d08c3c11f3ee5fb9e5d20a1324f2ab829 *i386-win32.pe/upx-3.95.exe
-d30bf134c5231317ae2182059034842f58d906b9dc49546bbb552f4e0411085f *m68k-atari.tos/upx-3.91.ttp
+f6fb2f10a4f2b2d327c9868bb06241c3143771b0371ca564b8dfaeb180026298 *m68k-atari.tos/upx-3.91.ttp
-9d0fca1d248d11ec8e96801dae3978c959a26e372e05836c15b56cfc0b4aa077 *mips-linux.elf/upx-3.95
+196fb37ba72d7b0e081386a8110cf193678934ae1a0f16cd9d071b18c034a3f2 *mips-linux.elf/upx-3.95
-d68a073cb1c222515502a3a0e8f91f424cb8cedb0d849d247531c2955fa5399a *mipsel-linux.elf/upx-3.91
+e528a2c33b2ab882c6e18fab4662d612ffc71c0261c367fa9c0282b23ad53b3c *mipsel-linux.elf/upx-3.91
-48919a0e564866d59ae1efae06269cea2cf7ebb5e3fda4a9ce70f9f1092a7e59 *mipsel-linux.elf/upx-3.95
+4b44c1b60f8eea0f40bcd2cdbc1e7217afee6d1cb054856e2791339aa7c31a78 *mipsel-linux.elf/upx-3.95
-93f04183b21f077d6423c23efee62f0c920cd63463b0932ac6200e966e423763 *powerpc-linux.elf/upx-3.91
+ae73bba4db8413a7a287b2a61dc9829ee3a66f9d93940ad7f08aa93b09770f4f *powerpc-linux.elf/upx-3.91
-9ef05193c11073f477606ff2c8654f11c370951ff5a7902ba0cab31598751029 *powerpc-linux.elf/upx-3.95
+c7a8bba27dbd09c8f73ae2cd11d893187b15b298dd7d857cbd2c676670ff0a80 *powerpc-linux.elf/upx-3.95
-1c04d45914809449337f22c93bf645703c6c6aa499e789ff9d2dd787be257e96 *powerpc64le-linux.elf/upx-3.95
+6075bc28ac64f865d0e93cb16629c02331fb4abbea8da931288a60a6350cf635 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t120_compress_ucl_nrv2d_3_no_filter="\
-89369823c5f2316f00f4a8af2e810a94050e28254669a2a2547a73b166178db2 *amd64-linux.elf/upx-3.91
+f23ea1c7cea84e5edf136b2b3a0a8740e9d6bf3552ef1f460aa4508c2f27df6d *amd64-linux.elf/upx-3.91
-a267b53b2de081c414ef82351a5e88431cafdd86f8202e48929d637bf6af9192 *amd64-linux.elf/upx-3.95
+e725f00542f605851cfe03aee2042fbccf04e0a01bbf5a4aaecd04ad59c80077 *amd64-linux.elf/upx-3.95
-1f40d3e26e266b7c305e01a0e480f936746d1c54df32826f5f6f16fbbe58f20b *amd64-win64.pe/upx-3.95.exe
+57af8f45cef9e5c9f63387a15b8cf1b96426ab8dc73c303bd4caaa95b093bf92 *amd64-win64.pe/upx-3.95.exe
-3d1ac6e85dfa79f8aa36d2d73073181c5cf7dd6c3e83da3b9248fa990c535d2a *arm-linux.elf/upx-3.95
+a01ad023431e05287be77f160ea1a491489416e34de0d5ce194665e99f12e483 *arm-linux.elf/upx-3.95
-856d307362db229387d3d33ad8478a8cba45c71d67d5bbf2d9794154a755722f *arm-wince.pe/upx-3.91.exe
+a711a73bfd20ccc012507c3f07ed98ee025f55e441156efb5fdbaa1815640c63 *arm-wince.pe/upx-3.91.exe
-2fdec54995bf5367991ef64a7582a3a0e3724a71d89e77fdbe8c5bb67071d65e *arm64-linux.elf/upx-3.95
+4a341330a44845a10521d5acaa91eda3b7602367b1c77f6a5cf0731b528e478f *arm64-linux.elf/upx-3.95
-ddde64e009beff80e2e185b03dbe1b966ffa4c5db18fcd80c409b52233d4bb81 *armeb-linux.elf/upx-3.91
+d4a8653134f16f91b8fcdb0ed0d71ae3a31199af2ec42bf5dbe97e3344eceb74 *armeb-linux.elf/upx-3.91
-08aece1b25973a84bedb155c2976ca08e4ce1334e21659e5583f17a0e9e3bc3c *armeb-linux.elf/upx-3.95
+a7da82c93f93a842a2876a54bba85cbb380eb7c79fc123ff30f31d99be3eca5c *armeb-linux.elf/upx-3.95
-ee07e1e15ff7a467f9ad262daa12886211f107886cae154795651d3cdba6fba3 *i386-dos32.djgpp2.coff/upx-3.91.exe
+f1caf28b7500b14ca1405b31b8e18a226bf682c619982ea2712b5631cc61d0d8 *i386-dos32.djgpp2.coff/upx-3.91.exe
-f73ac819d5f7f81b7cf62198381a51273df6a697d5429a144f42fabef0bcc327 *i386-dos32.djgpp2.coff/upx-3.95.exe
+2c5ab68a6a23d460fab8def92a4cd32a54f084811584c1472c07dbe9429a503a *i386-dos32.djgpp2.coff/upx-3.95.exe
-3b9e78245b5fa3108d2e69c22764e8204d24089f6661790edbdb88a508923191 *i386-linux.elf/upx-3.91
+8f227074f8bc7682fd8e71bf96c60cb42fba7d3038acb8e500c6b075df50b732 *i386-linux.elf/upx-3.91
-6a9aa8025e9389cbbe81a04926d12e120fd57b9909de4ee934e878a04fcf6169 *i386-linux.elf/upx-3.95
+3df0f160a7d58a1f1368450c9db2d6911818e00b11ab819edbc56afeb84e3fb8 *i386-linux.elf/upx-3.95
-7a667cc2b566ae2f8836cc3c21d55e45bf35d61beca22ec2a806d6bcbfa1f082 *i386-win32.pe/upx-3.91.exe
+31aaff6332ea65bb4c386de0bb75553cae77becd9a587dcbb51e38719c8a3b7a *i386-win32.pe/upx-3.91.exe
-cdd58a31c4914bdde47f03d81b988ffc9aa2af482de775c88cae144b4ff04293 *i386-win32.pe/upx-3.95.exe
+221a2c5c07d6c0a0127b3ce27d924fc36ee4b5af52fc4f47bc172e60ef0b244a *i386-win32.pe/upx-3.95.exe
-02b969917d52c4bd07e49e4ad589db8a1e4fa27984eac2eede03bc1abf73c376 *m68k-atari.tos/upx-3.91.ttp
+9b280a1d2b82185339a4aea0c9338d9ae6c34d1a68da84a4a173d9010d092feb *m68k-atari.tos/upx-3.91.ttp
-722ac1505bdaed421b6cce390608661be7236d4108429853485b8354b3c59347 *mips-linux.elf/upx-3.95
+410335b935535fab6852d4b9677a24d016a9fb47d1b71d5a7967e99d1300ac15 *mips-linux.elf/upx-3.95
-7309ee902e2c41ae72cc111c185d34e355e3892566e826698780fe69845174ad *mipsel-linux.elf/upx-3.91
+52746060c4c7971a4e786ba618896eebe9592f1b443c0d217d4e2cdb8b34fa8d *mipsel-linux.elf/upx-3.91
-fec12c58da7886a1eaf4702b2b0c710e2b72c4179070b04691b963d1c503c73b *mipsel-linux.elf/upx-3.95
+7367c89786c15b2d8305f41980b84addfddff69f2dae0f0572a88ffee6abe884 *mipsel-linux.elf/upx-3.95
-13ad283bc0e4f37f9f06eddb8c384faa4a2e66e045496aa79dfde0ae59f14a95 *powerpc-linux.elf/upx-3.91
+4504c03dcc84be9f5ffc2279c4638c47a435a70c4748f1e25a738af33dc20720 *powerpc-linux.elf/upx-3.91
-812550c5b65c39e347648e6ab9d51b2466919205a8b0928ef941ab3160151471 *powerpc-linux.elf/upx-3.95
+ef410a9cbd01c7c046f888417cb451aad8ebe4288aeb98319f689a030517d181 *powerpc-linux.elf/upx-3.95
-0e651fdc257be7b3143ad06559a137be6c87f7b7ec721d1f727dc138465b219d *powerpc64le-linux.elf/upx-3.95
+da073cf9edf9d6efd0495d3f09101972541cdccd9df3c5a07df97e47ce1f77c3 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t130_compress_ucl_nrv2e_3_no_filter="\
-5ee77141a1fdf1af31f3f9be97e60446873e659e341993a3bbceacb655618aa5 *amd64-linux.elf/upx-3.91
+1777841250f6b34fe7b75e2931b5154918abea5e7c47047f523ab15ed59e0658 *amd64-linux.elf/upx-3.91
-b94c4603c372400a06c2ae7838ed9f41e6e9393d81e091a0ceed39c861e3443f *amd64-linux.elf/upx-3.95
+9fefd378d92d1e370c450dd8d3f826248594ca7234aa6fccc83d20aa37694cdd *amd64-linux.elf/upx-3.95
-c9230d017885d7727ca766cb7933d0681a93ef21856c39fbf807899b734172c0 *amd64-win64.pe/upx-3.95.exe
+b5a9eee9a774712899148a339cb8326e51a120355cb0dbb5a59f07ef4a149562 *amd64-win64.pe/upx-3.95.exe
-6ae717a2a7ebe99f6d1c3af8c83939f5efe2144670806c336640ad88c29a9d90 *arm-linux.elf/upx-3.95
+e56b71096f08c30448f560ccd60e5bffcb1f14d5b84948005d9d707600e50311 *arm-linux.elf/upx-3.95
-6dbd0442d9e45c82d113463eb592d117c6761fd073e942342516fb0339d935e7 *arm-wince.pe/upx-3.91.exe
+9e1c47059e892f73a4fa118a6b435d455613e4ff4b4ab3fb432dd45adcc06809 *arm-wince.pe/upx-3.91.exe
-6f12e95d71382a7960b9712c75a897974f29561d2a8e774b7e984c9fba380aea *arm64-linux.elf/upx-3.95
+615437bd5f987fae39502999fc1fd6a8857cdbffa4001cba1b485a8ddd0dbd14 *arm64-linux.elf/upx-3.95
-94dbeae5763e5c86d865e9c6e473aafdb200b1ed06bfd5981728e0fa5cc6dcc6 *armeb-linux.elf/upx-3.91
+37dec03e64c74da1e194fb129231c5e87fb3398f4a4f1d269de9bc2487068a6a *armeb-linux.elf/upx-3.91
-cab852c4a69042aca4337869edce3af5f5aab8bf562a626ab755da0a5517bd73 *armeb-linux.elf/upx-3.95
+e45e09fca25c28cbd458c636ac1d060bc08bab37a6571880b6f32a6e26ecaff8 *armeb-linux.elf/upx-3.95
-dc6d412f41101e334f9e09c52e63f513e2b0bd047064283c0f7389276dd6d28b *i386-dos32.djgpp2.coff/upx-3.91.exe
+b941187968c86db8a01f106098996f2c0cd227da66003856c19e8b24438f446a *i386-dos32.djgpp2.coff/upx-3.91.exe
-0ab8e2454b1f5bfed09a8d0c231f4c595c7445b09077387ebb9348292206be59 *i386-dos32.djgpp2.coff/upx-3.95.exe
+8194a6a0de66019d8aa7f49504ec7303f155a2dbcf29489300428fb1bb5d1b4a *i386-dos32.djgpp2.coff/upx-3.95.exe
-7b6efd3d82b503f4d0ea3a111e80b0a1b785a2766ddea9f4090a7de190f811be *i386-linux.elf/upx-3.91
+4380ef64efadd605bc0908ac2d56ee7597e665850d2291f40f5acd978f4ecbf8 *i386-linux.elf/upx-3.91
-c1ede9406344f8b0d5fb08777c31c62016e36f54f3ff69fc03ffbc09d5b40a0e *i386-linux.elf/upx-3.95
+f9bacd9bf3a1f84455f0c647f615827606fba5608996cbae65c07a06b7b9ef42 *i386-linux.elf/upx-3.95
-728c6dc0c02d9ea3f7a0c86595fd64423f5545651b3a7bbc9e708759d8eec157 *i386-win32.pe/upx-3.91.exe
+71b7880ee783da6182fa1dcc5cc8662eb15b82c2e96ea827f2dca3c83d4040c2 *i386-win32.pe/upx-3.91.exe
-8569f6942377259c5a92acfe5bf0b2874f6ef3af40177947a8055e7641a776ef *i386-win32.pe/upx-3.95.exe
+629624e02dfa11c295e22989a09d5938c415ab2d32b7b4fdb009d3cc50c63933 *i386-win32.pe/upx-3.95.exe
-c4753f47328d70823f85b5d378502556388ee0a9ea6bf100cd6c73651126b3fb *m68k-atari.tos/upx-3.91.ttp
+5215eb51b80d7d0f428da49c3249eb2b5e937f8b3487f2e59eb31e7f1b9155ee *m68k-atari.tos/upx-3.91.ttp
-a918b7825fd5bf50097a62177b4638abee5aeb864e06ce1624042cace8a9a922 *mips-linux.elf/upx-3.95
+e393bb54cb21d93d1b4ade1048204e4a9ed1bb0ca0517e54f42fddf8dc09a89d *mips-linux.elf/upx-3.95
-4b5cddac9a79b5e7aa99b7589d7e862bfbe026da44c2fed2a1f396883b072442 *mipsel-linux.elf/upx-3.91
+7fd4a440ffa128a455b6e4a7864f75953a16fb593b5dc1b890c1ed111e80b021 *mipsel-linux.elf/upx-3.91
-cc1be3f4d27d3ab5f6073f38c47ca72f4ba47121b14b7e60a4906a6d04af4e9c *mipsel-linux.elf/upx-3.95
+24357e6c79022919f181286d6ae5a8316078f30c01bbbb83169cd2794c7204ec *mipsel-linux.elf/upx-3.95
-cedc2def9464f839e9aab153dfe93dda0d37d0da43e8c600ef366f6adf17b64b *powerpc-linux.elf/upx-3.91
+e37070c89617e9d155507662ee98d9f97a7c506317fdbe22797769a5738e75c5 *powerpc-linux.elf/upx-3.91
-748a4a2481b73ff2881b6de39749f1672b8b8d7f1d66a6453374caf6d840777d *powerpc-linux.elf/upx-3.95
+e2af43ea9cdc9f2e75de4c9a03ace0fabac9dcbfb54ea1b57031f2c860318663 *powerpc-linux.elf/upx-3.95
-f07f45141bf199db4847fd11ff56f496790efc3b7cff248a93c4ca45ca76a71a *powerpc64le-linux.elf/upx-3.95
+d7cf1e60f962094ce5b28e3e920ed4ba0b8b84daee896043f915ab036ed774c7 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t140_compress_lzma_2_no_filter="\
-f553659c34a772cbdaf571d83d9c8173b75f1e2deecf7c590d38e34b46cab43b *amd64-linux.elf/upx-3.91
+0744ab571ee5d8ca76d0be11d474611771e417a99598b051f1d8a3a791a91533 *amd64-linux.elf/upx-3.91
-9464896ca0082d41cf7e51159e7cd58a637b0a9d7a9151930e81746f1f43898b *amd64-linux.elf/upx-3.95
+90660071ddb63165bf77f9175d3f9862d8626c085d932af2c2d66459a73cf409 *amd64-linux.elf/upx-3.95
-255ef236a7fe03865dd300ce447c57754aef05de537564f38715eef64285c6fa *amd64-win64.pe/upx-3.95.exe
+9781094badb6013e8fd29caad2d7f369e79f60d5a5f66b547c2260e98b1c7d92 *amd64-win64.pe/upx-3.95.exe
-88ae278afa54ac766f1940f3607c91d4915cdd492988dafac9be274dbda6fd5b *arm-linux.elf/upx-3.95
+9224db1973129ab654bfa9154689e2f1e99c7e5118dad9f143fa7b3e49abcb82 *arm-linux.elf/upx-3.95
-14f77ebb33e788aa8f9a9ad608232c3f9047dc6dfd55ceb02244a36cac9aea25 *arm-wince.pe/upx-3.91.exe
+961d61207958be48cccb37e5c0a111d85ff3e5d8fb6d5e0ca92e8681320a6f4b *arm-wince.pe/upx-3.91.exe
-a79b9a7fc7e8a5e0b42fdf342fe44aae827e63809b0797d3deefd4b9f184388c *arm64-linux.elf/upx-3.95
+f044f8755d43dfd753327b6a5d1e69c8b73095fc12b3208be720ca2286a258c0 *arm64-linux.elf/upx-3.95
-17603d9f6b48e10b438d65c70e8afbf87a82f84a6ee12e96ac66371663d4f18f *armeb-linux.elf/upx-3.91
+85e460829c5bc3bad8a7a7c82b2dfcd64594980b443972de1e52d15f644225cb *armeb-linux.elf/upx-3.91
-5162fcc6f1327c76c2221d7a5f9668d05dd828f7a6d4dbbc732005d244947805 *armeb-linux.elf/upx-3.95
+4829edc4b97d2011e789272a4b8ad254d7df573a476bae5a71832e9aecbf0e7b *armeb-linux.elf/upx-3.95
-3a94cec95fd3eac557bf929b372b20b155e8d331e44e47eb3486b048ebb36c9f *i386-dos32.djgpp2.coff/upx-3.91.exe
+902a9f177818e680042911e77d17de3f4bd3846fac210581ccaa7643dd1426f2 *i386-dos32.djgpp2.coff/upx-3.91.exe
-632b63bce916203d52d997d191728667d1091694a5cfc1a2ed327b540357e7e9 *i386-dos32.djgpp2.coff/upx-3.95.exe
+665d3c278bb9a8e0cb28cffdf6a17c3c920052a2bf7d05b74413186b043ede28 *i386-dos32.djgpp2.coff/upx-3.95.exe
-04edc6bc3ec1a4217461ee6b81b0ea29fb25a62721c92ea62ab0dfaa147412b1 *i386-linux.elf/upx-3.91
+5ffc9d683e2e2050a7f4d6e03332de3754bb48efaf800e3dcd96678fcff6d15a *i386-linux.elf/upx-3.91
-36f47959198dace24777e95c3dcff64940ce514dc62b9cb794e957e969f07bae *i386-linux.elf/upx-3.95
+fbc487cf2343a2b277e5a1d469ea34b6b70ce609b2966ce6a372e004ae70a125 *i386-linux.elf/upx-3.95
-cf3c0f31aca86f30edb45e4bd945997d7acca9c2d54acfc427936fe4ff2ba355 *i386-win32.pe/upx-3.91.exe
+9c35de99b53620cb09617061e7d01c31ff7a60f4bda7c4560b294ef18300c7f6 *i386-win32.pe/upx-3.91.exe
-c774fb5e3dcc0a00fa58ce223c30d7805f2f96606d9dddda30075c6a6c35a639 *i386-win32.pe/upx-3.95.exe
+9430239c9d12e7d796fe2fa2de10bef21985841a0adf2357a4ca6b08cf08f989 *i386-win32.pe/upx-3.95.exe
-3be124d31c578530d8aa4da4ad53346a6fd62c8d4f3a9b1d068d5f912d9117ee *m68k-atari.tos/upx-3.91.ttp
+e3d224960f13424eb4083a547eefd907e3384cfd2ebe6e8d6a8bd56181f5339b *m68k-atari.tos/upx-3.91.ttp
-0ed619426db38bdbb783e2f47a1ce36c4b6831e00be8626f560cdf968b61f8a1 *mips-linux.elf/upx-3.95
+fa9c411562d1d580944274e744d5d63c2268b334ef754fef89a666938c8601ee *mips-linux.elf/upx-3.95
-9b83be53c444ad4dda60b8fa3faf9a7ae4ffb1f99027364a2af52e6c12e64462 *mipsel-linux.elf/upx-3.91
+dd71cec3b4c14c462f58f26077193c8ec2a302aa37b4ae59a6c92ce2d493cccc *mipsel-linux.elf/upx-3.91
-e405854a04fc1ebf272e57ffc74580e387ce8860ec460d77e660c829d30d9153 *mipsel-linux.elf/upx-3.95
+29c04c30ee8b3c2b4353d92b3e9ad5327af3d9f4439f2a93a08801bb456b7a2a *mipsel-linux.elf/upx-3.95
-f876a78a55939bf5ec990aaa3ece0a8a69d0a70eb7b00422d44ee1f0fa9ec6ea *powerpc-linux.elf/upx-3.91
+2c109762689cf8691dcc6ad952f27863dd0fc79bfa74883702dc3a4601784aa5 *powerpc-linux.elf/upx-3.91
-8e65ca7e13e26b18c5ee93ab2c1a06f244dd7fff72da4523de3225feed9a4002 *powerpc-linux.elf/upx-3.95
+2ad4441667860519efbd0cd60744ceadcce73e3019acd80e593917ce76b3cbf1 *powerpc-linux.elf/upx-3.95
-07c6d83eeb6c664674df125fa9711c76140ccec562022f8d1334c761c00e787e *powerpc64le-linux.elf/upx-3.95
+970fe74533bd7b7c3bd7ddb300f982cde77227f2b1a69155a8dfb30366574d76 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t150_compress_ucl_2_all_filters="\
-c41d2eb5d32c57b1302ceb17bb18b3cf7f611f8e31478f47e188cc39870b0e8d *amd64-linux.elf/upx-3.91
+62e5a3fe8a9e2f7934194904ebfebd445e194b17fe3171c07d22017b3aa09419 *amd64-linux.elf/upx-3.91
-0dd8f6812aed9accea975c855dc2b4ae48fa2d03554614484de1d0335364e370 *amd64-linux.elf/upx-3.95
+351c778baa6826faf9661c7c5b8e8c0dd49a8aa5899f0107b2f5f7a4e3a69f3e *amd64-linux.elf/upx-3.95
-8cf83b49aab1a366318591fe69d87408ec1f7b36c3470a9cee82fd1fc39d7899 *amd64-win64.pe/upx-3.95.exe
+3b943c943fe91b948e159c5687db6ff1b22acae0552d1cbf50a181750873f8d4 *amd64-win64.pe/upx-3.95.exe
-b4b25da30e8f5da864bd8319d1c9b193eff9cf20f365d768763a2972a02d4c0f *arm-linux.elf/upx-3.95
+cda2ba38e20f75623cea46cd75f604cd5466edd63cb9eafca64ea0fe765c69eb *arm-linux.elf/upx-3.95
-040117965a54878b7665b7f8155230e0f171a7749c961a1dca26eb76719b3b97 *arm-wince.pe/upx-3.91.exe
+dea0d13ec7b3f1208988d25c30e3bcd60bc013186a88cc82c998e86f320cad99 *arm-wince.pe/upx-3.91.exe
-2b790cb0fe0b83ade980b1014e4b2f9336557f4f3ae469b94a32757ea88a281c *arm64-linux.elf/upx-3.95
+b748ca51f52811112aeea21aba9d0e59b67512d98b1e01f71c22bf4fe755304d *arm64-linux.elf/upx-3.95
-aa7ad6e9b537ab8a17d4bee539d220b39ec0fded7e9924178e3be786c6cc6907 *armeb-linux.elf/upx-3.91
+57686ad3f48c7d950f866f534232693ecc3489f322bb8f1eaf78fbcbbc3bba4d *armeb-linux.elf/upx-3.91
-66b161bdb4f9c94518f04acb385ddcaa180913f62bafc060d9f723f2bde40bdb *armeb-linux.elf/upx-3.95
+c50c2f015491e40a8b687ae91827cf502e46e47dff21382b19c8e626388e5fe3 *armeb-linux.elf/upx-3.95
-1584cbffe0037e9e3c441aeac8fc2ef226ee78d0430d4298070c7258a5de650e *i386-dos32.djgpp2.coff/upx-3.91.exe
+d597d829ef4beca9759c51b135f3cfd1e17c17c1d7cda04e9cb453e76742c9dc *i386-dos32.djgpp2.coff/upx-3.91.exe
-da37d160c4c185dfb7c0754637278a512503ecc396741678adfda38423eaae44 *i386-dos32.djgpp2.coff/upx-3.95.exe
+ac0cc4beea08af6a39ec037d0b2a4e77d0951776e0f9ac945e8b0033b227cc30 *i386-dos32.djgpp2.coff/upx-3.95.exe
-39d8526dfd19d6fa8753731dc4dd362ede4a360f834f41f7d320f3e5ac1aa083 *i386-linux.elf/upx-3.91
+9204e3fabb4cca148a0d545f9ae3d7facd199edc570d4ce9b9794c4c7d8f46e3 *i386-linux.elf/upx-3.91
-3a86c29348f68ec5b99dad6b739a66c36f64bf35adcc7defa950e3140c99e11d *i386-linux.elf/upx-3.95
+7953f12209c9838707898a73a79962764c01d7106c9c743e7437d996042811b5 *i386-linux.elf/upx-3.95
-6cc7deccbafc7c5a658a017ca18613b004d3b9b21e2a4e08343f92fbb82587fb *i386-win32.pe/upx-3.91.exe
+2e6dbebbae2997ae689c616221f7eecf72117d148783025363b99580df79fdad *i386-win32.pe/upx-3.91.exe
-43c04b1eef6ea89821dc8689f09865008784fcb2152cbc59a3be7c091a56a536 *i386-win32.pe/upx-3.95.exe
+8d549e43950072ce5d271ecad25331e29a9886c4f034f150260af20f8a57feb9 *i386-win32.pe/upx-3.95.exe
-d0ccb6fa3cb2557923c494a5d41615e2ba6687960144a98ae575761d20ff29d6 *m68k-atari.tos/upx-3.91.ttp
+d4eabc9adebd7edd40483f34ceb4081157c7542cdcea0f6b4b4dec640084fc6f *m68k-atari.tos/upx-3.91.ttp
-9a217e5a233b523a1d031819f8e9acb00d5be03e8e8b718dc18a8819b5b04a3a *mips-linux.elf/upx-3.95
+d03d5702382fd391c61736a3dda350737590c05de07837aa3ac0eb23ff9e6d7a *mips-linux.elf/upx-3.95
-a5e18b41cad43cc4583cbb49248c3608d64df760a8deb302aaed5f96d3f9a46b *mipsel-linux.elf/upx-3.91
+431e8d80da56f51339a914c5bc4cf00242a7a8afbc4a77837888c42fb4888c3b *mipsel-linux.elf/upx-3.91
-b799dbcfc4fde1cdfa572a0143a4513d83636ea0883eec320761ae57a7c36ccd *mipsel-linux.elf/upx-3.95
+8a9722f82e89c2d83437503765b9e0798854b960839d3fa57e6ccd2f581ed352 *mipsel-linux.elf/upx-3.95
-ce42a8aad4bbed730e7bcd7970efa170040eef22c9ecad4a993b81d2f6780329 *powerpc-linux.elf/upx-3.91
+2bcf9a0b0245e807a4728f84ca134ab30371a91a2d247ed63ea80fbf4f6a44be *powerpc-linux.elf/upx-3.91
-6c812174a92107ac598a6b36b2e14cad82109813e14c436a2aa9d517bdea107b *powerpc-linux.elf/upx-3.95
+37b3f5e0a7973ca5143dea5fc7d116d759f662780ee0b809357554b21fd4bbb0 *powerpc-linux.elf/upx-3.95
-047a4063962c372bce50aed451404d06e3f00a4f8a535acf0f92895ebc47ba0a *powerpc64le-linux.elf/upx-3.95
+04c9a8dfb2bc25327894045cc5b5f8325fb7fe90d77473ad08c5491c58b28988 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t160_compress_all_methods_1_no_filter="\
-848eff62a732dce17b36fa34277727cdbe68637dd169c0d4fa831a8085369c6c *amd64-linux.elf/upx-3.91
+0c2dedc98ac535a39c4166db713ed6feb02680869d23cc734c40e4d4ee36c6b4 *amd64-linux.elf/upx-3.91
-9a7a1df07d95f17b64a9c714a444b61baf790a3a3378b53c1f0f7752c5ef7aa3 *amd64-linux.elf/upx-3.95
+dc87386b6afd2a36ab6ca67139399f9de6b3d29edb1741b523236e596c625043 *amd64-linux.elf/upx-3.95
-ff5f4d665a04bfa1bddabf9853686626aea828a8e542006ef7d76d49b549d9d5 *amd64-win64.pe/upx-3.95.exe
+b75527ed6cfd8fa9b48a68e021545833790bc2817c2155cc5eeb97cb9d43cd5c *amd64-win64.pe/upx-3.95.exe
-a1f0f5df99eeed2009cdf2d253c824335b7010d91458297718bd257a2c2bc464 *arm-linux.elf/upx-3.95
+56416fe7d9100ebb3dddee598ce0844d1abfc6f006178b5fa05fc6d1d15e9a8c *arm-linux.elf/upx-3.95
-8b236855f4df2df1072a93d3bd1f7203c3d43801830a38679afc354250c6a7be *arm-wince.pe/upx-3.91.exe
+3ea0a4cafa457a1bf86ddf659a57c5737c4fa79b4a0d161df1c55c7ff0fa5ad5 *arm-wince.pe/upx-3.91.exe
-e0644a18614e3ff48c3a8c306ab0c057a3ef58fab7015e522a6ef7a9aeb28970 *arm64-linux.elf/upx-3.95
+0fe74c52794dc63e8e92590413eea6aceb73a9cb9f34bed3eae9a8fc34aa5ef2 *arm64-linux.elf/upx-3.95
-bffe4754c49568fcc9cf67e973ecb9a48e8119bab4b03d9ebae436192fbfe76b *armeb-linux.elf/upx-3.91
+5eb71685d564fdc4e99d939e5b2d58d8a8341288bcde5eac06f465c68a61a40a *armeb-linux.elf/upx-3.91
-e69f6fc17db59b12c6910af45704c33387079492c24b1659038433e4211a8898 *armeb-linux.elf/upx-3.95
+08516cb6655f58965c4dea7c9227aac78e3bcffd8113062dd72118e074b3380e *armeb-linux.elf/upx-3.95
-14133daa854c4355b25e58803ad9b5e4bfb5e665fdbf12489f8b7c29ef6646a3 *i386-dos32.djgpp2.coff/upx-3.91.exe
+2a98332d1e82db93f7025dcf792d0e8924caf38fa9b4c22963841ab5e86d22ce *i386-dos32.djgpp2.coff/upx-3.91.exe
-1a903afd11b866820a1814c6ee8a68431727e5c570045169295a425a6198a273 *i386-dos32.djgpp2.coff/upx-3.95.exe
+6939a695082de59e8993886c8213aaff1ca2ed1d7687404dd242796e27275a42 *i386-dos32.djgpp2.coff/upx-3.95.exe
-86a466a5d4568b225216cce95738fc63457b065b36590ca4d204108768ca8f78 *i386-linux.elf/upx-3.91
+0a866faf423e2c134f26ec705916b7ded0cdcb4c11fcb4e3b1ff75291d0b9d71 *i386-linux.elf/upx-3.91
-79077dc8b999ee25171ee721e8ca56880c6d0b486f88747861ef437370075504 *i386-linux.elf/upx-3.95
+523d569a0682728fa84312db03930d290b7f6ef71eb2222fd81ebeb4bcc16ffa *i386-linux.elf/upx-3.95
-58b93bd7d162f89c2ea187590c515192649831ab94435b87b27d47a9e74379e4 *i386-win32.pe/upx-3.91.exe
+e1f8df77bb4591b1a68f7c110ed36ad778fef240ed52f9d3e511318a2d091e66 *i386-win32.pe/upx-3.91.exe
-34c4260a53579a6859668cf3eb6c069cf5db82c00ad605bfdc8b2f1e0450aa16 *i386-win32.pe/upx-3.95.exe
+265f4c7045bae686897dd9981575a5ebeb99ab28233d66e9a8164789359f00d8 *i386-win32.pe/upx-3.95.exe
-8495d281bf4a8f193a204b5a56d49b3c645370049e8e83db4154db3e02d55543 *m68k-atari.tos/upx-3.91.ttp
+55732af6251cc6aa7bbb9c52415424a8cc4074288004a6064d9311a2ee01fddb *m68k-atari.tos/upx-3.91.ttp
-388b013a17b84b1068502fb01b13a78a17bec5f1bd7953ec127ee3c952a7da1c *mips-linux.elf/upx-3.95
+138f3f2798f0cac9235011f14910ef6b079b908746d570a2ec631bb62d0f5917 *mips-linux.elf/upx-3.95
-466da371ef3123d18c61e2a094d7a609e16dd005f0ea8a46d813690405e1d616 *mipsel-linux.elf/upx-3.91
+4f740937696b2d86a4bd89ec61d52338db4c739c71a8dde5cc6ff67f675304c6 *mipsel-linux.elf/upx-3.91
-36bed2f441c3abc918b46cfb80ff1bd31c82b264c3f69dcf0c1c28521fd53128 *mipsel-linux.elf/upx-3.95
+18b3320462c479420723407cc3aea2b07911a4c725b0c334e1d9585a51c86bf0 *mipsel-linux.elf/upx-3.95
-0b988e12ea324ce2c6ba9506209bbb80c10bb6a02ff8949887e810f44d710338 *powerpc-linux.elf/upx-3.91
+c8f8974ebc401286910894d6751b0a13cd908d09b51e186e49e0c309ace3d282 *powerpc-linux.elf/upx-3.91
-94981cf2f48631c476da88f8e5dcecf3ee68772ce12b189d33aaf871ef7a9536 *powerpc-linux.elf/upx-3.95
+ad08eb6c4339cd8ec63c12dd8551ef10851dcce66be27d0f9fbb251003ef0f4b *powerpc-linux.elf/upx-3.95
-616a829f2d1324fad2863481a5cba088f2a51c38de866c20fe9d9d7a75df3dfc *powerpc64le-linux.elf/upx-3.95
+fb0fa7d60c542653e7d3448f2aa69e7c2ed5aaebf3845d5aa5f10c5bff2ee279 *powerpc64le-linux.elf/upx-3.95
 "
 expected_sha256sums__t170_compress_all_methods_no_lzma_5_no_filter="\
-55046a0c623116f9d6c78e62d7f3fb781e3aa8d8a03e987f49f0705ee3a7840b *amd64-linux.elf/upx-3.91
+3a5098207aa95f40fd8a62a6a79f416837f69bf0a1ac729264fbee72d1fae0f6 *amd64-linux.elf/upx-3.91
-a9ca57293b43b093fb9582a81a2ad2877f7c2546a536541bf3766452a9faa4aa *amd64-linux.elf/upx-3.95
+4748b6f0bb08e1417dc62cff1c049eb2ee993717be4f9f5359fc7454e736def2 *amd64-linux.elf/upx-3.95
-3247a637f6cc56219bc2d6a3b16237226e1ba97ac1d0fce012657e23bfe256c3 *amd64-win64.pe/upx-3.95.exe
+9fc18a2ec177ff3b48b5d299828e3275be1585db6c205ec5652e3d13f4d91eda *amd64-win64.pe/upx-3.95.exe
-d43683421216236ab6e90f4f7d6ad69f3b1d18e53bc5dd57b5dcea2916fe480f *arm-linux.elf/upx-3.95
+d90b9a2f71107025885e289633ef9e7942f494a7f8aa0e0597e79664b09ad034 *arm-linux.elf/upx-3.95
-387787098a33b61637b39d7d015972d18e687771d8596b74286764ac73ee9286 *arm-wince.pe/upx-3.91.exe
+f03a3f07787765e499ad5a60f7c576598f433ba9a1f4d7158b0923f510929142 *arm-wince.pe/upx-3.91.exe
-e2e476b9ccfd13f14940f28240b8e6f85ce0e21f6cc5b619cc2972b9238b5bd2 *arm64-linux.elf/upx-3.95
+d01b573be7bb79257c3e0637f38a7fe8940e9302c7391fbc4a75664219a5522c *arm64-linux.elf/upx-3.95
-538eef066d7deb4b6c07de4a50ffaf24a759278beeee9204e4d6c642aa382de3 *armeb-linux.elf/upx-3.91
+085600cfffbe1d9e0c1bc25a3e48bbf3130b023b49ccbca001db27b4881e6246 *armeb-linux.elf/upx-3.91
-9349eca3e551ce1d2ab95735b8898efc54439c3d87395f2c0bddbe88fbc35cbc *armeb-linux.elf/upx-3.95
+a7923c6b78b9d3d58ee4f1bc42861476a57bb9935af47d2a15e048efb642f5d4 *armeb-linux.elf/upx-3.95
-ce768b3be6ffeb84d0558a937a9a5778427ce56898a9b3ef9490e7e5ba6ce688 *i386-dos32.djgpp2.coff/upx-3.91.exe
+0970d5a8ee6c819e11b2bd889c7ee908403af2adf3542f7670ed92eb51090485 *i386-dos32.djgpp2.coff/upx-3.91.exe
-849e285cb39e5609f384559398c47f5e34d2067711c58aacc5ed1c97495b8da0 *i386-dos32.djgpp2.coff/upx-3.95.exe
+e2d6b3c8de85bdc7b0262f64c1a16c9d41695a92e6f374cc9f12e87ca78fd956 *i386-dos32.djgpp2.coff/upx-3.95.exe
-6a0b78c2af8d68faac587531b32679a3a264fa86f524cf801db31a41a231becb *i386-linux.elf/upx-3.91
+9e28e20b115e4a671b3f4006934b94fd59fcd48dc36311a479dda6bc1ccebe07 *i386-linux.elf/upx-3.91
-e524ee0c3058ba4a44073ec29d67982bc39721865b33e6881dffbe2329a79279 *i386-linux.elf/upx-3.95
+910401db763c9a0bcb8e4d1b9cf1ee476c034b94b54a9350bcd303a5487085ef *i386-linux.elf/upx-3.95
-06d281a60d5ed815f74052e3e133915739e58c3a563a2e914186e85114687a12 *i386-win32.pe/upx-3.91.exe
+0a413298c461facb93048106cfd261d72192443e6d2d313f2b48dbdf6537b22a *i386-win32.pe/upx-3.91.exe
-a1c3256670c4f55d3aea58063c4689d122c605d079537a27b1952eeab8d5d6ad *i386-win32.pe/upx-3.95.exe
+684a0e0309d062e3fb7a1fabbdb7b2be45d3bde6a9a030f8a45fcc369a066efa *i386-win32.pe/upx-3.95.exe
-b866f184c6fe911b410afa8080acd1c7fddc11131d15bd272eb8adbca20439d2 *m68k-atari.tos/upx-3.91.ttp
+3ea4fe59d58b92fe0b0e41662c15c40130d72ed30425871d572a8c06c3c27bbf *m68k-atari.tos/upx-3.91.ttp
-197d7dace27bbeba5627868b7a333b4580673ffe38353f3a11bd2d65b4216470 *mips-linux.elf/upx-3.95
+e098036f912764f9dcef7377d17fe15b4f21439303306f9c84838d35fe655530 *mips-linux.elf/upx-3.95
-9b13d57d59a97313e20a0d3e02641045fddd5eb3bcbbcf7772181d5d87c4b3bf *mipsel-linux.elf/upx-3.91
+df4106be954d5233644a3d761a9f899132f052741d16e1d793ae481aafd51caa *mipsel-linux.elf/upx-3.91
-6f671511e19d9719c0bc7c2344d65cbf13a04da1c9bae9e55d2ca83ba9dede0a *mipsel-linux.elf/upx-3.95
+4c87f94f926aedbe17bf2d7ef72873506bbae75b8abf51a6775eb4b2e0ac0d96 *mipsel-linux.elf/upx-3.95
-4ec415399f04f546d9831758a3cfedb00f20b06cb7e1c2eb38354aff3b6d3004 *powerpc-linux.elf/upx-3.91
+4c6b2ca8ed7bbe6b9705f02a26781e6d93ab2a1011c119283130a738df5e47eb *powerpc-linux.elf/upx-3.91
-20e31a1df4eb5f6a930b34707b591265c6b5609ee2b2cdd5f504009284d1afc9 *powerpc-linux.elf/upx-3.95
+ccecc0acef4c430a8871704f93280a17bff518267499f05ba89a5290ba654a89 *powerpc-linux.elf/upx-3.95
-fe4dd9c59e6ae76ff23d6b4df27ca0df4289f6d13c8e3dc8d82c22982639ddd9 *powerpc64le-linux.elf/upx-3.95
+86123a78b0ff91321acbc837874034c099443f77ff62848e338bb61c0888e1c6 *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
@@ -28,15 +32,17 @@ upx_exe=$(readlink -fn "$upx_exe") # make absolute
 upx_run=()
 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
+elif [[ -n $CMAKE_CROSSCOMPILING_EMULATOR ]]; then
+    IFS=';' read -r -a upx_run <<< "$CMAKE_CROSSCOMPILING_EMULATOR" # split at semicolons into array
 fi
 upx_run+=( "$upx_exe" )
 echo "upx_run='${upx_run[*]}'"
 
-# upx_run check, part1
+# upx_run sanity 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
@@ -72,7 +78,7 @@ upx_testsuite_BUILDDIR=$(readlink -fn "$upx_testsuite_BUILDDIR") # make absolute
 cd / && cd "$upx_testsuite_BUILDDIR" || exit 1
 : > ./.mfxnobackup
 
-# upx_run check, part2
+# upx_run sanity check, part2
 if ! "${upx_run[@]}" --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"
@@ -91,9 +97,9 @@ if [[ $UPX_TESTSUITE_LEVEL == 0 ]]; then
     exit 0
 fi
 
-# /***********************************************************************
+#***********************************************************************
-# // setup
+# setup
-# ************************************************************************/
+#***********************************************************************
 
 #set -x # debug
 exit_code=0
@@ -108,9 +114,9 @@ rm -rf ./testsuite_1
 mkdir testsuite_1 || exit 1
 cd testsuite_1 || exit 1
 
-# /***********************************************************************
+#***********************************************************************
-# // support functions
+# support functions
-# ************************************************************************/
+#***********************************************************************
 
 run_upx() {
     local ec=0
@@ -194,13 +200,13 @@ testsuite_run_compress() {
     fi
 }
 
-# /***********************************************************************
+#***********************************************************************
-# // expected checksums
+# expected checksums
-# //
+#
-# // To ease maintenance of this script in case of updates this section
+# To ease maintenance of this script in case of updates this section
-# // can be automatically re-created from the current checksums -
+# can be automatically re-created from the current checksums -
-# // see call of function recreate_expected_sha256sums below.
+# 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
+# compression tests
-# // info: we use fast compression levels because we want to
+# info: we use fast compression levels because we want to
-# //   test UPX and not the compression libraries
+#   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

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,46 @@
 # Copyright (C) Markus Franz Xaver Johannes Oberhumer
 #
 
-# NOTE: this Makefile is deprecated - please directly use the CMake build
+# NOTE: this Makefile is deprecated - please directly use
-# instead. And see the top-level Makefile for some pre-defined CMake
+# the top-level CMake build instead.
-# build configurations.
-
-MAKEFLAGS += -r
-export SHELL = /bin/sh
 
 ifndef srcdir
-  srcdir := $(dir $(lastword $(MAKEFILE_LIST)))
+  srcdir := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-  srcdir := $(shell echo '$(srcdir)' | sed 's,/*$$,,' || echo 'ERROR')
 endif
 ifndef top_srcdir
   top_srcdir := $(srcdir)/..
 endif
 
-#
+#***********************************************************************
 # redirect to top-level CMake build
-#
+#***********************************************************************
 
-# NOTE that top-level Makefile .DEFAULT_GOAL is build/release
+# NOTE that the top-level Makefile .DEFAULT_GOAL is build/release
-.DEFAULT_GOAL = build/debug
+.DEFAULT_GOAL = build/all
-
-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
 
 .NOTPARALLEL: # because the actual builds use "cmake --parallel"
 .PHONY: PHONY
 .SECONDEXPANSION:
 .SUFFIXES:
 
-#
+build/debug build/release build/all:                PHONY; $(MAKE) -C $(top_srcdir) $@
-# "make run-testsuite"
+build/debug+test build/release+test build/all+test: PHONY; $(MAKE) -C $(top_srcdir) $@
-# see https://github.com/upx/upx-testsuite.git
+# 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
+test:: build/all+test PHONY
-# you also can override upx_testsuite_SRCDIR
+
+# OLD target names [deprecated]
+$(top_srcdir)/build/debug:   build/debug PHONY
+$(top_srcdir)/build/release: build/release 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 +56,56 @@ 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-%: 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
+ifneq ($(wildcard /usr/bin/env),) # need Unix utils like bash, perl, sed, xargs, etc.
-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
 
-#
+CHECK_WHITESPACE = bash $(top_srcdir)/misc/scripts/check_whitespace.sh $(top_srcdir)
-# "make check-whitespace"
-#
-
-CHECK_WHITESPACE =
-ifeq ($(shell uname),Linux)
-CHECK_WHITESPACE = $(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 some 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.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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -42,39 +42,104 @@
 #define bswap64 upx_bswap64
 #endif
 
+/*************************************************************************
+// XE - eXtended Endian compatibility
+// try to detect XX16 vs XX32 vs XX64 size mismatches
+**************************************************************************/
+
+#if !(DEBUG)
+
+// permissive version using "void *"
+#define REQUIRE_XE16 /*empty*/
+#define REQUIRE_XE24 /*empty*/
+#define REQUIRE_XE32 /*empty*/
+#define REQUIRE_XE64 /*empty*/
+typedef void XE16;
+typedef void XE24;
+typedef void XE32;
+typedef void XE64;
+
+#else // permissive version
+
+// forward declarations
+struct BE16;
+struct BE32;
+struct BE64;
+struct LE16;
+struct LE32;
+struct LE64;
+
+// Note:
+//   void is explicitly allowed (but there is no automatic pointer conversion because of template!)
+//   char is explicitly allowed
+//   byte is explicitly allowed
+template <class T>
+inline constexpr bool is_xe16_type =
+    upx::is_same_any_v<T, void, char, byte, upx_int16_t, upx_uint16_t, BE16, LE16>;
+template <class T>
+inline constexpr bool is_xe24_type = upx::is_same_any_v<T, void, char, byte>;
+template <class T>
+inline constexpr bool is_xe32_type =
+    upx::is_same_any_v<T, void, char, byte, upx_int32_t, upx_uint32_t, BE32, LE32>;
+template <class T>
+inline constexpr bool is_xe64_type =
+    upx::is_same_any_v<T, void, char, byte, upx_int64_t, upx_uint64_t, BE64, LE64>;
+
+template <class T>
+using enable_if_xe16 = std::enable_if_t<is_xe16_type<T>, T>;
+template <class T>
+using enable_if_xe24 = std::enable_if_t<is_xe24_type<T>, T>;
+template <class T>
+using enable_if_xe32 = std::enable_if_t<is_xe32_type<T>, T>;
+template <class T>
+using enable_if_xe64 = std::enable_if_t<is_xe64_type<T>, T>;
+
+#define REQUIRE_XE16 template <class XE16, class = enable_if_xe16<XE16> >
+#define REQUIRE_XE24 template <class XE24, class = enable_if_xe24<XE24> >
+#define REQUIRE_XE32 template <class XE32, class = enable_if_xe32<XE32> >
+#define REQUIRE_XE64 template <class XE64, class = enable_if_xe64<XE64> >
+
+#endif // permissive version
+
 /*************************************************************************
 // core - NE
 **************************************************************************/
 
-static forceinline unsigned get_ne16(const void *p) noexcept {
+REQUIRE_XE16
+static forceinline unsigned get_ne16(const XE16 *p) noexcept {
     upx_uint16_t v = 0;
     upx_memcpy_inline(&v, p, sizeof(v));
     return v;
 }
 
-static forceinline unsigned get_ne32(const void *p) noexcept {
+REQUIRE_XE32
+static forceinline unsigned get_ne32(const XE32 *p) noexcept {
     upx_uint32_t v = 0;
     upx_memcpy_inline(&v, p, sizeof(v));
     return v;
 }
 
-static forceinline upx_uint64_t get_ne64(const void *p) noexcept {
+REQUIRE_XE64
+static forceinline upx_uint64_t get_ne64(const XE64 *p) noexcept {
     upx_uint64_t v = 0;
     upx_memcpy_inline(&v, p, sizeof(v));
     return v;
 }
 
-static forceinline void set_ne16(void *p, unsigned vv) noexcept {
+REQUIRE_XE16
+static forceinline void set_ne16(XE16 *p, unsigned vv) noexcept {
     upx_uint16_t v = (upx_uint16_t) (vv & 0xffff);
     upx_memcpy_inline(p, &v, sizeof(v));
 }
 
-static forceinline void set_ne32(void *p, unsigned vv) noexcept {
+REQUIRE_XE32
+static forceinline void set_ne32(XE32 *p, unsigned vv) noexcept {
     upx_uint32_t v = vv;
     upx_memcpy_inline(p, &v, sizeof(v));
 }
 
-static forceinline void set_ne64(void *p, upx_uint64_t vv) noexcept {
+REQUIRE_XE64
+static forceinline void set_ne64(XE64 *p, upx_uint64_t vv) noexcept {
     upx_uint64_t v = vv;
     upx_memcpy_inline(p, &v, sizeof(v));
 }
@@ -88,22 +153,32 @@ static forceinline void set_ne64(void *p, upx_uint64_t vv) noexcept {
 ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(long) == 4)
 
 // unfortunately *not* constexpr with current MSVC
-static forceinline unsigned bswap16(unsigned v) noexcept {
+static forceinline /*constexpr*/ unsigned bswap16(unsigned v) noexcept {
     return (unsigned) _byteswap_ulong(v << 16);
 }
-static forceinline unsigned bswap32(unsigned v) noexcept { return (unsigned) _byteswap_ulong(v); }
+static forceinline /*constexpr*/ unsigned bswap32(unsigned v) noexcept {
-static forceinline upx_uint64_t bswap64(upx_uint64_t v) noexcept { return _byteswap_uint64(v); }
+    return (unsigned) _byteswap_ulong(v);
+}
+static forceinline /*constexpr*/ upx_uint64_t bswap64(upx_uint64_t v) noexcept {
+    return _byteswap_uint64(v);
+}
 
 #else
 
 static forceinline constexpr unsigned bswap16(unsigned v) noexcept {
+#if defined(__riscv) && __riscv_xlen == 64
+    return (unsigned) __builtin_bswap64((upx_uint64_t) v << 48);
+#else
     // return __builtin_bswap16((upx_uint16_t) (v & 0xffff));
-    // return (unsigned) __builtin_bswap64((upx_uint64_t) v << 48);
     return __builtin_bswap32(v << 16);
+#endif
 }
 static forceinline constexpr unsigned bswap32(unsigned v) noexcept {
-    // return (unsigned) __builtin_bswap64((upx_uint64_t) v << 32);
+#if defined(__riscv) && __riscv_xlen == 64
+    return (unsigned) __builtin_bswap64((upx_uint64_t) v << 32);
+#else
     return __builtin_bswap32(v);
+#endif
 }
 static forceinline constexpr upx_uint64_t bswap64(upx_uint64_t v) noexcept {
     return __builtin_bswap64(v);
@@ -138,62 +213,85 @@ static forceinline constexpr upx_uint64_t no_bswap64(upx_uint64_t v) noexcept {
 // get/set 16/32/64
 **************************************************************************/
 
-inline unsigned get_be16(const void *p) noexcept { return ne16_to_be16(get_ne16(p)); }
+REQUIRE_XE16
-inline unsigned get_be32(const void *p) noexcept { return ne32_to_be32(get_ne32(p)); }
+inline unsigned get_be16(const XE16 *p) noexcept { return ne16_to_be16(get_ne16(p)); }
-inline upx_uint64_t get_be64(const void *p) noexcept { return ne64_to_be64(get_ne64(p)); }
+REQUIRE_XE32
-inline unsigned get_le16(const void *p) noexcept { return ne16_to_le16(get_ne16(p)); }
+inline unsigned get_be32(const XE32 *p) noexcept { return ne32_to_be32(get_ne32(p)); }
-inline unsigned get_le32(const void *p) noexcept { return ne32_to_le32(get_ne32(p)); }
+REQUIRE_XE64
-inline upx_uint64_t get_le64(const void *p) noexcept { return ne64_to_le64(get_ne64(p)); }
+inline upx_uint64_t get_be64(const XE64 *p) noexcept { return ne64_to_be64(get_ne64(p)); }
-inline void set_be16(void *p, unsigned v) noexcept { set_ne16(p, ne16_to_be16(v)); }
+REQUIRE_XE16
-inline void set_be32(void *p, unsigned v) noexcept { set_ne32(p, ne32_to_be32(v)); }
+inline unsigned get_le16(const XE16 *p) noexcept { return ne16_to_le16(get_ne16(p)); }
-inline void set_be64(void *p, upx_uint64_t v) noexcept { set_ne64(p, ne64_to_be64(v)); }
+REQUIRE_XE32
-inline void set_le16(void *p, unsigned v) noexcept { set_ne16(p, ne16_to_le16(v)); }
+inline unsigned get_le32(const XE32 *p) noexcept { return ne32_to_le32(get_ne32(p)); }
-inline void set_le32(void *p, unsigned v) noexcept { set_ne32(p, ne32_to_le32(v)); }
+REQUIRE_XE64
-inline void set_le64(void *p, upx_uint64_t v) noexcept { set_ne64(p, ne64_to_le64(v)); }
+inline upx_uint64_t get_le64(const XE64 *p) noexcept { return ne64_to_le64(get_ne64(p)); }
+
+REQUIRE_XE16
+inline void set_be16(XE16 *p, unsigned v) noexcept { set_ne16(p, ne16_to_be16(v)); }
+REQUIRE_XE32
+inline void set_be32(XE32 *p, unsigned v) noexcept { set_ne32(p, ne32_to_be32(v)); }
+REQUIRE_XE64
+inline void set_be64(XE64 *p, upx_uint64_t v) noexcept { set_ne64(p, ne64_to_be64(v)); }
+REQUIRE_XE16
+inline void set_le16(XE16 *p, unsigned v) noexcept { set_ne16(p, ne16_to_le16(v)); }
+REQUIRE_XE32
+inline void set_le32(XE32 *p, unsigned v) noexcept { set_ne32(p, ne32_to_le32(v)); }
+REQUIRE_XE64
+inline void set_le64(XE64 *p, upx_uint64_t v) noexcept { set_ne64(p, ne64_to_le64(v)); }
 
 /*************************************************************************
 // get/set 24/26
 **************************************************************************/
 
-inline unsigned get_be24(const void *p) noexcept {
+REQUIRE_XE24
+inline unsigned get_be24(const XE24 *p) noexcept {
     const byte *b = ACC_CCAST(const byte *, p);
     return (b[0] << 16) | (b[1] << 8) | (b[2] << 0);
 }
 
-inline unsigned get_le24(const void *p) noexcept {
+REQUIRE_XE24
+inline unsigned get_le24(const XE24 *p) noexcept {
     const byte *b = ACC_CCAST(const byte *, p);
     return (b[0] << 0) | (b[1] << 8) | (b[2] << 16);
 }
 
-inline void set_be24(void *p, unsigned v) noexcept {
+REQUIRE_XE24
+inline void set_be24(XE24 *p, unsigned v) noexcept {
     byte *b = ACC_PCAST(byte *, p);
     b[0] = ACC_ICONV(byte, (v >> 16) & 0xff);
     b[1] = ACC_ICONV(byte, (v >> 8) & 0xff);
     b[2] = ACC_ICONV(byte, (v >> 0) & 0xff);
 }
 
-inline void set_le24(void *p, unsigned v) noexcept {
+REQUIRE_XE24
+inline void set_le24(XE24 *p, unsigned v) noexcept {
     byte *b = ACC_PCAST(byte *, p);
     b[0] = ACC_ICONV(byte, (v >> 0) & 0xff);
     b[1] = ACC_ICONV(byte, (v >> 8) & 0xff);
     b[2] = ACC_ICONV(byte, (v >> 16) & 0xff);
 }
 
-inline unsigned get_le26(const void *p) noexcept { return get_le32(p) & 0x03ffffff; }
+REQUIRE_XE32
-inline unsigned get_le19_5(const void *p) noexcept { return (get_le32(p) >> 5) & 0x0007ffff; }
+inline unsigned get_le26(const XE32 *p) noexcept { return get_le32(p) & 0x03ffffff; }
-inline unsigned get_le14_5(const void *p) noexcept { return (get_le32(p) >> 5) & 0x00003fff; }
+REQUIRE_XE32
+inline unsigned get_le19_5(const XE32 *p) noexcept { return (get_le32(p) >> 5) & 0x0007ffff; }
+REQUIRE_XE32
+inline unsigned get_le14_5(const XE32 *p) noexcept { return (get_le32(p) >> 5) & 0x00003fff; }
 
-inline void set_le26(void *p, unsigned v) noexcept {
+REQUIRE_XE32
+inline void set_le26(XE32 *p, unsigned v) noexcept {
     // preserve the top 6 bits
     //   set_le32(p, (get_le32(p) & 0xfc000000) | (v & 0x03ffffff));
     // optimized version, saving a runtime bswap32
     set_ne32(p, (get_ne32(p) & ne32_to_le32(0xfc000000)) |
                     (ne32_to_le32(v) & ne32_to_le32(0x03ffffff)));
 }
-inline void set_le19_5(void *p, unsigned v) noexcept {
+REQUIRE_XE32
+inline void set_le19_5(XE32 *p, unsigned v) noexcept {
     set_le32(p, (get_le32(p) & 0xff00001f) | ((v & 0x0007ffff) << 5));
 }
-inline void set_le14_5(void *p, unsigned v) noexcept {
+REQUIRE_XE32
+inline void set_le14_5(XE32 *p, unsigned v) noexcept {
     set_le32(p, (get_le32(p) & 0xfff8001f) | ((v & 0x00003fff) << 5));
 }
 
@@ -201,56 +299,68 @@ inline void set_le14_5(void *p, unsigned v) noexcept {
 // get signed values
 **************************************************************************/
 
-static forceinline int sign_extend(unsigned v, unsigned bits) noexcept {
+static forceinline constexpr int sign_extend(unsigned v, unsigned bits) noexcept {
+#if (ACC_ARCH_M68K) // no barrel shifter
     const unsigned sign_bit = 1u << (bits - 1);
-    v &= sign_bit | (sign_bit - 1);
+    return ACC_ICAST(int, (v & (sign_bit - 1)) - (v & sign_bit));
-    v |= 0u - (v & sign_bit);
+#else
-    return ACC_ICAST(int, v);
+    return ACC_ICAST(int, v << (32 - bits)) >> (32 - bits);
+#endif
 }
 
-static forceinline upx_int64_t sign_extend(upx_uint64_t v, unsigned bits) noexcept {
+static forceinline constexpr upx_int64_t sign_extend(upx_uint64_t v, unsigned bits) noexcept {
+#if (ACC_ARCH_M68K) // no barrel shifter
     const upx_uint64_t sign_bit = 1ull << (bits - 1);
-    v &= sign_bit | (sign_bit - 1);
+    return ACC_ICAST(upx_int64_t, (v & (sign_bit - 1)) - (v & sign_bit));
-    v |= 0ull - (v & sign_bit);
+#else
-    return ACC_ICAST(upx_int64_t, v);
+    return ACC_ICAST(upx_int64_t, v << (64 - bits)) >> (64 - bits);
+#endif
 }
 
-inline int get_be16_signed(const void *p) noexcept {
+REQUIRE_XE16
+inline int get_be16_signed(const XE16 *p) noexcept {
     unsigned v = get_be16(p);
     return sign_extend(v, 16);
 }
 
-inline int get_be24_signed(const void *p) noexcept {
+REQUIRE_XE24
+inline int get_be24_signed(const XE24 *p) noexcept {
     unsigned v = get_be24(p);
     return sign_extend(v, 24);
 }
 
-inline int get_be32_signed(const void *p) noexcept {
+REQUIRE_XE32
+inline int get_be32_signed(const XE32 *p) noexcept {
     unsigned v = get_be32(p);
     return sign_extend(v, 32);
 }
 
-inline upx_int64_t get_be64_signed(const void *p) noexcept {
+REQUIRE_XE64
+inline upx_int64_t get_be64_signed(const XE64 *p) noexcept {
     upx_uint64_t v = get_be64(p);
     return sign_extend(v, 64);
 }
 
-inline int get_le16_signed(const void *p) noexcept {
+REQUIRE_XE16
+inline int get_le16_signed(const XE16 *p) noexcept {
     unsigned v = get_le16(p);
     return sign_extend(v, 16);
 }
 
-inline int get_le24_signed(const void *p) noexcept {
+REQUIRE_XE24
+inline int get_le24_signed(const XE24 *p) noexcept {
     unsigned v = get_le24(p);
     return sign_extend(v, 24);
 }
 
-inline int get_le32_signed(const void *p) noexcept {
+REQUIRE_XE32
+inline int get_le32_signed(const XE32 *p) noexcept {
     unsigned v = get_le32(p);
     return sign_extend(v, 32);
 }
 
-inline upx_int64_t get_le64_signed(const void *p) noexcept {
+REQUIRE_XE64
+inline upx_int64_t get_le64_signed(const XE64 *p) noexcept {
     upx_uint64_t v = get_le64(p);
     return sign_extend(v, 64);
 }
@@ -619,10 +729,27 @@ T *operator+(T *ptr, const LE64 &v) noexcept DELETED_FUNCTION;
 template <class T>
 T *operator-(T *ptr, const LE64 &v) noexcept DELETED_FUNCTION;
 
+#if !ALLOW_INT_PLUS_MEMBUFFER
+template <class T>
+T *operator+(const BE16 &v, T *ptr) noexcept DELETED_FUNCTION;
+template <class T>
+T *operator+(const BE32 &v, T *ptr) noexcept DELETED_FUNCTION;
+template <class T>
+T *operator+(const LE16 &v, T *ptr) noexcept DELETED_FUNCTION;
+template <class T>
+T *operator+(const LE32 &v, T *ptr) noexcept DELETED_FUNCTION;
+#endif // ALLOW_INT_PLUS_MEMBUFFER
+
+template <class T>
+T *operator+(const BE64 &v, T *ptr) noexcept DELETED_FUNCTION;
+template <class T>
+T *operator+(const LE64 &v, T *ptr) noexcept DELETED_FUNCTION;
+
 /*************************************************************************
 // global overloads
 **************************************************************************/
 
+// TODO later: move these to upx namespace in util/cxxlib.h; see conf.h
 inline unsigned ALIGN_DOWN(unsigned a, const BE32 &b) { return ALIGN_DOWN(a, unsigned(b)); }
 inline unsigned ALIGN_DOWN(const BE32 &a, unsigned b) { return ALIGN_DOWN(unsigned(a), b); }
 inline unsigned ALIGN_UP(unsigned a, const BE32 &b) { return ALIGN_UP(a, unsigned(b)); }
@@ -633,6 +760,7 @@ inline unsigned ALIGN_DOWN(const LE32 &a, unsigned b) { return ALIGN_DOWN(unsign
 inline unsigned ALIGN_UP(unsigned a, const LE32 &b) { return ALIGN_UP(a, unsigned(b)); }
 inline unsigned ALIGN_UP(const LE32 &a, unsigned b) { return ALIGN_UP(unsigned(a), b); }
 
+// TODO later: introduce upx::umax() and upx::umin()
 inline unsigned UPX_MAX(unsigned a, const BE16 &b) { return UPX_MAX(a, unsigned(b)); }
 inline unsigned UPX_MAX(const BE16 &a, unsigned b) { return UPX_MAX(unsigned(a), b); }
 inline unsigned UPX_MIN(unsigned a, const BE16 &b) { return UPX_MIN(a, unsigned(b)); }
@@ -657,6 +785,24 @@ inline unsigned UPX_MIN(const LE32 &a, unsigned b) { return UPX_MIN(unsigned(a),
 // misc support
 **************************************************************************/
 
+// <type_traits> upx_is_integral; see conf.h
+#define TT_UPX_IS_INTEGRAL(T)                                                                      \
+    template <>                                                                                    \
+    struct upx_is_integral<T> : public std::true_type {};                                          \
+    template <>                                                                                    \
+    struct upx_is_integral<const T> : public std::true_type {};                                    \
+    template <>                                                                                    \
+    struct upx_is_integral<volatile T> : public std::true_type {};                                 \
+    template <>                                                                                    \
+    struct upx_is_integral<const volatile T> : public std::true_type {}
+TT_UPX_IS_INTEGRAL(BE16);
+TT_UPX_IS_INTEGRAL(BE32);
+TT_UPX_IS_INTEGRAL(BE64);
+TT_UPX_IS_INTEGRAL(LE16);
+TT_UPX_IS_INTEGRAL(LE32);
+TT_UPX_IS_INTEGRAL(LE64);
+#undef TT_UPX_IS_INTEGRAL
+
 // native types
 #if (ACC_ABI_BIG_ENDIAN)
 typedef BE16 NE16;
@@ -680,24 +826,6 @@ typedef LE64 NE64;
 #define ne64_compare_signed le64_compare_signed
 #endif
 
-// <type_traits> upx_is_integral
-#define TT_IS_INTEGRAL(T)                                                                          \
-    template <>                                                                                    \
-    struct upx_is_integral<T> : public std::true_type {};                                          \
-    template <>                                                                                    \
-    struct upx_is_integral<const T> : public std::true_type {};                                    \
-    template <>                                                                                    \
-    struct upx_is_integral<volatile T> : public std::true_type {};                                 \
-    template <>                                                                                    \
-    struct upx_is_integral<const volatile T> : public std::true_type {}
-TT_IS_INTEGRAL(BE16);
-TT_IS_INTEGRAL(BE32);
-TT_IS_INTEGRAL(BE64);
-TT_IS_INTEGRAL(LE16);
-TT_IS_INTEGRAL(LE32);
-TT_IS_INTEGRAL(LE64);
-#undef TT_IS_INTEGRAL
-
 // for use with qsort()
 extern "C" {
 int __acc_cdecl_qsort be16_compare(const void *, const void *);

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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -34,11 +34,13 @@
 #if defined(BELE_CTP)
 // CTP - Compile-Time Polymorphism (templates)
 #define V  static inline
+#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
@@ -79,12 +81,9 @@ struct AbstractPolicy {
 
 private:
     // disable copy and move
-    AbstractPolicy(const AbstractPolicy &) DELETED_FUNCTION;
+    UPX_CXX_DISABLE_COPY_MOVE(AbstractPolicy)
-    AbstractPolicy &operator=(const AbstractPolicy &) DELETED_FUNCTION;
-    AbstractPolicy(AbstractPolicy &&) noexcept DELETED_FUNCTION;
-    AbstractPolicy &operator=(AbstractPolicy &&) noexcept DELETED_FUNCTION;
     // disable dynamic allocation
-    ACC_CXX_DISABLE_NEW_DELETE
+    UPX_CXX_DISABLE_NEW_DELETE(AbstractPolicy)
 };
 #endif
 
@@ -104,8 +103,8 @@ struct BEPolicy
 #elif defined(BELE_RTP)
     typedef N_BELE_CTP::BEPolicy CTP_Policy;
 #endif
-    V bool isBE() C { return true; }
+    VV bool isBE() C { return true; }
-    V bool isLE() C { return false; }
+    VV bool isLE() C { return false; }
 
     typedef BE16 U16;
     typedef BE32 U32;
@@ -147,12 +146,9 @@ struct BEPolicy
 
 private:
     // disable copy and move
-    BEPolicy(const BEPolicy &) DELETED_FUNCTION;
+    UPX_CXX_DISABLE_COPY_MOVE(BEPolicy)
-    BEPolicy &operator=(const BEPolicy &) DELETED_FUNCTION;
-    BEPolicy(BEPolicy &&) noexcept DELETED_FUNCTION;
-    BEPolicy &operator=(BEPolicy &&) noexcept DELETED_FUNCTION;
     // disable dynamic allocation
-    ACC_CXX_DISABLE_NEW_DELETE
+    UPX_CXX_DISABLE_NEW_DELETE(BEPolicy)
 };
 
 struct LEPolicy
@@ -166,8 +162,8 @@ struct LEPolicy
 #elif defined(BELE_RTP)
     typedef N_BELE_CTP::LEPolicy CTP_Policy;
 #endif
-    V bool isBE() C { return false; }
+    VV bool isBE() C { return false; }
-    V bool isLE() C { return true; }
+    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;
+    UPX_CXX_DISABLE_COPY_MOVE(LEPolicy)
-    LEPolicy &operator=(const LEPolicy &) DELETED_FUNCTION;
-    LEPolicy(LEPolicy &&) noexcept DELETED_FUNCTION;
-    LEPolicy &operator=(LEPolicy &&) noexcept DELETED_FUNCTION;
     // 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_check.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-2024 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -24,6 +24,8 @@
    <markus@oberhumer.com>
  */
 
+#include "../util/system_headers.h"
+#include <cmath> // std::isinf std::isnan
 #include "../conf.h"
 
 /*************************************************************************
@@ -42,8 +44,7 @@ int upx_doctest_check(int argc, char **argv) {
     UNUSED(argv);
     return 0;
 #else
-    const char *e = getenv("UPX_DEBUG_DOCTEST_DISABLE");
+    if (is_envvar_true("UPX_DEBUG_DOCTEST_DISABLE", "UPX_DEBUG_DISABLE_DOCTEST"))
-    if (e && e[0] && strcmp(e, "0") != 0)
         return 0;
     bool minimal = true;   // don't show summary
     bool duration = false; // don't show timings
@@ -52,7 +53,7 @@ int upx_doctest_check(int argc, char **argv) {
     // default for debug builds: do show the [doctest] summary
     minimal = false;
 #endif
-    e = getenv("UPX_DEBUG_DOCTEST_VERBOSE");
+    const char *e = getenv("UPX_DEBUG_DOCTEST_VERBOSE");
     if (e && e[0]) {
         if (strcmp(e, "0") == 0) {
             minimal = true;
@@ -100,21 +101,6 @@ ACC_COMPILE_TIME_ASSERT_HEADER((std::is_same<unsigned, upx_uint32_t>::value))
 ACC_COMPILE_TIME_ASSERT_HEADER((std::is_same<long long, upx_int64_t>::value))
 ACC_COMPILE_TIME_ASSERT_HEADER((std::is_same<unsigned long long, upx_uint64_t>::value))
 
-ACC_COMPILE_TIME_ASSERT_HEADER((is_same_all_v<int>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((is_same_all_v<int, int>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((is_same_all_v<int, int, int>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((!is_same_all_v<int, char>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((!is_same_all_v<int, char, int>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((!is_same_all_v<int, int, char>) )
-
-ACC_COMPILE_TIME_ASSERT_HEADER((!is_same_any_v<int>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((is_same_any_v<int, int>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((is_same_any_v<int, char, int>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((is_same_any_v<int, int, char>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((!is_same_any_v<int, char>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((!is_same_any_v<int, char, char>) )
-ACC_COMPILE_TIME_ASSERT_HEADER((!is_same_any_v<int, char, long>) )
-
 ACC_COMPILE_TIME_ASSERT_HEADER(no_bswap16(0x04030201) == 0x0201)
 ACC_COMPILE_TIME_ASSERT_HEADER(no_bswap32(0x04030201) == 0x04030201)
 ACC_COMPILE_TIME_ASSERT_HEADER(no_bswap64(0x0807060504030201ull) == 0x0807060504030201ull)
@@ -128,42 +114,18 @@ ACC_COMPILE_TIME_ASSERT_HEADER(bswap64(bswap64(0xf8f7f6f5f4f3f2f1ull)) ==
                                no_bswap64(0xf8f7f6f5f4f3f2f1ull))
 #endif
 
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(int) == sizeof(int))
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u + 0, 8) == 0)
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof('a') == sizeof(char))
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u + 1, 8) == 1)
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof("") == 1)
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u + 127, 8) == 127)
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof("a") == 2)
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u + 128, 8) == -128)
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(0) == sizeof(int))
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u - 1, 8) == -1)
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(0L) == sizeof(long))
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u + 256, 8) == 0)
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(0LL) == sizeof(long long))
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u + 257, 8) == 1)
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(nullptr) == sizeof(void *))
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u + 383, 8) == 127)
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(sizeof(0)) == sizeof(size_t))
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u + 384, 8) == -128)
-ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(usizeof(0)) == sizeof(unsigned))
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0u + 511, 8) == -1)
-
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0ull + 0, 1) == 0)
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_len("") == 0)
+ACC_COMPILE_TIME_ASSERT_HEADER(sign_extend(0ull + 1, 1) == -1)
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_len("a") == 1)
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_len("ab") == 2)
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_len("abc") == 3)
-
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_eq("", ""))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_eq("a", ""))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_eq("", "a"))
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_eq("abc", "abc"))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_eq("ab", "abc"))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_eq("abc", "ab"))
-
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("", ""))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("a", ""))
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_lt("", "a"))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("abc", "abc"))
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_lt("ab", "abc"))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("abc", "ab"))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("abc", "aba"))
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_lt("abc", "abz"))
-
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_ne("abc", "abz"))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_gt("abc", "abz"))
-ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_ge("abc", "abz"))
-ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_le("abc", "abz"))
 
 ACC_COMPILE_TIME_ASSERT_HEADER(CHAR_BIT == 8)
 #if 0 // does not work with MSVC
@@ -227,7 +189,7 @@ struct CheckIntegral {
             assert_noexcept(t.y[0] == 0 && t.y[1] == 0);
             assert_noexcept(t.z[0] == 0 && t.z[1] == 0);
         }
-#if __cplusplus < 202002L
+#if __cplusplus <= 201703L
         COMPILE_TIME_ASSERT(std::is_pod<U>::value) // std::is_pod is deprecated in C++20
 #endif
         COMPILE_TIME_ASSERT(std::is_standard_layout<U>::value)
@@ -360,7 +322,11 @@ struct TestIntegerWrap {
     static inline bool neg_eq(const T x) noexcept { return T(0) - x == x; }
 };
 
-static noinline void throwSomeValue(int x) {
+//
+// basic exception handling checks to early catch toolchain/qemu/wine/etc problems
+//
+
+static noinline void throwSomeValue(int x) may_throw {
     if (x < 0)
         throw int(x);
     else
@@ -379,26 +345,97 @@ static noinline void check_basic_cxx_exception_handling(void (*func)(int)) noexc
     assert_noexcept(cxx_exception_handling_works);
 }
 
+//
+// basic floating point checks to early catch toolchain/qemu/wine/etc problems
+//
+
+static noinline float i64_f32_add_div(upx_int64_t a, upx_int64_t b) { return (a + b) / 1000000.0f; }
+static noinline float u64_f32_add_div(upx_uint64_t a, upx_uint64_t b) {
+    return (a + b) / 1000000.0f;
+}
+static noinline float i64_f32_sub_div(upx_int64_t a, upx_int64_t b) { return (a - b) / 1000000.0f; }
+static noinline float u64_f32_sub_div(upx_uint64_t a, upx_uint64_t b) {
+    return (a - b) / 1000000.0f;
+}
+
+static noinline double i64_f64_add_div(upx_int64_t a, upx_int64_t b) { return (a + b) / 1000000.0; }
+static noinline double u64_f64_add_div(upx_uint64_t a, upx_uint64_t b) {
+    return (a + b) / 1000000.0;
+}
+static noinline double i64_f64_sub_div(upx_int64_t a, upx_int64_t b) { return (a - b) / 1000000.0; }
+static noinline double u64_f64_sub_div(upx_uint64_t a, upx_uint64_t b) {
+    return (a - b) / 1000000.0;
+}
+
+template <class Int, class Float>
+struct TestFloat {
+    static constexpr Int X = 1000000;
+    static noinline Float div(Int a, Float f) { return a / f; }
+    static noinline Float add_div(Int a, Int b, Float f) { return Float(a + b) / f; }
+    static noinline Float sub_div(Int a, Int b, Float f) { return Float(a - b) / f; }
+    static noinline Float add_div_x(Int a, Int b) { return Float(a + b) / Float(X); }
+    static noinline Float sub_div_x(Int a, Int b) { return Float(a - b) / Float(X); }
+    static noinline void check() noexcept {
+        assert_noexcept(add_div(X, X, Float(X)) == Float(2));
+        assert_noexcept(add_div_x(X, X) == Float(2));
+        assert_noexcept(sub_div(3 * X, X, Float(X)) == Float(2));
+        assert_noexcept(sub_div_x(3 * X, X) == Float(2));
+        // extra debugging; floating point edge cases cause portability problems in practice
+        if (is_envvar_true("UPX_DEBUG_TEST_FLOAT_DIVISION_BY_ZERO")) {
+#if defined(__clang__) && defined(__FAST_MATH__) && defined(__INTEL_LLVM_COMPILER)
+            // warning: comparison with NaN always evaluates to false in fast floating point modes
+            fprintf(stderr, "upx: WARNING: ignoring UPX_DEBUG_TEST_FLOAT_DIVISION_BY_ZERO\n");
+#elif defined(__clang__) && (__clang_major__ < 9) && defined(__SANITIZE_UNDEFINED_BEHAVIOR__)
+            // @COMPILER_BUG @CLANG_BUG
+            fprintf(stderr, "upx: WARNING: ignoring UPX_DEBUG_TEST_FLOAT_DIVISION_BY_ZERO\n");
+#else
+            assert_noexcept(std::isnan(div(0, Float(0))));
+            assert_noexcept(std::isinf(div(1, Float(0))));
+#endif
+        }
+    }
+};
+
+static noinline void check_basic_floating_point(void) noexcept {
+    assert_noexcept(i64_f32_add_div(1000000, 1000000) == 2.0f);
+    assert_noexcept(u64_f32_add_div(1000000, 1000000) == 2.0f);
+    assert_noexcept(i64_f32_sub_div(3000000, 1000000) == 2.0f);
+    assert_noexcept(u64_f32_sub_div(3000000, 1000000) == 2.0f);
+    assert_noexcept(i64_f64_add_div(1000000, 1000000) == 2.0);
+    assert_noexcept(u64_f64_add_div(1000000, 1000000) == 2.0);
+    assert_noexcept(i64_f64_sub_div(3000000, 1000000) == 2.0);
+    assert_noexcept(u64_f64_sub_div(3000000, 1000000) == 2.0);
+    TestFloat<upx_int32_t, float>::check();
+    TestFloat<upx_uint32_t, float>::check();
+    TestFloat<upx_int64_t, float>::check();
+    TestFloat<upx_uint64_t, float>::check();
+    TestFloat<upx_int32_t, double>::check();
+    TestFloat<upx_uint32_t, double>::check();
+    TestFloat<upx_int64_t, double>::check();
+    TestFloat<upx_uint64_t, double>::check();
+}
+
 } // namespace
 
 #define ACC_WANT_ACC_CHK_CH 1
 #undef ACCCHK_ASSERT
-#include "../miniacc.h"
+#include "../util/miniacc.h"
 
 void upx_compiler_sanity_check(void) noexcept {
-    const char *e = getenv("UPX_DEBUG_DOCTEST_DISABLE");
+    if (is_envvar_true("UPX_DEBUG_DOCTEST_DISABLE", "UPX_DEBUG_DISABLE_DOCTEST")) {
-    if (e && e[0] && strcmp(e, "0") != 0) {
         // If UPX_DEBUG_DOCTEST_DISABLE is set then we don't want to throw any
         // exceptions in order to improve debugging experience.
     } else {
-        // check working C++ exception handling to catch toolchain/qemu/wine/etc problems
+        // check working C++ exception handling to early catch toolchain/qemu/wine/etc problems
         check_basic_cxx_exception_handling(throwSomeValue);
     }
 
+    check_basic_floating_point();
+
 #define ACC_WANT_ACC_CHK_CH 1
 #undef ACCCHK_ASSERT
 #define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr)
-#include "../miniacc.h"
+#include "../util/miniacc.h"
 #undef ACCCHK_ASSERT
 
     COMPILE_TIME_ASSERT(sizeof(char) == 1)
@@ -505,6 +542,38 @@ void upx_compiler_sanity_check(void) noexcept {
         assert_noexcept(get_be32_signed(d) == 2138996092);
         assert_noexcept(get_be64_signed(d) == 9186918263483431288LL);
     }
+#if DEBUG >= 1
+    {
+        for (int i = 0; i < 256; i++) {
+            {
+                const unsigned u = i;
+                assert_noexcept(sign_extend(u, 1) == ((i & 1) ? -1 : 0));
+                assert_noexcept(sign_extend(u, 2) == ((i & 2) ? -2 + (i & 1) : (i & 1)));
+                assert_noexcept(sign_extend(u, 3) == ((i & 4) ? -4 + (i & 3) : (i & 3)));
+                assert_noexcept(sign_extend(u, 4) == ((i & 8) ? -8 + (i & 7) : (i & 7)));
+                assert_noexcept(sign_extend(u, 5) == ((i & 16) ? -16 + (i & 15) : (i & 15)));
+                assert_noexcept(sign_extend(u, 6) == ((i & 32) ? -32 + (i & 31) : (i & 31)));
+                assert_noexcept(sign_extend(u, 7) == ((i & 64) ? -64 + (i & 63) : (i & 63)));
+                assert_noexcept(sign_extend(u, 8) == ((i & 128) ? -128 + (i & 127) : (i & 127)));
+                assert_noexcept(sign_extend(u, 32) == i);
+                assert_noexcept(sign_extend(0u - u, 32) == -i);
+            }
+            {
+                const upx_uint64_t u = i;
+                assert_noexcept(sign_extend(u, 1) == ((i & 1) ? -1 : 0));
+                assert_noexcept(sign_extend(u, 2) == ((i & 2) ? -2 + (i & 1) : (i & 1)));
+                assert_noexcept(sign_extend(u, 3) == ((i & 4) ? -4 + (i & 3) : (i & 3)));
+                assert_noexcept(sign_extend(u, 4) == ((i & 8) ? -8 + (i & 7) : (i & 7)));
+                assert_noexcept(sign_extend(u, 5) == ((i & 16) ? -16 + (i & 15) : (i & 15)));
+                assert_noexcept(sign_extend(u, 6) == ((i & 32) ? -32 + (i & 31) : (i & 31)));
+                assert_noexcept(sign_extend(u, 7) == ((i & 64) ? -64 + (i & 63) : (i & 63)));
+                assert_noexcept(sign_extend(u, 8) == ((i & 128) ? -128 + (i & 127) : (i & 127)));
+                assert_noexcept(sign_extend(u, 64) == i);
+                assert_noexcept(sign_extend(0ull - u, 64) == -i);
+            }
+        }
+    }
+#endif
     {
         unsigned dd;
         void *const d = &dd;
@@ -577,7 +646,7 @@ void upx_compiler_sanity_check(void) noexcept {
 **************************************************************************/
 
 TEST_CASE("assert_noexcept") {
-    // just to make sure that our own assert macros don't generate any warnings
+    // just to make sure that our own assert() macros don't generate any warnings
     byte dummy = 0;
     byte *ptr1 = &dummy;
     const byte *const ptr2 = &dummy;
@@ -594,20 +663,6 @@ TEST_CASE("assert_noexcept") {
     assert_noexcept(!ptr3);
 }
 
-TEST_CASE("noncopyable") {
-    struct Test : private noncopyable {
-        int v = 1;
-    };
-    Test t = {};
-    CHECK(t.v == 1);
-#if (ACC_CC_MSC) // MSVC thinks that Test is not std::is_trivially_copyable; true or compiler bug?
-    t.v = 0;
-#else
-    mem_clear(&t);
-#endif
-    CHECK(t.v == 0);
-}
-
 TEST_CASE("acc_vget") {
     CHECK_EQ(acc_vget_int(0, 0), 0);
     CHECK_EQ(acc_vget_long(1, -1), 1);
@@ -615,6 +670,17 @@ TEST_CASE("acc_vget") {
     CHECK_EQ(acc_vget_acc_hvoid_p(nullptr, 0), nullptr);
 }
 
+TEST_CASE("ptr_invalidate_and_poison") {
+    int *ip = nullptr;
+    ptr_invalidate_and_poison(ip);
+    assert(ip != nullptr);
+    (void) ip;
+    double *dp; // not initialized
+    ptr_invalidate_and_poison(dp);
+    assert(dp != nullptr);
+    (void) dp;
+}
+
 TEST_CASE("working -fno-strict-aliasing") {
     bool ok;
     long v = 0;
@@ -637,6 +703,7 @@ TEST_CASE("working -fno-strict-aliasing") {
     *pi = -1;
     ok = *pl != 0;
     CHECK(ok);
+    UNUSED(ok);
 }
 
 TEST_CASE("working -fno-strict-overflow") {
@@ -654,6 +721,7 @@ TEST_CASE("working -fno-strict-overflow") {
     i -= 1;
     ok = i == INT_MAX;
     CHECK(ok);
+    UNUSED(ok);
 }
 
 TEST_CASE("libc snprintf") {
@@ -673,6 +741,59 @@ TEST_CASE("libc snprintf") {
     CHECK_EQ(strcmp(buf, "-6.0.0.0.0.0.0.0.6.ffffffffffffffff"), 0);
     snprintf(buf, sizeof(buf), "%d.%d.%d.%d.%d.%d.%d.%d.%d.%#jx", -7, 0, 0, 0, 0, 0, 0, 0, 7, um);
     CHECK_EQ(strcmp(buf, "-7.0.0.0.0.0.0.0.7.0xffffffffffffffff"), 0);
+    snprintf(buf, sizeof(buf), "%#X %#lx %#llx", 26u, 27ul, 28ull);
+    CHECK_EQ(strcmp(buf, "0X1A 0x1b 0x1c"), 0);
+    snprintf(buf, sizeof(buf), "%#06x %#06lX %#06llx", 26u, 27ul, 28ull);
+    CHECK_EQ(strcmp(buf, "0x001a 0X001B 0x001c"), 0);
+    snprintf(buf, sizeof(buf), "%#6x %#6lx %#6llX", 26u, 27ul, 28ull);
+    CHECK_EQ(strcmp(buf, "  0x1a   0x1b   0X1C"), 0);
+    snprintf(buf, sizeof(buf), "%#-6X %#-6lx %#-6llx", 26u, 27ul, 28ull);
+    CHECK_EQ(strcmp(buf, "0X1A   0x1b   0x1c  "), 0);
 }
 
+#if 0
+TEST_CASE("libc qsort") {
+    // runtime check that libc qsort() never compares identical objects
+    // UPDATE: while only poor implementations of qsort() would actually do
+    //   this, it is probably allowed by the standard; so skip this test case
+    struct Elem {
+        upx_uint16_t id;
+        upx_uint16_t value;
+        static int __acc_cdecl_qsort compare(const void *aa, const void *bb) noexcept {
+            const Elem *a = (const Elem *) aa;
+            const Elem *b = (const Elem *) bb;
+            assert_noexcept(a->id != b->id); // check not IDENTICAL
+            return a->value < b->value ? -1 : (a->value == b->value ? 0 : 1);
+        }
+        static bool check_sort(upx_sort_func_t sort, Elem *e, size_t n) {
+            upx_uint32_t x = 5381 + n + ((upx_uintptr_t) e & 0xff);
+            for (size_t i = 0; i < n; i++) {
+                e[i].id = (upx_uint16_t) i;
+                x = x * 33 + 1 + (i & 255);
+                e[i].value = (upx_uint16_t) x;
+            }
+            sort(e, n, sizeof(Elem), Elem::compare);
+            for (size_t i = 1; i < n; i++)
+                if very_unlikely (e[i - 1].value > e[i].value)
+                    return false;
+            return true;
+        }
+    };
+    constexpr size_t N = 4096;
+    Elem e[N];
+    for (size_t n = 0; n <= N; n = 2 * n + 1) {
+        // CHECK(Elem::check_sort(qsort, e, n)); // libc qsort()
+        CHECK(Elem::check_sort(upx_gnomesort, e, n));
+        CHECK(Elem::check_sort(upx_shellsort_memswap, e, n));
+        CHECK(Elem::check_sort(upx_shellsort_memcpy, e, n));
+#if UPX_CONFIG_USE_STABLE_SORT
+        upx_sort_func_t wrap_stable_sort = [](void *aa, size_t nn, size_t, upx_compare_func_t cc) {
+            upx_std_stable_sort<sizeof(Elem)>(aa, nn, cc);
+        };
+        CHECK(Elem::check_sort(wrap_stable_sort, e, n));
+#endif
+    }
+}
+#endif
+
 /* vim:set ts=4 sw=4 et: */

src/check/dt_cxxlib.cpp

@@ -0,0 +1,489 @@
+/* dt_cxxlib.cpp -- doctest check
+
+   This file is part of the UPX executable compressor.
+
+   Copyright (C) 1996-2024 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>
+ */
+
+// lots of tests (and probably quite a number of redundant tests)
+// modern compilers will optimize away much of this code
+
+#if 0 // TODO later
+// libc++ hardenining
+#if defined(__clang__) && defined(__clang_major__) && (__clang_major__ + 0 >= 18)
+#if DEBUG
+#define _LIBCPP_HARDENING_MODE _LIBCPP_HARDENING_MODE_DEBUG
+#else
+#define _LIBCPP_HARDENING_MODE _LIBCPP_HARDENING_MODE_EXTENSIVE
+#endif
+#endif
+#if defined(__clang__) && defined(__clang_major__) && (__clang_major__ + 0 < 18)
+#if DEBUG
+#define _LIBCPP_ENABLE_ASSERTIONS 1
+#endif
+#endif
+#endif // TODO later
+
+#include "../util/system_headers.h"
+#include <vector>
+#include "../conf.h"
+
+/*************************************************************************
+// compile-time checks
+**************************************************************************/
+
+// need extra parenthesis because the C preprocessor does not understand C++ templates
+ACC_COMPILE_TIME_ASSERT_HEADER((upx::is_same_all_v<int>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((upx::is_same_all_v<int, int>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((upx::is_same_all_v<int, int, int>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((!upx::is_same_all_v<int, char>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((!upx::is_same_all_v<int, char, int>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((!upx::is_same_all_v<int, int, char>) )
+
+ACC_COMPILE_TIME_ASSERT_HEADER((!upx::is_same_any_v<int>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((upx::is_same_any_v<int, int>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((upx::is_same_any_v<int, char, int>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((upx::is_same_any_v<int, int, char>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((!upx::is_same_any_v<int, char>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((!upx::is_same_any_v<int, char, char>) )
+ACC_COMPILE_TIME_ASSERT_HEADER((!upx::is_same_any_v<int, char, long>) )
+
+ACC_COMPILE_TIME_ASSERT_HEADER((upx::is_same_any_v<ptrdiff_t, int, long, long long>) )
+ACC_COMPILE_TIME_ASSERT_HEADER(
+    (upx::is_same_any_v<size_t, unsigned, unsigned long, unsigned long long>) )
+ACC_COMPILE_TIME_ASSERT_HEADER(
+    (upx::is_same_any_v<upx_uintptr_t, unsigned, unsigned long, unsigned long long>) )
+
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(int) == sizeof(int))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof('a') == sizeof(char))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof("") == 1)
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof("a") == 2)
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof("ab") == 3)
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(L'a') == sizeof(wchar_t))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(L"") == 1 * sizeof(wchar_t))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(L"a") == 2 * sizeof(wchar_t))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(L"ab") == 3 * sizeof(wchar_t))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(0) == sizeof(int))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(0L) == sizeof(long))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(0LL) == sizeof(long long))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(nullptr) == sizeof(void *))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(sizeof(0)) == sizeof(size_t))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof(usizeof(0)) == sizeof(unsigned))
+#if 0
+// works, but may trigger clang/gcc warnings "-Wunused-value"
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof((1LL, 1)) == sizeof(int))
+ACC_COMPILE_TIME_ASSERT_HEADER(usizeof((1, 1LL)) == sizeof(long long))
+#endif
+
+namespace compile_time = upx::compile_time;
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_len("") == 0)
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_len("a") == 1)
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_len("ab") == 2)
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_len("abc") == 3)
+
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_eq("", ""))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_eq("a", ""))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_eq("", "a"))
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_eq("abc", "abc"))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_eq("ab", "abc"))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_eq("abc", "ab"))
+
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("", ""))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("a", ""))
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_lt("", "a"))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("abc", "abc"))
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_lt("ab", "abc"))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("abc", "ab"))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_lt("abc", "aba"))
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_lt("abc", "abz"))
+
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_ne("abc", "abz"))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_gt("abc", "abz"))
+ACC_COMPILE_TIME_ASSERT_HEADER(!compile_time::string_ge("abc", "abz"))
+ACC_COMPILE_TIME_ASSERT_HEADER(compile_time::string_le("abc", "abz"))
+
+/*************************************************************************
+//
+**************************************************************************/
+
+TEST_CASE("libc++") {
+    constexpr size_t N = 16;
+    std::vector<int> v(N);
+    CHECK(v.end() - v.begin() == N);
+    CHECK(&v[0] == &(*(v.begin())));
+    // CHECK(&v[0] + N == &(*(v.end()))); // TODO later: is this legal??
+    // TODO later: make sure that this throws
+#if defined(_LIBCPP_HARDENING_MODE_DEBUG) &&                                                       \
+    (_LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG)
+    CHECK_THROWS((void) &v[N]);
+#endif
+    UNUSED(v);
+}
+
+/*************************************************************************
+// UPX_CXX_DISABLE_xxx
+**************************************************************************/
+
+namespace {
+template <class TA, class TB, int TC = 0>
+struct MyType1 {
+    MyType1() noexcept {}
+    UPX_CXX_DISABLE_ADDRESS(MyType1)
+    UPX_CXX_DISABLE_COPY_MOVE(MyType1)
+    UPX_CXX_DISABLE_NEW_DELETE_NO_VIRTUAL(MyType1)
+};
+template <class TA, class TB, int TC = 0>
+struct MyType2 {
+    MyType2() noexcept {}
+    UPX_CXX_DISABLE_COPY_MOVE(MyType2)
+    typedef MyType2<TA, TB, TC> Self;
+    UPX_CXX_DISABLE_ADDRESS(Self)
+    UPX_CXX_DISABLE_NEW_DELETE_NO_VIRTUAL(Self)
+};
+template <class TA, class TB, int TC = 0>
+struct MyVType1 {
+    MyVType1() noexcept {}
+    virtual ~MyVType1() noexcept {}
+    UPX_CXX_DISABLE_ADDRESS(MyVType1)
+    UPX_CXX_DISABLE_COPY_MOVE(MyVType1)
+    UPX_CXX_DISABLE_NEW_DELETE(MyVType1)
+};
+template <class TA, class TB, int TC = 0>
+struct MyVType2 {
+    MyVType2() noexcept {}
+    virtual ~MyVType2() noexcept {}
+    UPX_CXX_DISABLE_COPY_MOVE(MyVType2)
+    typedef MyVType2<TA, TB, TC> Self;
+    UPX_CXX_DISABLE_ADDRESS(Self)
+    UPX_CXX_DISABLE_NEW_DELETE(Self)
+};
+TEST_CASE("UPX_CXX_DISABLE_xxx") {
+    MyType1<char, int, 1> dummy1;
+    MyType2<char, int, 2> dummy2;
+    MyVType1<char, int, 1> vdummy1;
+    MyVType2<char, int, 2> vdummy2;
+    (void) dummy1;
+    (void) dummy2;
+    (void) vdummy1;
+    (void) vdummy2;
+}
+} // namespace
+
+namespace test_disable_new_delete {
+
+struct A1 {
+    int a;
+};
+struct A2 {
+    int a;
+    UPX_CXX_DISABLE_NEW_DELETE_NO_VIRTUAL(A2)
+};
+struct B1_A1 : public A1 {
+    int b;
+};
+struct B1_A2 : public A2 {
+    int b;
+};
+struct B2_A1 : public A1 {
+    int b;
+    UPX_CXX_DISABLE_NEW_DELETE_NO_VIRTUAL(B2_A1)
+};
+struct B2_A2 : public A2 {
+    int b;
+    UPX_CXX_DISABLE_NEW_DELETE_NO_VIRTUAL(B2_A2)
+};
+
+struct X1 {
+    virtual ~X1() noexcept {}
+    int x;
+};
+struct X2 {
+    virtual ~X2() noexcept {}
+    int x;
+    UPX_CXX_DISABLE_NEW_DELETE(X2)
+};
+struct Y1_X1 : public X1 {
+    int y;
+};
+struct Y1_X2 : public X2 {
+    int y;
+};
+struct Y2_X1 : public X1 {
+    int y;
+    UPX_CXX_DISABLE_NEW_DELETE(Y2_X1)
+};
+struct Y2_X2 : public X2 {
+    int y;
+    UPX_CXX_DISABLE_NEW_DELETE(Y2_X2)
+};
+struct Z1_X1 : public X1 {
+    virtual ~Z1_X1() noexcept {}
+    int z;
+};
+struct Z1_X2 : public X2 {
+    virtual ~Z1_X2() noexcept {}
+    int z;
+};
+struct Z2_X1 : public X1 {
+    virtual ~Z2_X1() noexcept {}
+    int z;
+    UPX_CXX_DISABLE_NEW_DELETE(Z2_X1)
+};
+struct Z2_X2 : public X2 {
+    virtual ~Z2_X2() noexcept {}
+    int z;
+    UPX_CXX_DISABLE_NEW_DELETE(Z2_X2)
+};
+
+} // namespace test_disable_new_delete
+
+/*************************************************************************
+// util
+**************************************************************************/
+
+TEST_CASE("upx::ObjectDeleter 1") {
+    LE16 *o = nullptr; // object
+    LE32 *a = nullptr; // array
+    {
+        const upx::ObjectDeleter<LE16 **> o_deleter{&o, 1};
+        o = new LE16;
+        assert(o != nullptr);
+        const upx::ArrayDeleter<LE32 **> a_deleter{&a, 1};
+        a = New(LE32, 1);
+        assert(a != nullptr);
+    }
+    assert(o == nullptr);
+    assert(a == nullptr);
+}
+
+TEST_CASE("upx::ObjectDeleter 2") {
+    constexpr size_t N = 2;
+    BE16 *o[N]; // multiple objects
+    BE32 *a[N]; // multiple arrays
+    {
+        upx::ObjectDeleter<BE16 **> o_deleter{o, 0};
+        upx::ArrayDeleter<BE32 **> a_deleter{a, 0};
+        for (size_t i = 0; i < N; i++) {
+            o[i] = new BE16;
+            assert(o[i] != nullptr);
+            o_deleter.count += 1;
+            a[i] = New(BE32, 1 + i);
+            assert(a[i] != nullptr);
+            a_deleter.count += 1;
+        }
+    }
+    for (size_t i = 0; i < N; i++) {
+        assert(o[i] == nullptr);
+        assert(a[i] == nullptr);
+    }
+}
+
+TEST_CASE("upx::ptr_static_cast") {
+    // check that we don't trigger any -Wcast-align warnings
+    using upx::ptr_static_cast;
+    void *vp = nullptr;
+    byte *bp = nullptr;
+    int *ip = nullptr;
+    double *dp = nullptr;
+
+    assert((vp == ptr_static_cast<void *>(vp)));
+    assert((vp == ptr_static_cast<void *>(bp)));
+    assert((vp == ptr_static_cast<void *>(ip)));
+    assert((vp == ptr_static_cast<void *>(dp)));
+
+    assert((bp == ptr_static_cast<byte *>(vp)));
+    assert((bp == ptr_static_cast<byte *>(bp)));
+    assert((bp == ptr_static_cast<byte *>(ip)));
+    assert((bp == ptr_static_cast<byte *>(dp)));
+
+    assert((ip == ptr_static_cast<int *>(vp)));
+    assert((ip == ptr_static_cast<int *>(bp)));
+    assert((ip == ptr_static_cast<int *>(ip)));
+    assert((ip == ptr_static_cast<int *>(dp)));
+
+    assert((dp == ptr_static_cast<double *>(vp)));
+    assert((dp == ptr_static_cast<double *>(bp)));
+    assert((dp == ptr_static_cast<double *>(ip)));
+    assert((dp == ptr_static_cast<double *>(dp)));
+
+    const byte *bc = nullptr;
+    const int *ic = nullptr;
+    assert((bc == ptr_static_cast<byte *>(bp)));
+    assert((bc == ptr_static_cast<const byte *>(bc)));
+    assert((bc == ptr_static_cast<byte *>(ip)));
+    assert((bc == ptr_static_cast<const byte *>(ic)));
+    assert((ic == ptr_static_cast<int *>(bp)));
+    assert((ic == ptr_static_cast<const int *>(bc)));
+    assert((ic == ptr_static_cast<int *>(ip)));
+    assert((ic == ptr_static_cast<const int *>(ic)));
+}
+
+TEST_CASE("upx::noncopyable") {
+    struct Test : private upx::noncopyable {
+        int v = 1;
+    };
+    Test t = {};
+    CHECK(t.v == 1);
+#if (ACC_CC_MSC) // MSVC thinks that Test is not std::is_trivially_copyable; true or compiler bug?
+    // @COMPILER_BUG @MSVC_BUG
+    t.v = 0;
+#else
+    mem_clear(&t);
+#endif
+    CHECK(t.v == 0);
+    constexpr Test x = {};
+    static_assert(x.v == 1);
+}
+
+/*************************************************************************
+// TriBool checks
+**************************************************************************/
+
+namespace {
+template <class T>
+struct TestTriBool {
+    static void test(bool expect_true) {
+        static_assert(std::is_class<T>::value);
+        static_assert(std::is_nothrow_default_constructible<T>::value);
+        static_assert(std::is_nothrow_destructible<T>::value);
+        static_assert(std::is_standard_layout<T>::value);
+        static_assert(std::is_trivially_copyable<T>::value);
+        static_assert(sizeof(typename T::value_type) == sizeof(typename T::underlying_type));
+        static_assert(alignof(typename T::value_type) == alignof(typename T::underlying_type));
+#if (ACC_ARCH_M68K && ACC_OS_TOS && ACC_CC_GNUC) && defined(__MINT__)
+        // broken compiler or broken ABI
+#else
+        static_assert(sizeof(T) == sizeof(typename T::underlying_type));
+        static_assert(alignof(T) == alignof(typename T::underlying_type));
+#endif
+        static_assert(!bool(T(false)));
+        static_assert(bool(T(true)));
+        static_assert(bool(T(T::Third)) == T::is_third_true);
+        static_assert(T(false) == T::False);
+        static_assert(T(true) == T::True);
+        static_assert(T(T::False) == T::False);
+        static_assert(T(T::True) == T::True);
+        static_assert(T(T::Third) == T::Third);
+        static_assert(T(T::Third) == T(9));
+        static_assert(T(8) == T(9));
+        static_assert(!(T(0) == T(9)));
+        static_assert(!(T(1) == T(9)));
+        static_assert(T(T::Third) == 9);
+        static_assert(T(8) == 9);
+        static_assert(!(T(0) == 9));
+        static_assert(!(T(1) == 9));
+        constexpr T array[] = {false, true, T::Third};
+        static_assert(array[0].isStrictFalse());
+        static_assert(array[1].isStrictTrue());
+        static_assert(array[2].isThird());
+        static_assert(sizeof(array) == 3 * sizeof(T));
+        T a;
+        assert(a.getValue() == T::False);
+        assert(!a);
+        assert(!bool(a));
+        assert((!a ? true : false));
+        assert(a.isStrictFalse());
+        assert(!a.isStrictTrue());
+        assert(a.isStrictBool());
+        assert(!a.isThird());
+        a = false;
+        assert(a.getValue() == T::False);
+        assert(!a);
+        assert(!bool(a));
+        assert((!a ? true : false));
+        assert(a.isStrictFalse());
+        assert(!a.isStrictTrue());
+        assert(a.isStrictBool());
+        assert(!a.isThird());
+        a = true;
+        assert(a.getValue() == T::True);
+        assert(a);
+        assert(bool(a));
+        assert((a ? true : false));
+        assert(!a.isStrictFalse());
+        assert(a.isStrictTrue());
+        assert(a.isStrictBool());
+        assert(!a.isThird());
+        a = T::Third;
+        assert(a.getValue() == T::Third);
+        assert(T::is_third_true == expect_true);
+        if (expect_true) {
+            assert(a);
+            assert(bool(a));
+            assert((a ? true : false));
+        } else {
+            assert(!a);
+            assert(!bool(a));
+            assert((!a ? true : false));
+        }
+        assert(!a.isStrictFalse());
+        assert(!a.isStrictTrue());
+        assert(!a.isStrictBool());
+        assert(a.isThird());
+        a = 99;
+        assert(a.getValue() == T::Third);
+        if (expect_true) {
+            assert(a);
+            assert(bool(a));
+            assert((a ? true : false));
+        } else {
+            assert(!a);
+            assert(!bool(a));
+            assert((!a ? true : false));
+        }
+        assert(!a.isStrictFalse());
+        assert(!a.isStrictTrue());
+        assert(!a.isStrictBool());
+        assert(a.isThird());
+        mem_clear(&a);
+        assert(a.isStrictFalse());
+    }
+};
+} // namespace
+
+TEST_CASE("upx::TriBool") {
+    using upx::TriBool, upx::tribool;
+    static_assert(!tribool(false));
+    static_assert(tribool(true));
+    static_assert(!tribool(tribool::Third));
+    TestTriBool<tribool>::test(false);
+#if DEBUG || 1
+    TestTriBool<TriBool<upx_int8_t> >::test(false);
+    TestTriBool<TriBool<upx_uint8_t> >::test(false);
+    TestTriBool<TriBool<upx_int16_t> >::test(false);
+    TestTriBool<TriBool<upx_uint16_t> >::test(false);
+    TestTriBool<TriBool<upx_int32_t> >::test(false);
+    TestTriBool<TriBool<upx_uint32_t> >::test(false);
+    TestTriBool<TriBool<upx_int64_t> >::test(false);
+    TestTriBool<TriBool<upx_uint64_t> >::test(false);
+    TestTriBool<TriBool<upx_int8_t, true> >::test(true);
+    TestTriBool<TriBool<upx_uint8_t, true> >::test(true);
+    TestTriBool<TriBool<upx_int16_t, true> >::test(true);
+    TestTriBool<TriBool<upx_uint16_t, true> >::test(true);
+    TestTriBool<TriBool<upx_int32_t, true> >::test(true);
+    TestTriBool<TriBool<upx_uint32_t, true> >::test(true);
+    TestTriBool<TriBool<upx_int64_t, true> >::test(true);
+    TestTriBool<TriBool<upx_uint64_t, true> >::test(true);
+#endif
+}
+
+/* vim:set ts=4 sw=4 et: */

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-2024 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,9 +49,11 @@
 #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-#if !defined(UPX_DOCTEST_CONFIG_MULTITHREADING)
+#if !defined(UPX_DOCTEST_CONFIG_MULTITHREADING) && !(WITH_THREADS)
+#ifndef DOCTEST_CONFIG_NO_MULTITHREADING
 #define DOCTEST_CONFIG_NO_MULTITHREADING
 #endif
+#endif
 
 #if defined(__clang__) && defined(__FAST_MATH__) && defined(__INTEL_LLVM_COMPILER)
 // warning: comparison with NaN always evaluates to false in fast floating point modes

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-2024 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-2024 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-2024 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-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -293,7 +293,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) {
@@ -317,7 +317,7 @@ STDMETHODIMP ProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outS
 #undef RC_NORMALIZE
 
 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 +327,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();
@@ -547,6 +548,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-2024 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);
@@ -363,6 +363,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-2024 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -75,7 +75,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 +85,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;
@@ -99,8 +100,6 @@ int upx_zlib_compress(const upx_bytep src, unsigned src_len, upx_bytep dst, unsi
         oassign(strategy, lcconf->strategy);
     }
 
-    res->dummy = 0;
-
     z_stream s;
     s.zalloc = (alloc_func) nullptr;
     s.zfree = (free_func) nullptr;
@@ -305,6 +304,7 @@ 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);
 }
 
 /* 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-2024 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

@@ -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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -31,9 +31,22 @@
 // init
 **************************************************************************/
 
-#include "headers.h"
+#include "util/system_headers.h"
 #include "version.h"
 
+#if !defined(__has_attribute)
+#define __has_attribute(x) 0
+#endif
+#if !defined(__has_builtin)
+#define __has_builtin(x) 0
+#endif
+#if !defined(__has_feature)
+#define __has_feature(x) 0
+#endif
+
+// reserve name "upx" for namespace
+namespace upx {}
+
 ACC_COMPILE_TIME_ASSERT_HEADER(CHAR_BIT == 8)
 ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(short) == 2)
 ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(int) == 4)
@@ -45,7 +58,7 @@ 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
+ACC_COMPILE_TIME_ASSERT_HEADER((char) (-1) == 255)
 
 // enable some more strict warnings for Git developer builds
 #if defined(UPX_CONFIG_DISABLE_WSTRICT) && (UPX_CONFIG_DISABLE_WSTRICT + 0 == 0)
@@ -57,7 +70,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++:
@@ -81,40 +94,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 +127,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 !!!
@@ -139,16 +145,17 @@ typedef acc_int64_t     upx_int64_t;
 typedef acc_uint64_t upx_uint64_t;
 typedef acc_uintptr_t upx_uintptr_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__; };
+//// typedef char upx_charptr_unit_type; // also works
+struct alignas(1) upx_charptr_unit_type final { char hidden__; };
 ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(upx_charptr_unit_type) == 1)
 
 // using the system off_t was a bad idea even back in 199x...
@@ -163,47 +170,68 @@ 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, generates 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: 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
+// some platform system headers may pre-define these, so undef to avoid conflicts
 #undef _
 #undef __
 #undef ___
 #undef dos
+#undef large
 #undef linux
+#undef PAGE_MASK
+#undef PAGE_SIZE
 #undef small
+#undef SP
+#undef SS
 #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__)
+#if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 ||  \
-#  undef sopen
+     ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
 #undef __unix
 #undef __unix__
 #endif
+#if (ACC_OS_DOS32) && defined(__DJGPP__)
+#undef sopen
+#endif
 
 #if defined(HAVE_DUP) && (HAVE_DUP + 0 == 0)
+// TODO later: add upx_fd_dup() util
 #undef dup
 #define dup(x) (-1)
 #endif
@@ -274,11 +302,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 +312,6 @@ typedef upx_int64_t upx_off_t;
 #define O_BINARY 0
 #endif
 
-
 /*************************************************************************
 // util
 **************************************************************************/
@@ -310,6 +335,7 @@ 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)
@@ -324,23 +350,21 @@ 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 {}
 
-#if !defined(__has_builtin)
-#  define __has_builtin(x)      0
-#endif
-
 #if __has_builtin(__builtin_memcpy_inline)
 #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 +372,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
+// TODO later cleanup: we now require C++17, so remove all packed_struct usage
-#define __packed_struct(s)      struct alignas(1) s {
+#define packed_struct(s) struct alignas(1) s
-#define __packed_struct_end()   };
 
-#define COMPILE_TIME_ASSERT_ALIGNOF_USING_SIZEOF__(a,b) { \
+// TODO later cleanup: this was needed in the old days to catch compiler problems/bugs;
-     typedef a acc_tmp_a_t; typedef b acc_tmp_b_t; \
+//   we now require C++17, so remove this
-     struct alignas(1) acc_tmp_t { acc_tmp_b_t x; acc_tmp_a_t y; acc_tmp_b_t z; }; \
+#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,25 +400,38 @@ inline void NO_fprintf(FILE *, const char *, ...) noexcept {}
 
 #define TABLESIZE(table) ((sizeof(table) / sizeof((table)[0])))
 
+// TODO later: move these to upx namespace in util/cxxlib.h; also see bele.h
+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 T ALIGN_DOWN(const T& a, const T& b) { T r; r = (a / b) * b; return r; }
+inline const T &UPX_MAX(const T &a, const T &b) {
+    if (a < b)
+        return b;
+    return a;
+}
 template <class T>
-inline T ALIGN_UP  (const T& a, const T& b) { T r; r = ((a + b - 1) / b) * b; return r; }
+inline const T &UPX_MIN(const T &a, const T &b) {
-template <class T>
+    if (a < b)
-inline T ALIGN_GAP (const T& a, const T& b) { T r; r = ALIGN_UP(a, b) - a; return r; }
+        return a;
-
+    return b;
-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 {
@@ -411,57 +458,32 @@ 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;
+noreturn 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);
+noreturn void throwAssertFailed(const char *expr, const char *file, int line, const char *func);
-#if defined(__GNUC__)
+#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)))
+#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 {
+// C++ support library
-protected:
+#include "util/cxxlib.h"
-    inline noncopyable() noexcept {}
+using upx::is_same_any_v;
-    inline ~noncopyable() noexcept = default;
+using upx::noncopyable;
-private:
+using upx::OptVar;
-    noncopyable(const noncopyable &) noexcept DELETED_FUNCTION; // copy constructor
+using upx::tribool;
-    noncopyable& operator=(const noncopyable &) noexcept DELETED_FUNCTION; // copy assignment
+#define usizeof(expr) (upx::UnsignedSizeOf<sizeof(expr)>::value)
-    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
 
 /*************************************************************************
 // constants
@@ -471,7 +493,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 +502,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 +519,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
@@ -576,7 +595,8 @@ constexpr bool string_ge(const char *a, const char *b) {
 // #define M_CL1B_LE16   13
 #define M_LZMA        14
 #define M_DEFLATE     15 // zlib
-#define M_ZSTD          16
+#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 +611,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,7 +619,6 @@ constexpr bool string_ge(const char *a, const char *b) {
 #define FT_SKIP        (-3)
 #define FT_ULTRA_BRUTE (-4)
 
-
 /*************************************************************************
 // compression - setup and callback_t
 **************************************************************************/
@@ -616,69 +635,26 @@ 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_t *, unsigned, unsigned);
-typedef void (__acc_cdecl *upx_progress_func_t)
-    (upx_callback_p, 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 bzip2_compress_config_t final {
-struct OptVar final {
+    unsigned dummy;
-    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);
 
-    static void assertValue(const T &v) noexcept {
+    void reset() 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;
 };
 
-
+struct lzma_compress_config_t final {
-// 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
@@ -698,11 +674,11 @@ 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 {
+struct zlib_compress_config_t final {
     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
@@ -714,29 +690,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)
 
-
 /*************************************************************************
 // 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 +737,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 +764,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,11 +772,14 @@ 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
 **************************************************************************/
@@ -812,7 +804,7 @@ 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 +821,26 @@ void infoHeader();
 void infoWriting(const char *what, upx_int64_t size);
 
 // work.cpp
-void do_one_file(const char *iname, char *oname);
+void do_one_file(const char *iname, char *oname) may_throw;
-int do_files(int i, int argc, char *argv[]);
+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_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 +854,16 @@ 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"
 
-
 /* 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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
+        assert_noexcept(msg != nullptr);
-    fprintf(stderr, "construct exception: %s %zu\n", msg, debug_counter);
+    }
-    debug_counter += 1;
+    NO_fprintf(stderr, "construct exception: %zu %zu %s\n", size_t(stats.counter_current),
-#endif
+               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
+        assert_noexcept(msg != nullptr);
-    fprintf(stderr, "copy exception: %s %zu\n", msg, debug_counter);
+    }
-    debug_counter += 1;
+    NO_fprintf(stderr, "copy construct exception: %zu %zu %s\n", size_t(stats.counter_current),
-#endif
+               size_t(stats.counter_total), (const char *) msg);
+    stats.counter_current += 1;
+    stats.counter_total += 1;
 }
 
 Throwable::~Throwable() noexcept {
-#if 0
+    stats.counter_current -= 1;
-    debug_counter -= 1;
+    NO_fprintf(stderr, "destruct exception: %zu %zu %s\n", size_t(stats.counter_current),
-    fprintf(stderr, "destruct exception: %s %zu\n", msg, debug_counter);
+               size_t(stats.counter_total), (const char *) msg);
-#endif
+    upx::owner_free(msg);
-    if (msg)
-        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);
+    (void) 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);
+    (void) 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);
+    (void) upx_safe_vsnprintf_noexcept(msg, sizeof(msg), format, ap);
     va_end(ap);
     throwCantUnpack(msg);
 }
 
 /*************************************************************************
-//
+// util
 **************************************************************************/
 
 void assertFailed(const char *expr, const char *file, int line, const char *func) noexcept {
@@ -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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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 &operator=(const Throwable &) noexcept DELETED_FUNCTION; // copy assignment
-    Throwable(Throwable &&) noexcept DELETED_FUNCTION;
+    UPX_CXX_DISABLE_MOVE(Throwable)
-    Throwable &operator=(Throwable &&) noexcept DELETED_FUNCTION;
     // 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 {
@@ -179,40 +178,37 @@ public:
 // util
 **************************************************************************/
 
-#undef NORET
+const char *prettyName(const char *n) noexcept;
-#if 1 && defined(__GNUC__)
-#define NORET noinline __attribute__((__noreturn__))
-#else
-#define NORET noinline
-#endif
 
-NORET void throwCantPack(const char *msg);
+noreturn void throwCantPack(const char *msg) may_throw;
-NORET void throwCantPackExact();
+noreturn void throwCantPackExact() may_throw;
-NORET void throwUnknownExecutableFormat(const char *msg = nullptr, bool warn = false);
+noreturn void throwUnknownExecutableFormat(const char *msg = nullptr, bool warn = false) may_throw;
-NORET void throwNotCompressible(const char *msg = nullptr);
+noreturn void throwNotCompressible(const char *msg = nullptr) may_throw;
-NORET void throwAlreadyPacked(const char *msg = nullptr);
+noreturn void throwAlreadyPacked(const char *msg = nullptr) may_throw;
-NORET void throwAlreadyPackedByUPX(const char *msg = nullptr);
+noreturn void throwAlreadyPackedByUPX(const char *msg = nullptr) may_throw;
-NORET void throwCantUnpack(const char *msg);
+noreturn void throwCantUnpack(const char *msg) may_throw;
-NORET void throwNotPacked(const char *msg = nullptr);
+noreturn void throwNotPacked(const char *msg = nullptr) may_throw;
-NORET void throwFilterException();
+noreturn void throwFilterException() may_throw;
-NORET void throwBadLoader();
+noreturn void throwBadLoader() may_throw;
-NORET void throwChecksumError();
+noreturn void throwChecksumError() may_throw;
-NORET void throwCompressedDataViolation();
+noreturn void throwCompressedDataViolation() may_throw;
-NORET void throwInternalError(const char *msg);
+noreturn void throwInternalError(const char *msg) may_throw;
-NORET void throwOutOfMemoryException(const char *msg = nullptr);
+noreturn void throwOutOfMemoryException(const char *msg = nullptr) may_throw;
-NORET void throwIOException(const char *msg = nullptr, int e = 0);
+noreturn void throwIOException(const char *msg = nullptr, int e = 0) may_throw;
-NORET void throwEOFException(const char *msg = nullptr, int e = 0);
+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);
+noreturn void throwCantUnpack(const char *format, ...) may_throw attribute_format(1, 2);
-
+template <class T>
-#undef NORET
+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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -33,6 +33,7 @@
 **************************************************************************/
 
 /*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);
@@ -51,13 +52,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 +76,10 @@ FileBase::~FileBase() may_throw {
     if (isOpen())
         fprintf(stderr, "%s: %s\n", _name, __PRETTY_FUNCTION__);
 #endif
-
+    if (std::uncaught_exceptions() == 0)
-    // FIXME: we should use close() during exception unwinding but
+        closex(); // may_throw
-    //        closex() otherwise
+    else
-    closex();
+        close_noexcept(); // currently in exception unwinding, use noexcept variant
 }
 
 bool FileBase::do_sopen() {
@@ -93,7 +104,7 @@ bool FileBase::do_sopen() {
     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 +119,7 @@ bool FileBase::close() noexcept {
 }
 
 void FileBase::closex() may_throw {
-    if (!close())
+    if (!close_noexcept())
         throwIOException("close failed", errno);
 }
 
@@ -121,14 +132,14 @@ upx_off_t FileBase::seek(upx_off_t off, int whence) {
         if (off < 0)
             throwIOException("bad seek 2");
         off += _offset;
-    }
+    } else if (whence == SEEK_END) {
-    if (whence == SEEK_END) {
         if (off > 0)
             throwIOException("bad seek 3");
         off += _offset + _length;
         whence = SEEK_SET;
-    }
+    } else if (whence == SEEK_CUR) {
-    // SEEK_CUR falls through to here
+    } else
+        throwInternalError("bad seek: whence");
     upx_off_t l = ::lseek(_fd, off, whence);
     if (l < 0)
         throwIOException("seek error", errno);
@@ -152,11 +163,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;
@@ -202,11 +213,11 @@ upx_off_t InputFile::seek(upx_off_t off, int whence) {
 upx_off_t InputFile::st_size_orig() const { return _length_orig; }
 
 /*************************************************************************
-//
+// OutputFile
 **************************************************************************/
 
 void OutputFile::sopen(const char *name, int flags, int shflags, int mode) {
-    close();
+    closex();
     _name = name;
     _flags = flags;
     _shflags = shflags;
@@ -228,7 +239,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;

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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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; }
+    bool isOpen() const noexcept { return _fd >= 0; }
-    int getFd() const { return _fd; }
+    int getFd() const noexcept { return _fd; }
-    const char *getName() const { return _name; }
+    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 chmod(const char *name, int mode) may_throw;
-    static void rename(const char *old_, const char *new_);
+    static void rename(const char *old_, const char *new_) may_throw;
-    static void unlink(const char *name);
+    static void unlink(const char *name) may_throw;
+    static bool unlink_noexcept(const char *name) noexcept;
 
 protected:
     bool do_sopen();

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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 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:

src/filter/ct.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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -25,8 +25,6 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-
-
 /*************************************************************************
 // 16-bit calltrick ("naive")
 **************************************************************************/
@@ -35,8 +33,7 @@
     byte *b = f->buf;                                                                              \
     byte *b_end = b + f->buf_len - 3;                                                              \
     do {                                                                                           \
-        if (cond) \
+        if (cond) {                                                                                \
-        { \
             b += 1;                                                                                \
             unsigned a = (unsigned) (b - f->buf);                                                  \
             f->lastcall = a;                                                                       \
@@ -45,167 +42,117 @@
             b += 2 - 1;                                                                            \
         }                                                                                          \
     } while (++b < b_end);                                                                         \
-    if (f->lastcall) f->lastcall += 2; \
+    if (f->lastcall)                                                                               \
+        f->lastcall += 2;                                                                          \
     return 0;
 
-
-
 // filter: e8, e9, e8e9
-static int f_ct16_e8(Filter *f)
+static int f_ct16_e8(Filter *f) { CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_le16) }
-{
-    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_le16)
-}
 
-static int f_ct16_e9(Filter *f)
+static int f_ct16_e9(Filter *f) { CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_le16) }
-{
-    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_le16)
-}
 
-static int f_ct16_e8e9(Filter *f)
+static int f_ct16_e8e9(Filter *f) {
-{
     CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_le16)
 }
 
-
 // unfilter: e8, e9, e8e9
-static int u_ct16_e8(Filter *f)
+static int u_ct16_e8(Filter *f) { CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_le16, set_le16) }
-{
-    CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_le16, set_le16)
-}
 
-static int u_ct16_e9(Filter *f)
+static int u_ct16_e9(Filter *f) { CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_le16, set_le16) }
-{
-    CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_le16, set_le16)
-}
 
-static int u_ct16_e8e9(Filter *f)
+static int u_ct16_e8e9(Filter *f) {
-{
     CT16(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le16, set_le16)
 }
 
-
 // scan: e8, e9, e8e9
-static int s_ct16_e8(Filter *f)
+static int s_ct16_e8(Filter *f) { CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_dummy) }
-{
-    CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_dummy)
-}
 
-static int s_ct16_e9(Filter *f)
+static int s_ct16_e9(Filter *f) { CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_dummy) }
-{
-    CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_dummy)
-}
 
-static int s_ct16_e8e9(Filter *f)
+static int s_ct16_e8e9(Filter *f) {
-{
     CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_dummy)
 }
 
-
 // filter: e8, e9, e8e9 with bswap le->be
-static int f_ct16_e8_bswap_le(Filter *f)
+static int f_ct16_e8_bswap_le(Filter *f) {
-{
     CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_be16)
 }
 
-static int f_ct16_e9_bswap_le(Filter *f)
+static int f_ct16_e9_bswap_le(Filter *f) {
-{
     CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_be16)
 }
 
-static int f_ct16_e8e9_bswap_le(Filter *f)
+static int f_ct16_e8e9_bswap_le(Filter *f) {
-{
     CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_be16)
 }
 
-
 // unfilter: e8, e9, e8e9 with bswap le->be
-static int u_ct16_e8_bswap_le(Filter *f)
+static int u_ct16_e8_bswap_le(Filter *f) {
-{
     CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_be16, set_le16)
 }
 
-static int u_ct16_e9_bswap_le(Filter *f)
+static int u_ct16_e9_bswap_le(Filter *f) {
-{
     CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_be16, set_le16)
 }
 
-static int u_ct16_e8e9_bswap_le(Filter *f)
+static int u_ct16_e8e9_bswap_le(Filter *f) {
-{
     CT16(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_be16, set_le16)
 }
 
-
 // scan: e8, e9, e8e9 with bswap le->be
-static int s_ct16_e8_bswap_le(Filter *f)
+static int s_ct16_e8_bswap_le(Filter *f) {
-{
     CT16(f, (*b == 0xe8), a + f->addvalue, get_be16, set_dummy)
 }
 
-static int s_ct16_e9_bswap_le(Filter *f)
+static int s_ct16_e9_bswap_le(Filter *f) {
-{
     CT16(f, (*b == 0xe9), a + f->addvalue, get_be16, set_dummy)
 }
 
-static int s_ct16_e8e9_bswap_le(Filter *f)
+static int s_ct16_e8e9_bswap_le(Filter *f) {
-{
     CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be16, set_dummy)
 }
 
-
 // filter: e8, e9, e8e9 with bswap be->le
-static int f_ct16_e8_bswap_be(Filter *f)
+static int f_ct16_e8_bswap_be(Filter *f) {
-{
     CT16(f, (*b == 0xe8), a + f->addvalue, get_be16, set_le16)
 }
 
-static int f_ct16_e9_bswap_be(Filter *f)
+static int f_ct16_e9_bswap_be(Filter *f) {
-{
     CT16(f, (*b == 0xe9), a + f->addvalue, get_be16, set_le16)
 }
 
-static int f_ct16_e8e9_bswap_be(Filter *f)
+static int f_ct16_e8e9_bswap_be(Filter *f) {
-{
     CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be16, set_le16)
 }
 
-
 // unfilter: e8, e9, e8e9 with bswap be->le
-static int u_ct16_e8_bswap_be(Filter *f)
+static int u_ct16_e8_bswap_be(Filter *f) {
-{
     CT16(f, (*b == 0xe8), 0 - a - f->addvalue, get_le16, set_be16)
 }
 
-static int u_ct16_e9_bswap_be(Filter *f)
+static int u_ct16_e9_bswap_be(Filter *f) {
-{
     CT16(f, (*b == 0xe9), 0 - a - f->addvalue, get_le16, set_be16)
 }
 
-static int u_ct16_e8e9_bswap_be(Filter *f)
+static int u_ct16_e8e9_bswap_be(Filter *f) {
-{
     CT16(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le16, set_be16)
 }
 
-
 // scan: e8, e9, e8e9 with bswap be->le
-static int s_ct16_e8_bswap_be(Filter *f)
+static int s_ct16_e8_bswap_be(Filter *f) {
-{
     CT16(f, (*b == 0xe8), a + f->addvalue, get_le16, set_dummy)
 }
 
-static int s_ct16_e9_bswap_be(Filter *f)
+static int s_ct16_e9_bswap_be(Filter *f) {
-{
     CT16(f, (*b == 0xe9), a + f->addvalue, get_le16, set_dummy)
 }
 
-static int s_ct16_e8e9_bswap_be(Filter *f)
+static int s_ct16_e8e9_bswap_be(Filter *f) {
-{
     CT16(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le16, set_dummy)
 }
 
-
 #undef CT16
 
-
 /*************************************************************************
 // 32-bit calltrick ("naive")
 **************************************************************************/
@@ -214,8 +161,7 @@ static int s_ct16_e8e9_bswap_be(Filter *f)
     byte *b = f->buf;                                                                              \
     byte *b_end = b + f->buf_len - 5;                                                              \
     do {                                                                                           \
-        if (cond) \
+        if (cond) {                                                                                \
-        { \
             b += 1;                                                                                \
             unsigned a = (unsigned) (b - f->buf);                                                  \
             f->lastcall = a;                                                                       \
@@ -224,163 +170,115 @@ static int s_ct16_e8e9_bswap_be(Filter *f)
             b += 4 - 1;                                                                            \
         }                                                                                          \
     } while (++b < b_end);                                                                         \
-    if (f->lastcall) f->lastcall += 4; \
+    if (f->lastcall)                                                                               \
+        f->lastcall += 4;                                                                          \
     return 0;
 
-
 // filter: e8, e9, e8e9
-static int f_ct32_e8(Filter *f)
+static int f_ct32_e8(Filter *f) { CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_le32) }
-{
-    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_le32)
-}
 
-static int f_ct32_e9(Filter *f)
+static int f_ct32_e9(Filter *f) { CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_le32) }
-{
-    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_le32)
-}
 
-static int f_ct32_e8e9(Filter *f)
+static int f_ct32_e8e9(Filter *f) {
-{
     CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_le32)
 }
 
-
 // unfilter: e8, e9, e8e9
-static int u_ct32_e8(Filter *f)
+static int u_ct32_e8(Filter *f) { CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_le32, set_le32) }
-{
-    CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_le32, set_le32)
-}
 
-static int u_ct32_e9(Filter *f)
+static int u_ct32_e9(Filter *f) { CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_le32, set_le32) }
-{
-    CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_le32, set_le32)
-}
 
-static int u_ct32_e8e9(Filter *f)
+static int u_ct32_e8e9(Filter *f) {
-{
     CT32(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le32, set_le32)
 }
 
-
 // scan: e8, e9, e8e9
-static int s_ct32_e8(Filter *f)
+static int s_ct32_e8(Filter *f) { CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_dummy) }
-{
-    CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_dummy)
-}
 
-static int s_ct32_e9(Filter *f)
+static int s_ct32_e9(Filter *f) { CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_dummy) }
-{
-    CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_dummy)
-}
 
-static int s_ct32_e8e9(Filter *f)
+static int s_ct32_e8e9(Filter *f) {
-{
     CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_dummy)
 }
 
-
 // filter: e8, e9, e8e9 with bswap le->be
-static int f_ct32_e8_bswap_le(Filter *f)
+static int f_ct32_e8_bswap_le(Filter *f) {
-{
     CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_be32)
 }
 
-static int f_ct32_e9_bswap_le(Filter *f)
+static int f_ct32_e9_bswap_le(Filter *f) {
-{
     CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_be32)
 }
 
-static int f_ct32_e8e9_bswap_le(Filter *f)
+static int f_ct32_e8e9_bswap_le(Filter *f) {
-{
     CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_be32)
 }
 
-
 // unfilter: e8, e9, e8e9 with bswap le->be
-static int u_ct32_e8_bswap_le(Filter *f)
+static int u_ct32_e8_bswap_le(Filter *f) {
-{
     CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_be32, set_le32)
 }
 
-static int u_ct32_e9_bswap_le(Filter *f)
+static int u_ct32_e9_bswap_le(Filter *f) {
-{
     CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_be32, set_le32)
 }
 
-static int u_ct32_e8e9_bswap_le(Filter *f)
+static int u_ct32_e8e9_bswap_le(Filter *f) {
-{
     CT32(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_be32, set_le32)
 }
 
-
 // scan: e8, e9, e8e9 with bswap le->be
-static int s_ct32_e8_bswap_le(Filter *f)
+static int s_ct32_e8_bswap_le(Filter *f) {
-{
     CT32(f, (*b == 0xe8), a + f->addvalue, get_be32, set_dummy)
 }
 
-static int s_ct32_e9_bswap_le(Filter *f)
+static int s_ct32_e9_bswap_le(Filter *f) {
-{
     CT32(f, (*b == 0xe9), a + f->addvalue, get_be32, set_dummy)
 }
 
-static int s_ct32_e8e9_bswap_le(Filter *f)
+static int s_ct32_e8e9_bswap_le(Filter *f) {
-{
     CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be32, set_dummy)
 }
 
-
 // filter: e8, e9, e8e9 with bswap be->le
-static int f_ct32_e8_bswap_be(Filter *f)
+static int f_ct32_e8_bswap_be(Filter *f) {
-{
     CT32(f, (*b == 0xe8), a + f->addvalue, get_be32, set_le32)
 }
 
-static int f_ct32_e9_bswap_be(Filter *f)
+static int f_ct32_e9_bswap_be(Filter *f) {
-{
     CT32(f, (*b == 0xe9), a + f->addvalue, get_be32, set_le32)
 }
 
-static int f_ct32_e8e9_bswap_be(Filter *f)
+static int f_ct32_e8e9_bswap_be(Filter *f) {
-{
     CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_be32, set_le32)
 }
 
-
 // unfilter: e8, e9, e8e9 with bswap be->le
-static int u_ct32_e8_bswap_be(Filter *f)
+static int u_ct32_e8_bswap_be(Filter *f) {
-{
     CT32(f, (*b == 0xe8), 0 - a - f->addvalue, get_le32, set_be32)
 }
 
-static int u_ct32_e9_bswap_be(Filter *f)
+static int u_ct32_e9_bswap_be(Filter *f) {
-{
     CT32(f, (*b == 0xe9), 0 - a - f->addvalue, get_le32, set_be32)
 }
 
-static int u_ct32_e8e9_bswap_be(Filter *f)
+static int u_ct32_e8e9_bswap_be(Filter *f) {
-{
     CT32(f, (*b == 0xe8 || *b == 0xe9), 0 - a - f->addvalue, get_le32, set_be32)
 }
 
-
 // scan: e8, e9, e8e9 with bswap be->le
-static int s_ct32_e8_bswap_be(Filter *f)
+static int s_ct32_e8_bswap_be(Filter *f) {
-{
     CT32(f, (*b == 0xe8), a + f->addvalue, get_le32, set_dummy)
 }
 
-static int s_ct32_e9_bswap_be(Filter *f)
+static int s_ct32_e9_bswap_be(Filter *f) {
-{
     CT32(f, (*b == 0xe9), a + f->addvalue, get_le32, set_dummy)
 }
 
-static int s_ct32_e8e9_bswap_be(Filter *f)
+static int s_ct32_e8e9_bswap_be(Filter *f) {
-{
     CT32(f, (*b == 0xe8 || *b == 0xe9), a + f->addvalue, get_le32, set_dummy)
 }
 
-
 #undef CT32
 
 /*************************************************************************
@@ -391,8 +289,7 @@ static int s_ct32_e8e9_bswap_be(Filter *f)
     byte *b = f->buf;                                                                              \
     byte *b_end = b + f->buf_len - 4;                                                              \
     do {                                                                                           \
-        if (cond) \
+        if (cond) {                                                                                \
-        { \
             unsigned a = (unsigned) (b - f->buf);                                                  \
             f->lastcall = a;                                                                       \
             set(b, get(b) + (addvalue));                                                           \
@@ -400,24 +297,21 @@ static int s_ct32_e8e9_bswap_be(Filter *f)
         }                                                                                          \
         b += 4;                                                                                    \
     } while (b < b_end);                                                                           \
-    if (f->lastcall) f->lastcall += 4; \
+    if (f->lastcall)                                                                               \
+        f->lastcall += 4;                                                                          \
     return 0;
 
-
 #define ARMCT_COND_le (((b[3] & 0x0f) == 0x0b))
 
-static int f_ct24arm_le(Filter *f)
+static int f_ct24arm_le(Filter *f) {
-{
     CT24ARM_LE(f, ARMCT_COND_le, a / 4 + f->addvalue, get_le24, set_le24)
 }
 
-static int u_ct24arm_le(Filter *f)
+static int u_ct24arm_le(Filter *f) {
-{
     CT24ARM_LE(f, ARMCT_COND_le, 0 - a / 4 - f->addvalue, get_le24, set_le24)
 }
 
-static int s_ct24arm_le(Filter *f)
+static int s_ct24arm_le(Filter *f) {
-{
     CT24ARM_LE(f, ARMCT_COND_le, a + f->addvalue, get_le24, set_dummy)
 }
 
@@ -427,8 +321,7 @@ static int s_ct24arm_le(Filter *f)
     byte *b = f->buf;                                                                              \
     byte *b_end = b + f->buf_len - 4;                                                              \
     do {                                                                                           \
-        if (cond) \
+        if (cond) {                                                                                \
-        { \
             unsigned a = (unsigned) (b - f->buf);                                                  \
             f->lastcall = a;                                                                       \
             set(1 + b, get(1 + b) + (addvalue));                                                   \
@@ -436,23 +329,21 @@ static int s_ct24arm_le(Filter *f)
         }                                                                                          \
         b += 4;                                                                                    \
     } while (b < b_end);                                                                           \
-    if (f->lastcall) f->lastcall += 4; \
+    if (f->lastcall)                                                                               \
+        f->lastcall += 4;                                                                          \
     return 0;
 
 #define ARMCT_COND_be (((b[0] & 0x0f) == 0x0b))
 
-static int f_ct24arm_be(Filter *f)
+static int f_ct24arm_be(Filter *f) {
-{
     CT24ARM_BE(f, ARMCT_COND_be, a / 4 + f->addvalue, get_be24, set_be24)
 }
 
-static int u_ct24arm_be(Filter *f)
+static int u_ct24arm_be(Filter *f) {
-{
     CT24ARM_BE(f, ARMCT_COND_be, 0 - a / 4 - f->addvalue, get_be24, set_be24)
 }
 
-static int s_ct24arm_be(Filter *f)
+static int s_ct24arm_be(Filter *f) {
-{
     CT24ARM_BE(f, ARMCT_COND_be, a + f->addvalue, get_be24, set_dummy)
 }
 
@@ -468,8 +359,7 @@ static int s_ct24arm_be(Filter *f)
     byte *b = f->buf;                                                                              \
     byte *b_end = b + f->buf_len - 4;                                                              \
     do {                                                                                           \
-        if (cond) \
+        if (cond) {                                                                                \
-        { \
             unsigned a = (unsigned) (b - f->buf);                                                  \
             f->lastcall = a;                                                                       \
             set(b, get(b) + (addvalue));                                                           \
@@ -477,23 +367,21 @@ static int s_ct24arm_be(Filter *f)
         }                                                                                          \
         b += 4;                                                                                    \
     } while (b < b_end);                                                                           \
-    if (f->lastcall) f->lastcall += 4; \
+    if (f->lastcall)                                                                               \
+        f->lastcall += 4;                                                                          \
     return 0;
 
 #define ARMCT_COND (((b[3] & 0x7C) == 0x14))
 
-static int f_ct26arm_le(Filter *f)
+static int f_ct26arm_le(Filter *f) {
-{
     CT26ARM_LE(f, ARMCT_COND, a / 4 + f->addvalue, get_le26, set_le26)
 }
 
-static int u_ct26arm_le(Filter *f)
+static int u_ct26arm_le(Filter *f) {
-{
     CT26ARM_LE(f, ARMCT_COND, 0 - a / 4 - f->addvalue, get_le26, set_le26)
 }
 
-static int s_ct26arm_le(Filter *f)
+static int s_ct26arm_le(Filter *f) {
-{
     CT26ARM_LE(f, ARMCT_COND, a + f->addvalue, get_le26, set_dummy)
 }
 
@@ -509,41 +397,34 @@ static int CTarm64(Filter *f, int dir)  // dir: 1, 0, -1
         unsigned const v = get_le32(f->buf); // the 32-bit instruction
         if (0x05 == (0x1f & (v >> 26))) {    // b, bl
             f->lastcall = a;
-            if (dir) set_le26(b, v + d);
+            if (dir)
+                set_le26(b, v + d);
             f->calls++;
-        }
+        } else if ((0x54 == (v >> 24))             // b.cond
-        else if (  (0x54 ==  (v >> 24)        )  // b.cond
                    || (0x1a == ((v >> 25) & 0x3f)) // cb{z,nz}
         ) {
             f->lastcall = a;
-            if (dir) set_le19_5(b, (v >> 5) + d);
+            if (dir)
+                set_le19_5(b, (v >> 5) + d);
             f->calls++;
-        }
+        } else if (0x1b == ((v >> 25) & 0x3f)) { // tb{z,nz}
-        else if (0x1b == ((v >> 25) & 0x3f)) { // tb{z,nz}
             f->lastcall = a;
-            if (dir) set_le14_5(b, (v >> 5) + d);
+            if (dir)
+                set_le14_5(b, (v >> 5) + d);
             f->calls++;
         }
         b += 4;
     } while (b < b_end);
-    if (f->lastcall) f->lastcall += 4;
+    if (f->lastcall)
+        f->lastcall += 4;
     return 0;
 }
 
-static int f_CTarm64_le(Filter *f)
+static int f_CTarm64_le(Filter *f) { return CTarm64(f, 1); }
-{
-    return CTarm64(f, 1);
-}
 
-static int u_CTarm64_le(Filter *f)
+static int u_CTarm64_le(Filter *f) { return CTarm64(f, -1); }
-{
-    return CTarm64(f, -1);
-}
 
-static int s_CTarm64_le(Filter *f)
+static int s_CTarm64_le(Filter *f) { return CTarm64(f, 0); }
-{
-    return CTarm64(f, 0);
-}
 
 #endif //}
 

src/filter/cto.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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -25,14 +25,11 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-
-
 /*************************************************************************
 // filter / scan
 **************************************************************************/
 
-static int F(Filter *f)
+static int F(Filter *f) {
-{
 #ifdef U
     // filter
     byte *b = f->buf;
@@ -57,17 +54,14 @@ static int F(Filter *f)
         // So, a call to a destination that is outside the buffer
         // must not conflict with the mark.
         // Note that unsigned comparison checks both edges of buffer.
-        for (ic = 0; ic < size - 5; ic++)
+        for (ic = 0; ic < size - 5; ic++) {
-        {
             if (!COND(b, ic))
                 continue;
             jc = get_le32(b + ic + 1) + ic + 1;
-            if (jc < size)
+            if (jc < size) {
-            {
                 if (jc + addvalue >= (1u << 24)) // hi 8 bits won't be cto8
                     return -1;
-            }
+            } else
-            else
                 buf[b[ic + 1]] |= 1;
         }
 
@@ -79,26 +73,22 @@ static int F(Filter *f)
     const unsigned cto = (unsigned) f->cto << 24;
 #endif
 
-    for (ic = 0; ic < size - 5; ic++)
+    for (ic = 0; ic < size - 5; ic++) {
-    {
         if (!COND(b, ic))
             continue;
         jc = get_le32(b + ic + 1) + ic + 1;
         // try to detect 'real' calls only
-        if (jc < size)
+        if (jc < size) {
-        {
             assert(jc + addvalue < (1u << 24)); // hi 8 bits won't be cto8
 #ifdef U
             set_be32(b + ic + 1, jc + addvalue + cto);
 #endif
-            if (ic - lastnoncall < 5)
+            if (ic - lastnoncall < 5) {
-            {
                 // check the last 4 bytes before this call
                 for (kc = 4; kc; kc--)
                     if (COND(b, ic - kc) && b[ic - kc + 1] == cto8)
                         break;
-                if (kc)
+                if (kc) {
-                {
 #ifdef U
                     // restore original
                     set_le32(b + ic + 1, jc - ic - 1);
@@ -113,9 +103,7 @@ static int F(Filter *f)
             calls++;
             ic += 4;
             lastcall = ic + 1;
-        }
+        } else {
-        else
-        {
             assert(b[ic + 1] != cto8); // this should not happen
             lastnoncall = ic;
             noncalls++;
@@ -133,14 +121,12 @@ static int F(Filter *f)
     return 0;
 }
 
-
 /*************************************************************************
 // unfilter
 **************************************************************************/
 
 #ifdef U
-static int U(Filter *f)
+static int U(Filter *f) {
-{
     byte *b = f->buf;
     const unsigned size5 = f->buf_len - 5;
     const unsigned addvalue = f->addvalue;
@@ -149,24 +135,20 @@ static int U(Filter *f)
     unsigned ic, jc;
 
     for (ic = 0; ic < size5; ic++)
-        if (COND(b,ic))
+        if (COND(b, ic)) {
-        {
             jc = get_be32(b + ic + 1);
-            if (b[ic+1] == f->cto)
+            if (b[ic + 1] == f->cto) {
-            {
                 set_le32(b + ic + 1, jc - ic - 1 - addvalue - cto);
                 f->calls++;
                 ic += 4;
                 f->lastcall = ic + 1;
-            }
+            } else
-            else
                 f->noncalls++;
         }
     return 0;
 }
 #endif
 
-
 #undef F
 #undef U
 

src/filter/ctoj.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
-   Copyright (C) 2000-2023 John F. Reiser
+   Copyright (C) 2000-2024 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -29,14 +29,11 @@
    <jreiser@users.sourceforge.net>
  */
 
-
-
 /*************************************************************************
 // filter / scan
 **************************************************************************/
 
-static int F(Filter *f)
+static int F(Filter *f) {
-{
 #ifdef U
     // filter
     byte *b = f->buf;
@@ -56,17 +53,14 @@ static int F(Filter *f)
         unsigned char buf[256];
         memset(buf, 0, 256);
 
-        for (ic = 0; ic < size - 5; ic++)
+        for (ic = 0; ic < size - 5; ic++) {
-        {
             if (!COND(b, ic, lastcall))
                 continue;
             jc = get_le32(b + ic + 1) + ic + 1;
-            if (jc < size)
+            if (jc < size) {
-            {
                 if (jc + addvalue >= (1u << 24)) // hi 8 bits won't be cto8
                     return -1;
-            }
+            } else
-            else
                 buf[b[ic + 1]] |= 1;
         }
 
@@ -78,26 +72,22 @@ static int F(Filter *f)
     const unsigned cto = (unsigned) f->cto << 24;
 #endif
 
-    for (ic = 0; ic < size - 5; ic++)
+    for (ic = 0; ic < size - 5; ic++) {
-    {
         if (!COND(b, ic, lastcall))
             continue;
         jc = get_le32(b + ic + 1) + ic + 1;
         // try to detect 'real' calls only
-        if (jc < size)
+        if (jc < size) {
-        {
             assert(jc + addvalue < (1u << 24)); // hi 8 bits won't be cto8
 #ifdef U
             set_be32(b + ic + 1, jc + addvalue + cto);
 #endif
-            if (ic - lastnoncall < 5)
+            if (ic - lastnoncall < 5) {
-            {
                 // check the last 4 bytes before this call
                 for (kc = 4; kc; kc--)
                     if (COND(b, ic - kc, lastcall) && b[ic - kc + 1] == cto8)
                         break;
-                if (kc)
+                if (kc) {
-                {
 #ifdef U
                     // restore original
                     set_le32(b + ic + 1, jc - ic - 1);
@@ -112,9 +102,7 @@ static int F(Filter *f)
             calls++;
             ic += 4;
             lastcall = ic + 1;
-        }
+        } else {
-        else
-        {
             assert(b[ic + 1] != cto8); // this should not happen
             lastnoncall = ic;
             noncalls++;
@@ -132,14 +120,12 @@ static int F(Filter *f)
     return 0;
 }
 
-
 /*************************************************************************
 // unfilter
 **************************************************************************/
 
 #ifdef U
-static int U(Filter *f)
+static int U(Filter *f) {
-{
     byte *b = f->buf;
     const unsigned size5 = f->buf_len - 5;
     const unsigned addvalue = f->addvalue;
@@ -148,24 +134,20 @@ static int U(Filter *f)
     unsigned ic, jc;
 
     for (ic = 0; ic < size5; ic++)
-        if (COND(b,ic,lastcall))
+        if (COND(b, ic, lastcall)) {
-        {
             jc = get_be32(b + ic + 1);
-            if (b[ic+1] == f->cto)
+            if (b[ic + 1] == f->cto) {
-            {
                 set_le32(b + ic + 1, jc - ic - 1 - addvalue - cto);
                 f->calls++;
                 ic += 4;
                 f->lastcall = ic + 1;
-            }
+            } else
-            else
                 f->noncalls++;
         }
     return 0;
 }
 #endif
 
-
 #undef F
 #undef U
 

src/filter/ctojr.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
-   Copyright (C) 2000-2023 John F. Reiser
+   Copyright (C) 2000-2024 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -29,12 +29,10 @@
    <jreiser@users.sourceforge.net>
  */
 
-
 #if (ACC_CC_MSC && (_MSC_VER >= 1000 && _MSC_VER < 1300))
 #pragma warning(disable : 4702) // W4: unreachable code
 #endif
 
-
 /*************************************************************************
 // filter / scan
 **************************************************************************/
@@ -44,44 +42,28 @@
 #define FNOMRU 1 // filter, but not using mru
 #define MRUFLT 2 // mru filter
 
-static unsigned
+static unsigned f80_call(Filter const *f) { return (1 + (0x0f & f->id)) % 3; }
-f80_call(Filter const *f)
-{
-    return (1+ (0x0f & f->id)) % 3;
-}
 
-static unsigned
+static unsigned f80_jmp1(Filter const *f) { return ((1 + (0x0f & f->id)) / 3) % 3; }
-f80_jmp1(Filter const *f)
-{
-    return ((1+ (0x0f & f->id)) / 3) % 3;
-}
 
-static unsigned
+static unsigned f80_jcc2(Filter const *f) { return f80_jmp1(f); }
-f80_jcc2(Filter const *f)
-{
-    return f80_jmp1(f);
-}
 
 #define N_MRU 32 // does not have to be a power of 2
 
 // Adaptively remember recent destinations.
-static void
+static void update_mru(const unsigned jc,   // destination address
-update_mru(
-    const unsigned jc,  // destination address
                        const int kh,        // mru[kh] is slot where found
                        unsigned mru[N_MRU], // circular buffer of most recent destinations
                        int &hand,           // mru[hand] is most recent destination
                        int &tail // mru[tail] is beyond oldest destination ("cold cache" startup)
-)
+) {
-{
     if (0 > --hand) {
         hand = N_MRU - 1;
     }
     const unsigned t = mru[hand]; // entry which will be overwritten by jc
     if (0 != t) {                 // have seen at least N_MRU destinations
         mru[kh] = t;
-    }
+    } else { // "cold cache": keep active region contiguous
-    else { // "cold cache": keep active region contiguous
         if (0 > --tail) {
             tail = N_MRU - 1;
         }
@@ -93,9 +75,7 @@ update_mru(
 }
 #endif //}
 
-
+static int F(Filter *f) {
-static int F(Filter *f)
-{
 #ifdef U
     // filter
     byte *const b = f->buf;
@@ -108,7 +88,8 @@ static int F(Filter *f)
     unsigned ic, jc, kc;
     unsigned calls = 0, noncalls = 0, noncalls2 = 0;
     unsigned lastnoncall = size, lastcall = 0;
-    unsigned wtally[3]; memset(wtally, 0, sizeof(wtally));
+    unsigned wtally[3];
+    memset(wtally, 0, sizeof(wtally));
 
 #ifdef U //{
     const unsigned f_call = f80_call(f);
@@ -119,8 +100,7 @@ static int F(Filter *f)
     unsigned mru[N_MRU];
     memset(&mru[0], 0, sizeof(mru));
     assert(N_MRU <= 256);
-    f->n_mru = (MRUFLT==f_call || MRUFLT==f_jmp1 || MRUFLT==f_jcc2) ?
+    f->n_mru = (MRUFLT == f_call || MRUFLT == f_jmp1 || MRUFLT == f_jcc2) ? N_MRU : 0;
-        N_MRU : 0;
 #endif //}
 
     // FIXME: We must fit into 8 MiB because we steal one bit.
@@ -131,8 +111,7 @@ static int F(Filter *f)
         memset(buf, 0, 256);
 
         for (ic = 0; ic < size - 5; ic++)
-            if (CONDF(which,b,ic,lastcall) && get_le32(b+ic+1)+ic+1 >= size)
+            if (CONDF(which, b, ic, lastcall) && get_le32(b + ic + 1) + ic + 1 >= size) {
-            {
                 buf[b[ic + 1]] |= 1;
             }
         UNUSED(which);
@@ -145,8 +124,7 @@ static int F(Filter *f)
     const unsigned cto = (unsigned) f->cto << 24;
 #endif
 
-    for (ic = 0; ic < size - 5; ic++)
+    for (ic = 0; ic < size - 5; ic++) {
-    {
         int which;
         int f_on = 0;
         if (!CONDF(which, b, ic, lastcall))
@@ -154,8 +132,7 @@ static int F(Filter *f)
         ++wtally[which];
         jc = get_le32(b + ic + 1) + ic + 1;
         // try to detect 'real' calls only
-        if (jc < size)
+        if (jc < size) {
-        {
 #ifdef U
             if (2 == which && NOFILT != f_jcc2) { // 6-byte Jcc <disp32>
                 // Prefix 0x0f is constant, but opcode condition 0x80..0x8f
@@ -163,16 +140,14 @@ static int F(Filter *f)
                 // in be32 big endian format, the low-addressed bytes
                 // will tend to be constant.  Swap prefix and opcode
                 // so that constants are together for better compression.
-                unsigned char const t =
+                unsigned char const t = b[ic - 1];
-                b[ic-1];
                 b[ic - 1] = b[ic];
                 b[ic] = t;
             }
             // FIXME [?]: Extend to 8 bytes if "ADD ESP, byte 4*n" follows CALL.
             //   This will require two related cto's (consecutive, or otherwise).
-            if ((0==which && MRUFLT==f_call)
+            if ((0 == which && MRUFLT == f_call) || (1 == which && MRUFLT == f_jmp1) ||
-            ||  (1==which && MRUFLT==f_jmp1)
+                (2 == which && MRUFLT == f_jcc2)) {
-            ||  (2==which && MRUFLT==f_jcc2) ) {
                 f_on = 1;
                 // Recode the destination: narrower mru indices
                 // should compress better than wider addresses.
@@ -197,29 +172,24 @@ static int F(Filter *f)
                     }
                     mru[hand] = jc;
                 }
-            } else
+            } else if ((0 == which && NOFILT != f_call) || (1 == which && NOFILT != f_jmp1) ||
-            if ((0==which && NOFILT!=f_call)
+                       (2 == which && NOFILT != f_jcc2)) {
-            ||  (1==which && NOFILT!=f_jmp1)
-            ||  (2==which && NOFILT!=f_jcc2) ) {
                 f_on = 1;
                 set_be32(b + ic + 1, jc + cto);
             }
 #endif
             if (f_on) {
-                    if (ic - lastnoncall < 5)
+                if (ic - lastnoncall < 5) {
-                    {
                     // check the last 4 bytes before this call
                     for (kc = 4; kc; kc--)
                         if (CONDF(which, b, ic - kc, lastcall) && b[ic - kc + 1] == cto8)
                             break;
-                        if (kc)
+                    if (kc) {
-                        {
 #ifdef U
                         // restore original
                         if (2 == which) {
                             // Unswap prefix and opcode for 6-byte Jcc <disp32>
-                                unsigned char const t =
+                            unsigned char const t = b[ic - 1];
-                                b[ic-1];
                             b[ic - 1] = b[ic];
                             b[ic] = t;
                         }
@@ -236,9 +206,7 @@ static int F(Filter *f)
                 ic += 4;
                 lastcall = ic + 1;
             }
-        }
+        } else {
-        else
-        {
             assert(b[ic + 1] != cto8); // this should not happen
             lastnoncall = ic;
             noncalls++;
@@ -258,14 +226,12 @@ static int F(Filter *f)
     return 0;
 }
 
-
 /*************************************************************************
 // unfilter
 **************************************************************************/
 
 #ifdef U
-static int U(Filter *f)
+static int U(Filter *f) {
-{
     unsigned ic, jc;
 
     byte *const b = f->buf;
@@ -282,15 +248,12 @@ static int U(Filter *f)
 
     for (ic = 0; ic < size5; ic++) {
         int which;
-        if (CONDU(which,b,ic,lastcall))
+        if (CONDU(which, b, ic, lastcall)) {
-        {
             unsigned f_on = 0;
             jc = get_be32(b + ic + 1) - cto;
-            if (b[ic+1] == f->cto)
+            if (b[ic + 1] == f->cto) {
-            {
+                if ((0 == which && MRUFLT == f_call) || (1 == which && MRUFLT == f_jmp1) ||
-                if ((0==which && MRUFLT==f_call)
+                    (2 == which && MRUFLT == f_jcc2)) {
-                ||  (1==which && MRUFLT==f_jmp1)
-                ||  (2==which && MRUFLT==f_jcc2) ) {
                     f_on = 1;
                     if (1 & jc) { // 1st time at this destination
                         jc >>= 1;
@@ -298,8 +261,7 @@ static int U(Filter *f)
                             hand = N_MRU - 1;
                         }
                         mru[hand] = jc;
-                        }
+                    } else { // not 1st time at this destination
-                        else { // not 1st time at this destination
                         jc >>= 1;
                         if (N_MRU <= jc) {
                             throwCompressedDataViolation();
@@ -312,17 +274,14 @@ static int U(Filter *f)
                         update_mru(jc, kh, mru, hand, tail);
                     }
                     set_le32(b + ic + 1, jc - ic - 1);
-                } else
+                } else if ((0 == which && NOFILT != f_call) || (1 == which && NOFILT != f_jmp1) ||
-                if ((0==which && NOFILT!=f_call)
+                           (2 == which && NOFILT != f_jcc2)) {
-                ||  (1==which && NOFILT!=f_jmp1)
-                ||  (2==which && NOFILT!=f_jcc2) ) {
                     f_on = 1;
                     set_le32(b + ic + 1, jc - ic - 1);
                 }
                 if (2 == which && NOFILT != f_jcc2) {
                     // Unswap prefix and opcode for 6-byte Jcc <disp32>
-                    unsigned char const t =
+                    unsigned char const t = b[ic - 1];
-                    b[ic-1];
                     b[ic - 1] = b[ic];
                     b[ic] = t;
                 }
@@ -332,8 +291,7 @@ static int U(Filter *f)
                     ic += 4;
                     f->lastcall = lastcall = ic + 1;
                 }
-            }
+            } else
-            else
                 f->noncalls++;
         }
     }

src/filter/ctok.h

@@ -2,9 +2,9 @@
 
    This file is part of the UPX executable compressor.
 
-   Copyright (C) 1996-2023 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
-   Copyright (C) 2000-2023 John F. Reiser
+   Copyright (C) 2000-2024 John F. Reiser
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -29,14 +29,11 @@
    <jreiser@users.sourceforge.net>
  */
 
-
-
 /*************************************************************************
 // filter / scan
 **************************************************************************/
 
-static int F(Filter *f)
+static int F(Filter *f) {
-{
 #ifdef U
     // filter
     byte *b = f->buf;
@@ -57,17 +54,14 @@ static int F(Filter *f)
         unsigned char buf[256];
         memset(buf, 0, 256);
 
-        for (ic = 0; ic < size - 5; ic++)
+        for (ic = 0; ic < size - 5; ic++) {
-        {
             if (!COND(b, ic, lastcall, id))
                 continue;
             jc = get_le32(b + ic + 1) + ic + 1;
-            if (jc < size)
+            if (jc < size) {
-            {
                 if (jc + addvalue >= (1u << 24)) // hi 8 bits won't be cto8
                     return -1;
-            }
+            } else
-            else
                 buf[b[ic + 1]] |= 1;
         }
 
@@ -79,26 +73,22 @@ static int F(Filter *f)
     const unsigned cto = (unsigned) f->cto << 24;
 #endif
 
-    for (ic = 0; ic < size - 5; ic++)
+    for (ic = 0; ic < size - 5; ic++) {
-    {
         if (!COND(b, ic, lastcall, id))
             continue;
         jc = get_le32(b + ic + 1) + ic + 1;
         // try to detect 'real' calls only
-        if (jc < size)
+        if (jc < size) {
-        {
             assert(jc + addvalue < (1u << 24)); // hi 8 bits won't be cto8
 #ifdef U
             set_be32(b + ic + 1, jc + addvalue + cto);
 #endif
-            if (ic - lastnoncall < 5)
+            if (ic - lastnoncall < 5) {
-            {
                 // check the last 4 bytes before this call
                 for (kc = 4; kc; kc--)
                     if (COND(b, ic - kc, lastcall, id) && b[ic - kc + 1] == cto8)
                         break;
-                if (kc)
+                if (kc) {
-                {
 #ifdef U
                     // restore original
                     set_le32(b + ic + 1, jc - ic - 1);
@@ -113,9 +103,7 @@ static int F(Filter *f)
             calls++;
             ic += 4;
             lastcall = ic + 1;
-        }
+        } else {
-        else
-        {
             assert(b[ic + 1] != cto8); // this should not happen
             lastnoncall = ic;
             noncalls++;
@@ -133,14 +121,12 @@ static int F(Filter *f)
     return 0;
 }
 
-
 /*************************************************************************
 // unfilter
 **************************************************************************/
 
 #ifdef U
-static int U(Filter *f)
+static int U(Filter *f) {
-{
     byte *b = f->buf;
     const unsigned size5 = f->buf_len - 5;
     const unsigned addvalue = f->addvalue;
@@ -151,24 +137,20 @@ static int U(Filter *f)
     unsigned ic, jc;
 
     for (ic = 0; ic < size5; ic++)
-        if (COND(b,ic,lastcall,id))
+        if (COND(b, ic, lastcall, id)) {
-        {
             jc = get_be32(b + ic + 1);
-            if (b[ic+1] == f->cto)
+            if (b[ic + 1] == f->cto) {
-            {
                 set_le32(b + ic + 1, jc - ic - 1 - addvalue - cto);
                 f->calls++;
                 ic += 4;
                 f->lastcall = lastcall = ic + 1;
-            }
+            } else
-            else
                 f->noncalls++;
         }
     return 0;
 }
 #endif
 
-
 #undef F
 #undef U
 

src/filter/ctsw.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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -25,8 +25,6 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-
-
 /*************************************************************************
 // 16-bit call-/swaptrick ("naive")
 **************************************************************************/
@@ -35,17 +33,14 @@
     byte *b = f->buf;                                                                              \
     byte *b_end = b + f->buf_len - 3;                                                              \
     do {                                                                                           \
-        if (cond1) \
+        if (cond1) {                                                                               \
-        { \
             b += 1;                                                                                \
             unsigned a = (unsigned) (b - f->buf);                                                  \
             f->lastcall = a;                                                                       \
             set(b, get(b) + (addvalue));                                                           \
             f->calls++;                                                                            \
             b += 2 - 1;                                                                            \
-        } \
+        } else if (cond2) {                                                                        \
-        else if (cond2) \
-        { \
             b += 1;                                                                                \
             unsigned a = (unsigned) (b - f->buf);                                                  \
             f->lastcall = a;                                                                       \
@@ -54,49 +49,39 @@
             b += 2 - 1;                                                                            \
         }                                                                                          \
     } while (++b < b_end);                                                                         \
-    if (f->lastcall) f->lastcall += 2; \
+    if (f->lastcall)                                                                               \
+        f->lastcall += 2;                                                                          \
     return 0;
 
-
 // filter
-static int f_ctsw16_e8_e9(Filter *f)
+static int f_ctsw16_e8_e9(Filter *f) {
-{
     CTSW16(f, (*b == 0xe8), (*b == 0xe9), a + f->addvalue, get_le16, set_be16)
 }
 
-static int f_ctsw16_e9_e8(Filter *f)
+static int f_ctsw16_e9_e8(Filter *f) {
-{
     CTSW16(f, (*b == 0xe9), (*b == 0xe8), a + f->addvalue, get_le16, set_be16)
 }
 
-
 // unfilter
-static int u_ctsw16_e8_e9(Filter *f)
+static int u_ctsw16_e8_e9(Filter *f) {
-{
     CTSW16(f, (*b == 0xe8), (*b == 0xe9), 0 - a - f->addvalue, get_be16, set_le16)
 }
 
-static int u_ctsw16_e9_e8(Filter *f)
+static int u_ctsw16_e9_e8(Filter *f) {
-{
     CTSW16(f, (*b == 0xe9), (*b == 0xe8), 0 - a - f->addvalue, get_be16, set_le16)
 }
 
-
 // scan
-static int s_ctsw16_e8_e9(Filter *f)
+static int s_ctsw16_e8_e9(Filter *f) {
-{
     CTSW16(f, (*b == 0xe8), (*b == 0xe9), a + f->addvalue, get_le16, set_dummy)
 }
 
-static int s_ctsw16_e9_e8(Filter *f)
+static int s_ctsw16_e9_e8(Filter *f) {
-{
     CTSW16(f, (*b == 0xe9), (*b == 0xe8), a + f->addvalue, get_le16, set_dummy)
 }
 
-
 #undef CTSW16
 
-
 /*************************************************************************
 // 32-bit call-/swaptrick ("naive")
 **************************************************************************/
@@ -105,17 +90,14 @@ static int s_ctsw16_e9_e8(Filter *f)
     byte *b = f->buf;                                                                              \
     byte *b_end = b + f->buf_len - 5;                                                              \
     do {                                                                                           \
-        if (cond1) \
+        if (cond1) {                                                                               \
-        { \
             b += 1;                                                                                \
             unsigned a = (unsigned) (b - f->buf);                                                  \
             f->lastcall = a;                                                                       \
             set(b, get(b) + (addvalue));                                                           \
             f->calls++;                                                                            \
             b += 4 - 1;                                                                            \
-        } \
+        } else if (cond2) {                                                                        \
-        else if (cond2) \
-        { \
             b += 1;                                                                                \
             unsigned a = (unsigned) (b - f->buf);                                                  \
             f->lastcall = a;                                                                       \
@@ -124,46 +106,37 @@ static int s_ctsw16_e9_e8(Filter *f)
             b += 4 - 1;                                                                            \
         }                                                                                          \
     } while (++b < b_end);                                                                         \
-    if (f->lastcall) f->lastcall += 4; \
+    if (f->lastcall)                                                                               \
+        f->lastcall += 4;                                                                          \
     return 0;
 
-
 // filter
-static int f_ctsw32_e8_e9(Filter *f)
+static int f_ctsw32_e8_e9(Filter *f) {
-{
     CTSW32(f, (*b == 0xe8), (*b == 0xe9), a + f->addvalue, get_le32, set_be32)
 }
 
-static int f_ctsw32_e9_e8(Filter *f)
+static int f_ctsw32_e9_e8(Filter *f) {
-{
     CTSW32(f, (*b == 0xe9), (*b == 0xe8), a + f->addvalue, get_le32, set_be32)
 }
 
-
 // unfilter
-static int u_ctsw32_e8_e9(Filter *f)
+static int u_ctsw32_e8_e9(Filter *f) {
-{
     CTSW32(f, (*b == 0xe8), (*b == 0xe9), 0 - a - f->addvalue, get_be32, set_le32)
 }
 
-static int u_ctsw32_e9_e8(Filter *f)
+static int u_ctsw32_e9_e8(Filter *f) {
-{
     CTSW32(f, (*b == 0xe9), (*b == 0xe8), 0 - a - f->addvalue, get_be32, set_le32)
 }
 
-
 // scan
-static int s_ctsw32_e8_e9(Filter *f)
+static int s_ctsw32_e8_e9(Filter *f) {
-{
     CTSW32(f, (*b == 0xe8), (*b == 0xe9), a + f->addvalue, get_le32, set_dummy)
 }
 
-static int s_ctsw32_e9_e8(Filter *f)
+static int s_ctsw32_e9_e8(Filter *f) {
-{
     CTSW32(f, (*b == 0xe9), (*b == 0xe8), a + f->addvalue, get_le32, set_dummy)
 }
 
-
 #undef CTSW32
 
 /* vim:set ts=4 sw=4 et: */

src/filter/filter_impl.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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -25,29 +25,21 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-
 #include "../conf.h"
 #include "../filter.h"
 
-static unsigned
+static unsigned umin(const unsigned a, const unsigned b) { return (a <= b) ? a : b; }
-umin(const unsigned a, const unsigned b)
-{
-    return (a<=b) ? a : b;
-}
-
 
 #define set_dummy(p, v) ((void) 0)
 #define get_8(p)        (*(p))
 #define set_8(p, v)     (*(p) = (v))
 
-
 /*************************************************************************
 // util
 **************************************************************************/
 
 #include "getcto.h"
 
-
 /*************************************************************************
 // simple filters: calltrick / swaptrick / delta / ...
 **************************************************************************/
@@ -60,7 +52,6 @@ umin(const unsigned a, const unsigned b)
 #include "sub16.h"
 #include "sub32.h"
 
-
 /*************************************************************************
 // cto calltrick
 **************************************************************************/
@@ -89,7 +80,6 @@ umin(const unsigned a, const unsigned b)
 #include "cto.h"
 #undef COND
 
-
 /*************************************************************************
 // cto calltrick with jmp
 **************************************************************************/
@@ -102,7 +92,6 @@ umin(const unsigned a, const unsigned b)
 #include "ctoj.h"
 #undef COND
 
-
 /*************************************************************************
 // cto calltrick with jmp, optional jcc
 **************************************************************************/
@@ -119,22 +108,19 @@ umin(const unsigned a, const unsigned b)
 #undef COND2
 #undef COND1
 
-
 /*************************************************************************
 // cto calltrick with jmp and jcc and relative renumbering
 **************************************************************************/
 
 #define COND_CALL(which, b, x) ((which = 0), b[x] == 0xe8)
 #define COND_JMP(which, b, x)  ((which = 1), b[x] == 0xe9)
-#define COND_JCC( which,b,lastcall,x,y,z) ((which = 2), \
+#define COND_JCC(which, b, lastcall, x, y, z)                                                      \
-         (lastcall!=(x) && 0xf==b[y] && 0x80<=b[z] && b[z]<=0x8f))
+    ((which = 2), (lastcall != (x) && 0xf == b[y] && 0x80 <= b[z] && b[z] <= 0x8f))
 #define COND1(which, b, x)                 (COND_CALL(which, b, x) || COND_JMP(which, b, x))
 #define COND2(which, b, lastcall, x, y, z) COND_JCC(which, b, lastcall, x, y, z)
 
-#define CONDF(which,b,x,lastcall) \
+#define CONDF(which, b, x, lastcall) (COND1(which, b, x) || COND2(which, b, lastcall, x, (x) -1, x))
-    (COND1(which,b,x) || COND2(which,b,lastcall,x,(x)-1, x   ))
+#define CONDU(which, b, x, lastcall) (COND1(which, b, x) || COND2(which, b, lastcall, x, x, (x) -1))
-#define CONDU(which,b,x,lastcall) \
-    (COND1(which,b,x) || COND2(which,b,lastcall,x, x   ,(x)-1))
 
 #define F f_ctojr32_e8e9_bswap_le
 #define U u_ctojr32_e8e9_bswap_le
@@ -150,7 +136,6 @@ umin(const unsigned a, const unsigned b)
 #undef COND_JMP
 #undef COND_CALL
 
-
 /*************************************************************************
 // PowerPC branch [incl. call] trick
 **************************************************************************/
@@ -163,11 +148,11 @@ umin(const unsigned a, const unsigned b)
 #include "ppcbxx.h"
 #undef COND
 
-
 /*************************************************************************
 // database for use in class Filter
 **************************************************************************/
 
+// clang-format off
 /*static*/ const FilterImpl::FilterEntry FilterImpl::filters[] = {
     // no filter
     { 0x00, 0,          0, nullptr, nullptr, nullptr },
@@ -265,6 +250,7 @@ umin(const unsigned a, const unsigned b)
     // PowerPC branch+call trick
     { 0xd0, 8,          0, f_ppcbxx, u_ppcbxx, s_ppcbxx },
 };
+// clang-format on
 
 /*static*/ const int FilterImpl::n_filters = TABLESIZE(filters);
 

src/filter/getcto.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-2024 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996-2023 Laszlo Molnar
+   Copyright (C) 1996-2024 Laszlo Molnar
    All Rights Reserved.
 
    UPX and the UCL library are free software; you can redistribute them
@@ -25,22 +25,16 @@
    <markus@oberhumer.com>               <ezerotven+github@gmail.com>
  */
 
-
-
 /*************************************************************************
 //
 **************************************************************************/
 
-static int getcto(Filter *f, const byte *buf, const int n=256)
+static int getcto(Filter *f, const byte *buf, const int n = 256) {
-{
     int ic = n;
 
-    if (f->preferred_ctos)
+    if (f->preferred_ctos) {
-    {
+        for (const int *pc = f->preferred_ctos; *pc >= 0; pc++) {
-        for (const int *pc = f->preferred_ctos; *pc >= 0; pc++)
+            if (*pc < n && buf[*pc] == 0) {
-        {
-            if (*pc < n && buf[*pc] == 0)
-            {
                 ic = *pc;
                 break;
             }