luvit · fel1x-developer · Jun 28, 2023 · Jun 28, 2023 · Jun 28, 2023 · Jun 28, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -13,9 +13,9 @@
 [submodule "deps/lrexlib"]
 	path = deps/lrexlib
 	url = https://github.com/rrthomas/lrexlib.git
-[submodule "deps/pcre"]
-	path = deps/pcre
-	url = https://github.com/luvit/pcre.git
 [submodule "deps/lpeg"]
 	path = deps/lpeg
 	url = https://github.com/luvit/lpeg.git
+[submodule "deps/pcre2"]
+	path = deps/pcre2
+	url = https://github.com/PCRE2Project/pcre2
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 3.24)
 
 if(WIN32)
   set(projects C ASM ASM_MASM)
@@ -60,8 +60,8 @@ option(WithSharedLibluv "Shared or Static libluv" OFF)
 option(WithOpenSSL "Include OpenSSL" OFF)
 option(WithOpenSSLASM "Enable Assembly Optimizations" OFF)
 option(WithSharedOpenSSL "Shared or Static OpenSSL" ON)
-option(WithPCRE "Include PCRE" OFF)
-option(WithSharedPCRE "Shared or Static PCRE" OFF)
+option(WithPCRE2 "Include PCRE2" OFF)
+option(WithSharedPCRE2 "Shared or Static PCRE2" OFF)
 option(WithLPEG "Include LPEG" OFF)
 option(WithSharedLPEG "Shared or Static LPEG" OFF)
 option(WithZLIB "Include ZLIB" OFF)
@@ -119,9 +119,9 @@ if (WithOpenSSL)
   include(deps/openssl.cmake)
 endif (WithOpenSSL)
 
-if (WithPCRE)
-  include (deps/pcre.cmake)
-endif (WithPCRE)
+if (WithPCRE2)
+  include (deps/pcre2.cmake)
+endif (WithPCRE2)
 
 if (WithLPEG)
   set(LPEGLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/lpeg)

diff --git a/Makefile b/Makefile
@@ -68,14 +68,14 @@ tiny: deps/luv/CMakeLists.txt
 
 # Configure the build with openssl statically included
 regular: deps/luv/CMakeLists.txt
-	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF
+	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE2=ON -DWithLPEG=ON -DWithSharedPCRE2=OFF
 
 regular-asm: deps/luv/CMakeLists.txt
-	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithOpenSSLASM=ON -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF
+	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithOpenSSLASM=ON -DWithPCRE2=ON -DWithLPEG=ON -DWithSharedPCRE2=OFF
 
 # Configure the build with shared openssl
 regular-shared:
-	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=ON -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF
+	cmake $(CMAKE_FLAGS) $(CPACK_FLAGS) -DWithOpenSSL=ON -DWithSharedOpenSSL=ON -DWithPCRE2=ON -DWithLPEG=ON -DWithSharedPCRE2=OFF
 
 package: deps/luv/CMakeLists.txt
 	cmake --build build -- package

diff --git a/cmake/Modules/FindPCRE.cmake b/cmake/Modules/FindPCRE.cmake
diff --git a/cmake/Modules/FindPCRE2.cmake b/cmake/Modules/FindPCRE2.cmake
@@ -0,0 +1,24 @@
+
+FIND_PATH(PCRE2_INCLUDE_DIR NAMES PCRE2.h)
+
+# Look for the library.
+FIND_LIBRARY(PCRE2_LIBRARY NAMES PCRE2)
+
+# Handle the QUIETLY and REQUIRED arguments and set PCRE2_FOUND to TRUE if all listed variables are TRUE.
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE2 DEFAULT_MSG PCRE2_LIBRARY PCRE2_INCLUDE_DIR)
+
+# Copy the results to the output variables.
+IF(PCRE2_FOUND)
+  SET(PCRE2_LIBRARIES ${PCRE2_LIBRARY})
+  SET(PCRE2_INCLUDE_DIRS ${PCRE2_INCLUDE_DIR})
+  SET(PCRE2_UNIT_WIDTH ${PCRE2_CODE_UNIT_WIDTH})
+ELSE(PCRE2_FOUND)
+  SET(PCRE2_LIBRARIES)
+  SET(PCRE2_INCLUDE_DIRS)
+  SET(PCRE2_UNIT_WIDTH)
+ENDIF(PCRE2_FOUND)
+
+ADD_DEFINITIONS( -DPCRE2_CODE_UNIT_WIDTH=${PCRE2_UNIT_WIDTH} )
+
+MARK_AS_ADVANCED(PCRE2_INCLUDE_DIRS PCRE2_LIBRARIES PCRE2_UNIT_WIDTH)
diff --git a/deps/lrexlib.cmake b/deps/lrexlib.cmake
@@ -1,17 +1,19 @@
 set(LREXLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/lrexlib)
 
