From 47a27fd3b766aad1090359ba5ffcf087fee8ecb6 Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Mon, 14 Jun 2021 19:09:06 -0300
Subject: [PATCH] iis: Having build scripts up2date

---
 iis/build_dependencies.bat      |  18 +-
 iis/build_msi.bat               |   8 +-
 iis/dependencies/build_curl.bat |   7 +-
 iis/installer.wxs               | 304 +++++++++++++++++++++-----------
 iis/wix/modsecurity_iis.conf    |   2 -
 5 files changed, 214 insertions(+), 125 deletions(-)

diff --git a/iis/build_dependencies.bat b/iis/build_dependencies.bat
index 61cffb63..0908d51e 100644
--- a/iis/build_dependencies.bat
+++ b/iis/build_dependencies.bat
@@ -10,15 +10,15 @@
 @set CMAKE=cmake-3.12.4-win32-x86.zip
 @set PCRE=pcre-8.41.zip
 @set ZLIB=zlib-1.2.11.tar.gz
-@set LIBXML2=libxml2-2.9.8.tar.gz
-@set LUA=lua-5.3.5.tar.gz
-@set CURL=curl-7.62.0.zip
-@set APACHE_SRC=httpd-2.4.37.tar.gz
-@set APACHE_BIN32=httpd-2.4.37-win32-VC11.zip
-@set APACHE_BIN64=httpd-2.4.37-win64-VC11.zip
+@set LIBXML2=libxml2-2.9.11.tar.gz
+@set LUA=lua-5.3.6.tar.gz
+@set CURL=curl-7.77.0.zip
+@set APACHE_SRC=httpd-2.4.48.tar.gz
+@set APACHE_BIN32=httpd-2.4.48-win32-VS16.zip
+@set APACHE_BIN64=httpd-2.4.48-win64-VS16.zip
 @set YAJL=yajl-2.1.0.zip
-@set SSDEEP=ssdeep-2.13.tar.gz
-@set SSDEEP_BIN=ssdeep-2.13.zip
+@set SSDEEP=ssdeep-2.14.1.tar.gz
+@set SSDEEP_BIN=ssdeep-2.14.1.zip
 
 @set CMAKE_DIR=%WORK_DIR%\%CMAKE:~0,-4%\bin
 
@@ -64,7 +64,7 @@ call cl 2>&1 | findstr /C:"x64"
 @echo # pcre. - %PCRE%
 @call dependencies/build_pcre.bat
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed_pcre
-@cd "%CURRENT_DIR%"
+@cd "%CURRENT_DIR%
 
 @echo # zlib - %ZLIB%
 @call dependencies/build_zlib.bat
diff --git a/iis/build_msi.bat b/iis/build_msi.bat
index fde4022c..d3c020fd 100644
--- a/iis/build_msi.bat
+++ b/iis/build_msi.bat
@@ -5,16 +5,16 @@ set CURRENT_DIR=%cd%
 
 del installer.wix*
 
-"candle.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wxs" -out "%CURRENT_DIR%\installer.wixobj" -arch x64
+"C:\Program Files (x86)\WiX Toolset v3.11\bin\candle.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wxs" -out "%CURRENT_DIR%\installer.wixobj" -arch x64
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 
-"light.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wixobj" -out "%CURRENT_DIR%\installer-64.msi" 
+"C:\Program Files (x86)\WiX Toolset v3.11\bin\light.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wixobj" -out "%CURRENT_DIR%\installer-64.msi" 
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 
-"candle.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wxs" -out "%CURRENT_DIR%\installer.wixobj" -arch x86
+"C:\Program Files (x86)\WiX Toolset v3.11\bin\candle.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wxs" -out "%CURRENT_DIR%\installer.wixobj" -arch x86
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 
-"light.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wixobj" -out "%CURRENT_DIR%\installer-32.msi" 
+"C:\Program Files (x86)\WiX Toolset v3.11\bin\light.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wixobj" -out "%CURRENT_DIR%\installer-32.msi" 
 @if NOT (%ERRORLEVEL%) == (0) goto build_failed
 
 exit /B 0
