From df4bffcdc8960464022beb5f7cb1bc70706b2ae1 Mon Sep 17 00:00:00 2001
From: Martin Vierula <martin.vierula@trustwave.com>
Date: Mon, 6 Dec 2021 14:27:04 -0800
Subject: [PATCH] IIS: Update dependencies for Windows build as of v2.9.5

---
 CHANGES                    |  6 ++++++
 iis/build_dependencies.bat | 20 ++++++++++----------
 iis/build_release.bat      |  5 +++--
 3 files changed, 19 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 iis/build_dependencies.bat
 mode change 100644 => 100755 iis/build_release.bat

diff --git a/CHANGES b/CHANGES
index 8a2be8ef..14f49ec8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+DD mmm YYYY - 2.9.x (to be released)
+-------------------
+
+ * IIS: Update dependencies for Windows build as of v2.9.5
+   [@martinhsv]
+
 22 Nov 2021 - 2.9.5
 -------------------
 
diff --git a/iis/build_dependencies.bat b/iis/build_dependencies.bat
old mode 100644
new mode 100755
index 0908d51e..7bca0301
--- a/iis/build_dependencies.bat
+++ b/iis/build_dependencies.bat
@@ -8,14 +8,14 @@
 
 :: Dependencies
 @set CMAKE=cmake-3.12.4-win32-x86.zip
-@set PCRE=pcre-8.41.zip
+@set PCRE=pcre-8.45.zip
 @set ZLIB=zlib-1.2.11.tar.gz
-@set LIBXML2=libxml2-2.9.11.tar.gz
+@set LIBXML2=libxml2-2.9.12.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 CURL=curl-7.79.0.zip
+@set APACHE_SRC=httpd-2.4.51.tar.gz
+@set APACHE_BIN32=httpd-2.4.51-win32-VS16.zip
+@set APACHE_BIN64=httpd-2.4.51-win64-VS16.zip
 @set YAJL=yajl-2.1.0.zip
 @set SSDEEP=ssdeep-2.14.1.tar.gz
 @set SSDEEP_BIN=ssdeep-2.14.1.zip
@@ -23,11 +23,11 @@
 @set CMAKE_DIR=%WORK_DIR%\%CMAKE:~0,-4%\bin
 
 :: Aditional paths.
-@set PATH=%PATH%;%CMAKE_DIR%;"c:\program files\7-zip"
+@set "DIR_7ZIP=c:\program files\7-zip"
+@set PATH=%PATH%;%CMAKE_DIR%;%DIR_7ZIP%
 
-
-:: @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"
+:: @set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
+:: @set VCARGS64="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat"
 
 
 :: Do not edit bellow this line.
diff --git a/iis/build_release.bat b/iis/build_release.bat
old mode 100644
new mode 100755
index 68bc5871..c1d8e85e
--- a/iis/build_release.bat
+++ b/iis/build_release.bat
@@ -14,8 +14,9 @@ mkdir "%AMD64%"
 
 mkdir "%X86%"
 
-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"
+set VCARGS32="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
+set VCARGS64="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat"
+
 
 set SSDEEP_ARCH="x64"
 call build_dependencies.bat %VCARGS64%