Skip to content

Commit 3b656da

Browse files
danpetrydanpetry
committed
Update a couple of patches
1 parent 789f249 commit 3b656da

File tree

2 files changed

+55
-62
lines changed

2 files changed

+55
-62
lines changed

‎recipe/patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ Co-authored-by: Isuru Fernando<[email protected]>
1212
3 files changed, 1148 insertions(+), 1 deletion(-)
1313
create mode 100644 PC/getpathp.c
1414

15-
diff --git a/Modules/getpath.c b/Modules/getpath.c
16-
index 94479887cf..5ca10cb0f2 100644
17-
--- a/Modules/getpath.c
18-
+++ b/Modules/getpath.c
19-
@@ -894,6 +894,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
15+
Index: CPython/Modules/getpath.c
16+
===================================================================
17+
--- CPython.orig/Modules/getpath.c 2023-12-14 17:26:29.166336000 -0600
18+
+++ CPython/Modules/getpath.c 2023-12-14 17:26:55.751864098 -0600
19+
@@ -903,6 +903,7 @@
2020
!env_to_dict(dict, "ENV_PATH", 0) ||
2121
!env_to_dict(dict, "ENV_PYTHONHOME", 0) ||
2222
!env_to_dict(dict, "ENV_PYTHONEXECUTABLE", 0) ||
2323
+ !env_to_dict(dict, "ENV_CONDA_PY_ALLOW_REG_PATHS", 0) ||
2424
!env_to_dict(dict, "ENV___PYVENV_LAUNCHER__", 1) ||
2525
!progname_to_dict(dict, "real_executable") ||
2626
!library_to_dict(dict, "library") ||
27-
diff --git a/Modules/getpath.py b/Modules/getpath.py
28-
index dceeed7702..334455f7d6 100644
29-
--- a/Modules/getpath.py
30-
+++ b/Modules/getpath.py
27+
Index: CPython/Modules/getpath.py
28+
===================================================================
29+
--- CPython.orig/Modules/getpath.py 2023-12-14 17:26:29.166444000 -0600
30+
+++ CPython/Modules/getpath.py 2023-12-14 17:26:55.752181931 -0600
3131
@@ -51,6 +51,7 @@
3232
# ENV_PYTHONHOME -- [in] getenv(...)
3333
# ENV_PYTHONEXECUTABLE -- [in] getenv(...)
@@ -36,7 +36,7 @@ index dceeed7702..334455f7d6 100644
3636

3737
# ** Values calculated at runtime **
3838
# config -- [in/out] dict of the PyConfig structure
39-
@@ -654,7 +655,7 @@ def search_up(prefix, *landmarks, test=isfile):
39+
@@ -673,7 +674,7 @@
4040
else:
4141
pythonpath.append(joinpath(prefix, ZIP_LANDMARK))
4242

@@ -45,11 +45,10 @@ index dceeed7702..334455f7d6 100644
4545
# QUIRK: Windows also lists paths in the registry. Paths are stored
4646
# as the default value of each subkey of
4747
# {HKCU,HKLM}\Software\Python\PythonCore\{winver}\PythonPath
48-
diff --git a/PC/getpathp.c b/PC/getpathp.c
49-
new file mode 100644
50-
index 0000000000..a73ea8a0e9
51-
--- /dev/null
52-
+++ b/PC/getpathp.c
48+
Index: CPython/PC/getpathp.c
49+
===================================================================
50+
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
51+
+++ CPython/PC/getpathp.c 2023-12-14 17:26:55.753097597 -0600
5352
@@ -0,0 +1,1145 @@
5453
+
5554
+/* Return the initial module search path. */
@@ -1196,6 +1195,3 @@ index 0000000000..a73ea8a0e9
11961195
+ }
11971196
+ return hPython3 != NULL;
11981197
+}
1199-
--
1200-
2.32.1 (Apple Git-133)
1201-

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

