Merge pull request #130 from AnacondaRecipes/PKG-3026-update-3.11.7

Update to 3.11.7

Author: danpetry

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "3.11.5" %}
+{% set version = "3.11.7" %}
 {% set dev = "" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
@@ -50,7 +50,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: 85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f
+    sha256: 18e1aa7e66ff3a58423d59ed22815a6954e53342122c45df20c96877c062b9b7
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

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

@@ -12,22 +12,22 @@ Co-authored-by: Isuru Fernando<[email protected]>
  3 files changed, 1148 insertions(+), 1 deletion(-)
  create mode 100644 PC/getpathp.c
 
-diff --git a/Modules/getpath.c b/Modules/getpath.c
-index 94479887cf..5ca10cb0f2 100644
---- a/Modules/getpath.c
-+++ b/Modules/getpath.c
-@@ -894,6 +894,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
+Index: CPython/Modules/getpath.c
+===================================================================
+--- CPython.orig/Modules/getpath.c	2023-12-14 17:26:29.166336000 -0600
++++ CPython/Modules/getpath.c	2023-12-14 17:26:55.751864098 -0600
+@@ -903,6 +903,7 @@
          !env_to_dict(dict, "ENV_PATH", 0) ||
          !env_to_dict(dict, "ENV_PYTHONHOME", 0) ||
          !env_to_dict(dict, "ENV_PYTHONEXECUTABLE", 0) ||
 +        !env_to_dict(dict, "ENV_CONDA_PY_ALLOW_REG_PATHS", 0) ||
          !env_to_dict(dict, "ENV___PYVENV_LAUNCHER__", 1) ||
          !progname_to_dict(dict, "real_executable") ||
          !library_to_dict(dict, "library") ||
-diff --git a/Modules/getpath.py b/Modules/getpath.py
-index dceeed7702..334455f7d6 100644
---- a/Modules/getpath.py
-+++ b/Modules/getpath.py
+Index: CPython/Modules/getpath.py
+===================================================================
+--- CPython.orig/Modules/getpath.py	2023-12-14 17:26:29.166444000 -0600
++++ CPython/Modules/getpath.py	2023-12-14 17:26:55.752181931 -0600
 @@ -51,6 +51,7 @@
  # ENV_PYTHONHOME          -- [in] getenv(...)
  # ENV_PYTHONEXECUTABLE    -- [in] getenv(...)
@@ -36,7 +36,7 @@ index dceeed7702..334455f7d6 100644
 
  # ** Values calculated at runtime **
  # config            -- [in/out] dict of the PyConfig structure
-@@ -654,7 +655,7 @@ def search_up(prefix, *landmarks, test=isfile):
+@@ -673,7 +674,7 @@
      else:
          pythonpath.append(joinpath(prefix, ZIP_LANDMARK))
 
@@ -45,11 +45,10 @@ index dceeed7702..334455f7d6 100644
          # QUIRK: Windows also lists paths in the registry. Paths are stored
          # as the default value of each subkey of
          # {HKCU,HKLM}\Software\Python\PythonCore\{winver}\PythonPath
-diff --git a/PC/getpathp.c b/PC/getpathp.c
-new file mode 100644
-index 0000000000..a73ea8a0e9
---- /dev/null
-+++ b/PC/getpathp.c
+Index: CPython/PC/getpathp.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ CPython/PC/getpathp.c	2023-12-14 17:26:55.753097597 -0600
 @@ -0,0 +1,1145 @@
 +
 +/* Return the initial module search path. */
@@ -1196,6 +1195,3 @@ index 0000000000..a73ea8a0e9
 +    }
 +    return hPython3 != NULL;
 +}
--- 
-2.32.1 (Apple Git-133)
-

recipe/patches/0010-Unvendor-openssl.patch

@@ -14,10 +14,10 @@ Co-authored-by: Isuru Fernando <[email protected]>
  PCbuild/pythonw.vcxproj      |  3 ++
  7 files changed, 19 insertions(+), 84 deletions(-)
 
-diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj
-index 4907f49b66..b2c23d5e8c 100644
---- a/PCbuild/_ssl.vcxproj
-+++ b/PCbuild/_ssl.vcxproj
+Index: CPython/PCbuild/_ssl.vcxproj
+===================================================================
+--- CPython.orig/PCbuild/_ssl.vcxproj	2023-12-14 17:40:12.222521230 -0600
++++ CPython/PCbuild/_ssl.vcxproj	2023-12-14 17:40:20.047423623 -0600
 @@ -99,9 +99,6 @@
    </ItemDefinitionGroup>
    <ItemGroup>
@@ -28,10 +28,10 @@ index 4907f49b66..b2c23d5e8c 100644
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc" />
-diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters
-index 716a69a41a..8aef9e03fc 100644
---- a/PCbuild/_ssl.vcxproj.filters
-+++ b/PCbuild/_ssl.vcxproj.filters
+Index: CPython/PCbuild/_ssl.vcxproj.filters
+===================================================================
+--- CPython.orig/PCbuild/_ssl.vcxproj.filters	2023-12-14 17:35:21.991951190 -0600
++++ CPython/PCbuild/_ssl.vcxproj.filters	2023-12-14 17:40:20.047676583 -0600
 @@ -12,9 +12,6 @@
      <ClCompile Include="..\Modules\_ssl.c">
        <Filter>Source Files</Filter>
@@ -42,10 +42,10 @@ index 716a69a41a..8aef9e03fc 100644
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="..\PC\python_nt.rc">
-diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
-index a4186f01da..fc39a0105a 100644
---- a/PCbuild/openssl.props
-+++ b/PCbuild/openssl.props
+Index: CPython/PCbuild/openssl.props
+===================================================================
+--- CPython.orig/PCbuild/openssl.props	2023-12-14 17:40:12.223644781 -0600
++++ CPython/PCbuild/openssl.props	2023-12-14 17:40:20.047843251 -0600
 @@ -2,10 +2,10 @@
  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemDefinitionGroup>
@@ -74,11 +74,11 @@ index a4186f01da..fc39a0105a 100644
 -    <Delete Files="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" />
 -  </Target>
  </Project>
-\ No newline at end of file
-diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj
-index 0da6f67495..17eee400eb 100644
---- a/PCbuild/openssl.vcxproj
-+++ b/PCbuild/openssl.vcxproj
+\ No newline at end of file
+Index: CPython/PCbuild/openssl.vcxproj
+===================================================================
+--- CPython.orig/PCbuild/openssl.vcxproj	2023-12-14 17:40:12.224467080 -0600
++++ CPython/PCbuild/openssl.vcxproj	2023-12-14 17:40:20.048039336 -0600
 @@ -60,64 +60,8 @@
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    <Import Project="pyproject.props" />
@@ -144,10 +144,10 @@ index 0da6f67495..17eee400eb 100644
    <Target Name="Clean" />
    <Target Name="CleanAll">
      <Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
-diff --git a/PCbuild/python.props b/PCbuild/python.props
-index d3586235c8..f77eded4be 100644
---- a/PCbuild/python.props
-+++ b/PCbuild/python.props
+Index: CPython/PCbuild/python.props
+===================================================================
+--- CPython.orig/PCbuild/python.props	2023-12-14 17:40:20.048323797 -0600
++++ CPython/PCbuild/python.props	2023-12-14 17:44:29.935690032 -0600
 @@ -63,22 +63,23 @@
      <ExternalsDir Condition="$(ExternalsDir) == ''">$(EXTERNALS_DIR)</ExternalsDir>
      <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
@@ -158,34 +158,34 @@ index d3586235c8..f77eded4be 100644
    <Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
 
    <PropertyGroup>
--    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.42.0.0\</sqlite3Dir>
+-    <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.43.1.0\</sqlite3Dir>
 -    <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
 -    <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
 -    <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
 -    <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
 -    <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
--    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.9\</opensslDir>
--    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.9\$(ArchName)\</opensslOutDir>
+-    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.11\</opensslDir>
+-    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.11\$(ArchName)\</opensslOutDir>
 -    <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
