diff --git a/iis/build_dependencies.bat b/iis/build_dependencies.bat index 447e0352..c2db6696 100644 --- a/iis/build_dependencies.bat +++ b/iis/build_dependencies.bat @@ -20,6 +20,7 @@ @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" @@ -70,6 +71,11 @@ 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 @@ -121,6 +127,10 @@ 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 diff --git a/iis/build_release.bat b/iis/build_release.bat index 68bc5871..98984727 100644 --- a/iis/build_release.bat +++ b/iis/build_release.bat @@ -35,6 +35,8 @@ copy "%OUTPUT_DIR%\pcre.dll" "%AMD64%" copy "%OUTPUT_DIR%\zlib1.dll" "%AMD64%" copy "%OUTPUT_DIR%\yajl.dll" "%AMD64%" copy "%OUTPUT_DIR%\fuzzy.dll" "%AMD64%" +copy "%OUTPUT_DIR%\libeay32.dll" "%AMD64%" +copy "%OUTPUT_DIR%\ssleay32.dll" "%AMD64%" set SSDEEP_ARCH="x86" call build_dependencies.bat %VCARGS32% @@ -54,6 +56,8 @@ copy "%OUTPUT_DIR%\pcre.dll" "%X86%" copy "%OUTPUT_DIR%\zlib1.dll" "%X86%" copy "%OUTPUT_DIR%\yajl.dll" "%X86%" copy "%OUTPUT_DIR%\fuzzy.dll" "%X86%" +copy "%OUTPUT_DIR%\libeay32.dll" "%X86%" +copy "%OUTPUT_DIR%\ssleay32.dll" "%X86%" :: copy %OUTPUT_DIR%\Installer.exe %RELEASE_DIR% diff --git a/iis/dependencies/build_openssl.bat b/iis/dependencies/build_openssl.bat new file mode 100644 index 00000000..a8fe3043 --- /dev/null +++ b/iis/dependencies/build_openssl.bat @@ -0,0 +1,83 @@ +::set WORK_DIR=C:\buildbot\win-local_-_Release\build\ModSecurity\iis\dependencies\build_dir +::set SOURCE_DIR=C:\Users\fcosta\Downloads +::set OPENSSL=openssl-1.0.1j.tar.gz +::set OUTPUT_DIR=C:\buildbot\win-local_-_Release\build\ModSecurity\iis\release_files + +cd "%WORK_DIR%" +@if NOT EXIST "%SOURCE_DIR%\%OPENSSL%" goto file_not_found_bin + +echo "7z..." +@7z.exe x "%SOURCE_DIR%\%OPENSSL%" -so | 7z.exe x -aoa -si -ttar + +echo "Timeout..." +timeout 5 + +echo "OpenSSL..." +set OPENSSL_DIR=%OPENSSL:~0,-7% + +echo "Move..." +move "%OPENSSL_DIR%" "openssl" + +echo "Cd..." +cd "openssl" + + +@set ARCH=x86 +@call cl 2>&1 | findstr /C:"x64" +@if (%ERRORLEVEL%) == (0) set ARCH=x64 + +echo "Starting to build" + +if "%ARCH%" == "x64" ( goto first ) else ( goto second ) +goto end + +:first + echo "Building x64" + perl Configure VC-WIN64A --prefix=%WORK_DIR%/openssl_inst + @if NOT (%ERRORLEVEL%) == (0) goto build_failed + call ms\do_win64a + @if NOT (%ERRORLEVEL%) == (0) goto build_failed + nmake -f ms\ntdll.mak + @if NOT (%ERRORLEVEL%) == (0) goto build_failed + nmake -f ms\ntdll.mak install + @if NOT (%ERRORLEVEL%) == (0) goto build_failed + + copy /y "%WORK_DIR%\openssl\out32dll\libeay32.dll" "%OUTPUT_DIR%" + copy /y "%WORK_DIR%\openssl\out32dll\ssleay32.dll" "%OUTPUT_DIR%" + copy /y "%WORK_DIR%\openssl\out32dll\libeay32.lib" "%OUTPUT_DIR%" + copy /y "%WORK_DIR%\openssl\out32dll\ssleay32.lib" "%OUTPUT_DIR%" + goto end + +:second + echo "Building x86" + perl Configure VC-WIN32 no-asm --prefix=%WORK_DIR%/openssl_inst + @if NOT (%ERRORLEVEL%) == (0) goto build_failed + :: call ms\do_nasm + call ms\do_ms + @if NOT (%ERRORLEVEL%) == (0) goto build_failed + nmake -f ms\ntdll.mak + @if NOT (%ERRORLEVEL%) == (0) goto build_failed + nmake -f ms\ntdll.mak install + @if NOT (%ERRORLEVEL%) == (0) goto build_failed + + copy /y "%WORK_DIR%\openssl\out32dll\libeay32.dll" "%OUTPUT_DIR%" + copy /y "%WORK_DIR%\openssl\out32dll\ssleay32.dll" "%OUTPUT_DIR%" + copy /y "%WORK_DIR%\openssl\out32dll\libeay32.lib" "%OUTPUT_DIR%" + copy /y "%WORK_DIR%\openssl\out32dll\ssleay32.lib" "%OUTPUT_DIR%" + goto end + + +:end +exit /B 0 + +:file_not_found_bin +@echo File not found: "%SOURCE_DIR%\%OPENSSL%" +@goto failed + +:: :build_failed +:: @echo Problems during the building phase +:: @goto failed + +:failed +@exit /B 1 + diff --git a/iis/installer.wxs b/iis/installer.wxs index 0b98b35a..744c506c 100644 --- a/iis/installer.wxs +++ b/iis/installer.wxs @@ -86,6 +86,16 @@ + + + + + + + + + + @@ -326,9 +336,9 @@ - + - + @@ -370,6 +380,9 @@ + + + @@ -386,6 +399,9 @@ + + + @@ -413,6 +429,9 @@ + + +