From 1dc98cad27733171de0aa74b87a57a6ad5b968f8 Mon Sep 17 00:00:00 2001
From: Philippe Antoine <contact@catenacyber.fr>
Date: Tue, 28 Sep 2021 12:09:41 +0200
Subject: [PATCH] pcre2: remove PCRE1 from CI

---
 .github/workflows/builds.yml     | 32 +-------------------------------
 .github/workflows/commits.yml    |  2 --
 .github/workflows/formatting.yml |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 377bfdfba0..e2a42a92f7 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -208,7 +208,6 @@ jobs:
                 lz4-devel \
                 make \
                 nss-devel \
-                pcre-devel \
                 pcre2-devel \
                 pkgconfig \
                 python3-devel \
@@ -284,7 +283,6 @@ jobs:
                 lz4-devel \
                 make \
                 nss-devel \
-                pcre-devel \
                 pcre2-devel \
                 pkgconfig \
                 python36-PyYAML \
@@ -361,7 +359,6 @@ jobs:
                 lz4-devel \
                 make \
                 nss-softokn-devel \
-                pcre-devel \
                 pcre2-devel \
                 pkgconfig \
                 python3-yaml \
@@ -448,7 +445,6 @@ jobs:
                 lz4-devel \
                 make \
                 nss-softokn-devel \
-                pcre-devel \
                 pcre2-devel \
                 pkgconfig \
                 python3-yaml \
@@ -521,7 +517,6 @@ jobs:
                 lz4-devel \
                 make \
                 nss-softokn-devel \
-                pcre-devel \
                 pcre2-devel \
                 pkgconfig \
                 python3-yaml \
@@ -559,8 +554,6 @@ jobs:
         run: |
           apt update
           apt -y install \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 build-essential \
                 autoconf \
@@ -637,8 +630,6 @@ jobs:
         run: |
           apt update
           apt -y install \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 build-essential \
                 autoconf \
@@ -711,8 +702,6 @@ jobs:
         run: |
           apt update
           apt -y install \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 build-essential \
                 autoconf \
@@ -813,8 +802,6 @@ jobs:
                 libevent-pthreads-2.1-7 \
                 libjansson-dev \
                 libpython2.7 \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 make \
                 parallel \
@@ -889,8 +876,6 @@ jobs:
                 libevent-pthreads-2.1-7 \
                 libjansson-dev \
                 libpython2.7 \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 make \
                 python3-yaml \
@@ -930,8 +915,6 @@ jobs:
         run: |
           apt update
           apt -y install \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 build-essential \
                 autoconf \
@@ -1003,8 +986,6 @@ jobs:
         run: |
           apt update
           apt -y install \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 build-essential \
                 autoconf \
@@ -1101,8 +1082,6 @@ jobs:
           apt -y install \
                 afl \
                 afl-clang \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 build-essential \
                 autoconf \
@@ -1171,8 +1150,6 @@ jobs:
                 libnetfilter-queue1 \
                 libnfnetlink-dev \
                 libnfnetlink0 \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 libpcap-dev \
                 libyaml-0-2 \
@@ -1224,9 +1201,6 @@ jobs:
                 git \
                 gosu \
                 jq \
-                libpcre3 \
-                libpcre3-dbg \
-                libpcre3-dev \
                 libpcre2-dev \
                 libpcap-dev   \
                 libnet1-dev \
@@ -1291,9 +1265,6 @@ jobs:
                 git-core \
                 gosu \
                 jq \
-                libpcre3 \
-                libpcre3-dbg \
-                libpcre3-dev \
                 libpcre2-dev \
                 libpcap-dev   \
                 libnet1-dev \
@@ -1362,7 +1333,6 @@ jobs:
           libtool \
           libyaml \
           lua \
-          pcre \
           pkg-config \
           python \
           rust \
@@ -1399,7 +1369,7 @@ jobs:
         with:
           msystem: MINGW64
           update: true
-          install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre-devel pcre2-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre mingw-w64-x86_64-pcre2 mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq mingw-w64-x86_64-libxml2
+          install: git mingw-w64-x86_64-toolchain automake1.16 automake-wrapper autoconf libtool libyaml-devel pcre2-devel jansson-devel make mingw-w64-x86_64-libyaml mingw-w64-x86_64-pcre2 mingw-w64-x86_64-rust mingw-w64-x86_64-jansson unzip p7zip python-setuptools mingw-w64-x86_64-python-yaml mingw-w64-x86_64-jq mingw-w64-x86_64-libxml2
       # hack: install our own cbindgen system wide as we can't get the
       # preinstalled one to be picked up by configure
       - name: cbindgen
diff --git a/.github/workflows/commits.yml b/.github/workflows/commits.yml
index 6386e45344..1b6d8ee7b1 100644
--- a/.github/workflows/commits.yml
+++ b/.github/workflows/commits.yml
@@ -19,8 +19,6 @@ jobs:
         run: |
           apt update
           apt -y install \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 build-essential \
                 autoconf \
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index 94d633a013..e77389511b 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -29,8 +29,6 @@ jobs:
         run: |
           apt update
           apt -y install \
-                libpcre3 \
-                libpcre3-dev \
                 libpcre2-dev \
                 build-essential \
                 autoconf \