Lines changed: 41 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Co-authored-by: Isuru Fernando <[email protected]>
1414
PCbuild/pythonw.vcxproj | 3 ++
1515
7 files changed, 19 insertions(+), 84 deletions(-)
1616

17-
diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
18-
index 4907f49b66..b2c23d5e8c 100644
19-
--- a/PCbuild/_ssl.vcxproj
20-
+++ b/PCbuild/_ssl.vcxproj
17+
Index: CPython/PCbuild/_ssl.vcxproj
18+
===================================================================
19+
--- CPython.orig/PCbuild/_ssl.vcxproj 2023-12-14 17:40:12.222521230 -0600
20+
+++ CPython/PCbuild/_ssl.vcxproj 2023-12-14 17:40:20.047423623 -0600
2121
@@ -99,9 +99,6 @@
2222
</ItemDefinitionGroup>
2323
<ItemGroup>
@@ -28,10 +28,10 @@ index 4907f49b66..b2c23d5e8c 100644
2828
</ItemGroup>
2929
<ItemGroup>
3030
<ResourceCompile Include="..\PC\python_nt.rc" />
31-
diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters
32-
index 716a69a41a..8aef9e03fc 100644
33-
--- a/PCbuild/_ssl.vcxproj.filters
34-
+++ b/PCbuild/_ssl.vcxproj.filters
31+
Index: CPython/PCbuild/_ssl.vcxproj.filters
32+
===================================================================
33+
--- CPython.orig/PCbuild/_ssl.vcxproj.filters 2023-12-14 17:35:21.991951190 -0600
34+
+++ CPython/PCbuild/_ssl.vcxproj.filters 2023-12-14 17:40:20.047676583 -0600
3535
@@ -12,9 +12,6 @@
3636
<ClCompile Include="..\Modules\_ssl.c">
3737
<Filter>Source Files</Filter>
@@ -42,10 +42,10 @@ index 716a69a41a..8aef9e03fc 100644
4242
</ItemGroup>
4343
<ItemGroup>
4444
<ResourceCompile Include="..\PC\python_nt.rc">
45-
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
46-
index a4186f01da..fc39a0105a 100644
47-
--- a/PCbuild/openssl.props
48-
+++ b/PCbuild/openssl.props
45+
Index: CPython/PCbuild/openssl.props
46+
===================================================================
47+
--- CPython.orig/PCbuild/openssl.props 2023-12-14 17:40:12.223644781 -0600
48+
+++ CPython/PCbuild/openssl.props 2023-12-14 17:40:20.047843251 -0600
4949
@@ -2,10 +2,10 @@
5050
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5151
<ItemDefinitionGroup>
@@ -74,11 +74,11 @@ index a4186f01da..fc39a0105a 100644
7474
- <Delete Files="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" />
7575
- </Target>
7676
</Project>
77-
\ No newline at end of file
78-
diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
79-
index 0da6f67495..17eee400eb 100644
80-
--- a/PCbuild/openssl.vcxproj
81-
+++ b/PCbuild/openssl.vcxproj
77+
\ No newline at end of file
78+
Index: CPython/PCbuild/openssl.vcxproj
79+
===================================================================
80+
--- CPython.orig/PCbuild/openssl.vcxproj 2023-12-14 17:40:12.224467080 -0600
81+
+++ CPython/PCbuild/openssl.vcxproj 2023-12-14 17:40:20.048039336 -0600
8282
@@ -60,64 +60,8 @@
8383
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8484
<Import Project="pyproject.props" />
@@ -144,10 +144,10 @@ index 0da6f67495..17eee400eb 100644
144144
<Target Name="Clean" />
145145
<Target Name="CleanAll">
146146
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
147-
diff --git a/PCbuild/python.props b/PCbuild/python.props
148-
index d3586235c8..f77eded4be 100644
149-
--- a/PCbuild/python.props
150-
+++ b/PCbuild/python.props
147+
Index: CPython/PCbuild/python.props
148+
===================================================================
149+
--- CPython.orig/PCbuild/python.props 2023-12-14 17:40:20.048323797 -0600
150+
+++ CPython/PCbuild/python.props 2023-12-14 17:44:29.935690032 -0600
151151
@@ -63,22 +63,23 @@
152152
<ExternalsDir Condition="$(ExternalsDir) == ''">$(EXTERNALS_DIR)</ExternalsDir>
153153
<ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
@@ -158,34 +158,34 @@ index d3586235c8..f77eded4be 100644
158158
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
159159

