Skip to content

Commit ad2259b

Browse files
cbousscbouss
authored
Merge pull request #123 from AnacondaRecipes/PKG-2652
Update to 3.11.5
2 parents c79ba5e + 255d83f commit ad2259b

File tree

3 files changed

+38
-39
lines changed

3 files changed

+38
-39
lines changed

‎recipe/meta.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = "3.11.4" %}
1+
{% set version = "3.11.5" %}
22
{% set dev = "" %}
33
{% set dev_ = "" %}
44
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
@@ -50,7 +50,7 @@ source:
5050
{% else %}
5151
- url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
5252
# md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
53-
sha256: 2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
53+
sha256: 85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f
5454
{% endif %}
5555
patches:
5656
- patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
@@ -85,8 +85,8 @@ source:
8585
- patches/0023-unvendor-xz.patch
8686
- patches/0024-unvendor-zlib.patch
8787
- patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
88-
{% if (openssl | string).startswith('3.0') %}
89-
- patches/0026-Use-OpenSSL-3-instead-of-1_1.patch
88+
{% if (openssl | string).startswith('1.1.1') %}
89+
- patches/0026-Use-OpenSSL-1_1-instead-of-3.patch
9090
{% endif %}
9191

9292
build:

‎recipe/patches/0010-Unvendor-openssl.patch‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ Co-authored-by: Isuru Fernando <[email protected]>
77
---
88
PCbuild/_ssl.vcxproj | 3 --
99
PCbuild/_ssl.vcxproj.filters | 3 --
10-
PCbuild/openssl.props | 16 ++---------
10+
PCbuild/openssl.props | 14 ++-------
1111
PCbuild/openssl.vcxproj | 56 ------------------------------------
12-
PCbuild/python.props | 1 +
12+
PCbuild/python.props | 21 +++++++-------
1313
PCbuild/python.vcxproj | 3 ++
1414
PCbuild/pythonw.vcxproj | 3 ++
15-
7 files changed, 10 insertions(+), 75 deletions(-)
15+
7 files changed, 19 insertions(+), 84 deletions(-)
1616

1717
diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
1818
index 4907f49b66..b2c23d5e8c 100644
@@ -43,7 +43,7 @@ index 716a69a41a..8aef9e03fc 100644
4343
<ItemGroup>
4444
<ResourceCompile Include="..\PC\python_nt.rc">
4545
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
46-
index 6081d3c8c6..3538596cbf 100644
46+
index a4186f01da..fc39a0105a 100644
4747
--- a/PCbuild/openssl.props
4848
+++ b/PCbuild/openssl.props
4949
@@ -2,10 +2,10 @@
@@ -73,9 +73,8 @@ index 6081d3c8c6..3538596cbf 100644
7373
- <Target Name="_CleanSSLDLL" Condition="$(SkipCopySSLDLL) == ''" BeforeTargets="Clean">
7474
- <Delete Files="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" />
7575
- </Target>
76-
-</Project>
76+
</Project>
7777
\ No newline at end of file
78-
+</Project>
7978
diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
8079
index 0da6f67495..17eee400eb 100644
8180
--- a/PCbuild/openssl.vcxproj
@@ -146,7 +145,7 @@ index 0da6f67495..17eee400eb 100644
146145
<Target Name="CleanAll">
147146
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
148147
diff --git a/PCbuild/python.props b/PCbuild/python.props
149-
index 57360e57ba..51b2d8cc0a 100644
148+
index d3586235c8..f77eded4be 100644
150149
--- a/PCbuild/python.props
151150
+++ b/PCbuild/python.props
152151
@@ -63,22 +63,23 @@
@@ -165,26 +164,26 @@ index 57360e57ba..51b2d8cc0a 100644
165164
- <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
166165
- <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
167166
- <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
168-
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1u\</opensslDir>
169-
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1u\$(ArchName)\</opensslOutDir>
167+
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.9\</opensslDir>
168+
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.9\$(ArchName)\</opensslOutDir>
170169
- <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
171-
+ <!-- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.39.4.0\</sqlite3Dir> -->
170+
+ <!-- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.42.0.0\</sqlite3Dir> -->
172171
+ <!-- <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> -->
173172
+ <!-- <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> -->
174-
+ <!-- <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.3\</libffiDir> -->
173+
+ <!-- <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> -->
175174
+ <!-- <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir> -->
176175
+ <!-- <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir> -->
177-
+ <!-- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1s\</opensslDir> -->
178-
+ <!-- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1s\$(ArchName)\</opensslOutDir> -->
176+
+ <!-- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.9\</opensslDir> -->
177+
+ <!-- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.9\$(ArchName)\</opensslOutDir> -->
179178
+ <!-- <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir> -->
180179
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
181180
- <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>
182181
+ <!-- <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir> -->
183182
</PropertyGroup>
184183

