From 765c2e67bffc394ed831622fe1e637080701bdd3 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Fri, 18 Sep 2026 13:59:06 +0100
Subject: [PATCH 1/2] [cmake] Update pcre2, apache, expat to fix cmake

The previously used versions of these libraries set minimum cmake
versions that modern cmake no longer supports.

See:
https://github.com/PCRE2Project/pcre2/commit/c7364c4694250c416e16b9dd81f281cb331c73de
https://github.com/libexpat/libexpat/commit/899a775a2ed07a72d4c5c4cb2115199392400c39
https://github.com/apache/httpd/commit/08138ac986851217ff8f03b495d12ceca9051e24
---
 libs/CMakeLists.txt        | 9 ++++-----
 libs/regexp/CMakeLists.txt | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index 9aae8194..c40b4e8c 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -166,8 +166,8 @@ if (WITH_APACHE)
 		if(WIN32)
 			ExternalProject_Add(EXPAT
 				${EP_CONFIGS}
-				URL https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.gz
-				URL_HASH SHA256=6b902ab103843592be5e99504f846ec109c1abb692e85347587f237a4ffa1033
+				URL https://github.com/libexpat/libexpat/releases/download/R_2_8_4/expat-2.8.4.tar.gz
+				URL_HASH SHA256=b8ece2437692dad44d851c4532723390a5a330990007706be9c8d2b90d294f36
 				CMAKE_ARGS
 					-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/libs/src/install-prefix
 					-Wno-dev
@@ -254,9 +254,8 @@ if (WITH_APACHE)
 			${EP_CONFIGS}
 			DEPENDS ${APR_DEP} ${APRUTIL_DEP} ${OPENSSL_DEP} ${PCRE_DEP} ${ZLIB_DEP}
 			URL
-				https://archive.apache.org/dist/httpd/httpd-2.4.55.tar.gz
-				https://github.com/HaxeFoundation/neko/files/10745746/httpd-2.4.55.tar.gz
-			URL_HASH SHA256=5276ea8bc6fff31eed5c82132ae51a0b2ee05f9e6b61a00fa877f6cadab3b638
+				https://archive.apache.org/dist/httpd/httpd-2.4.68.tar.gz
+			URL_HASH SHA256=ed9a9d4500fb48bb28eaffb3ba71d06ccf86d498fa13ab9f781da010cc488498
 			${Apache_CONFIGS}
 		)
 		set_target_properties(Apache PROPERTIES ${EP_PROPS})
diff --git a/libs/regexp/CMakeLists.txt b/libs/regexp/CMakeLists.txt
index 20763827..9831cd05 100644
--- a/libs/regexp/CMakeLists.txt
+++ b/libs/regexp/CMakeLists.txt
@@ -9,8 +9,8 @@ if (STATIC_PCRE2)
 		COMPILE_DEFINITIONS PCRE2_STATIC_LINK
 	)
 	set(PCRE2_CONFIG
-		URL https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.gz
-		URL_HASH SHA256=c33b418e3b936ee3153de2c61cc638e7e4fe3156022a5c77d0711bcbb9d64f1f
+		URL https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.48/pcre2-10.48.tar.gz
+		URL_HASH SHA256=ebcc25aadf2a51fa1fefa9b8bc9e7a79b3dae86870a0f1152a22e42befd46888
 	)
 	if (WIN32)
 		ExternalProject_Add(pcre2

From 06c539b7b9acd8a0fc3a862675acd1401617f0b4 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Fri, 18 Sep 2026 16:02:17 +0100
Subject: [PATCH 2/2] [cmake] Add workaround for apr/apr-util errors

APR and APR-util CMakeLists file still sets the minimum version to 2.8,
which is not compatible with modern cmake.

For now, no update for these libraries contains a fix, so we have to set
the CMAKE_POLICY_VERSION_MINIMUM flag to work around it.

See:
https://github.com/apache/apr/blob/1.7.6/CMakeLists.txt#L20
https://github.com/apache/apr-util/blob/1.6.5/CMakeLists.txt#L20
---
 libs/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index c40b4e8c..2c7b6db6 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -140,6 +140,7 @@ if (WITH_APACHE)
 					-Wno-dev
 					-DAPR_INSTALL_PRIVATE_H=ON
 					-DINSTALL_PDB=OFF
+					-DCMAKE_POLICY_VERSION_MINIMUM=3.5
 			)
 		else()
 			set(APR_CONFIGS
@@ -179,6 +180,7 @@ if (WITH_APACHE)
 					-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/libs/src/install-prefix
 					-Wno-dev
 					-DINSTALL_PDB=OFF
+					-DCMAKE_POLICY_VERSION_MINIMUM=3.5
 					${EXPAT_CONF}
 				PATCH_COMMAND ${CMAKE_COMMAND} -Dapr-util_source=${CMAKE_BINARY_DIR}/libs/src/APRutil -P ${CMAKE_SOURCE_DIR}/cmake/patch_apr-util.cmake
 			)