From 63cbd91723fc663f68090b08158ad204883d3a29 Mon Sep 17 00:00:00 2001 From: Victor Hora Date: Sun, 11 Nov 2018 15:33:29 -0500 Subject: [PATCH] IIS: Update dependencies for Windows build --- CHANGES | 2 ++ iis/build_dependencies.bat | 16 ++++++++-------- iis/build_msi.bat | 2 +- iis/dependencies/build_pcre.bat | 12 +++++++----- iis/download_files.bat | 32 +++++++++++++++----------------- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/CHANGES b/CHANGES index ebadec0f..df79fcd3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ DD MMM YYYY - 2.9.3 - To be released ------------------------------------ + * IIS: Update dependencies for Windows build + [Issue #1848 - @victorhora, @hsluoyz] * IIS: Set SecStreamInBodyInspection by default on IIS builds (#1299) [Issue #1299 - @victorhora] * IIS: Update modsecurity.conf diff --git a/iis/build_dependencies.bat b/iis/build_dependencies.bat index 1ae2a607..61cffb63 100644 --- a/iis/build_dependencies.bat +++ b/iis/build_dependencies.bat @@ -7,15 +7,15 @@ @set SOURCE_DIR=%USERPROFILE%\Downloads :: Dependencies -@set CMAKE=cmake-3.8.2-win32-x86.zip -@set PCRE=pcre-8.40.zip +@set CMAKE=cmake-3.12.4-win32-x86.zip +@set PCRE=pcre-8.41.zip @set ZLIB=zlib-1.2.11.tar.gz -@set LIBXML2=libxml2-2.9.4.tar.gz -@set LUA=lua-5.3.4.tar.gz -@set CURL=curl-7.54.1.zip -@set APACHE_SRC=httpd-2.4.27.tar.gz -@set APACHE_BIN32=httpd-2.4.27-win32-VC11.zip -@set APACHE_BIN64=httpd-2.4.27-win64-VC11.zip +@set LIBXML2=libxml2-2.9.8.tar.gz +@set LUA=lua-5.3.5.tar.gz +@set CURL=curl-7.62.0.zip +@set APACHE_SRC=httpd-2.4.37.tar.gz +@set APACHE_BIN32=httpd-2.4.37-win32-VC11.zip +@set APACHE_BIN64=httpd-2.4.37-win64-VC11.zip @set YAJL=yajl-2.1.0.zip @set SSDEEP=ssdeep-2.13.tar.gz @set SSDEEP_BIN=ssdeep-2.13.zip diff --git a/iis/build_msi.bat b/iis/build_msi.bat index 0ea7d369..fde4022c 100644 --- a/iis/build_msi.bat +++ b/iis/build_msi.bat @@ -1,6 +1,6 @@ -set PATH="%PATH%;C:\Program Files (x86)\WiX Toolset v3.8\bin;C:\Program Files (x86)\WiX Toolset v3.7\bin;" +set PATH="%PATH%;C:\Program Files (x86)\WiX Toolset v3.11\bin;C:\Program Files (x86)\WiX Toolset v3.8\bin;C:\Program Files (x86)\WiX Toolset v3.7\bin;" set CURRENT_DIR=%cd% del installer.wix* diff --git a/iis/dependencies/build_pcre.bat b/iis/dependencies/build_pcre.bat index b7841b25..d2cbcce0 100644 --- a/iis/dependencies/build_pcre.bat +++ b/iis/dependencies/build_pcre.bat @@ -10,14 +10,16 @@ set PCRE_DIR=%PCRE:~0,-4% move "%PCRE_DIR%" "pcre" @if "%PCRE_DIR%" == "pcre-8.40" ( - Echo. && Echo "PCRE 8.40 found... patching with patch-pcre-8.40.vbs..." - cscript /B /Nologo ../patch-pcre-8.40.vbs + Echo. && Echo "PCRE 8.40 found... trying to patch it to compile cleanly" + ::cscript /B /Nologo ../patch-pcre-8.40.vbs + cd "pcre" + cat CMakeLists.txt | sed "s/PCRE_STATIC_RUNTIME OFF CACHE BOOL/PCRE_STATIC_RUNTIME/g" > CMakeLists.txt.ops + move CMakeLists.txt CMakeLists.txt.old + move CMakeLists.txt.ops CMakeLists.txt + cd .. ) cd "pcre" -cat CMakeLists.txt | sed "s/PCRE_STATIC_RUNTIME OFF CACHE BOOL/PCRE_STATIC_RUNTIME/g" > CMakeLists.txt.ops -move CMakeLists.txt CMakeLists.txt.old -move CMakeLists.txt.ops CMakeLists.txt CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True @if NOT (%ERRORLEVEL%) == (0) goto build_failed NMAKE diff --git a/iis/download_files.bat b/iis/download_files.bat index f0db400e..dd0773aa 100644 --- a/iis/download_files.bat +++ b/iis/download_files.bat @@ -1,34 +1,32 @@ - -::@set CMAKE=cmake-3.8.2-win32-x86.zip -::@set PCRE=pcre-8.40.zip -::@set ZLIB=zlib-1.2.11.tar.gz -::@set LIBXML2=libxml2-2.9.4.tar.gz -::@set LUA=lua-5.3.4.tar.gz -::@set CURL=curl-7.54.1.zip -::@set APACHE_SRC=httpd-2.4.27.tar.gz -::@set APACHE_BIN32=httpd-2.4.27-win32-VC11.zip -::@set APACHE_BIN64=httpd-2.4.27-win64-VC11.zip -::@set YAJL=yajl-2.1.0.zip -::@set SSDEEP=ssdeep-2.13.tar.gz -::@set SSDEEP_BIN=ssdeep-2.13.zip +@set CMAKE=cmake-3.12.4-win32-x86.zip +@set PCRE=pcre-8.41.zip +@set ZLIB=zlib-1.2.11.tar.gz +@set LIBXML2=libxml2-2.9.8.tar.gz +@set LUA=lua-5.3.5.tar.gz +@set CURL=curl-7.62.0.zip +@set APACHE_SRC=httpd-2.4.37.tar.gz +@set APACHE_BIN32=httpd-2.4.37-win32-VC11.zip +@set APACHE_BIN64=httpd-2.4.37-win64-VC11.zip +@set YAJL=yajl-2.1.0.zip +@set SSDEEP=ssdeep-2.13.tar.gz +@set SSDEEP_BIN=ssdeep-2.13.zip :: BITSAdmin refuses to download YAJL from GitHub URL :: @set YAJL_URL=https://github.com/lloyd/yajl/archive/%YAJL:~-9% @set YAJL_URL=http://http.debian.net/debian/pool/main/y/yajl/yajl_2.1.0.orig.tar.gz -@set CMAKE_URL=https://cmake.org/files/v3.8/%CMAKE% +@set CMAKE_URL=https://cmake.org/files/v3.12/%CMAKE% @set PCRE_URL=https://ftp.pcre.org/pub/pcre/%PCRE% @set ZLIB_URL=https://zlib.net/%ZLIB% @set LIBXML2_URL=http://xmlsoft.org/sources/%LIBXML2% -@set LUA_URL=https://www.lua.org/ftp/%LUA% +@set LUA_URL=https://www.lua.org/ftp/%LUA% @set CURL_URL=http://curl.askapache.com/download/%CURL% @set APACHE_SRC_URL=https://www.apache.org/dist/httpd/%APACHE_SRC% -@set APACHE_BIN_URL=https://www.apachelounge.com/download/VC11/binaries +@set APACHE_BIN_URL=https://home.apache.org/~steffenal/VC11/binaries @set SSDEEP_URL=https://downloads.sourceforge.net/project/ssdeep/ssdeep-2.13 bitsadmin.exe /transfer "Downloading dependencies..." %CMAKE_URL% %SOURCE_DIR%\%CMAKE% %PCRE_URL% %SOURCE_DIR%\%PCRE% %ZLIB_URL% %SOURCE_DIR%\%ZLIB% %LIBXML2_URL% %SOURCE_DIR%\%LIBXML2% %LUA_URL% %SOURCE_DIR%\%LUA% %CURL_URL% %SOURCE_DIR%\%CURL% %APACHE_SRC_URL% %SOURCE_DIR%\%APACHE_SRC% %APACHE_BIN_URL%/%APACHE_BIN32% %SOURCE_DIR%\%APACHE_BIN32% %APACHE_BIN_URL%/%APACHE_BIN64% %SOURCE_DIR%\%APACHE_BIN64% %YAJL_URL% %SOURCE_DIR%\%YAJL% %SSDEEP_URL%/%SSDEEP% %SOURCE_DIR%\%SSDEEP% %SSDEEP_URL%/%SSDEEP_BIN% %SOURCE_DIR%\%SSDEEP_BIN% - @if NOT (%ERRORLEVEL%) == (0) goto :failed_to_download @exit /B 0