github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

IIS: Changes Curl version and removes OpenSSL dependency

Browse Source 
As the this new Curl version supports well the Windows certificate storage,
removing the dependency on the OpenSSL. Also changing the build scripts to work
accordingly. As the cmake build of Curl is said to broken abandoning it in
favor of the nmake files. Thanks to Gregg Smith and Steffen.
This commit is contained in:
Felipe Zimmerle
2014-12-05 05:49:58 -08:00
parent 0d2d01ba2c
commit 6c0cdab35a
10 changed files with 53 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
iis/build_dependencies.bat
View File

@@ -13,14 +13,13 @@
@set ZLIB=zlib-1.2.8.tar.gz
@set LIBXML2=libxml2-2.9.1.tar.gz
@set LUA=lua-5.1.5.tar.gz
@set CURL=curl-7.33.0.zip
@set CURL=curl-7.39.0.zip
@set APACHE_SRC=httpd-2.4.6.tar.gz
@set APACHE_BIN32=httpd-2.4.6-win32-VC11.zip
@set APACHE_BIN64=httpd-2.4.6-win64-VC11.zip
@set YAJL=lloyd-yajl-f4b2b1a.zip
@set SSDEEP=ssdeep-2.10.tar.gz
@set SSDEEP_BIN=ssdeep-2.10.zip
@set OPENSSL=openssl-1.0.1j.tar.gz
:: @set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"
:: @set VCARGS64="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat"
@@ -71,11 +70,6 @@ call cl 2>&1 | findstr /C:"x64"
@if NOT (%ERRORLEVEL%) == (0) goto build_failed_lua
@cd "%CURRENT_DIR%"
@echo # openssl - %OPENSSL%
@call dependencies/build_openssl.bat
@if NOT (%ERRORLEVEL%) == (0) goto build_failed_openssl
@cd "%CURRENT_DIR%"
@echo # curl - %CURL%
@call dependencies/build_curl.bat
@if NOT (%ERRORLEVEL%) == (0) goto build_failed_curl
@@ -127,10 +121,6 @@ call cl 2>&1 | findstr /C:"x64"
@echo Failed to setup %CURL%...
@goto failed
:build_failed_openssl
@echo Failed to setup %OPENSSL%...
@goto failed
:build_failed_yajl
@echo Failed to setup %YAJL%...
@goto failed