chore: update lua to 5.4

Signed-off-by: Felipe Zipitria <felipe.zipitria@owasp.org>

Author: fzipi

README_WINDOWS.md

@@ -94,8 +94,8 @@ Note: PCRE2 with JIT support provides better performance and fixes stack overflo
     CD C:\work\lua-5.4.8\src
     CL /Ox /arch:SSE2 /GF /GL /Gy /FD /EHsc /MD  /Zi /TC /wd4005 /D "_MBCS" /D "LUA_CORE" /D "LUA_BUILD_AS_DLL" /D "_CRT_SECURE_NO_WARNINGS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "_WINDLL" /c *.c
     DEL lua.obj luac.obj
-    LINK /DLL /LTCG /DEBUG /OUT:lua5.1.dll *.obj
-    IF EXIST lua5.1.dll.manifest MT  -manifest lua5.1.dll.manifest -outputresource:lua5.1.dll;2
+    LINK /DLL /LTCG /DEBUG /OUT:lua54.dll *.obj
+    IF EXIST lua54.dll.manifest MT  -manifest lua54.dll.manifest -outputresource:lua54.dll;2
 
 ### cURL-8.18.0
 
@@ -113,7 +113,7 @@ Note: PCRE2 with JIT support provides better performance and fixes stack overflo
 Copy these files to ``C:\Apache2466\bin``:
 
     C:\work\pcre2-10.47\pcre2-8.dll C:\Apache2466\bin\
-    C:\work\lua-5.4.8\src\lua5.1.dll C:\Apache2466\bin\
+    C:\work\lua-5.4.8\src\lua54.dll C:\Apache2466\bin\
     C:\work\libxml2-2.15.1\win32\bin.msvc\libxml2.dll C:\Apache2466\bin\
     C:\work\curl-8.18.0\builds\libcurl-vc-x64-release-dll-zlib-dll-ipv6-sspi-schannel-obj-lib\libcurl.dll C:\Apache2466\bin\
     C:\work\mod_security\apache2\mlogc-src\mlogc.exe C:\Apache2466\bin\

apache2/Makefile.win

@@ -11,19 +11,19 @@ LIBS = $(APACHE)\lib\libhttpd.lib \
        $(APACHE)\lib\libapr-1.lib \
        $(APACHE)\lib\libaprutil-1.lib \
        $(PCRE)\pcre.lib \
-       $(CURL)\libcurl.lib \
+       $(CURL)\libcurl.lib \
        $(LIBXML2)\win32\bin.msvc\libxml2.lib \
        Ws2_32.lib \
        "iphlpapi.lib"
 
 ###########################################################################
 ###########################################################################
 
-
-!IF "$(IIS_BUILD)" == "yes"
-DEFS=$(DEFS) -DVERSION_IIS
-!ENDIF
-
+
+!IF "$(IIS_BUILD)" == "yes"
+DEFS=$(DEFS) -DVERSION_IIS
+!ENDIF
+
 CC = CL
 
 MT = mt
@@ -37,13 +37,13 @@ INCLUDES = -I. -I.. \
            -I$(PCRE)\include -I$(PCRE) \
            -I$(LIBXML2)\include \
            -I$(APACHE)\include
-
-# Enables support for SecRemoteRules and external resources.
-DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES
+
+# Enables support for SecRemoteRules and external resources.
+DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES
 
 # Lua is optional
 !IF "$(LUA)" != ""
-LIBS = $(LIBS) $(LUA)\lua5.1.lib
+LIBS = $(LIBS) $(LUA)\lua54.lib
 DEFS=$(DEFS) -DWITH_LUA
 INCLUDES = $(INCLUDES) -I$(LUA)\include -I$(LUA) \
 !ENDIF
@@ -65,8 +65,8 @@ OBJS = mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \
        msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \
        msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_crypt.obj msc_tree.obj msc_unicode.obj acmp.obj msc_lua.obj \
        msc_release.obj \
-       msc_status_engine.obj \
-       msc_remote_rules.obj \
+       msc_status_engine.obj \
+       msc_remote_rules.obj \
        msc_json.obj \
        libinjection/libinjection_html5.obj \
        libinjection/libinjection_sqli.obj \

iis/Makefile.win

@@ -44,7 +44,7 @@ DEFS=$(DEFS) -DWITH_CURL -DWITH_REMOTE_RULES -DMSC_LARGE_STREAM_INPUT
 #	   -I$(SSDEEP) \
 # Lua is optional
 !IF "$(LUA)" != ""
-LIBS = $(LIBS) $(LUA)\lua5.1.lib
+LIBS = $(LIBS) $(LUA)\lua54.lib
 DEFS=$(DEFS) -DWITH_LUA
 INCLUDES = $(INCLUDES) -I$(LUA)\include -I$(LUA) \
 !ENDIF