160160
<PropertyGroup>
161-
- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.42.0.0\</sqlite3Dir>
161+
- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.43.1.0\</sqlite3Dir>
162162
- <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
163163
- <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
164164
- <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
165165
- <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
166166
- <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
167-
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.9\</opensslDir>
168-
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.9\$(ArchName)\</opensslOutDir>
167+
- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.11\</opensslDir>
168+
- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.11\$(ArchName)\</opensslOutDir>
169169
- <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
170-
+ <!-- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.42.0.0\</sqlite3Dir> -->
171-
+ <!-- <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> -->
172-
+ <!-- <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> -->
173-
+ <!-- <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> -->
174-
+ <!-- <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir> -->
175-
+ <!-- <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir> -->
176-
+ <!-- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.9\</opensslDir> -->
177-
+ <!-- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.9\$(ArchName)\</opensslOutDir> -->
178-
+ <!-- <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir> -->
170+
+ <!-- sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.43.1.0\</sqlite3Dir> -->
171+
+ <!-- bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> -->
172+
+ <!-- lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> -->
173+
+ <!-- libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> -->
174+
+ <!-- libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir> -->
175+
+ <!-- libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir> -->
176+
+ <!-- opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.11\</opensslDir> -->
177+
+ <!-- opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.11\$(ArchName)\</opensslOutDir> -->
178+
+ <!-- opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir> -->
179179
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
180180
- <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>
181181
+ <!-- <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir> -->
182182
</PropertyGroup>
183183

184184
<PropertyGroup>
185-
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
186-
index f4640454a7..c1810c7db2 100644
187-
--- a/PCbuild/python.vcxproj
188-
+++ b/PCbuild/python.vcxproj
185+
Index: CPython/PCbuild/python.vcxproj
186+
===================================================================
187+
--- CPython.orig/PCbuild/python.vcxproj 2023-12-14 17:40:12.226076385 -0600
188+
+++ CPython/PCbuild/python.vcxproj 2023-12-14 17:40:20.048838759 -0600
189189
@@ -106,6 +106,9 @@
190190
</ItemGroup>
191191
<ItemGroup>
@@ -196,10 +196,10 @@ index f4640454a7..c1810c7db2 100644
196196
</ItemGroup>
197197
<ItemGroup>
198198
<ProjectReference Include="pythoncore.vcxproj">
199-
diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
200-
index e23635e5ea..525295c76f 100644
201-
--- a/PCbuild/pythonw.vcxproj
202-
+++ b/PCbuild/pythonw.vcxproj
199+
Index: CPython/PCbuild/pythonw.vcxproj
200+
===================================================================
201+
--- CPython.orig/PCbuild/pythonw.vcxproj 2023-12-14 17:40:12.226674890 -0600
202+
+++ CPython/PCbuild/pythonw.vcxproj 2023-12-14 17:40:20.049048886 -0600
203203
@@ -98,6 +98,9 @@
204204
</ItemGroup>
205205
<ItemGroup>
@@ -210,6 +210,3 @@ index e23635e5ea..525295c76f 100644
210210
</ItemGroup>
211211
<ItemGroup>
212212
<ProjectReference Include="pythoncore.vcxproj">
213-
--
214-
2.32.1 (Apple Git-133)
215-

0 commit comments

Comments
 (0)