Merging upstream version 3.12.2.

Signed-off-by: Daniel Baumann <daniel@debian.org>

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
             options: "-DENABLE_TESTS=ON",
             packager: "sudo apt-get",
             # no expect because stdout seems to be redirected
-            packages: "libcmocka-dev shunit2",
+            packages: "libcmocka-dev libxxhash-dev shunit2",
             snaps: "",
             build-cmd: "make"
           }
@@ -36,7 +36,7 @@ jobs:
             cc: "clang",
             options: "-DENABLE_TESTS=ON",
             packager: "sudo apt-get",
-            packages: "libcmocka-dev shunit2",
+            packages: "libcmocka-dev libxxhash-dev shunit2",
             snaps: "",
             build-cmd: "make"
           }
@@ -47,7 +47,7 @@ jobs:
             cc: "gcc",
             options: "",
             packager: "sudo apt-get",
-            packages: "libcmocka-dev valgrind shunit2",
+            packages: "libcmocka-dev libxxhash-dev valgrind shunit2",
             snaps: "",
             build-cmd: "make"
           }
@@ -59,7 +59,7 @@ jobs:
             options: "",
             packager: "sudo apt-get",
             # no valgrind because it does not support DWARF5 yet generated by clang 14
-            packages: "libcmocka-dev shunit2",
+            packages: "libcmocka-dev libxxhash-dev shunit2",
             snaps: "",
             build-cmd: "make"
           }
@@ -70,7 +70,7 @@ jobs:
             cc: "clang",
             options: "-DENABLE_TESTS=ON -DPATH_EXPECT=",
             packager: "brew",
-            packages: "cmocka shunit2 tcl-tk",
+            packages: "cmocka xxhash shunit2 tcl-tk",
             snaps: "",
             build-cmd: "make"
           }
@@ -81,7 +81,7 @@ jobs:
             cc: "clang",
             options: "-DCMAKE_C_FLAGS=-fsanitize=address,undefined -DENABLE_TESTS=ON -DENABLE_VALGRIND_TESTS=OFF",
             packager: "sudo apt-get",
-            packages: "libcmocka-dev",
+            packages: "libcmocka-dev libxxhash-dev",
             snaps: "",
             build-cmd: "make"
           }
@@ -92,7 +92,7 @@ jobs:
             cc: "gcc",
             options: "",
             packager: "sudo apt-get",
-            packages: "libcmocka-dev abi-dumper abi-compliance-checker",
+            packages: "libcmocka-dev libxxhash-dev abi-dumper abi-compliance-checker",
             snaps: "core universal-ctags",
             build-cmd: "make abi-check"
           }
@@ -103,7 +103,7 @@ jobs:
             cc: "gcc",
             options: "",
             packager: "sudo apt-get",
-            packages: "cmake debhelper libcmocka-dev python3-pip",
+            packages: "cmake debhelper libcmocka-dev libxxhash-dev python3-pip",
             snaps: "",
             build-cmd: ""
           }
@@ -132,7 +132,7 @@ jobs:
           cd uncrustify
           mkdir build
           cd build
-          CC=${{ matrix.config.cc }} cmake ..
+          CC=${{ matrix.config.cc }} cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
           make
           sudo make install
         if: ${{ matrix.config.name == 'Debug, gcc' }}
@@ -209,8 +209,13 @@ jobs:
         id: cpu-cores
         uses: SimenB/github-actions-cpu-cores@v1
 
+      - name: pin CMake to the latest 3.x series
+        uses: jwlawson/actions-setup-cmake@09fd9b0fb3b239b4b68d9256cd65adf8d6b91da0
+        with:
+          cmake-version: '3.31.6'
+
       - name: Install Windows dependencies
-        run: vcpkg install --triplet=${{ matrix.triplet }} pcre2 pthreads dirent dlfcn-win32 cmocka getopt
+        run: vcpkg install --triplet=${{ matrix.triplet }} pcre2 pthreads dirent dlfcn-win32 cmocka getopt xxhash
 
       - name: Configure
         shell: bash

.github/workflows/cifuzz.yml

@@ -17,7 +17,7 @@ jobs:
         fuzz-seconds: 300
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@main
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/devel-push.yml

@@ -34,7 +34,7 @@ jobs:
             cc: "gcc",
             options: "-DENABLE_COVERAGE=ON",
             packager: "sudo apt-get",
-            packages: "libcmocka-dev lcov",
+            packages: "libcmocka-dev libxxhash-dev lcov",
             snaps: "",
             make-prepend: "",
             make-target: ""