From: Christian Marangi <ansuelsmth@gmail.com>
Date: Wed, 27 Sep 2023 14:28:14 +0000 (+0200)
Subject: apache: move to PCRE2
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e5b7e46eff74305f2ad23f8f253b00ab719ae98c;p=feed%2Fpackages.git

apache: move to PCRE2

Move apache to PCRE2 now that PCRE is flagged EOL and won't receive any
security update.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit d14fe0c51c0be8d66772b83a165c7fb3c4850af0)
---

diff --git a/net/apache/Makefile b/net/apache/Makefile
index 6b01b80292..5005a233dd 100644
--- a/net/apache/Makefile
+++ b/net/apache/Makefile
@@ -66,7 +66,7 @@ endef
 define Package/apache
 $(call Package/apache/Default)
   USERID:=apache=377:apache=377
-  DEPENDS:=+libapr +libaprutil +libpcre
+  DEPENDS:=+libapr +libaprutil +libpcre2
 endef
 
 define Package/apache/description
@@ -201,7 +201,7 @@ CONFIGURE_ARGS+= \
 	--with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \
 	--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
 	--with-mpm=prefork \
-	--with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \
+	--with-pcre="$(STAGING_DIR)/usr/bin/pcre2-config" \
 	--with-program-name=apache2 \
 	--with-ssl