diff --git a/iis/dependencies/build_curl.bat b/iis/dependencies/build_curl.bat
index 6d66a1d1..be26ca9a 100644
--- a/iis/dependencies/build_curl.bat
+++ b/iis/dependencies/build_curl.bat
@@ -20,9 +20,10 @@ nmake /f Makefile.vc mode=dll ENABLE_WINSSL=yes MACHINE=%ARCH% WITH_ZLIB=dll
 
 cd "%WORK_DIR%"
 
-copy /y "%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.dll" "%OUTPUT_DIR%"
-copy /y "%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib" "%OUTPUT_DIR%"
-copy /y "%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-winssl-obj-lib\libcurl.lib" "%WORK_DIR%\curl\libcurl.lib"
+copy /y "%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-schannel-obj-lib\libcurl.dll" "%OUTPUT_DIR%"
+copy /y "%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-schannel-obj-lib\libcurl.lib" "%OUTPUT_DIR%"
+copy /y "%WORK_DIR%\curl\builds\libcurl-vc-%ARCH%-release-dll-zlib-dll-ipv6-sspi-schannel-obj-lib\libcurl.lib" "%WORK_DIR%\curl\libcurl.lib"
+
 
 exit /B 0
 
diff --git a/iis/installer.wxs b/iis/installer.wxs
index 4f6a1fff..06b1c976 100644
--- a/iis/installer.wxs
+++ b/iis/installer.wxs
@@ -7,7 +7,7 @@
     lightArgs: 
 -->
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-    <Product Id="22B04FDB-9BAB-46B0-87B8-A39544ECECD3" Name="ModSecurity IIS" Language="1033" Version="2.9.1" Manufacturer="ModSecurity" UpgradeCode="82F09489-1678-4C38-ADCB-08C3757653DB">
+    <Product Id="22B04FDB-9BAB-46B0-87B8-A39544ECECD3" Name="ModSecurity IIS" Language="1033" Version="2.9.4" Manufacturer="ModSecurity" UpgradeCode="82F09489-1678-4C38-ADCB-08C3757653DB">
         <Package Description="ModSecurityISS" Comments="none" InstallerVersion="405" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" />
         <?define ProductName = "ModSecuirty IIS" ?>
         <?if $(sys.BUILDARCH) = x64 ?>
@@ -129,12 +129,15 @@
                     </Directory>
                 </Directory>
             </Directory>
-            <?endif ?>
+	    <?endif ?>
             <Directory Id="$(var.PlatformProgramFilesFolder)">
 		    <Directory Id="INSTALLFOLDER" Name="ModSecurity IIS">
+			    <!--
                         <Component Id="OWASP_CRS_V_3_0_2_SETUP" DiskId="1" Guid="64629082-F6A2-4675-9E3E-4EA363CD6500">
  			   <File Id="CRS_SETUP.CONF.EXAMPLE" Name="crs-setup.conf.example" Source="release\owasp_crs\crs-setup.conf.example" />
-                        </Component>
+			</Component>
+			-->
+	    <!--
                     <Directory Id="OWASP_CRS" Name="owasp_crs">
                         <Component Id="OWASP_CRS_V_3_0_2" DiskId="1" Guid="64629082-F6A2-4675-9E3E-4EA363CD6502">
                             <File Id="CHANGES" Name="CHANGES" Source="release\owasp_crs\CHANGES" />
@@ -208,7 +211,7 @@
                                 <File Id="UNIX_SHELL.DATA" Name="unix-shell.data" Source="release\owasp_crs\rules\unix-shell.data" />
                                 <File Id="WINDOWS_POWERSHELL_COMMANDS.DATA" Name="windows-powershell-commands.data" Source="release\owasp_crs\rules\windows-powershell-commands.data" />
                             </Component>
-                        </Directory>
+			</Directory>
                         <Directory Id="UTIL" Name="util">
                             <Component Id="UTIL" DiskId="1" Guid="A95D50D7-4E87-4A87-BAD1-12370B8F5B9B">
                                 <File Id="ID_RANGE" Name="id-range" Source="release\owasp_crs\util\id-range" />
@@ -294,13 +297,14 @@
                             </Directory>
                         </Directory>
                     </Directory>
+	    -->
                 </Directory>
-            </Directory>
+	    </Directory>
             <Directory Id="ProgramMenuFolder">
                 <Directory Id="ProgramMenuDir" Name="ModSecurity IIS">
                     <Component Id="StartMenuShortcuts" Guid="43C26B13-C4D8-42F8-8715-3AF78E66C902">
                         <util:InternetShortcut Id="WebsiteShortcut" Name="ModSecurity" Target="http://www.modsecurity.org/" />