-+    <!-- <sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.42.0.0\</sqlite3Dir> -->
-+    <!-- <bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> -->
-+    <!-- <lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> -->
-+    <!-- <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> -->
-+    <!-- <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir> -->
-+    <!-- <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir> -->
-+    <!-- <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.9\</opensslDir> -->
-+    <!-- <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.9\$(ArchName)\</opensslOutDir> -->
-+    <!-- <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir> -->
++    <!-- sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.43.1.0\</sqlite3Dir> -->
++    <!-- bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir> -->
++    <!-- lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir> -->
++    <!-- libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir> -->
++    <!-- libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir> -->
++    <!-- libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir> -->
++    <!-- opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.11\</opensslDir> -->
++    <!-- opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.11\$(ArchName)\</opensslOutDir> -->
++    <!-- opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir> -->
      <nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
 -    <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>
 +    <!-- <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir> -->
    </PropertyGroup>
 
    <PropertyGroup>
-diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
-index f4640454a7..c1810c7db2 100644
---- a/PCbuild/python.vcxproj
-+++ b/PCbuild/python.vcxproj
+Index: CPython/PCbuild/python.vcxproj
+===================================================================
+--- CPython.orig/PCbuild/python.vcxproj	2023-12-14 17:40:12.226076385 -0600
++++ CPython/PCbuild/python.vcxproj	2023-12-14 17:40:20.048838759 -0600
 @@ -106,6 +106,9 @@
    </ItemGroup>
    <ItemGroup>
@@ -196,10 +196,10 @@ index f4640454a7..c1810c7db2 100644
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="pythoncore.vcxproj">
-diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj
-index e23635e5ea..525295c76f 100644
---- a/PCbuild/pythonw.vcxproj
-+++ b/PCbuild/pythonw.vcxproj
+Index: CPython/PCbuild/pythonw.vcxproj
+===================================================================
+--- CPython.orig/PCbuild/pythonw.vcxproj	2023-12-14 17:40:12.226674890 -0600
++++ CPython/PCbuild/pythonw.vcxproj	2023-12-14 17:40:20.049048886 -0600
 @@ -98,6 +98,9 @@
    </ItemGroup>
    <ItemGroup>
@@ -210,6 +210,3 @@ index e23635e5ea..525295c76f 100644
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="pythoncore.vcxproj">
--- 
-2.32.1 (Apple Git-133)
-

recipe/patches/0016-cross-compile-darwin.patch

@@ -11,11 +11,11 @@ By Isuru Fernando.
  setup.py        | 6 +++---
  4 files changed, 17 insertions(+), 6 deletions(-)
 
-diff --git a/Lib/platform.py b/Lib/platform.py
-index c272c407c7..c05b9b8ea9 100755
---- a/Lib/platform.py
-+++ b/Lib/platform.py
-@@ -413,7 +413,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
+Index: CPython/Lib/platform.py
+===================================================================
+--- CPython.orig/Lib/platform.py	2023-12-14 17:49:23.307172000 -0600
++++ CPython/Lib/platform.py	2023-12-14 17:49:31.861760057 -0600
+@@ -414,7 +414,12 @@
  def _mac_ver_xml():
      fn = '/System/Library/CoreServices/SystemVersion.plist'
      if not os.path.exists(fn):
@@ -29,11 +29,11 @@ index c272c407c7..c05b9b8ea9 100755
 
      try:
          import plistlib
-diff --git a/configure b/configure
-index 91227f00be..b89d1a380a 100755
---- a/configure
-+++ b/configure
-@@ -3873,6 +3873,9 @@ if test "$cross_compiling" = yes; then
+Index: CPython/configure
+===================================================================
+--- CPython.orig/configure	2023-12-14 17:49:23.307057000 -0600
++++ CPython/configure	2023-12-14 17:49:31.864960501 -0600
+@@ -3887,6 +3887,9 @@
  			_host_cpu=$host_cpu
  		esac
  		;;
@@ -43,7 +43,7 @@ index 91227f00be..b89d1a380a 100755
  	*-*-cygwin*)
  		_host_cpu=
  		;;
-@@ -7051,7 +7054,7 @@ esac
+@@ -7220,7 +7223,7 @@
    fi
  fi
 
@@ -52,11 +52,11 @@ index 91227f00be..b89d1a380a 100755
      case "$READELF" in
  	readelf|:)
  	as_fn_error $? "readelf for the host is required for cross builds" "$LINENO" 5
