NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit85c7ba0

Felipe Zimmerle

committed

IIS: Adds ssdeep/libfuzzy to msi installer

fuzzy.dll should be installed by the ModSecurityIIS installer.

1 parent858d480 commit85c7ba0Copy full SHA for 85c7ba0

File tree

2 files changed

+12

-3

lines changed

iis
- build_release.bat
- installer.wxs

2 files changed

+12

-3

lines changed

`‎iis/build_release.bat‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ mkdir "%X86%"`
`17`	`17`	`setVCARGS32="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\vcvars32.bat"`
`18`	`18`	`setVCARGS64="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\vcvarsx86_amd64.bat"`
`19`	`19`
	`20`	`+setSSDEEP_ARCH="x64"`
`20`	`21`	`call build_dependencies.bat%VCARGS64%`
`21`	`22`	`@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
`22`	`23`	`call build_modsecurity.bat%VCARGS64%`
`@@ -33,8 +34,9 @@ copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%AMD64%"`
`33`	`34`	`copy"%OUTPUT_DIR%\pcre.dll""%AMD64%"`
`34`	`35`	`copy"%OUTPUT_DIR%\zlib1.dll""%AMD64%"`
`35`	`36`	`copy"%OUTPUT_DIR%\yajl.dll""%AMD64%"`
	`37`	`+copy"%OUTPUT_DIR%\fuzzy.dll""%AMD64%"`
`36`	`38`
`37`		`-`
	`39`	`+setSSDEEP_ARCH="x86"`
`38`	`40`	`call build_dependencies.bat%VCARGS32%`
`39`	`41`	`@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
`40`	`42`	`call build_modsecurity.bat%VCARGS32%`
`@@ -51,6 +53,7 @@ copy "%OUTPUT_DIR%\ModSecurityIIS.dll" "%X86%"`
`51`	`53`	`copy"%OUTPUT_DIR%\pcre.dll""%X86%"`
`52`	`54`	`copy"%OUTPUT_DIR%\zlib1.dll""%X86%"`
`53`	`55`	`copy"%OUTPUT_DIR%\yajl.dll""%X86%"`
	`56`	`+copy"%OUTPUT_DIR%\fuzzy.dll""%X86%"`
`54`	`57`
`55`	`58`
`56`	`59`	`:: copy %OUTPUT_DIR%\Installer.exe %RELEASE_DIR%`

`‎iis/installer.wxs‎`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,9 @@`
`83`	`83`	`<DirectorySearchId="CheckFileDir18"Path="C:\Windows\System32\inetsrv"Depth="0">`
`84`	`84`	`<FileSearchId="CheckFile18"Name="zlib1.dll" />`
`85`	`85`	`</DirectorySearch>`
	`86`	`+ <DirectorySearchId="CheckFileDir19"Path="C:\Windows\System32\inetsrv"Depth="0">`
	`87`	`+ <FileSearchId="CheckFile19"Name="fuzzy.dll" />`
	`88`	`+ </DirectorySearch>`
`86`	`89`	`</Property>`
`87`	`90`	`<PropertyId="WWWROOT">`
`88`	`91`	`<RegistrySearchId="FindInetPubFolder"Root="HKLM"Key="SOFTWARE\Microsoft\InetStp"Name="PathWWWRoot"Type="directory" />`
`@@ -323,9 +326,9 @@`
`323`	`326`	`<ShortcutId="EULA"Name="EULA"Description="EULA"Target="[INSTALLFOLDER]EULA.rtf"WorkingDirectory="INSTALLFOLDER" />`
`324`	`327`	`<ShortcutId="Readme"Name="EULA"Description="EULA"Target="[INSTALLFOLDER]README.TXT"WorkingDirectory="INSTALLFOLDER" />`
`325`	`328`	`<?if $(var.Win64) ="yes" ?>`
`326`		- <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""[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""WorkingDirectory="INSTALLFOLDER" />
	`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" />
`327`	`330`	`<?else ?>`
`328`		- <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""WorkingDirectory="INSTALLFOLDER" />
	`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" />
`329`	`332`	`<?endif ?>`
`330`	`333`	`</Component>`
`331`	`334`	`</Directory>`
`@@ -366,6 +369,7 @@`
`366`	`369`	`<FileId="_64_MODSECURITYIIS"Name="ModSecurityIIS.dll"Source="Release\amd64\ModSecurityIIS.dll" />`
`367`	`370`	`<FileId="_64_PCRE"Name="pcre.dll"Source="Release\amd64\pcre.dll" />`
`368`	`371`	`<FileId="_64_ZLIB1"Name="zlib1.dll"Source="Release\amd64\zlib1.dll" />`
	`372`	`+ <FileId="_64_FUZZY"Name="fuzzy.dll"Source="Release\amd64\fuzzy.dll" />`
`369`	`373`	`</Component>`
`370`	`374`	`</DirectoryRef>`
`371`	`375`	`<DirectoryRefId="inetsrv32">`
`@@ -381,6 +385,7 @@`
`381`	`385`	`<FileId="_32_MODSECURITYIIS"Name="ModSecurityIIS.dll"Source="Release\x86\ModSecurityIIS.dll" />`
`382`	`386`	`<FileId="_32_PCRE"Name="pcre.dll"Source="Release\x86\pcre.dll" />`
`383`	`387`	`<FileId="_32_ZLIB1"Name="zlib1.dll"Source="Release\x86\zlib1.dll" />`
	`388`	`+ <FileId="_32_FUZZY"Name="fuzzy.dll"Source="Release\x86\fuzzy.dll" />`
`384`	`389`	`</Component>`
`385`	`390`	`</DirectoryRef>`
`386`	`391`	`<DirectoryRefId="SystemFolderConfigSchema32">`
`@@ -407,6 +412,7 @@`
`407`	`412`	`<FileId="_32_MODSECURITYIIS"Name="ModSecurityIIS.dll"Source="Release\x86\ModSecurityIIS.dll" />`
`408`	`413`	`<FileId="_32_PCRE"Name="pcre.dll"Source="Release\x86\pcre.dll" />`
`409`	`414`	`<FileId="_32_ZLIB1"Name="zlib1.dll"Source="Release\x86\zlib1.dll" />`
	`415`	`+ <FileId="_32_FUZZY"Name="fuzzy.dll"Source="Release\x86\fuzzy.dll" />`
`410`	`416`	`</Component>`
`411`	`417`	`</DirectoryRef>`
`412`	`418`	`<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!

Commit85c7ba0

File tree

2 files changed

2 files changed

`‎iis/build_release.bat‎`

`‎iis/installer.wxs‎`

0 commit comments