-                        <util:InternetShortcut Id="CSR" Name="OWASP ModSecurity Core Rule Set" Target="http://spIderlabs.github.io/owasp-modsecurity-crs/" />
+			<!--<util:InternetShortcut Id="CSR" Name="OWASP ModSecurity Core Rule Set" Target="http://spIderlabs.github.io/owasp-modsecurity-crs/" />-->
                         <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
                         <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" />
                         <Shortcut Id="UninstallProduct" Name="Uninstall" Description="Uninstalls the ModSecurity IIS" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
@@ -315,104 +319,189 @@
                 </Directory>
             </Directory>
         </Directory>
-        <DirectoryRef Id="INSTALLFOLDER">
-            <Component Id="ModSecCommon" DiskId="1" Guid="980270DF-81AB-469B-AB0E-64FA3BA160B6" Location="local">
-                <File Id="README.TXT" Name="README.TXT" Source="wix\README.TXT" />
-                <File Id="EULA.RTF" Name="EULA.rtf" Source="wix\EULA.rtf" />
-                <File Id="modsecurity.conf" Name="modsecurity.conf" Source="wix\modsecurity.conf" />
-                <File Id="modsecurity_iis.conf" Name="modsecurity_iis.conf" Source="wix\modsecurity_iis.conf" />
-                <File Id="unicode.mapping" Name="unicode.mapping" Source="wix\unicode.mapping" />
-	<!-- <File Id="modsecurity_crs_10_setup.conf" Name="modsecurity_crs_10_setup.conf" Source="wix\modsecurity_crs_10_setup.conf" /> -->
-                <File Id="LIST_DEPENDENCIES.BAT" Name="list_dependencies.bat" Source="wix\list_dependencies.bat" />
-                <File Id="ModSecurity.xml" Name="ModSecurity.xml" Source="ModSecurity.xml" />
-                <!-- Modify ApplicationHost.config -->
-                <util:XmlConfig Id="appHostEntry" File="$(var.ConfigFile)" Action="create" ElementPath="//configuration/configSections/sectionGroup[\[]@name='system.webServer'[\]]" VerifyPath="section[\[]@name='ModSecurity'[\]]" Name="section" Node="element" Sequence="1" On="install" />
-                <util:XmlConfig Id="appHostEntryName" File="$(var.ConfigFile)" ElementPath="appHostEntry" Name="name" Value="ModSecurity" Sequence="2" />
-                <util:XmlConfig Id="appHostEntryOverrideMode" File="$(var.ConfigFile)" ElementPath="appHostEntry" Name="overrideModeDefault" Value="Allow" Sequence="3" />
-                <util:XmlConfig Id="appHostEntryAllowDefinition" File="$(var.ConfigFile)" ElementPath="appHostEntry" Name="allowDefinition" Value="Everywhere" Sequence="4" />
-                <util:XmlConfig Id="removeAppHostEntry" File="$(var.ConfigFile)" Action="delete" ElementPath="/configuration/configSections/sectionGroup[\[]@name='system.webServer'[\]]" Node="element" VerifyPath="section[\[]@name='ModSecurity'[\]]" On="uninstall" Sequence="1" />
-                <util:XmlConfig Id="removeAppHostEntry2" File="$(var.ConfigFile)" Action="delete" ElementPath="/configuration/system.webServer" Node="element" VerifyPath="/configuration/system.webServer/ModSecurity" Name="section" On="uninstall" Sequence="2" />
-                <RegistryKey Root="HKLM" Key="SOFTWARE\ModSecurity\ModSecurity" Action="createAndRemoveOnUninstall">
-                    <RegistryValue Type="string" Name="ModSecurityConfigureIIS" Value="[IIS_SETUP]" KeyPath="yes" />
-                </RegistryKey>
-            </Component>
-        </DirectoryRef>
-        <?if $(var.Win64) = "yes" ?>
-        <DirectoryRef Id="inetsrv64">
-            <Component Id="ModSec64" DiskId="1" Guid="514A81F0-2413-42EF-B19F-E2613125ECE0" Win64="yes" Location="local">
-                <File Id="_64_LIBAPR_1" Name="libapr-1.dll" Source="Release\amd64\libapr-1.dll" />
-                <File Id="_64_LIBAPRICONV_1" Name="libapriconv-1.dll" Source="Release\amd64\libapriconv-1.dll" />
-                <File Id="_64_LIBAPRUTIL_1" Name="libaprutil-1.dll" Source="Release\amd64\libaprutil-1.dll" />
-                <File Id="_64_LIBCURL" Name="libcurl.dll" Source="Release\amd64\libcurl.dll" />
-                <File Id="_64_LIBXML2" Name="libxml2.dll" Source="Release\amd64\libxml2.dll" />
-                <File Id="_64_LUA5.1" Name="lua5.1.dll" Source="Release\amd64\lua5.1.dll" />
-                <File Id="_64_YAJL" Name="yajl.dll" Source="Release\amd64\yajl.dll" />
-                <File Id="_64_MLOGC" Name="mlogc.exe" Source="Release\amd64\mlogc.exe" />
-                <File Id="_64_MODSECURITYIIS" Name="ModSecurityIIS.dll" Source="Release\amd64\ModSecurityIIS.dll" />
-                <File Id="_64_PCRE" Name="pcre.dll" Source="Release\amd64\pcre.dll" />
-                <File Id="_64_ZLIB1" Name="zlib1.dll" Source="Release\amd64\zlib1.dll" />
-                <File Id="_64_FUZZY" Name="fuzzy.dll" Source="Release\amd64\fuzzy.dll" />
-            </Component>
-        </DirectoryRef>
-        <DirectoryRef Id="inetsrv32">
-            <Component Id="ModSec32" DiskId="1" Guid="514A81F0-2413-42EF-B19F-E2613125ECE7" Win64="no" Location="local">
-                <File Id="_32_LIBAPR_1" Name="libapr-1.dll" Source="Release\x86\libapr-1.dll" />
-                <File Id="_32_LIBAPRICONV_1" Name="libapriconv-1.dll" Source="Release\x86\libapriconv-1.dll" />
-                <File Id="_32_LIBAPRUTIL_1" Name="libaprutil-1.dll" Source="Release\x86\libaprutil-1.dll" />
-                <File Id="_32_LIBCURL" Name="libcurl.dll" Source="Release\x86\libcurl.dll" />
-                <File Id="_32_LIBXML2" Name="libxml2.dll" Source="Release\x86\libxml2.dll" />
-                <File Id="_32_LUA5.1" Name="lua5.1.dll" Source="Release\x86\lua5.1.dll" />
-                <File Id="_32_YAJL" Name="yajl.dll" Source="Release\x86\yajl.dll" />
-                <File Id="_32_MLOGC" Name="mlogc.exe" Source="Release\x86\mlogc.exe" />
-                <File Id="_32_MODSECURITYIIS" Name="ModSecurityIIS.dll" Source="Release\x86\ModSecurityIIS.dll" />
-                <File Id="_32_PCRE" Name="pcre.dll" Source="Release\x86\pcre.dll" />
-                <File Id="_32_ZLIB1" Name="zlib1.dll" Source="Release\x86\zlib1.dll" />
-                <File Id="_32_FUZZY" Name="fuzzy.dll" Source="Release\x86\fuzzy.dll" />
-            </Component>
-        </DirectoryRef>
-        <DirectoryRef Id="SystemFolderConfigSchema32">
-            <Component Id="ConfigSchema32" Guid="514A81F0-2413-42EF-B19F-E2613125EC11" Location="local" Win64="no">
-                <File Id="_32_ConfigSchema" Name="ModSecurity.xml" Source="ModSecurity.xml" />
-            </Component>
-        </DirectoryRef>
-        <DirectoryRef Id="SystemFolderConfigSchema64">
-            <Component Id="ConfigSchema64" Guid="514A81F0-2413-42EF-B19F-E2613125EC22" Location="local" Win64="yes">
-                <File Id="_64_ConfigSchema" Name="ModSecurity.xml" Source="ModSecurity.xml" />
-            </Component>
-        </DirectoryRef>
-        <?else ?>
-        <DirectoryRef Id="inetsrv32">
-            <Component Id="ModSec32" DiskId="1" Guid="514A81F0-2413-42EF-B19F-E2613125ECE1" Win64="no" Location="local">
-                <File Id="_32_LIBAPR_1" Name="libapr-1.dll" Source="Release\x86\libapr-1.dll" />
-                <File Id="_32_LIBAPRICONV_1" Name="libapriconv-1.dll" Source="Release\x86\libapriconv-1.dll" />
-                <File Id="_32_LIBAPRUTIL_1" Name="libaprutil-1.dll" Source="Release\x86\libaprutil-1.dll" />
-                <File Id="_32_LIBCURL" Name="libcurl.dll" Source="Release\x86\libcurl.dll" />
-                <File Id="_32_LIBXML2" Name="libxml2.dll" Source="Release\x86\libxml2.dll" />
-                <File Id="_32_LUA5.1" Name="lua5.1.dll" Source="Release\x86\lua5.1.dll" />
-                <File Id="_32_YAJL" Name="yajl.dll" Source="Release\x86\yajl.dll" />
-                <File Id="_32_MLOGC" Name="mlogc.exe" Source="Release\x86\mlogc.exe" />
-                <File Id="_32_MODSECURITYIIS" Name="ModSecurityIIS.dll" Source="Release\x86\ModSecurityIIS.dll" />
-                <File Id="_32_PCRE" Name="pcre.dll" Source="Release\x86\pcre.dll" />
-                <File Id="_32_ZLIB1" Name="zlib1.dll" Source="Release\x86\zlib1.dll" />
-                <File Id="_32_FUZZY" Name="fuzzy.dll" Source="Release\x86\fuzzy.dll" />
-            </Component>
-        </DirectoryRef>
-        <DirectoryRef Id="SystemFolderConfigSchema32">
-            <Component Id="ConfigSchema32" Guid="514A81F0-2413-42EF-B19F-E2613125EC11" Location="local" Win64="no">
-                <File Id="_32_ConfigSchema" Name="ModSecurity.xml" Source="ModSecurity.xml" />
-            </Component>
-        </DirectoryRef>
-        <?endif ?>
-        <Feature Id="DefaultFeature" Title="ModSecurity IIS Common files" Level="1" InstallDefault="local" Absent="disallow" Display="expand" AllowAdvertise="no" Description="Configuration and common files">
-            <ComponentRef Id="ModSecCommon" />
-            <ComponentRef Id="ConfigSchema32" />
-            <?if $(var.Win64) = "yes" ?>
-            <ComponentRef Id="ConfigSchema64" />
-            <?endif ?>
-            <ComponentRef Id="StartMenuShortcuts" />
-            <Feature Id="OWASP_ModSecurity_CRS_v3.0.2" Level="1" Title="OWASP ModSecurity CRS v3.0.2" InstallDefault="local" Display="expand" AllowAdvertise="no" Description="Install OWASP CRS v3.0.2">
-		    <ComponentRef Id="OWASP_CRS_V_3_0_2" />
-		    <ComponentRef Id="OWASP_CRS_V_3_0_2_SETUP" />
+	<DirectoryRef Id="INSTALLFOLDER"> <Component Id="ModSecCommon"
+			DiskId="1" Guid="980270DF-81AB-469B-AB0E-64FA3BA160B6"
+			Location="local"> <File Id="README.TXT"
+				Name="README.TXT" Source="wix\README.TXT" />
+			<File Id="EULA.RTF" Name="EULA.rtf"
+				Source="wix\EULA.rtf" /> <File
+				Id="modsecurity.conf" Name="modsecurity.conf"
+				Source="wix\modsecurity.conf" />
+		<File Id="modsecurity_iis.conf" Name="modsecurity_iis.conf"
+			Source="wix\modsecurity_iis.conf" /> <File
+			Id="unicode.mapping" Name="unicode.mapping"
+			Source="wix\unicode.mapping" />
+	<!-- <File Id="modsecurity_crs_10_setup.conf"
+		Name="modsecurity_crs_10_setup.conf"
+		Source="wix\modsecurity_crs_10_setup.conf" /> --> <File
+		Id="LIST_DEPENDENCIES.BAT" Name="list_dependencies.bat"
+		Source="wix\list_dependencies.bat" /> <File
+		Id="ModSecurity.xml" Name="ModSecurity.xml"
+		Source="ModSecurity.xml" />
+		<!-- Modify ApplicationHost.config --> <util:XmlConfig
+			Id="appHostEntry" File="$(var.ConfigFile)"
+			Action="create"
+			ElementPath="//configuration/configSections/sectionGroup[\[]@name='system.webServer'[\]]"
+			VerifyPath="section[\[]@name='ModSecurity'[\]]"
+			Name="section" Node="element" Sequence="1" On="install"
+			/> <util:XmlConfig Id="appHostEntryName"
+			File="$(var.ConfigFile)" ElementPath="appHostEntry"
+			Name="name" Value="ModSecurity" Sequence="2" />
+		<util:XmlConfig Id="appHostEntryOverrideMode"
+			File="$(var.ConfigFile)" ElementPath="appHostEntry"
+			Name="overrideModeDefault" Value="Allow" Sequence="3"
+			/> <util:XmlConfig Id="appHostEntryAllowDefinition"
+			File="$(var.ConfigFile)" ElementPath="appHostEntry"
+			Name="allowDefinition" Value="Everywhere" Sequence="4"
+			/> <util:XmlConfig Id="removeAppHostEntry"
+			File="$(var.ConfigFile)" Action="delete"
+			ElementPath="/configuration/configSections/sectionGroup[\[]@name='system.webServer'[\]]"
+			Node="element"
+			VerifyPath="section[\[]@name='ModSecurity'[\]]"
+			On="uninstall" Sequence="1" /> <util:XmlConfig
+			Id="removeAppHostEntry2" File="$(var.ConfigFile)"
+			Action="delete"
+			ElementPath="/configuration/system.webServer"
+			Node="element"
+			VerifyPath="/configuration/system.webServer/ModSecurity"
+			Name="section" On="uninstall" Sequence="2" />
+		<RegistryKey Root="HKLM" Key="SOFTWARE\ModSecurity\ModSecurity"
+			Action="createAndRemoveOnUninstall"> <RegistryValue
+				Type="string" Name="ModSecurityConfigureIIS"
+				Value="[IIS_SETUP]" KeyPath="yes" />
+		</RegistryKey> </Component> </DirectoryRef> <?if $(var.Win64) =
+		"yes" ?> <DirectoryRef Id="inetsrv64"> <Component Id="ModSec64"
+				DiskId="1"
+				Guid="514A81F0-2413-42EF-B19F-E2613125ECE0"
+				Win64="yes" Location="local"> <File
+					Id="_64_LIBAPR_1" Name="libapr-1.dll"
+					Source="Release\amd64\libapr-1.dll" />
+				<File Id="_64_LIBAPRICONV_1"
+					Name="libapriconv-1.dll"
+					Source="Release\amd64\libapriconv-1.dll"
+					/> <File Id="_64_LIBAPRUTIL_1"
+					Name="libaprutil-1.dll"
+					Source="Release\amd64\libaprutil-1.dll"
+					/> <File Id="_64_LIBCURL"
+					Name="libcurl.dll"
+					Source="Release\amd64\libcurl.dll" />
+				<File Id="_64_LIBXML2" Name="libxml2.dll"
+					Source="Release\amd64\libxml2.dll" />
+				<File Id="_64_LUA5.1" Name="lua5.1.dll"
+					Source="Release\amd64\lua5.1.dll" />
+				<File Id="_64_YAJL" Name="yajl.dll"
+					Source="Release\amd64\yajl.dll" />
+				<File Id="_64_MLOGC" Name="mlogc.exe"
+					Source="Release\amd64\mlogc.exe" />
+				<File Id="_64_MODSECURITYIIS"
+					Name="ModSecurityIIS.dll"
+					Source="Release\amd64\ModSecurityIIS.dll"
+					/> <File Id="_64_PCRE" Name="pcre.dll"
+					Source="Release\amd64\pcre.dll" />
+				<File Id="_64_ZLIB1" Name="zlib1.dll"
+					Source="Release\amd64\zlib1.dll" />
+				<File Id="_64_FUZZY" Name="fuzzy.dll"
+					Source="Release\amd64\fuzzy.dll" />
+			</Component> </DirectoryRef> <DirectoryRef
+			Id="inetsrv32"> <Component Id="ModSec32" DiskId="1"
+				Guid="514A81F0-2413-42EF-B19F-E2613125ECE7"
+				Win64="no" Location="local"> <File
+					Id="_32_LIBAPR_1" Name="libapr-1.dll"
+					Source="Release\x86\libapr-1.dll" />
+				<File Id="_32_LIBAPRICONV_1"
+					Name="libapriconv-1.dll"
+					Source="Release\x86\libapriconv-1.dll"
+					/> <File Id="_32_LIBAPRUTIL_1"
+					Name="libaprutil-1.dll"
+					Source="Release\x86\libaprutil-1.dll"
+					/> <File Id="_32_LIBCURL"
+					Name="libcurl.dll"
+					Source="Release\x86\libcurl.dll" />
+				<File Id="_32_LIBXML2" Name="libxml2.dll"
+					Source="Release\x86\libxml2.dll" />
+				<File Id="_32_LUA5.1" Name="lua5.1.dll"
+					Source="Release\x86\lua5.1.dll" />
+				<File Id="_32_YAJL" Name="yajl.dll"
+					Source="Release\x86\yajl.dll" /> <File
+					Id="_32_MLOGC" Name="mlogc.exe"
+					Source="Release\x86\mlogc.exe" /> <File
+					Id="_32_MODSECURITYIIS"
+					Name="ModSecurityIIS.dll"
+					Source="Release\x86\ModSecurityIIS.dll"
+					/> <File Id="_32_PCRE" Name="pcre.dll"
+					Source="Release\x86\pcre.dll" /> <File
+					Id="_32_ZLIB1" Name="zlib1.dll"
+					Source="Release\x86\zlib1.dll" /> <File
+					Id="_32_FUZZY" Name="fuzzy.dll"
+					Source="Release\x86\fuzzy.dll" />
+			</Component> </DirectoryRef> <DirectoryRef
+			Id="SystemFolderConfigSchema32"> <Component
+				Id="ConfigSchema32"
+				Guid="514A81F0-2413-42EF-B19F-E2613125EC11"
+				Location="local" Win64="no"> <File
+					Id="_32_ConfigSchema"
+					Name="ModSecurity.xml"
+					Source="ModSecurity.xml" />
+		</Component> </DirectoryRef> <DirectoryRef
+		Id="SystemFolderConfigSchema64"> <Component Id="ConfigSchema64"
+			Guid="514A81F0-2413-42EF-B19F-E2613125EC22"
+			Location="local" Win64="yes"> <File
+				Id="_64_ConfigSchema" Name="ModSecurity.xml"
+				Source="ModSecurity.xml" /> </Component>
+			</DirectoryRef> <?else ?> <DirectoryRef Id="inetsrv32">
+			<Component Id="ModSec32" DiskId="1"
+				Guid="514A81F0-2413-42EF-B19F-E2613125ECE1"
+				Win64="no" Location="local"> <File
+					Id="_32_LIBAPR_1" Name="libapr-1.dll"
+					Source="Release\x86\libapr-1.dll" />
+				<File Id="_32_LIBAPRICONV_1"
+					Name="libapriconv-1.dll"
+					Source="Release\x86\libapriconv-1.dll"
+					/> <File Id="_32_LIBAPRUTIL_1"
+					Name="libaprutil-1.dll"
+					Source="Release\x86\libaprutil-1.dll"
+					/> <File Id="_32_LIBCURL"
+					Name="libcurl.dll"
+					Source="Release\x86\libcurl.dll" />
+				<File Id="_32_LIBXML2" Name="libxml2.dll"
+					Source="Release\x86\libxml2.dll" />
+				<File Id="_32_LUA5.1" Name="lua5.1.dll"
+					Source="Release\x86\lua5.1.dll" />
+				<File Id="_32_YAJL" Name="yajl.dll"
+					Source="Release\x86\yajl.dll" /> <File
+					Id="_32_MLOGC" Name="mlogc.exe"
+					Source="Release\x86\mlogc.exe" /> <File
+					Id="_32_MODSECURITYIIS"
+					Name="ModSecurityIIS.dll"
+					Source="Release\x86\ModSecurityIIS.dll"
+					/> <File Id="_32_PCRE" Name="pcre.dll"
+					Source="Release\x86\pcre.dll" /> <File
+					Id="_32_ZLIB1" Name="zlib1.dll"
+					Source="Release\x86\zlib1.dll" /> <File
+					Id="_32_FUZZY" Name="fuzzy.dll"
+					Source="Release\x86\fuzzy.dll" />
+			</Component> </DirectoryRef> <DirectoryRef
+			Id="SystemFolderConfigSchema32"> <Component
+				Id="ConfigSchema32"
+				Guid="514A81F0-2413-42EF-B19F-E2613125EC11"
+				Location="local" Win64="no"> <File
+					Id="_32_ConfigSchema"
+					Name="ModSecurity.xml"
+					Source="ModSecurity.xml" />
+		</Component> </DirectoryRef> <?endif ?> <Feature
+		Id="DefaultFeature" Title="ModSecurity IIS Common files"
+		Level="1" InstallDefault="local" Absent="disallow"
+		Display="expand" AllowAdvertise="no" Description="Configuration
+		and common files"> <ComponentRef Id="ModSecCommon" />
+		<ComponentRef Id="ConfigSchema32" /> <?if $(var.Win64) = "yes"
+		?> <ComponentRef Id="ConfigSchema64" /> <?endif ?>
+		<ComponentRef Id="StartMenuShortcuts" />
+	    <!--
+	    <Feature Id="OWASP_ModSecurity_CRS_v3.0.2" Level="1" Title="OWASP
+	    ModSecurity CRS v3.0.2" InstallDefault="local" Display="expand"
+	    AllowAdvertise="no" Description="Install OWASP CRS v3.0.2">
+	    <ComponentRef Id="OWASP_CRS_V_3_0_2" /> <ComponentRef
+	    Id="OWASP_CRS_V_3_0_2_SETUP" />
 		    
                 <ComponentRef Id="ID_NUMBERING" />
                 <ComponentRef Id="README" />