-diff --git a/configure.ac b/configure.ac
-index 77fb609b74..1d9fa9e4ef 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -597,6 +597,9 @@ if test "$cross_compiling" = yes; then
+Index: CPython/configure.ac
+===================================================================
+--- CPython.orig/configure.ac	2023-12-14 17:49:23.306975000 -0600
++++ CPython/configure.ac	2023-12-14 17:49:31.866025176 -0600
+@@ -605,6 +605,9 @@
  			_host_cpu=$host_cpu
  		esac
  		;;
@@ -66,7 +66,7 @@ index 77fb609b74..1d9fa9e4ef 100644
  	*-*-cygwin*)
  		_host_cpu=
  		;;
-@@ -1590,7 +1593,7 @@ then
+@@ -1634,7 +1637,7 @@
  fi
 
  AC_CHECK_TOOLS([READELF], [readelf], [:])
@@ -75,11 +75,11 @@ index 77fb609b74..1d9fa9e4ef 100644
      case "$READELF" in
  	readelf|:)
  	AC_MSG_ERROR([readelf for the host is required for cross builds])
-diff --git a/setup.py b/setup.py
-index 1bb48591c6..79dae21c6d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -81,7 +81,7 @@ def get_platform():
+Index: CPython/setup.py
+===================================================================
+--- CPython.orig/setup.py	2023-12-14 17:49:23.307112000 -0600
++++ CPython/setup.py	2023-12-14 17:49:31.866430930 -0600
+@@ -81,7 +81,7 @@
  HOST_PLATFORM = get_platform()
  MS_WINDOWS = (HOST_PLATFORM == 'win32')
  CYGWIN = (HOST_PLATFORM == 'cygwin')
@@ -88,7 +88,7 @@ index 1bb48591c6..79dae21c6d 100644
  AIX = (HOST_PLATFORM.startswith('aix'))
  VXWORKS = ('vxworks' in HOST_PLATFORM)
  EMSCRIPTEN = HOST_PLATFORM == 'emscripten-wasm32'
-@@ -1046,11 +1046,11 @@ def detect_readline_curses(self):
+@@ -1049,11 +1049,11 @@
                  readline_lib = 'readline'
              do_readline = self.compiler.find_library_file(self.lib_dirs,
                  readline_lib)
@@ -102,6 +102,3 @@ index 1bb48591c6..79dae21c6d 100644
                  ret = run_command("ldd %s > %s" % (do_readline, tmpfile))
              else:
                  ret = 1
--- 
-2.32.1 (Apple Git-133)
-

recipe/patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch

@@ -9,11 +9,11 @@ This bloats our exe and our modules a lot.
  configure.ac | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/configure b/configure
-index b89d1a380a..439493615a 100755
---- a/configure
-+++ b/configure
-@@ -4782,9 +4782,9 @@ if test "$ac_test_CFLAGS" = set; then
+Index: CPython/configure
+===================================================================
+--- CPython.orig/configure	2023-12-14 17:49:31.864960501 -0600
++++ CPython/configure	2023-12-14 17:50:52.191001230 -0600
+@@ -4806,9 +4806,9 @@
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
@@ -25,7 +25,7 @@ index b89d1a380a..439493615a 100755
    fi
  else
    if test "$GCC" = yes; then
-@@ -7934,7 +7934,7 @@ then
+@@ -8138,7 +8138,7 @@
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
@@ -34,11 +34,11 @@ index b89d1a380a..439493615a 100755
  	    fi
  	    ;;
  	*)
-diff --git a/configure.ac b/configure.ac
-index 1d9fa9e4ef..0babe7c917 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2043,7 +2043,7 @@ then
+Index: CPython/configure.ac
+===================================================================
+--- CPython.orig/configure.ac	2023-12-14 17:49:31.866025176 -0600
++++ CPython/configure.ac	2023-12-14 17:50:52.192276782 -0600
+@@ -2089,7 +2089,7 @@
  	    if test "$Py_DEBUG" = 'true' ; then
  		OPT="-g $PYDEBUG_CFLAGS -Wall"
  	    else
@@ -47,5 +47,3 @@ index 1d9fa9e4ef..0babe7c917 100644
  	    fi
  	    ;;
  	*)
--- 
-2.30.2