Merge branch 'master' into user/niwilson/ebcdic-test

Author: NWilson

.github/workflows/build.yml

@@ -160,7 +160,7 @@ jobs:
         run: ./autogen.sh
 
       - name: Build & test
-        uses: vmactions/freebsd-vm@debf37ca7b7fa40e19c542ef7ba30d6054a706a4 # v1.1.5
+        uses: vmactions/freebsd-vm@848dac7e118679d08e2c2f9d42cd96608d834323 # v1.1.8
         with:
           envs: 'CFLAGS_GCC_STYLE'
           usesh: true
@@ -215,7 +215,7 @@ jobs:
         run: ./autogen.sh
 
       - name: Build & test
-        uses: vmactions/solaris-vm@a89b9438868c70db27e41625f0a5de6ff5e90809 # v1.1.0
+        uses: vmactions/solaris-vm@cc8f82fa1a7cc746153ec3f71bf11f311f16e225 # v1.1.1
         with:
           envs: 'CFLAGS_SOLARIS_CC'
           usesh: true
@@ -310,7 +310,7 @@ jobs:
           maint/RunManifestTest tarball-dir maint/manifest-tarball
 
       - name: Upload to GitHub artifacts
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: "Distribution release"
           path: |
@@ -385,14 +385,14 @@ jobs:
           echo '```' >> "$GITHUB_STEP_SUMMARY"
 
       - name: Upload report to GitHub artifacts
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: "Coverage report"
           path: './build/coverage-report'
           if-no-files-found: error
 
       - name: Upload report to Codecov
-        uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
+        uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

.github/workflows/cifuzz.yml

@@ -24,7 +24,7 @@ jobs:
         fuzz-seconds: 300
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/clang-analyzer.yml

@@ -59,14 +59,14 @@ jobs:
 
       # Upload the browsable HTML report as an artifact.
       - name: Upload report
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: "Clang Static Analyzer report"
           path: './build/clang-report'
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
         with:
           sarif_file: build/clang.sarif
           category: clang-analyzer

.github/workflows/codeql.yml

@@ -49,7 +49,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+      uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+      uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -74,4 +74,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+      uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8

.github/workflows/dev.yml

@@ -440,8 +440,8 @@ jobs:
         run: bazelisk test //... --enable_runfiles --incompatible_strict_action_env --test_output=all
 
   heron:
-    # Job to verify that the tasks performed by PrepareRelease have been done. It is
-    # the committer's responsibility (currently) to run PrepareRelease themselves when
+    # Job to verify that the tasks performed by UpdateAlways have been done. It is
+    # the committer's responsibility (currently) to run UpdateAlways themselves when
     # making a PR, so that everything is kept in-sync.
     name: Check autogenerated file freshness
     runs-on: ubuntu-24.04 # TODO: Update to ubuntu-latest when that switches to 24.04
