Merge pull request #115 from AnacondaRecipes/PKG-2182

Update to 3.10.12

Author: cbouss

recipe/meta.yaml

@@ -1,10 +1,10 @@
-{% set version = "3.10.11" %}
+{% set version = "3.10.12" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
 {% set ver2nd = ''.join(version.split('.')[0:2]) %}
 {% set ver3nd = ''.join(version.split('.')[0:3]) %}
-{% set build_number = "3" %}
+{% set build_number = "0" %}
 {% set channel_targets = ('abc', 'def')  %}
 
 # this makes the linter happy
@@ -48,7 +48,7 @@ source:
 {% else %}
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
-    sha256: 3c3bc3048303721c904a03eb8326b631e921f11cc3be2988456a42f115daf04c
+    sha256: afb74bf19130e7a47d10312c8f5e784f24e0527981eab68e20546cfb865830b8
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
@@ -84,6 +84,9 @@ source:
       - patches/0023-unvendor-xz.patch
       - patches/0024-unvendor-zlib.patch
       - patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
+      {% if (openssl | string).startswith('3.0') %}
+      - patches/0026-Use-OpenSSL-3-instead-of-1_1.patch
+      {% endif %}
 
 build:
   number: {{ build_number }}

recipe/patches/0010-Unvendor-openssl.patch

@@ -160,8 +160,8 @@ index 57360e57ba..51b2d8cc0a 100644
 -    <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.3.0\</libffiDir>
 -    <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
 -    <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
--    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1t\</opensslDir>
--    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1t\$(ArchName)\</opensslOutDir>
+-    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1u\</opensslDir>
+-    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1u\$(ArchName)\</opensslOutDir>
 -    <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
 +    <!-- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.40.1.0\</sqlite3Dir> -->
 +    <!-- <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> -->

recipe/patches/0026-Use-OpenSSL-3-instead-of-1_1.patch

@@ -0,0 +1,25 @@
+From c12df60ecaa0be147bb57f03fd031ca0776eb24c Mon Sep 17 00:00:00 2001
+From: Charles Bousseau <[email protected]>
+Date: Fri, 16 Jun 2023 13:14:12 -0400
+Subject: [PATCH] [PATCH] Use OpenSSL 3 instead of 1_1
+
+---
+ PCbuild/openssl.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
+index 7071bb57c0..b336a193ef 100644
+--- a/PCbuild/openssl.props
++++ b/PCbuild/openssl.props
+@@ -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>
+     <OpenSSLDLLSuffix>$(_DLLSuffix)</OpenSSLDLLSuffix>
+-- 
+2.32.1 (Apple Git-133)
+