From e4eceea1af555d6b0a83fa62eb50bc73865da8f3 Mon Sep 17 00:00:00 2001
From: Felipe Zipitria <felipe.zipitria@owasp.org>
Date: Sun, 17 Mar 2024 10:18:00 -0300
Subject: [PATCH] feat(apache): switch to pcre2

Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>
---
 apache/Dockerfile        | 5 +++--
 apache/Dockerfile-alpine | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apache/Dockerfile b/apache/Dockerfile
index f30289f..149f076 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -17,7 +17,7 @@ RUN set -eux; \
         libaprutil1-dev \
         libcurl4-gnutls-dev \
         libfuzzy-dev \
-        libpcre3-dev \
+        libpcre2-dev \
         libtool \
         libxml2-dev \
         libyajl-dev \
@@ -31,7 +31,7 @@ RUN set -eux; \
     tar -zxvf v${MODSEC2_VERSION}.tar.gz; \
     cd ModSecurity-${MODSEC2_VERSION}; \
     ./autogen.sh; \
-    ./configure --with-yajl --with-ssdeep; \
+    ./configure --with-yajl --with-ssdeep --with-pcre2; \
     make; \
     make install; \
     make clean
@@ -167,6 +167,7 @@ RUN set -eux; \
         libfuzzy2 \
         liblua${LUA_VERSION} \
         ${LUA_MODULES} \
+        libpcre2 \
         libxml2 \
         libyajl2; \
     update-ca-certificates -f; \
diff --git a/apache/Dockerfile-alpine b/apache/Dockerfile-alpine
index c52958f..3888ce1 100644
--- a/apache/Dockerfile-alpine
+++ b/apache/Dockerfile-alpine
@@ -33,7 +33,7 @@ RUN set -eux; \
     make \
     openssl \
     openssl-dev \
-    pcre-dev \
+    pcre2-dev \
     zlib-dev
 
 RUN set -eux; \
@@ -41,7 +41,7 @@ RUN set -eux; \
     tar -zxvf v${MODSEC2_VERSION}.tar.gz; \
     cd ModSecurity-${MODSEC2_VERSION}; \
     ./autogen.sh; \
-    ./configure --with-yajl --with-ssdeep --with-lmdb; \
+    ./configure --with-yajl --with-ssdeep --with-lmdb --with-pcre2; \
     make; \
     make install; \
     make clean