Merge pull request #255 from boostorg/202507

Merge for release.

Author: jzmaddock

.github/workflows/ci.yml

@@ -9,16 +9,22 @@ on:
     branches:
       - master
       - develop
+      - feature/**
+      - cve-*
   pull_request:
   release:
     types: [published, created, edited]
+
+env:
+  UBSAN_OPTIONS: print_stacktrace=1
+
 jobs:
-  ubuntu-focal:
-    runs-on: ubuntu-20.04
+  ubuntu-jammy:
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++-9, g++-10, clang++-9, clang++-10 ]
+        compiler: [ g++-11, g++-12, g++-13 ]
         standard: [ c++11, c++14, c++17, c++2a ]
     steps:
       - uses: actions/checkout@v2
@@ -34,7 +40,7 @@ jobs:
       - name: Add repository
         run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
-        run: sudo apt install g++-9 g++-10 clang-9 clang-10  libicu-dev
+        run: sudo apt install g++-11 g++-12 g++-13
       - name: Checkout main boost
         run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
       - name: Update tools/boostdep
@@ -55,14 +61,11 @@ jobs:
       - name: Generate user config
         run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} : <cxxflags>-std=${{ matrix.standard }} ;" > ~/user-config.jam'
         working-directory: ../boost-root
-      - name: Config info install
-        run: ../../../b2 config_info_travis_install toolset=$TOOLSET
-        working-directory: ../boost-root/libs/config/test
       - name: Config info
-        run: ./config_info_travis
+        run: ../../../b2 print_config_info toolset=$TOOLSET
         working-directory: ../boost-root/libs/config/test
       - name: Test
-        run: ../../../b2 toolset=$TOOLSET
+        run: ../../../b2 toolset=$TOOLSET variant=debug,release ${{ startsWith(matrix.compiler, 'g++-13') && 'address-sanitizer=norecover undefined-sanitizer=norecover' || '' }}
         working-directory: ../boost-root/libs/regex/test
   ubuntu-jammy-standalone:
     runs-on: ubuntu-22.04
@@ -89,12 +92,12 @@ jobs:
       - name: Test
         run: ${{ matrix.compiler }} -std=${{ matrix.standard }}  -I../../include *.cpp ../../src/*.cpp -o regress && ./regress
         working-directory: ./test/regress
-  ubuntu-bionic:
-    runs-on: ubuntu-18.04
+  ubuntu-jammy-clang:
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++-7, g++-8, clang++-7, clang++-8 ]
+        compiler: [ clang++-15 ]
         standard: [ c++11, c++14, c++17 ]
     steps:
       - uses: actions/checkout@v2
@@ -110,7 +113,7 @@ jobs:
       - name: Add repository
         run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
-        run: sudo apt install g++-7 g++-8 clang-7 clang-8 libicu-dev
+        run: sudo apt install clang-15
       - name: Checkout main boost
         run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
       - name: Update tools/boostdep
@@ -131,15 +134,95 @@ jobs:
       - name: Generate user config
         run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} : <cxxflags>-std=${{ matrix.standard }} ;" > ~/user-config.jam'
         working-directory: ../boost-root
-      - name: Config info install
-        run: ../../../b2 config_info_travis_install toolset=$TOOLSET
-        working-directory: ../boost-root/libs/config/test
       - name: Config info
-        run: ./config_info_travis
+        run: ../../../b2 print_config_info toolset=$TOOLSET
         working-directory: ../boost-root/libs/config/test
       - name: Test
         run: ../../../b2 toolset=$TOOLSET define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER
         working-directory: ../boost-root/libs/regex/test
+  ubuntu-jammy-clang-18-modules:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - uses: mstachniuk/ci-skip@v1
+        with:
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
+          commit-filter-separator: ';'
+          fail-fast: true
+      - name: Grab install script
+        run: wget https://apt.llvm.org/llvm.sh && chmod u+x llvm.sh
+      - name: Install clang 18 packages
+        run: sudo ./llvm.sh 18 && clang++-18 --version
+      - name: Checkout main boost
+        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
+      - name: Update tools/boostdep
+        run: git submodule update --init tools/boostdep
+        working-directory: ../boost-root
+      - name: Copy files
+        run: cp -r $GITHUB_WORKSPACE/* libs/regex
+        working-directory: ../boost-root
+      - name: Install deps
+        run: python tools/boostdep/depinst/depinst.py -I example -g "--jobs 3" regex
+        working-directory: ../boost-root
+      - name: Bootstrap
+        run: ./bootstrap.sh
+        working-directory: ../boost-root
+      - name: Generate headers
+        run: ./b2 headers
+        working-directory: ../boost-root
+      - name: Test
+        run: CXX=clang++-18 LIBRARIES="-licuuc -licudata -licui18n" ./test_clang.sh
+        working-directory: ../boost-root/libs/regex/test/module
+  ubuntu-noble-clang:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [ clang++-16, clang++-17, clang++-18 ]
+        standard: [ c++11, c++14, c++17, c++20 ]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - uses: mstachniuk/ci-skip@v1
+        with:
+          commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
+          commit-filter-separator: ';'
+          fail-fast: true
+      - name: Set TOOLSET
+        run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
+      - name: Add repository
+        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+      - name: Install packages
+        run: sudo apt install clang-16 clang-17 clang-18
+      - name: Checkout main boost
+        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
+      - name: Update tools/boostdep
+        run: git submodule update --init tools/boostdep
+        working-directory: ../boost-root
+      - name: Copy files
+        run: cp -r $GITHUB_WORKSPACE/* libs/regex
+        working-directory: ../boost-root
+      - name: Install deps
+        run: python tools/boostdep/depinst/depinst.py -I example -g "--jobs 3" regex
+        working-directory: ../boost-root
+      - name: Bootstrap
+        run: ./bootstrap.sh
+        working-directory: ../boost-root
+      - name: Generate headers
+        run: ./b2 headers
+        working-directory: ../boost-root
+      - name: Generate user config
+        run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} : <cxxflags>-std=${{ matrix.standard }} ;" > ~/user-config.jam'
+        working-directory: ../boost-root
+      - name: Config info
+        run: ../../../b2 print_config_info toolset=$TOOLSET
+        working-directory: ../boost-root/libs/config/test
+      - name: Test
+        run: ../../../b2 toolset=$TOOLSET define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER variant=debug,release ${{ startsWith(matrix.compiler, 'clang++-18') && 'address-sanitizer=norecover undefined-sanitizer=norecover' || '' }}
+        working-directory: ../boost-root/libs/regex/test
   macos:
     runs-on: macos-latest
     strategy:
@@ -344,6 +427,9 @@ jobs:
           commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[apple];[Apple];[APPLE];[linux];[Linux];[LINUX]'
           commit-filter-separator: ';'
           fail-fast: true
+      - uses: TheMrMilchmann/setup-msvc-dev@v3
+        with:
+          arch: x64
       - name: Checkout main boost
         run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
       - name: Update tools/boostdep
@@ -370,6 +456,9 @@ jobs:
       - name: Test
         run: ..\..\..\b2 --hash %ARGS%
         working-directory: ../boost-root/libs/regex/test
+      - name: Module Test
+        run: msvc_test.bat
+        working-directory: ../boost-root/libs/regex/test/module
   ubuntu-cmake-install:
     runs-on: ubuntu-20.04
     strategy:

build.jam

@@ -0,0 +1,30 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/assert//boost_assert
+    /boost/concept_check//boost_concept_check
+    /boost/config//boost_config
+    /boost/predef//boost_predef
+    /boost/static_assert//boost_static_assert
+    /boost/throw_exception//boost_throw_exception
+    /boost/type_traits//boost_type_traits ;
+
+project /boost/regex
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_regex : build//boost_regex ]
+    [ alias all : boost_regex example test ]
+    ;
+
+call-if : boost-library regex
+    : install boost_regex
+    ;
+

build/Jamfile.v2

@@ -1,29 +1,34 @@
 # copyright John Maddock 2003
-# Distributed under the Boost Software License, Version 1.0. 
-# (See accompanying file LICENSE_1_0.txt or copy at 
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt.
 
 import modules ;
 import testing ;
 import errors ;
 
-project : requirements
-   # default to all warnings on:
-   <warnings>all
+constant boost_dependencies_private :
+    /boost/core//boost_core
+    ;
+
+project
+   : default-build <warnings>all
+   : common-requirements <library>$(boost_dependencies)
+   : requirements <library>$(boost_dependencies_private)
    ;
 
 local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
 
 rule path_options ( properties * )
 {
     local result ;
-    if <address-model>64 in $(properties) && <toolset>msvc in $(properties) 
+    if <address-model>64 in $(properties) && <toolset>msvc in $(properties)
     {
-    	result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ;
+        result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ;
     }
     else
     {
-    	result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ;
+        result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ;
     }
     return $(result) ;
 }
@@ -34,24 +39,24 @@ rule path_options ( properties * )
 if ! $(disable-icu)
 {
    if [ modules.peek : ICU_LINK ]
-   {    
+   {
        errors.user-error : "The ICU_LINK option is no longer supported by the Boost.Regex build - please refer to the documentation for equivalent options" ;
    }
 
    if [ modules.peek : ICU_PATH ]
-   {    
+   {
        ICU_PATH =  [ modules.peek : ICU_PATH ] ;
    }
    if [ modules.peek : ICU_ICUUC_NAME ]
-   {    
+   {
        ICU_ICUUC_NAME =  [ modules.peek : ICU_ICUUC_NAME ] ;
    }
    if [ modules.peek : ICU_ICUDT_NAME ]
-   {    
+   {
        ICU_ICUDT_NAME =  [ modules.peek : ICU_ICUDT_NAME ] ;
    }
    if [ modules.peek : ICU_ICUIN_NAME ]
-   {    
+   {
        ICU_ICUIN_NAME =  [ modules.peek : ICU_ICUIN_NAME ] ;
    }
 
@@ -102,16 +107,16 @@ if ! $(disable-icu)
       lib icuin : : <name>this_is_an_invalid_library_name ;
    }
 
-   ICU_OPTS = 
-      <include>$(ICU_PATH)/include 
+   ICU_OPTS =
+      <include>$(ICU_PATH)/include
       <runtime-link>shared:<library>icuuc/<link>shared
       <runtime-link>shared:<library>icudt/<link>shared
       <runtime-link>shared:<library>icuin/<link>shared
       <runtime-link>static:<library>icuuc
       <runtime-link>static:<library>icudt
       <runtime-link>static:<library>icuin
       <target-os>windows,<toolset>clang:<linkflags>"advapi32.lib"
-      <define>BOOST_HAS_ICU=1 
+      <define>BOOST_HAS_ICU=1
       <runtime-link>static:<define>U_STATIC_IMPLEMENTATION=1
       ;
 
@@ -142,24 +147,17 @@ if ! $(disable-icu)
 exe has_icu : has_icu_test.cpp : $(ICU_OPTS) ;
 explicit has_icu ;
 
-obj is_legacy_03 : is_legacy_03.cpp ;
-explicit is_legacy_03 ;
-
 alias icu_options : : : : [ check-target-builds has_icu : $(ICU_OPTS) : ] ;
 
-SOURCES = 
+SOURCES =
    posix_api.cpp
-   regex.cpp
-   regex_debug.cpp
-   static_mutex.cpp
    wide_posix_api.cpp
 ;
 
 lib boost_regex : ../src/$(SOURCES) icu_options
-    :         
-	     <link>shared:<define>BOOST_REGEX_DYN_LINK=1
-	     <toolset>gcc-cygwin:<link>static
+    :
+        <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+        <toolset>gcc-cygwin:<link>static
+    : :
+        <define>BOOST_REGEX_NO_LIB=1
     ;
-
-boost-install boost_regex ;
-

build/is_legacy_03.cpp

@@ -10,8 +10,7 @@
 
 There are two main headers used by this library: `<boost/regex.hpp>` 
 provides full access to the main template library, while `<boost/cregex.hpp>` 
-provides access to the (deprecated) high level class RegEx, and the 
-POSIX API functions.
+provides access to the POSIX API functions.
 
 There is also a header containing only forward declarations 
 `<boost/regex_fwd.hpp>` for use when an interface is dependent upon 

doc/headers.qbk

@@ -14,6 +14,11 @@ Currently open issues can be viewed [@https://github.com/boostorg/regex/issues?q
 
 All issues including closed ones can be viewed [@https://github.com/boostorg/regex/issues?q=is%3Aissue+is%3Aclosed here].
 
+[h4 Boost.Regex-8.0.0 (Boost-1.86.0)]
+
+* BREAKING CHANGE: deprecated C++03 support has now been removed.
+* Fixed some low-impact security issues: [@https://github.com/boostorg/regex/pull/204 204].
+
 [h4 Boost.Regex-7.0.1 (boost-1.79.0)]
 
 * Minor fix for setting building with -DBOOST_REGEX_MAX_CACHE_BLOCKS=0 and `<atomic>` present.