downloads: CPython 3.11.4 -> 3.11.5

We remove a patch for limits.h handling because upstream incorporated a
fix (from a bug report I filed).

And it looks like upstream backported build system changes to build with
OpenSSL 3.0 on Windows. We need to update our code accordingly.

We really should be building against OpenSSL 3.0. But that's scope
bloat. We'll get there.

cpython-unix/build-cpython.sh

@@ -239,14 +239,6 @@ if [[ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" && -n "${PYTHON_MEETS_MAXIMUM_VER
     patch -p1 -i ${ROOT}/patch-posixmodule-remove-system.patch
 fi
 
-# posixmodule.c unconditionally includes linux/limits.h on musl. This breaks
-# because we're building with old Linux headers not having this file. This is
-# effectively a revert of CPython commit 8be8101bca34b60481ec3d7ecaea4a3379fb7dbb.
-# Upstream bug report: https://github.com/python/cpython/issues/106881.
-if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_11}" ]; then
-  patch -p1 -i ${ROOT}/patch-posixmodule-musl-limits.patch
-fi
-
 # Python 3.11 has configure support for configuring extension modules. We really,
 # really, really want to use this feature because it looks promising. But at the
 # time we added this code the functionality didn't support all extension modules

cpython-windows/build.py

@@ -859,17 +859,24 @@ def hack_props(
         )
     else:
         if arch == "amd64":
-            suffix = b"x64"
+            suffix = b"-x64"
         elif arch == "win32":
-            suffix = None
+            suffix = b""
         else:
             raise Exception("unhandled architecture: %s" % arch)
 
-        if suffix:
+        try:
+            # CPython 3.11+ builds with OpenSSL 3.0 by default.
+            static_replace_in_file(
+                openssl_props,
+                b"<_DLLSuffix>-3</_DLLSuffix>",
+                b"<_DLLSuffix>-1_1%s</_DLLSuffix>" % suffix,
+            )
+        except NoSearchStringError:
             static_replace_in_file(
                 openssl_props,
                 b"<_DLLSuffix>-1_1</_DLLSuffix>",
-                b"<_DLLSuffix>-1_1-%s</_DLLSuffix>" % suffix,
+                b"<_DLLSuffix>-1_1%s</_DLLSuffix>" % suffix,
             )
 
     libffi_props = pcbuild_path / "libffi.props"

pythonbuild/downloads.py

@@ -62,10 +62,10 @@
         "python_tag": "cp310",
     },
     "cpython-3.11": {
-        "url": "https://www.python.org/ftp/python/3.11.4/Python-3.11.4.tar.xz",
-        "size": 19954828,
-        "sha256": "2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6",
-        "version": "3.11.4",
+        "url": "https://www.python.org/ftp/python/3.11.5/Python-3.11.5.tar.xz",
+        "size": 20053580,
+        "sha256": "85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f",
+        "version": "3.11.5",
         "licenses": ["Python-2.0", "CNRI-Python"],
         "license_file": "LICENSE.cpython.txt",
         "python_tag": "cp311",