diff options
author | Christian Marangi <ansuelsmth@gmail.com> | 2023-11-01 14:16:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-01 14:16:49 +0100 |
commit | d5c9a16a489081c0b5bd396241c7e08649a60a4c (patch) | |
tree | 784acceb98b474353254df1a78a48509b448e9d8 /.github/workflows | |
parent | 5a2666ce9e77c188e1413f734dc32865bf5aafab (diff) |
Move from PCRE to PCRE2 (#2134)
Move from PCRE to PCRE2. PCRE is EOL and won't receive any security
updates anymore. Convert to PCRE2 by converting any function PCRE2 new
API.
Also update every entry in github workflows and README to point to the
new configure flag. (--with-pcre2)
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/build.yml | 32 | ||||
-rw-r--r-- | .github/workflows/build_scheduled.yml | 4 | ||||
-rw-r--r-- | .github/workflows/codeql.yml | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76e98c9c7..0a5958d7e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,7 +93,7 @@ jobs: os: ubuntu-20.04 arch: "x86_64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "--with-sanitizer" nBPF: "" @@ -101,7 +101,7 @@ jobs: os: ubuntu-22.04 arch: "x86_64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "--with-sanitizer" nBPF: "" @@ -110,7 +110,7 @@ jobs: os: ubuntu-20.04 arch: "x86_64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "--with-sanitizer" nBPF: "" @@ -120,7 +120,7 @@ jobs: os: ubuntu-22.04 arch: "x86_64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "--with-sanitizer" nBPF: "" @@ -129,7 +129,7 @@ jobs: os: ubuntu-latest arch: "x86_64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "--with-thread-sanitizer" nBPF: "" @@ -137,7 +137,7 @@ jobs: os: ubuntu-latest arch: "x86_64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "--with-sanitizer" nBPF: "nBPF" @@ -145,7 +145,7 @@ jobs: os: ubuntu-22.04 arch: "x86_64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "--with-memory-sanitizer" nBPF: "" @@ -153,7 +153,7 @@ jobs: os: macOS-latest arch: "x86_64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "" # Disable sanitizer on macos nBPF: "" @@ -161,7 +161,7 @@ jobs: os: macos-12 arch: "x86_64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "" # Disable sanitizer on macos nBPF: "" @@ -169,7 +169,7 @@ jobs: os: ubuntu-latest arch: "arm64" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "" # Disable sanitizer on arm64 nBPF: "" @@ -177,7 +177,7 @@ jobs: os: ubuntu-latest arch: "armhf" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "--with-sanitizer" nBPF: "" @@ -185,7 +185,7 @@ jobs: os: ubuntu-latest arch: "s390x" gcrypt: "" - pcre: "--with-pcre" + pcre: "--with-pcre2" maxminddb: "--with-maxminddb" msan: "" nBPF: "" @@ -209,8 +209,8 @@ jobs: if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.gcrypt, '--with-local-libgcrypt') run: | sudo apt-get install libgcrypt20-dev - - name: Install Ubuntu Prerequisites (libpcre) - if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.pcre, '--with-pcre') + - name: Install Ubuntu Prerequisites (libpcre2) + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.pcre, '--with-pcre2') run: | sudo apt-get install libpcre3-dev - name: Install Ubuntu Prerequisites (maxminddb) @@ -266,8 +266,8 @@ jobs: if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.gcrypt, '--with-local-libgcrypt') run: | brew install libgcrypt - - name: Install MacOS Prerequisites (libpcre) - if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.pcre, '--with-pcre') + - name: Install MacOS Prerequisites (libpcre2) + if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64') && startsWith(matrix.pcre, '--with-pcre2') run: | brew install pcre - name: Install MacOS Prerequisites (maxminddb) diff --git a/.github/workflows/build_scheduled.yml b/.github/workflows/build_scheduled.yml index 7f960fc55..55376608c 100644 --- a/.github/workflows/build_scheduled.yml +++ b/.github/workflows/build_scheduled.yml @@ -23,7 +23,7 @@ jobs: sudo apt-get install libpcre3-dev libmaxminddb-dev lcov sudo apt-get install wdiff colordiff - name: Configure - run: ./autogen.sh --enable-option-checking=fatal --enable-debug-messages --enable-code-coverage --with-pcre --with-maxminddb --enable-tls-sigs + run: ./autogen.sh --enable-option-checking=fatal --enable-debug-messages --enable-code-coverage --with-pcre2 --with-maxminddb --enable-tls-sigs - name: Build run: make all - name: Test @@ -91,7 +91,7 @@ jobs: pprof -h - name: Configure nDPI library run: | - ./autogen.sh --enable-gprof --enable-option-checking=fatal --with-pcre --with-maxminddb --enable-tls-sigs + ./autogen.sh --enable-gprof --enable-option-checking=fatal --with-pcre2 --with-maxminddb --enable-tls-sigs - name: Build nDPI library run: | make diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 914c106e0..e29fe2b4b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -42,7 +42,7 @@ jobs: pprof -h - name: Configure nDPI library run: | - ./autogen.sh --enable-gprof --enable-option-checking=fatal --with-pcre --with-maxminddb --enable-tls-sigs --enable-debug-messages + ./autogen.sh --enable-gprof --enable-option-checking=fatal --with-pcre2 --with-maxminddb --enable-tls-sigs --enable-debug-messages - name: Initialize CodeQL uses: github/codeql-action/init@v2 |