+add_definitions( -DPCRE2_CODE_UNIT_WIDTH=8 )
+
 include_directories(
   ${LREXLIB_DIR}/src
 )
 
 add_library(lrexlib
   ${LREXLIB_DIR}/src/common.c
-  ${LREXLIB_DIR}/src/pcre/lpcre.c
-  ${LREXLIB_DIR}/src/pcre/lpcre_f.c
+  ${LREXLIB_DIR}/src/pcre2/lpcre2.c
+  ${LREXLIB_DIR}/src/pcre2/lpcre2_f.c
 )
 
 set_target_properties(lrexlib PROPERTIES
     COMPILE_FLAGS "-DLUA_LIB -DLUA_COMPAT_APIINTCASTS -DVERSION=\\\"2.8.0\\\"")
-target_link_libraries(lrexlib pcre)
+target_link_libraries(lrexlib pcre2)
 
 set(EXTRA_LIBS ${EXTRA_LIBS} lrexlib)
diff --git a/deps/lua-openssl b/deps/lua-openssl
diff --git a/deps/luv b/deps/luv
diff --git a/deps/openssl.cmake b/deps/openssl.cmake
@@ -35,8 +35,9 @@ else (WithSharedOpenSSL)
 
   ExternalProject_Add(openssl
       PREFIX            openssl
-      URL               https://www.openssl.org/source/openssl-1.1.1m.tar.gz
-      URL_HASH          SHA256=f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96
+      URL               https://www.openssl.org/source/openssl-3.1.1.tar.gz
+      URL_HASH          SHA256=b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674
+      DOWNLOAD_EXTRACT_TIMESTAMP  YES
       LOG_BUILD         ON
       BUILD_IN_SOURCE   YES
       BUILD_COMMAND     ${OPENSSL_BUILD_COMMAND}

diff --git a/deps/pcre b/deps/pcre
diff --git a/deps/pcre.cmake b/deps/pcre.cmake
diff --git a/deps/pcre2 b/deps/pcre2
diff --git a/deps/pcre2.cmake b/deps/pcre2.cmake
@@ -0,0 +1,26 @@
+
+if (WithSharedPCRE2)
+  find_package(PCRE2 REQUIRED)
+  message("PCRE2 include dir: ${PCRE2_INCLUDE_DIR}")
+  message("PCRE2 libraries: ${PCRE2_LIBRARIES}")
+  include_directories(${PCRE2_INCLUDE_DIR})
+  link_directories(${PCRE2_ROOT_DIR}/lib)
+  list(APPEND LIB_LIST ${PCRE2_LIBRARIES})
+else (WithSharedPCRE2)
+  SET(PCRE2_MATCH_LIMIT "150000" CACHE STRING
+      "Default limit on internal looping. See MATCH_LIMIT in config.h.in for details.")
+  OPTION(PCRE2_BUILD_PCREGREP "Build pcregrep" OFF)
+  OPTION(PCRE2_BUILD_TESTS    "Build the tests" OFF)
+  OPTION(PCRE2_BUILD_PCRECPP "Build the PCRE C++ library (pcrecpp)." OFF)
+  SET(PCRE2_SUPPORT_UTF ON CACHE BOOL
+      "Enable support for Unicode Transformation Format (UTF-8/UTF-16/UTF-32) encoding.")
+
+  include_directories(${CMAKE_BINARY_DIR}/deps/pcre2)
+  add_subdirectory(deps/pcre2)
+  message("Enabling Static PCRE2")
+  list(APPEND EXTRA_LIBS pcre2)
+  add_definitions(-DPCRE_STATIC)
+endif (WithSharedPCRE2)
+
+add_definitions(-DWITH_PCRE2)
+include(deps/lrexlib.cmake)
diff --git a/make.bat b/make.bat
@@ -20,22 +20,22 @@ GOTO :build
 
 :regular
 ECHO "Building regular64"
-cmake -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF -H. -Bbuild -G"%GENERATOR%" -Ax64
+cmake -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE2=ON -DWithLPEG=ON -DWithSharedPCRE2=OFF -H. -Bbuild -G"%GENERATOR%" -Ax64
 GOTO :end
 
 :regular-asm
 ECHO "Building regular64 asm"
-cmake -DWithOpenSSLASM=ON -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF -H. -Bbuild -G"%GENERATOR%" -Ax64
+cmake -DWithOpenSSLASM=ON -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE2=ON -DWithLPEG=ON -DWithSharedPCRE2=OFF -H. -Bbuild -G"%GENERATOR%" -Ax64
 GOTO :end
 
 :regular32
 ECHO "Building regular32"
-cmake -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF -H. -Bbuild -G"%GENERATOR%" -AWin32
+cmake -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE2=ON -DWithLPEG=ON -DWithSharedPCRE2=OFF -H. -Bbuild -G"%GENERATOR%" -AWin32
 GOTO :end
 
 :regular32-asm
 ECHO "Building regular32 asm"
-cmake -DWithOpenSSLASM=ON -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE=ON -DWithLPEG=ON -DWithSharedPCRE=OFF -H. -Bbuild -G"%GENERATOR%" -AWin32
+cmake -DWithOpenSSLASM=ON -DWithOpenSSL=ON -DWithSharedOpenSSL=OFF -DWithPCRE2=ON -DWithLPEG=ON -DWithSharedPCRE2=OFF -H. -Bbuild -G"%GENERATOR%" -AWin32
 GOTO :end
 
 :tiny

diff --git a/src/luvi.c b/src/luvi.c
@@ -18,7 +18,7 @@
 #include "./luvi.h"
 
 LUALIB_API int luaopen_luvi(lua_State *L) {
-#if defined(WITH_OPENSSL) || defined(WITH_PCRE)
+#if defined(WITH_OPENSSL) || defined(WITH_PCRE2)
   char buffer[1024];
 #endif
   lua_newtable(L);
@@ -33,8 +33,11 @@ LUALIB_API int luaopen_luvi(lua_State *L) {
   lua_pushstring(L, buffer);
   lua_setfield(L, -2, "ssl");
 #endif
-#ifdef WITH_PCRE
-  lua_pushstring(L, pcre_version());
+#ifdef WITH_PCRE2
+  // lua_pushstring(L, pcre2_version());
+  char buf[64];
+  pcre2_config(PCRE2_CONFIG_VERSION, buf);
+  lua_pushstring (L, buf);
   lua_setfield(L, -2, "rex");
 #endif
 #ifdef WITH_ZLIB

diff --git a/src/luvi.h b/src/luvi.h
@@ -40,8 +40,9 @@
 #ifdef WITH_OPENSSL
 #include "openssl.h"
 #endif
-#ifdef WITH_PCRE
-#include "pcre.h"
+#ifdef WITH_PCRE2
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include "pcre2.h"
 #endif
 #ifdef WITH_ZLIB
 #include "zlib.h"

diff --git a/src/main.c b/src/main.c
@@ -25,8 +25,8 @@
 #endif
 #include "lminiz.c"
 #include "snapshot.c"
-#ifdef WITH_PCRE
-int luaopen_rex_pcre(lua_State* L);
+#ifdef WITH_PCRE2
+int luaopen_rex_pcre2(lua_State* L);
 #endif
 #ifdef WITH_PLAIN_LUA
 #include "../deps/bit.c"
@@ -95,10 +95,10 @@ static lua_State* vm_acquire(){
   lua_setfield(L, -2, "lpeg");
 #endif
 
-#ifdef WITH_PCRE
-  lua_pushcfunction(L, luaopen_rex_pcre);
+#ifdef WITH_PCRE2
+  lua_pushcfunction(L, luaopen_rex_pcre2);
   lua_pushvalue(L, -1);
-  lua_setfield(L, -3, "rex_pcre");
+  lua_setfield(L, -3, "rex_pcre2");
   lua_setfield(L, -2, "rex");
 #endif