From 5e44da1859522568051623de895d9d404d156896 Mon Sep 17 00:00:00 2001
From: Ray Molenkamp <github@lazydodo.com>
Date: Wed, 21 Jun 2023 15:02:45 -0600
Subject: [PATCH] deps_builder: python 3.10.12 + openssl 3.0.9 for windows
 fixes

Small fixes to make it build on windows.
---
 .../build_environment/cmake/python.cmake      |  2 +-
 .../patches/python_windows.diff               | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake
index 287b05d9bca..0b856389339 100644
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -35,7 +35,7 @@ if(WIN32)
     # regardless of the version actually in there.
     PATCH_COMMAND mkdir ${PYTHON_EXTERNALS_FOLDER_DOS} &&
       mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\zlib-1.2.13 ${ZLIB_SOURCE_FOLDER_DOS} &&
-      mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\openssl-1.1.1t ${SSL_SOURCE_FOLDER_DOS} &&
+      mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\openssl-1.1.1u ${SSL_SOURCE_FOLDER_DOS} &&
       ${CMAKE_COMMAND} -E copy ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.13/zconf.h &&
       ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_windows.diff
     CONFIGURE_COMMAND echo "."
diff --git a/build_files/build_environment/patches/python_windows.diff b/build_files/build_environment/patches/python_windows.diff
index a8d0d6d8126..ea9d501c393 100644
--- a/build_files/build_environment/patches/python_windows.diff
+++ b/build_files/build_environment/patches/python_windows.diff
@@ -19,4 +19,41 @@
 +REM if errorlevel 1 exit /b
 +REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM64
 +REM if errorlevel 1 exit /b
+
+diff -aurw Python-3.10.12/PCbuild/openssl.props external_python/PCbuild/openssl.props
+--- Python-3.10.12/PCbuild/openssl.props	2023-06-06 16:30:33 -0600
++++ external_python/PCbuild/openssl.props	2023-06-20 09:58:57 -0600
+@@ -10,7 +10,7 @@
+     </Link>
+   </ItemDefinitionGroup>
+   <PropertyGroup>
+-    <_DLLSuffix>-1_1</_DLLSuffix>
++    <_DLLSuffix>-3</_DLLSuffix>
+     <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
+     <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
+   </PropertyGroup>
+diff -aurw Python-3.10.12/PCbuild/openssl.vcxproj external_python/PCbuild/openssl.vcxproj
+--- Python-3.10.12/PCbuild/openssl.vcxproj	2023-06-06 16:30:33 -0600
++++ external_python/PCbuild/openssl.vcxproj	2023-06-20 08:50:43 -0600
+@@ -98,7 +98,7 @@
  
+   <Target Name="_CopyToOutput" AfterTargets="Build">
+     <ItemGroup>
+-      <_Built Include="$(opensslDir)\LICENSE" />
++      <_Built Include="$(opensslDir)\LICENSE.txt" />
+       <_Built Include="$(IntDir)\libcrypto.lib;$(IntDir)\libcrypto-*.dll;$(IntDir)\libcrypto-*.pdb" />
+       <_Built Include="$(IntDir)\libssl.lib;$(IntDir)\libssl-*.dll;$(IntDir)\libssl-*.pdb" />
+       <_AppLink Include="$(opensslDir)\ms\applink.c" />
+diff -aurw Python-3.10.12/PCbuild/regen.targets external_python/PCbuild/regen.targets
+--- Python-3.10.12/PCbuild/regen.targets	2023-06-06 16:30:33 -0600
++++ external_python/PCbuild/regen.targets	2023-06-20 09:37:17 -0600
+@@ -89,7 +89,7 @@
+     <_LicenseSources Include="$(PySourcePath)LICENSE;
+                               $(PySourcePath)PC\crtlicense.txt;
+                               $(bz2Dir)LICENSE;
+-                              $(opensslOutDir)LICENSE;
++                              $(opensslOutDir)LICENSE.txt;
+                               $(libffiDir)LICENSE;" />
+     <_LicenseSources Include="$(tcltkDir)tcllicense.terms;
+                               $(tcltkDir)tklicense.terms;
+