Merge pull request #977 from libexpat/issue-976-automake-add-missing-files

Integrate missing fuzzer files with Automake (fixes #976)

.github/workflows/fuzzing.yml

@@ -71,9 +71,26 @@ jobs:
       run: |-
         set -x
         sudo apt-get install --yes --no-install-recommends -V \
+            autoconf \
+            automake \
+            docbook2x \
+            libtool \
             libprotobuf-dev \
+            lzip \
             protobuf-compiler
 
+    - name: Turn Git clone into Autotools "make dist" release tarball
+      run: |-
+        set -x
+        pushd expat/
+          ./buildconf.sh
+          ./configure
+          make dist
+        popd
+        tar xf expat/expat-*.tar.xz
+        rm -R expat/
+        mv expat-* expat
+
     - name: Build Expat fuzzers
       run: |
         set -x -o pipefail
@@ -131,7 +148,7 @@ jobs:
     - name: Store fuzzing logs of last batch
       uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1  # v4.6.1
       with:
-        name: expat_fuzzing_logs_last_${{ matrix.fuzzer }}_${{ github.sha }}
+        name: ${{ matrix.fuzzer }}_${{ github.sha }}_logs_last
         path: expat/build/fuzz-*.log
         if-no-files-found: error
 
@@ -151,6 +168,6 @@ jobs:
     - name: Store coverage report
       uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1  # v4.6.1
       with:
-        name: expat_fuzzing_coverage_${{ matrix.fuzzer }}_${{ github.sha }}
+        name: ${{ matrix.fuzzer }}_${{ github.sha }}_coverage
         path: expat/build/coverage/
         if-no-files-found: error

expat/Changes

@@ -37,6 +37,15 @@
 !! THANK YOU!                        Sebastian Pipping -- Berlin, 2024-03-09 !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+Release 2.7.1 ??? ????? ?? ????
+        Other changes:
+       #976 #977  Autotools: Integrate files "fuzz/xml_lpm_fuzzer.{cpp,proto}"
+                    with Automake that were missing from 2.7.0 release tarballs
+
+        Infrastructure:
+       #976 #977  CI: Protect against fuzzer files missing from future
+                    release archives
+
 Release 2.7.0 Thu March 13 2025
         Security fixes:
        #893 #973  CVE-2024-8176 -- Fix crash from chaining a large number

expat/Makefile.am

@@ -96,6 +96,8 @@ EXTRA_DIST = \
     conftools/expat.m4 \
     conftools/get-version.sh \
     \
+    fuzz/xml_lpm_fuzzer.cpp \
+    fuzz/xml_lpm_fuzzer.proto \
     fuzz/xml_parsebuffer_fuzzer.c \
     fuzz/xml_parse_fuzzer.c \
     \