NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit277f2e1

Felipe Zimmerle

committed

iis: adds openssl to the build scripts

openssl is necessary to have curl talking in https.

1 parent9fe72b7 commit277f2e1Copy full SHA for 277f2e1

File tree

4 files changed

+118

-2

lines changed

iis
- build_dependencies.bat
- build_release.bat
- dependencies
  - build_openssl.bat
- installer.wxs

4 files changed

+118

-2

lines changed

`‎iis/build_dependencies.bat‎`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`@setYAJL=lloyd-yajl-f4b2b1a.zip`
`21`	`21`	`@setSSDEEP=ssdeep-2.10.tar.gz`
`22`	`22`	`@setSSDEEP_BIN=ssdeep-2.10.zip`
	`23`	`+@setOPENSSL=openssl-1.0.1j.tar.gz`
`23`	`24`
`24`	`25`	`:: @set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"`
`25`	`26`	`:: @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"`
`70`	`71`	`@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_lua`
`71`	`72`	`@cd"%CURRENT_DIR%"`
`72`	`73`
	`74`	`+@echo # openssl -%OPENSSL%`
	`75`	`+@call dependencies/build_openssl.bat`
	`76`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_openssl`
	`77`	`+@cd"%CURRENT_DIR%"`
	`78`	`+`
`73`	`79`	`@echo # curl -%CURL%`
`74`	`80`	`@call dependencies/build_curl.bat`
`75`	`81`	`@ifNOT (%ERRORLEVEL%)== (0)goto build_failed_curl`
`@@ -121,6 +127,10 @@ call cl 2>&1 \| findstr /C:"x64"`
`121`	`127`	`@echo Failed to setup%CURL%...`
`122`	`128`	`@goto failed`
`123`	`129`
	`130`	`+:build_failed_openssl`
	`131`	`+@echo Failed to setup%OPENSSL%...`
	`132`	`+@goto failed`
	`133`	`+`
`124`	`134`	`:build_failed_yajl`
`125`	`135`	`@echo Failed to setup%YAJL%...`
`126`	`136`	`@goto failed`

`‎iis/build_release.bat‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ copy "%OUTPUT_DIR%\pcre.dll" "%AMD64%"`
`35`	`35`	`copy"%OUTPUT_DIR%\zlib1.dll""%AMD64%"`
`36`	`36`	`copy"%OUTPUT_DIR%\yajl.dll""%AMD64%"`
`37`	`37`	`copy"%OUTPUT_DIR%\fuzzy.dll""%AMD64%"`
	`38`	`+copy"%OUTPUT_DIR%\libeay32.dll""%AMD64%"`
	`39`	`+copy"%OUTPUT_DIR%\ssleay32.dll""%AMD64%"`
`38`	`40`
`39`	`41`	`setSSDEEP_ARCH="x86"`
`40`	`42`	`call build_dependencies.bat%VCARGS32%`
`@@ -54,6 +56,8 @@ copy "%OUTPUT_DIR%\pcre.dll" "%X86%"`
`54`	`56`	`copy"%OUTPUT_DIR%\zlib1.dll""%X86%"`
`55`	`57`	`copy"%OUTPUT_DIR%\yajl.dll""%X86%"`
`56`	`58`	`copy"%OUTPUT_DIR%\fuzzy.dll""%X86%"`
	`59`	`+copy"%OUTPUT_DIR%\libeay32.dll""%X86%"`
	`60`	`+copy"%OUTPUT_DIR%\ssleay32.dll""%X86%"`
`57`	`61`
`58`	`62`
`59`	`63`	`:: copy %OUTPUT_DIR%\Installer.exe %RELEASE_DIR%`

`‎iis/dependencies/build_openssl.bat‎`