iis/build_release.bat

@@ -29,7 +29,7 @@ copy "%OUTPUT_DIR%\libapriconv-1.dll" "%AMD64%"
 copy "%OUTPUT_DIR%\libaprutil-1.dll" "%AMD64%"
 copy "%OUTPUT_DIR%\libcurl.dll" "%AMD64%"
 copy "%OUTPUT_DIR%\libxml2.dll" "%AMD64%"
-copy "%OUTPUT_DIR%\lua5.1.dll" "%AMD64%"
+copy "%OUTPUT_DIR%\lua54.dll" "%AMD64%"
 copy "%OUTPUT_DIR%\mlogc.exe" "%AMD64%"
 copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%AMD64%"
 copy "%OUTPUT_DIR%\pcre2-8.dll" "%AMD64%"
@@ -48,7 +48,7 @@ copy "%OUTPUT_DIR%\libapriconv-1.dll" "%X86%"
 copy "%OUTPUT_DIR%\libaprutil-1.dll" "%X86%"
 copy "%OUTPUT_DIR%\libcurl.dll" "%X86%"
 copy "%OUTPUT_DIR%\libxml2.dll" "%X86%"
-copy "%OUTPUT_DIR%\lua5.1.dll" "%X86%"
+copy "%OUTPUT_DIR%\lua54.dll" "%X86%"
 copy "%OUTPUT_DIR%\mlogc.exe" "%X86%"
 copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%X86%"
 copy "%OUTPUT_DIR%\pcre2-8.dll" "%X86%"

iis/dependencies/build_lua.bat

@@ -6,23 +6,23 @@ cd "%WORK_DIR%"
 
 set LUA_DIR=%LUA:~0,-7%
 
-move "%LUA_DIR%" "lua"
+move "%LUA_DIR%" "lua"
 
-cd "lua\src"
+cd "lua\src"
 
 CL /Ox /arch:SSE2 /GF /GL /Gy /FD /EHsc /MD  /Zi /TC /wd4005 /D "_MBCS" /D "LUA_CORE" /D "LUA_BUILD_AS_DLL" /D "_CRT_SECURE_NO_WARNINGS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "_WINDLL" /c *.c
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 DEL lua.obj luac.obj
-LINK /DLL /LTCG /DEBUG /OUT:lua5.1.dll *.obj
+LINK /DLL /LTCG /DEBUG /OUT:lua54.dll *.obj
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
-IF EXIST lua5.1.dll.manifest MT  -manifest lua5.1.dll.manifest -outputresource:lua5.1.dll;2
+IF EXIST lua54.dll.manifest MT  -manifest lua54.dll.manifest -outputresource:lua54.dll;2
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 
 cd "%WORK_DIR%"
 
-copy /y "%WORK_DIR%\lua\src\lua5.1.dll" "%OUTPUT_DIR%"
-copy /y "%WORK_DIR%\lua\src\lua5.1.pdb" "%OUTPUT_DIR%"
-copy /y "%WORK_DIR%\lua\src\lua5.1.lib" "%OUTPUT_DIR%"
+copy /y "%WORK_DIR%\lua\src\lua54.dll" "%OUTPUT_DIR%"
+copy /y "%WORK_DIR%\lua\src\lua54.pdb" "%OUTPUT_DIR%"
+copy /y "%WORK_DIR%\lua\src\lua54.lib" "%OUTPUT_DIR%"
 
 @exit /B 0
 

iis/installer.wxs

@@ -69,7 +69,7 @@
                 <FileSearch Id="CheckFile6" Name="libxml2.dll" />
             </DirectorySearch>
             <DirectorySearch Id="CheckFileDir7" Path="C:\Windows\System32\inetsrv" Depth="0">
-                <FileSearch Id="CheckFile7" Name="lua5.1.dll" />
+                <FileSearch Id="CheckFile7" Name="lua54.dll" />
             </DirectorySearch>
             <DirectorySearch Id="CheckFileDir8" Path="C:\Windows\System32\inetsrv" Depth="0">
                 <FileSearch Id="CheckFile8" Name="pcre2-8.dll" />
@@ -96,7 +96,7 @@
                 <FileSearch Id="CheckFile15" Name="libxml2.dll" />
             </DirectorySearch>
             <DirectorySearch Id="CheckFileDir16" Path="C:\Windows\System32\inetsrv" Depth="0">
-                <FileSearch Id="CheckFile16" Name="lua5.1.dll" />
+                <FileSearch Id="CheckFile16" Name="lua54.dll" />
             </DirectorySearch>
             <DirectorySearch Id="CheckFileDir17" Path="C:\Windows\System32\inetsrv" Depth="0">
                 <FileSearch Id="CheckFile17" Name="pcre2-8.dll" />