@@ -430,7 +519,8 @@
                 <ComponentRef Id="REGRESSION_TESTS" />
                 <ComponentRef Id="VIRTUAL_PATCHING" />
             </Feature>
-        </Feature>
+	-->
+	</Feature>
         <Feature Id="VCRedist" Title="Visual C++ 12.0 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
             <?if $(var.Win64) = "yes" ?>
             <MergeRef Id="VCRedist110_64" />
@@ -526,8 +616,8 @@
                 <Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}IIS Setup" />
                 <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Choose to configure ModSecurity on IIS or not." />
                 <Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="50" Text="ModSecurityIIS needs to be configured under IIS as a module. It is recommended to perform this configuration during the installation. However, if you are facing problems in the installation, the recomendation is to disable this step. This will facilitate the debugging process since the files will be installed in place. Note that some scripts will be installed along with ModSecurity common files that can be later used to help this configuration/debugging process." />
-                <Control Type="CheckBox" Id="ConfigureIIS" Width="200" Height="14" X="25" Y="124" CheckBoxValue="1" Property="IIS_SETUP" Text="Perform ModSecurityIIS configuration." />
-                <Control Type="Text" Id="troubleshooting" Width="314" Height="37" X="26" Y="161" Text="For further information about problems during the installation, have a look at ModSecurityIIS Troubleshooting guide. Available at: https://github.com/SpiderLabs/ModSecurity/wiki/IIS-Troubleshooting" />
+		<Control Type="CheckBox" Id="ConfigureIIS" Width="200" Height="14" X="25" Y="124" CheckBoxValue="1" Property="IIS_SETUP" Text="Perform ModSecurityIIS configuration." />
+                <Control Type="Text" Id="troubleshooting" Width="314" Height="67" X="26" Y="161" Text="For further information about problems during the installation, have a look at ModSecurityIIS Troubleshooting guide. Available at: https://github.com/SpiderLabs/ModSecurity/wiki/IIS-Troubleshooting. ATTENTION: This installation process no longer install OWASP CRS. Please refer to the OWASP CRS Project to understand how to install it. " />
             </Dialog>
             <Binary Id="bannrbmp" SourceFile="wix\banner.jpg" />
             <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
diff --git a/iis/wix/modsecurity_iis.conf b/iis/wix/modsecurity_iis.conf
index 7cd9cff4..a18a4a6b 100644
--- a/iis/wix/modsecurity_iis.conf
+++ b/iis/wix/modsecurity_iis.conf
@@ -1,3 +1 @@
 Include modsecurity.conf
-Include crs-setup.conf.example
-Include owasp_crs\rules\*.conf