@@ -452,27 +452,40 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: false
-          fetch-depth: 0 # Necessary for maint/PrepareRelease
+          fetch-depth: 0 # Necessary for maint/UpdateAlways
           fetch-tags: false
           # Check out the unmerged source branch for `pull_request`-triggered runs;
           # otherwise use the tip of the branch for `workflow_dispatch` and `pull` triggers.
           ref: ${{ github.event.pull_request.head.ref || github.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
 
-      - name: PrepareRelease
-        run: maint/PrepareRelease
+      - name: UpdateDates
+        if: |
+          github.event_name != 'pull_request' &&
+          (startsWith(github.ref, 'refs/heads/release/') ||
+           startsWith(github.ref, 'refs/tags/pcre2-'))
+        run: maint/UpdateDates.py
+
+      - name: UpdateAlways
+        run: maint/UpdateAlways
 
       - name: 'Rebuild *.h.generic'
         run: |
           ./autogen.sh && ./configure
+
+          # Workaround for incorrect filesystem permissions on /usr/share/aclocal, which
+          # causes the m4 macros to be copied with incorrect permissions.
+          # https://github.com/actions/runner-images/issues/11212
+          chmod u=rw,go=r m4/*.m4
+
           rm -f src/*.generic
           make src/config.h.generic src/pcre2.h.generic
 
       # If we're in a forked repo, it's too onerous to expect contributors to run the
       # checks locally to keep these files up to date (since the tool versions are very
       # fussy and brittle).
       #
-      # However, we still want to run the steps above, to check that the PrepareRelease
+      # However, we still want to run the steps above, to check that the UpdateAlways
       # process is able to run to completion, since it can pick up errors in the man pages.
 
       - name: Commit and push, if not in a forked repo

.github/workflows/scorecards.yml

@@ -44,15 +44,15 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
         with:
           sarif_file: results.sarif
           category: ossf-scorecard

AUTHORS.md

@@ -1,14 +1,14 @@
 PCRE2 Authorship and Contributors
 =================================
 
-COPYRIGHT
+Copyright
 ---------
 
 Please see the file [LICENCE](./LICENCE.md) in the PCRE2 distribution for
 copyright details.
 
 
-MAINTAINERS
+Maintainers
 -----------
 
 The PCRE and PCRE2 libraries were authored and maintained by Philip Hazel.
@@ -62,7 +62,7 @@ Both administrators are volunteers acting in a personal capacity.
 </table>
 
 
-CONTRIBUTORS
+Contributors
 ------------
 
 Many others have participated and contributed to PCRE2 over its history.

LICENCE.md

@@ -1,4 +1,4 @@
-PCRE2 License
+PCRE2 Licence
 =============
 
 | SPDX-License-Identifier: | BSD-3-Clause WITH PCRE2-exception |
@@ -99,5 +99,3 @@ not apply all the way down a chain of software. If binary package A includes
 PCRE2, it must respect the condition, but if package B is software that
 includes package A, the condition is not imposed on package B unless it uses
 PCRE2 independently.
-
-End

NON-AUTOTOOLS-BUILD

@@ -1,5 +1,5 @@
 Building PCRE2 without using autotools
---------------------------------------
+======================================
 
 This document contains the following sections:
 
@@ -16,7 +16,8 @@ This document contains the following sections:
   Building PCRE2 under VMS
 
 
-GENERAL
+General
+-------
 
 The source of the PCRE2 libraries consists entirely of code written in Standard
 C, and so should compile successfully on any system that has a Standard C
@@ -37,7 +38,8 @@ provided for those who build PCRE2 without using "configure" or CMake. If you
 use "configure" or CMake, the .generic versions are not used.
 
 
-GENERIC INSTRUCTIONS FOR THE PCRE2 C LIBRARIES
+Generic instructions for the PCRE2 C libraries
+----------------------------------------------
 
 There are three possible PCRE2 libraries, each handling data with a specific
 code unit width: 8, 16, or 32 bits. You can build any combination of them. The
@@ -207,20 +209,23 @@ example.
      defining SUPPORT_JIT, pcre2grep does not try to make use of JIT.
 
 
-STACK SIZE IN WINDOWS ENVIRONMENTS
+Stack size in Windows environments
+----------------------------------
 
 Prior to release 10.30 the default system stack size of 1MiB in some Windows
 environments caused issues with some tests. This should no longer be the case
 for 10.30 and later releases.
 
 
-LINKING PROGRAMS IN WINDOWS ENVIRONMENTS
+Linking programs in Windows environments
+----------------------------------------
 
 If you want to statically link a program against a PCRE2 library in the form of
 a non-dll .a file, you must define PCRE2_STATIC before including src/pcre2.h.
 
 
-CALLING CONVENTIONS IN WINDOWS ENVIRONMENTS
+Calling conventions in Windows environments
+-------------------------------------------
 
 It is possible to compile programs to use different calling conventions using
 MSVC. Search the web for "calling conventions" for more information. To make it
@@ -231,7 +236,8 @@ not set, it defaults to empty; the default calling convention is then used
 (which is what is wanted most of the time).
 
 
-COMMENTS ABOUT WIN32 BUILDS (see also "BUILDING PCRE2 ON WINDOWS WITH CMAKE")
+Comments about Win32 builds (see also "Building PCRE2 on Windows with CMake")
+---------------------------
 
 There are two ways of building PCRE2 using the "configure, make, make install"
 paradigm on Windows systems: using MinGW or using Cygwin. These are not at all
@@ -293,7 +299,8 @@ newline option that includes LF as a valid newline, it may be necessary to
 change the line terminators in the test files to get some of the tests to work.
 
 
-BUILDING PCRE2 ON WINDOWS WITH CMAKE
+Building PCRE2 on Windows with CMake
+------------------------------------
 
 CMake is an alternative configuration facility that can be used instead of
 "configure". CMake creates project files (make files, solution files, etc.)
@@ -364,7 +371,8 @@ be deleted.
    Regardless of build system used, `ctest` will run the tests.
 
 
-BUILDING PCRE2 ON WINDOWS WITH VISUAL STUDIO
+Building PCRE2 on Windows with Visual Studio
+--------------------------------------------
 
 The code currently cannot be compiled without an inttypes.h header, which is
 available only with Visual Studio 2013 or newer. However, this portable and
@@ -376,7 +384,8 @@ alternative:
 Just rename it and drop it into the top level of the build tree.
 
 
-TESTING WITH RUNTEST.BAT
+Testing with RunTest.bat
+------------------------
 
 If configured with CMake, building the test project ("make test" or building
 ALL_TESTS in Visual Studio) creates (and runs) pcre2_test.bat (and depending
@@ -410,7 +419,8 @@ Otherwise:
 To independently test the just-in-time compiler, run pcre2_jit_test.exe.
 
 
-BUILDING PCRE2 ON NATIVE Z/OS AND Z/VM
+Building PCRE2 on native z/OS and z/VM
+--------------------------------------
 
 z/OS and z/VM are operating systems for mainframe computers, produced by IBM.
 The character code used is EBCDIC, not ASCII or Unicode. In z/OS, UNIX APIs and
@@ -429,7 +439,8 @@ z/OS file formats. The port provides an API for LE languages such as COBOL and
 for the z/OS and z/VM versions of the Rexx languages.
 
 
-BUILDING PCRE2 UNDER VMS
+Building PCRE2 under VMS
+------------------------
 
 Alexey Chuphin has contributed some auxiliary files for building PCRE2 under
 OpenVMS. They are in the "vms" directory in the distribution tarball. Please

README

@@ -1,5 +1,5 @@
 README file for PCRE2 (Perl-compatible regular expression library)
-------------------------------------------------------------------
+==================================================================
 
 PCRE2 is a re-working of the original PCRE1 library to provide an entirely new
 API. Since its initial release in 2015, there has been further development of
@@ -618,7 +618,7 @@ zip formats. The command "make distcheck" does the same, but then does a trial
 build of the new distribution to ensure that it works.
 
 If you have modified any of the man page sources in the doc directory, you
-should first run the maint/PrepareRelease script before making a distribution.
+should first run the maint/UpdateAlways script before making a distribution.
 This script creates the .txt and HTML forms of the documentation from the man
 pages.