Skip to content

Commit 63cbd91

Browse files
victorhoravictorhora
committed
IIS: Update dependencies for Windows build
1 parent b7e82aa commit 63cbd91

File tree

5 files changed

+33
-31
lines changed

5 files changed

+33
-31
lines changed

‎CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
DD MMM YYYY - 2.9.3 - To be released
22
------------------------------------
33

4+
* IIS: Update dependencies for Windows build
5+
[Issue #1848 - @victorhora, @hsluoyz]
46
* IIS: Set SecStreamInBodyInspection by default on IIS builds (#1299)
57
[Issue #1299 - @victorhora]
68
* IIS: Update modsecurity.conf

‎iis/build_dependencies.bat

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
@set SOURCE_DIR=%USERPROFILE%\Downloads
88

99
:: Dependencies
10-
@set CMAKE=cmake-3.8.2-win32-x86.zip
11-
@set PCRE=pcre-8.40.zip
10+
@set CMAKE=cmake-3.12.4-win32-x86.zip
11+
@set PCRE=pcre-8.41.zip
1212
@set ZLIB=zlib-1.2.11.tar.gz
13-
@set LIBXML2=libxml2-2.9.4.tar.gz
14-
@set LUA=lua-5.3.4.tar.gz
15-
@set CURL=curl-7.54.1.zip
16-
@set APACHE_SRC=httpd-2.4.27.tar.gz
17-
@set APACHE_BIN32=httpd-2.4.27-win32-VC11.zip
18-
@set APACHE_BIN64=httpd-2.4.27-win64-VC11.zip
13+
@set LIBXML2=libxml2-2.9.8.tar.gz
14+
@set LUA=lua-5.3.5.tar.gz
15+
@set CURL=curl-7.62.0.zip
16+
@set APACHE_SRC=httpd-2.4.37.tar.gz
17+
@set APACHE_BIN32=httpd-2.4.37-win32-VC11.zip
18+
@set APACHE_BIN64=httpd-2.4.37-win64-VC11.zip
1919
@set YAJL=yajl-2.1.0.zip
2020
@set SSDEEP=ssdeep-2.13.tar.gz
2121
@set SSDEEP_BIN=ssdeep-2.13.zip

‎iis/build_msi.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
set PATH="%PATH%;C:\Program Files (x86)\WiX Toolset v3.8\bin;C:\Program Files (x86)\WiX Toolset v3.7\bin;"
3+
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;"
44
set CURRENT_DIR=%cd%
55

66
del installer.wix*

‎iis/dependencies/build_pcre.bat

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ set PCRE_DIR=%PCRE:~0,-4%
1010
move "%PCRE_DIR%" "pcre"
1111

1212
@if "%PCRE_DIR%" == "pcre-8.40" (
13-
Echo. && Echo "PCRE 8.40 found... patching with patch-pcre-8.40.vbs..."
14-
cscript /B /Nologo ../patch-pcre-8.40.vbs
13+
Echo. && Echo "PCRE 8.40 found... trying to patch it to compile cleanly"
14+
::cscript /B /Nologo ../patch-pcre-8.40.vbs
15+
cd "pcre"
16+
cat CMakeLists.txt | sed "s/PCRE_STATIC_RUNTIME OFF CACHE BOOL/PCRE_STATIC_RUNTIME/g" > CMakeLists.txt.ops
17+
move CMakeLists.txt CMakeLists.txt.old
18+
move CMakeLists.txt.ops CMakeLists.txt
19+
cd ..
1520
)
1621

1722
cd "pcre"
18-
cat CMakeLists.txt | sed "s/PCRE_STATIC_RUNTIME OFF CACHE BOOL/PCRE_STATIC_RUNTIME/g" > CMakeLists.txt.ops
19-
move CMakeLists.txt CMakeLists.txt.old
20-
move CMakeLists.txt.ops CMakeLists.txt
2123
CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True
2224
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
2325
NMAKE

‎iis/download_files.bat

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
1-
2-
::@set CMAKE=cmake-3.8.2-win32-x86.zip
3-
::@set PCRE=pcre-8.40.zip
4-
::@set ZLIB=zlib-1.2.11.tar.gz
5-
::@set LIBXML2=libxml2-2.9.4.tar.gz
6-
::@set LUA=lua-5.3.4.tar.gz
7-
::@set CURL=curl-7.54.1.zip
8-
::@set APACHE_SRC=httpd-2.4.27.tar.gz
9-
::@set APACHE_BIN32=httpd-2.4.27-win32-VC11.zip
10-
::@set APACHE_BIN64=httpd-2.4.27-win64-VC11.zip
11-
::@set YAJL=yajl-2.1.0.zip
12-
::@set SSDEEP=ssdeep-2.13.tar.gz
13-
::@set SSDEEP_BIN=ssdeep-2.13.zip
1+
@set CMAKE=cmake-3.12.4-win32-x86.zip
2+
@set PCRE=pcre-8.41.zip
3+
@set ZLIB=zlib-1.2.11.tar.gz
4+
@set LIBXML2=libxml2-2.9.8.tar.gz
5+
@set LUA=lua-5.3.5.tar.gz
6+
@set CURL=curl-7.62.0.zip
7+
@set APACHE_SRC=httpd-2.4.37.tar.gz
8+
@set APACHE_BIN32=httpd-2.4.37-win32-VC11.zip
9+
@set APACHE_BIN64=httpd-2.4.37-win64-VC11.zip
10+
@set YAJL=yajl-2.1.0.zip
11+
@set SSDEEP=ssdeep-2.13.tar.gz
12+
@set SSDEEP_BIN=ssdeep-2.13.zip
1413

1514
:: BITSAdmin refuses to download YAJL from GitHub URL
1615
:: @set YAJL_URL=https://github.com/lloyd/yajl/archive/%YAJL:~-9%
1716
@set YAJL_URL=http://http.debian.net/debian/pool/main/y/yajl/yajl_2.1.0.orig.tar.gz
1817

19-
@set CMAKE_URL=https://cmake.org/files/v3.8/%CMAKE%
18+
@set CMAKE_URL=https://cmake.org/files/v3.12/%CMAKE%
2019
@set PCRE_URL=https://ftp.pcre.org/pub/pcre/%PCRE%
2120
@set ZLIB_URL=https://zlib.net/%ZLIB%
2221
@set LIBXML2_URL=http://xmlsoft.org/sources/%LIBXML2%
23-
@set LUA_URL=https://www.lua.org/ftp/%LUA%
22+
@set LUA_URL=https://www.lua.org/ftp/%LUA%
2423
@set CURL_URL=http://curl.askapache.com/download/%CURL%
2524
@set APACHE_SRC_URL=https://www.apache.org/dist/httpd/%APACHE_SRC%
26-
@set APACHE_BIN_URL=https://www.apachelounge.com/download/VC11/binaries
25+
@set APACHE_BIN_URL=https://home.apache.org/~steffenal/VC11/binaries
2726
@set SSDEEP_URL=https://downloads.sourceforge.net/project/ssdeep/ssdeep-2.13
2827

2928
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%
3029

31-
3230
@if NOT (%ERRORLEVEL%) == (0) goto :failed_to_download
3331
@exit /B 0
3432

0 commit comments

Comments
 (0)