Lines changed: 83 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,83 @@`
	`1`	`+::set WORK_DIR=C:\buildbot\win-local_-_Release\build\ModSecurity\iis\dependencies\build_dir`
	`2`	`+::set SOURCE_DIR=C:\Users\fcosta\Downloads`
	`3`	`+::set OPENSSL=openssl-1.0.1j.tar.gz`
	`4`	`+::set OUTPUT_DIR=C:\buildbot\win-local_-_Release\build\ModSecurity\iis\release_files`
	`5`	`+`
	`6`	`+cd"%WORK_DIR%"`
	`7`	`+@ifNOT EXIST"%SOURCE_DIR%\%OPENSSL%"goto file_not_found_bin`
	`8`	`+`
	`9`	`+echo"7z..."`
	`10`	`+@7z.exe x"%SOURCE_DIR%\%OPENSSL%" -so\| 7z.exe x -aoa -si -ttar`
	`11`	`+`
	`12`	`+echo"Timeout..."`
	`13`	`+timeout5`
	`14`	`+`
	`15`	`+echo"OpenSSL..."`
	`16`	`+setOPENSSL_DIR=%OPENSSL:~0,-7%`
	`17`	`+`
	`18`	`+echo"Move..."`
	`19`	`+move"%OPENSSL_DIR%""openssl"`
	`20`	`+`
	`21`	`+echo"Cd..."`
	`22`	`+cd"openssl"`
	`23`	`+`
	`24`	`+`
	`25`	`+@setARCH=x86`
	`26`	`+@call cl2>&1\|findstr /C:"x64"`
	`27`	`+@if (%ERRORLEVEL%)== (0)setARCH=x64`
	`28`	`+`
	`29`	`+echo"Starting to build"`
	`30`	`+`
	`31`	`+if"%ARCH%"=="x64" (goto first )else (goto second )`
	`32`	`+goto end`
	`33`	`+`
	`34`	`+:first`
	`35`	`+echo"Building x64"`
	`36`	`+ perl Configure VC-WIN64A --prefix=%WORK_DIR%/openssl_inst`
	`37`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
	`38`	`+call ms\do_win64a`
	`39`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
	`40`	`+ nmake -f ms\ntdll.mak`
	`41`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
	`42`	`+ nmake -f ms\ntdll.mak install`
	`43`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
	`44`	`+`
	`45`	`+copy /y"%WORK_DIR%\openssl\out32dll\libeay32.dll""%OUTPUT_DIR%"`
	`46`	`+copy /y"%WORK_DIR%\openssl\out32dll\ssleay32.dll""%OUTPUT_DIR%"`
	`47`	`+copy /y"%WORK_DIR%\openssl\out32dll\libeay32.lib""%OUTPUT_DIR%"`
	`48`	`+copy /y"%WORK_DIR%\openssl\out32dll\ssleay32.lib""%OUTPUT_DIR%"`
	`49`	`+goto end`
	`50`	`+`
	`51`	`+:second`
	`52`	`+echo"Building x86"`
	`53`	`+ perl Configure VC-WIN32 no-asm --prefix=%WORK_DIR%/openssl_inst`
	`54`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
	`55`	`+:: call ms\do_nasm`
	`56`	`+call ms\do_ms`
	`57`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
	`58`	`+ nmake -f ms\ntdll.mak`
	`59`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
	`60`	`+ nmake -f ms\ntdll.mak install`
	`61`	`+@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
	`62`	`+`
	`63`	`+copy /y"%WORK_DIR%\openssl\out32dll\libeay32.dll""%OUTPUT_DIR%"`
	`64`	`+copy /y"%WORK_DIR%\openssl\out32dll\ssleay32.dll""%OUTPUT_DIR%"`
	`65`	`+copy /y"%WORK_DIR%\openssl\out32dll\libeay32.lib""%OUTPUT_DIR%"`
	`66`	`+copy /y"%WORK_DIR%\openssl\out32dll\ssleay32.lib""%OUTPUT_DIR%"`
	`67`	`+goto end`
	`68`	`+`
	`69`	`+`
	`70`	`+:end`
	`71`	`+exit /B0`
	`72`	`+`
	`73`	`+:file_not_found_bin`
	`74`	`+@echo File not found:"%SOURCE_DIR%\%OPENSSL%"`
	`75`	`+@goto failed`
	`76`	`+`
	`77`	`+:: :build_failed`
	`78`	`+:: @echo Problems during the building phase`
	`79`	`+:: @goto failed`
	`80`	`+`
	`81`	`+:failed`
	`82`	`+@exit /B1`
	`83`	`+`

`‎iis/installer.wxs‎`