185-
<PropertyGroup>
184+
<PropertyGroup>
186185
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
187-
index d07db3a681..5f2356cb36 100644
186+
index f4640454a7..c1810c7db2 100644
188187
--- a/PCbuild/python.vcxproj
189188
+++ b/PCbuild/python.vcxproj
190189
@@ -106,6 +106,9 @@
@@ -198,10 +197,10 @@ index d07db3a681..5f2356cb36 100644
198197
<ItemGroup>
199198
<ProjectReference Include="pythoncore.vcxproj">
200199
diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
201-
index e7216dec3a..247ea10d5c 100644
200+
index e23635e5ea..525295c76f 100644
202201
--- a/PCbuild/pythonw.vcxproj
203202
+++ b/PCbuild/pythonw.vcxproj
204-
@@ -97,6 +97,9 @@
203+
@@ -98,6 +98,9 @@
205204
</ItemGroup>
206205
<ItemGroup>
207206
<ClCompile Include="..\PC\WinMain.c" />
@@ -212,5 +211,5 @@ index e7216dec3a..247ea10d5c 100644
212211
<ItemGroup>
213212
<ProjectReference Include="pythoncore.vcxproj">
214213
--
215-
2.30.2
214+
2.32.1 (Apple Git-133)
216215

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
From c12df60ecaa0be147bb57f03fd031ca0776eb24c Mon Sep 17 00:00:00 2001
2-
From: Charles Bousseau <[email protected]>
3-
Date: Fri, 16 Jun 2023 13:14:12 -0400
4-
Subject: [PATCH] [PATCH] Use OpenSSL 3 instead of 1_1
5-
6-
---
7-
PCbuild/openssl.props | 2 +-
8-
1 file changed, 1 insertion(+), 1 deletion(-)
9-
10-
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
11-
index 7071bb57c0..b336a193ef 100644
12-
--- a/PCbuild/openssl.props
13-
+++ b/PCbuild/openssl.props
14-
@@ -10,7 +10,7 @@
1+
From c12df60ecaa0be147bb57f03fd031ca0776eb24c Mon Sep 17 00:00:00 2001
2+
From: Charles Bousseau <[email protected]>
3+
Date: Fri, 16 Jun 2023 13:14:12 -0400
4+
Subject: [PATCH] Use OpenSSL 1_1 instead of 3
5+
6+
---
7+
PCbuild/openssl.props | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
11+
index 7071bb57c0..b336a193ef 100644
12+
--- a/PCbuild/openssl.props
13+
+++ b/PCbuild/openssl.props
14+
@@ -10,7 +10,7 @@
1515
</Link>
1616
</ItemDefinitionGroup>
1717
<PropertyGroup>
18-
- <_DLLSuffix>-1_1</_DLLSuffix>
19-
+ <_DLLSuffix>-3</_DLLSuffix>
18+
- <_DLLSuffix>-3</_DLLSuffix>
19+
+ <_DLLSuffix>-1_1</_DLLSuffix>
2020
<_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
2121
<_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
22-
<OpenSSLDLLSuffix>$(_DLLSuffix)</OpenSSLDLLSuffix>
22+
<OpenSSLDLLSuffix Condition="$(OpenSSLDLLSuffix) == ''">$(_DLLSuffix)</OpenSSLDLLSuffix>
2323
--
2424
2.32.1 (Apple Git-133)
2525

0 commit comments

Comments
 (0)