From 295efa7e834446b81eb887ec169a03616ec897c6 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Wed, 28 May 2025 16:06:18 -0700
Subject: [PATCH 1/2] Update Windows CI image to Visual Studio 2022

---
 ci/windows/Dockerfile | 8 ++++----
 ci/windows/build.cmd  | 2 +-
 ci/windows/test.cmd   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/windows/Dockerfile b/ci/windows/Dockerfile
index 0117345f05..d1cba59c27 100644
--- a/ci/windows/Dockerfile
+++ b/ci/windows/Dockerfile
@@ -5,7 +5,7 @@ SHELL [ "powershell" ]
 
 # A version field to invalidatea Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20230801
+ENV DOCKERFILE_VERSION 20250528
 
 RUN Set-ExecutionPolicy Unrestricted -Force
 
@@ -14,8 +14,8 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePoin
     iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
 
 # Install prerequisites
-RUN choco install -y --no-progress visualstudio2019buildtools --version=16.11.11.0
-RUN choco install -y --no-progress visualstudio2019-workload-vctools --version=1.0.0 --package-parameters '--add Microsoft.VisualStudio.Component.VC.ATLMFC'
+RUN choco install -y --no-progress visualstudio2022buildtools --version=117.14.1
+RUN choco install -y --no-progress visualstudio2022-workload-vctools --version=1.0.0 --package-parameters '--add Microsoft.VisualStudio.Component.VC.ATLMFC'
 RUN choco install -y --no-progress sed
 RUN choco install -y --no-progress winflexbison3
 RUN choco install -y --no-progress msysgit
@@ -30,4 +30,4 @@ RUN mkdir C:\build
 WORKDIR C:\build
 
 # This entry point starts the developer command prompt and launches the PowerShell shell.
-ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "-arch=x64", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Unrestricted"]
\ No newline at end of file
+ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "-arch=x64", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Unrestricted"]
diff --git a/ci/windows/build.cmd b/ci/windows/build.cmd
index c9b38d4b3f..a539846c6f 100644
--- a/ci/windows/build.cmd
+++ b/ci/windows/build.cmd
@@ -2,7 +2,7 @@
 :: cmd current shell. This path is hard coded to the one on the CI image, but
 :: can be adjusted if running builds locally. Unfortunately, the initial path
 :: isn't in the environment so we have to hardcode the whole path.
-call "c:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+call "c:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
 
 mkdir build
 cd build
diff --git a/ci/windows/test.cmd b/ci/windows/test.cmd
index 5b5ff7329f..e8c9c06a66 100644
--- a/ci/windows/test.cmd
+++ b/ci/windows/test.cmd
@@ -1,5 +1,5 @@
 :: See build.cmd for documentation on this call.
-call "c:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+call "c:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
 
 cd build
 

From cd2514f9de2f0dec6708b17505ae7ec02dec99dc Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Thu, 29 May 2025 19:17:07 -0700
Subject: [PATCH 2/2] Update libunistd submodule [nomail]

---
 auxil/libunistd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auxil/libunistd b/auxil/libunistd
index d2bfec9295..27f17e1601 160000
--- a/auxil/libunistd
+++ b/auxil/libunistd
@@ -1 +1 @@
-Subproject commit d2bfec929540c1fec5d1d45f0bcee3cff1eb7fa5
+Subproject commit 27f17e1601123583272aa7622fe4c7b1eeb715d1