Lines changed: 21 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,16 @@`
`86`	`86`	`<DirectorySearchId="CheckFileDir19"Path="C:\Windows\System32\inetsrv"Depth="0">`
`87`	`87`	`<FileSearchId="CheckFile19"Name="fuzzy.dll" />`
`88`	`88`	`</DirectorySearch>`
	`89`	`+ <DirectorySearchId="CheckFileDir20"Path="C:\Windows\System32\inetsrv"Depth="0">`
	`90`	`+ <FileSearchId="CheckFile20"Name="libeay32.dll" />`
	`91`	`+ </DirectorySearch>`
	`92`	`+ <DirectorySearchId="CheckFileDir21"Path="C:\Windows\System32\inetsrv"Depth="0">`
	`93`	`+ <FileSearchId="CheckFile21"Name="ssleay32.dll" />`
	`94`	`+ </DirectorySearch>`
	`95`	`+ <DirectorySearchId="CheckFileDir22"Path="C:\Windows\System32\inetsrv"Depth="0">`
	`96`	`+ <FileSearchId="CheckFile22"Name="curl-ca-bundle.crt" />`
	`97`	`+ </DirectorySearch>`
	`98`	`+`
`89`	`99`	`</Property>`
`90`	`100`	`<PropertyId="WWWROOT">`
`91`	`101`	`<RegistrySearchId="FindInetPubFolder"Root="HKLM"Key="SOFTWARE\Microsoft\InetStp"Name="PathWWWRoot"Type="directory" />`
`@@ -326,9 +336,9 @@`
`326`	`336`	`<ShortcutId="EULA"Name="EULA"Description="EULA"Target="[INSTALLFOLDER]EULA.rtf"WorkingDirectory="INSTALLFOLDER" />`
`327`	`337`	`<ShortcutId="Readme"Name="EULA"Description="EULA"Target="[INSTALLFOLDER]README.TXT"WorkingDirectory="INSTALLFOLDER" />`
`328`	`338`	`<?if $(var.Win64) ="yes" ?>`
`329`		- <ShortcutId="List_Dependencies"Name="List Dependencies (Debug)"Description="Check for missing dependencies"Target="[INSTALLFOLDER]list_dependencies.bat"Arguments=""[inetsrv64]libapr-1.dll""[inetsrv64]libapriconv-1.dll""[inetsrv64]libaprutil-1.dll""[inetsrv64]libcurl.dll""[inetsrv64]libxml2.dll""[inetsrv64]lua5.1.dll""[inetsrv64]mlogc.exe""[inetsrv64]ModSecurityIIS.dll""[inetsrv64]pcre.dll""[inetsrv64]zlib1.dll""[inetsrv64]fuzzy.dll""[inetsrv32]libapr-1.dll""[inetsrv32]libapriconv-1.dll""[inetsrv32]libaprutil-1.dll""[inetsrv32]libcurl.dll""[inetsrv32]libxml2.dll""[inetsrv32]lua5.1.dll""[inetsrv32]mlogc.exe""[inetsrv32]ModSecurityIIS.dll""[inetsrv32]pcre.dll""[inetsrv32]zlib1.dll""[inetsrv32]fuzzy.dll""WorkingDirectory="INSTALLFOLDER" />
	`339`	+ <Shortcut Id="List_Dependencies" Name="List Dependencies (Debug)" Description="Check for missing dependencies" Target="[INSTALLFOLDER]list_dependencies.bat" Arguments=""[inetsrv64]libapr-1.dll" "[inetsrv64]libapriconv-1.dll" "[inetsrv64]libaprutil-1.dll" "[inetsrv64]libcurl.dll" "[inetsrv64]libxml2.dll" "[inetsrv64]lua5.1.dll" "[inetsrv64]mlogc.exe" "[inetsrv64]ModSecurityIIS.dll" "[inetsrv64]pcre.dll" "[inetsrv64]zlib1.dll" "[inetsrv64]fuzzy.dll" "[inetsrv64]libeay32.dll" "[inetsrv64]ssleay32.dll" "[inetsrv32]libapr-1.dll" "[inetsrv32]libapriconv-1.dll" "[inetsrv32]libaprutil-1.dll" "[inetsrv32]libcurl.dll" "[inetsrv32]libxml2.dll" "[inetsrv32]lua5.1.dll" "[inetsrv32]mlogc.exe" "[inetsrv32]ModSecurityIIS.dll" "[inetsrv32]pcre.dll" "[inetsrv32]zlib1.dll" "[inetsrv32]fuzzy.dll" "[inetsrv32]libeay32.dll" "[inetsrv32]ssleay32.dll"" WorkingDirectory="INSTALLFOLDER" />
`330`	`340`	`<?else ?>`
`331`		- <ShortcutId="List_Dependencies"Name="List Dependencies (Debug)"Description="Check for missing dependencies"Target="[INSTALLFOLDER]list_dependencies.bat"Arguments=""[inetsrv32]libapr-1.dll""[inetsrv32]libapriconv-1.dll""[inetsrv32]libaprutil-1.dll""[inetsrv32]libcurl.dll""[inetsrv32]libxml2.dll""[inetsrv32]lua5.1.dll""[inetsrv32]mlogc.exe""[inetsrv32]ModSecurityIIS.dll""[inetsrv32]pcre.dll""[inetsrv32]zlib1.dll""[inetsrv32]fuzzy.dll""WorkingDirectory="INSTALLFOLDER" />
	`341`	+ <ShortcutId="List_Dependencies"Name="List Dependencies (Debug)"Description="Check for missing dependencies"Target="[INSTALLFOLDER]list_dependencies.bat"Arguments=""[inetsrv32]libapr-1.dll""[inetsrv32]libapriconv-1.dll""[inetsrv32]libaprutil-1.dll""[inetsrv32]libcurl.dll""[inetsrv32]libxml2.dll""[inetsrv32]lua5.1.dll""[inetsrv32]mlogc.exe""[inetsrv32]ModSecurityIIS.dll""[inetsrv32]pcre.dll""[inetsrv32]zlib1.dll""[inetsrv32]fuzzy.dll""[inetsrv32]libeay32.dll""[inetsrv32]ssleay32.dll""WorkingDirectory="INSTALLFOLDER" />
`332`	`342`	`<?endif ?>`
`333`	`343`	`</Component>`
`334`	`344`	`</Directory>`
`@@ -370,6 +380,9 @@`
`370`	`380`	`<FileId="_64_PCRE"Name="pcre.dll"Source="Release\amd64\pcre.dll" />`
`371`	`381`	`<FileId="_64_ZLIB1"Name="zlib1.dll"Source="Release\amd64\zlib1.dll" />`
`372`	`382`	`<FileId="_64_FUZZY"Name="fuzzy.dll"Source="Release\amd64\fuzzy.dll" />`
	`383`	`+ <FileId="_64_LIBEAY"Name="libeay32.dll"Source="Release\amd64\libeay32.dll" />`
	`384`	`+ <FileId="_64_SSLEAY"Name="ssleay32.dll"Source="Release\amd64\ssleay32.dll" />`
	`385`	`+<FileId="_64_CA_BUNDLE"Name="curl-ca-bundle.crt"Source="curl-ca-bundle.crt" />`
`373`	`386`	`</Component>`
`374`	`387`	`</DirectoryRef>`
`375`	`388`	`<DirectoryRefId="inetsrv32">`
`@@ -386,6 +399,9 @@`
`386`	`399`	`<FileId="_32_PCRE"Name="pcre.dll"Source="Release\x86\pcre.dll" />`
`387`	`400`	`<FileId="_32_ZLIB1"Name="zlib1.dll"Source="Release\x86\zlib1.dll" />`
`388`	`401`	`<FileId="_32_FUZZY"Name="fuzzy.dll"Source="Release\x86\fuzzy.dll" />`
	`402`	`+ <FileId="_32_LIBEAY"Name="libeay32.dll"Source="Release\x86\libeay32.dll" />`
	`403`	`+ <FileId="_32_SSLEAY"Name="ssleay32.dll"Source="Release\x86\ssleay32.dll" />`
	`404`	`+<FileId="_32_CA_BUNDLE"Name="curl-ca-bundle.crt"Source="curl-ca-bundle.crt" />`
`389`	`405`	`</Component>`
`390`	`406`	`</DirectoryRef>`
`391`	`407`	`<DirectoryRefId="SystemFolderConfigSchema32">`
`@@ -413,6 +429,9 @@`
`413`	`429`	`<FileId="_32_PCRE"Name="pcre.dll"Source="Release\x86\pcre.dll" />`
`414`	`430`	`<FileId="_32_ZLIB1"Name="zlib1.dll"Source="Release\x86\zlib1.dll" />`
`415`	`431`	`<FileId="_32_FUZZY"Name="fuzzy.dll"Source="Release\x86\fuzzy.dll" />`
	`432`	`+ <FileId="_32_LIBEAY"Name="libeay32.dll"Source="Release\x86\libeay32.dll" />`
	`433`	`+ <FileId="_32_SSLEAY"Name="ssleay32.dll"Source="Release\x86\ssleay32.dll" />`
	`434`	`+<FileId="_32_CA_BUNDLE"Name="curl-ca-bundle.crt"Source="curl-ca-bundle.crt" />`
`416`	`435`	`</Component>`
`417`	`436`	`</DirectoryRef>`
`418`	`437`	`<DirectoryRefId="SystemFolderConfigSchema32">`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit277f2e1

File tree

4 files changed

4 files changed

`‎iis/build_dependencies.bat‎`

`‎iis/build_release.bat‎`

`‎iis/dependencies/build_openssl.bat‎`

`‎iis/installer.wxs‎`

0 commit comments