downloads: upgrade CPython 3.9.9 to 3.9.10 and 3.10.0 to 3.10.2

This involved refreshing a patch related to MULTIARCH. It also
entailed changing a shlwapi.dll annotation on Windows.

Author: indygreg

cpython-unix/build-cpython.sh

@@ -67,24 +67,35 @@ if [ "${BUILD_TRIPLE}" != "${TARGET_TRIPLE}" ]; then
 
   # Same patch as below. See comment there.
   if [ "${CC}" = "clang" ]; then
-    if [ "${PYTHON_MAJMIN_VERSION}" = "3.9" ]; then
+    if [ "${PYTHON_MAJMIN_VERSION}" != "3.8" ]; then
       patch -p1 <<"EOF"
 diff --git a/configure b/configure
-index 33ecb16f71..7f21822d97 100755
+index d078887b2f..78654eed29 100755
 --- a/configure
 +++ b/configure
-@@ -5354,10 +5354,7 @@ $as_echo "none" >&6; }
+@@ -5366,20 +5366,7 @@ $as_echo "none" >&6; }
  fi
  rm -f conftest.c conftest.out
 
--if test x$PLATFORM_TRIPLET != xdarwin; then
--  MULTIARCH=$($CC --print-multiarch 2>/dev/null)
--fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch" >&5
+-$as_echo_n "checking for multiarch... " >&6; }
+-case $ac_sys_system in #(
+-  Darwin*) :
+-    MULTIARCH="" ;; #(
+-  FreeBSD*) :
+-    MULTIARCH="" ;; #(
+-  *) :
+-    MULTIARCH=$($CC --print-multiarch 2>/dev/null)
+- ;;
+-esac
 -
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MULTIARCH" >&5
+-$as_echo "$MULTIARCH" >&6; }
 +MULTIARCH=
 
  if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
    if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
+
 EOF
     else
       patch -p1 <<"EOF"
@@ -325,24 +336,35 @@ fi
 # configure. This is reported as https://bugs.python.org/issue45405. We nerf the
 # check since we know what we're doing.
 if [ "${CC}" = "clang" ]; then
-    if [ "${PYTHON_MAJMIN_VERSION}" = "3.9" ]; then
+    if [ "${PYTHON_MAJMIN_VERSION}" != "3.8" ]; then
         patch -p1 <<"EOF"
 diff --git a/configure b/configure
-index 33ecb16f71..7f21822d97 100755
+index d078887b2f..78654eed29 100755
 --- a/configure
 +++ b/configure
-@@ -5354,10 +5354,7 @@ $as_echo "none" >&6; }
+@@ -5366,20 +5366,7 @@ $as_echo "none" >&6; }
  fi
  rm -f conftest.c conftest.out
- 
--if test x$PLATFORM_TRIPLET != xdarwin; then
--  MULTIARCH=$($CC --print-multiarch 2>/dev/null)
--fi
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch" >&5
+-$as_echo_n "checking for multiarch... " >&6; }
+-case $ac_sys_system in #(
+-  Darwin*) :
+-    MULTIARCH="" ;; #(
+-  FreeBSD*) :
+-    MULTIARCH="" ;; #(
+-  *) :
+-    MULTIARCH=$($CC --print-multiarch 2>/dev/null)
+- ;;
+-esac
 -
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MULTIARCH" >&5
+-$as_echo "$MULTIARCH" >&6; }
 +MULTIARCH=
- 
+
  if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
    if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
+
 EOF
     else
         patch -p1 <<"EOF"

cpython-windows/build.py

@@ -1880,7 +1880,7 @@ def find_additional_dependencies(project: pathlib.Path):
         res["core"]["links"].append({"name": "pathcch", "system": True})
 
     # shlwapi was dropped from 3.9.9+.
-    if python_majmin != "3.9":
+    if python_majmin == "3.8":
         res["core"]["links"].append({"name": "shlwapi", "system": True})
 
     # Copy files for extensions into their own directories.

pythonbuild/downloads.py

@@ -62,20 +62,19 @@
         "python_tag": "cp38",
     },
     "cpython-3.9": {
-        "url": "https://www.python.org/ftp/python/3.9.9/Python-3.9.9.tar.xz",
-        "size": 19144372,
-        "sha256": "06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27",
-        "version": "3.9.9",
+        "url": "https://www.python.org/ftp/python/3.9.10/Python-3.9.10.tar.xz",
+        "size": 19154136,
+        "sha256": "0a8fbfb5287ebc3a13e9baf3d54e08fa06778ffeccf6311aef821bb3a6586cc8",
+        "version": "3.9.10",
         "licenses": ["Python-2.0", "CNRI-Python"],
         "license_file": "LICENSE.cpython.txt",
         "python_tag": "cp39",
     },
-    # TODO remember to update windows shlwapi link annotation when we upgrade to 3.10.1.
     "cpython-3.10": {
-        "url": "https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tar.xz",
-        "size": 18726176,
-        "sha256": "5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002",
-        "version": "3.10.0",
+        "url": "https://www.python.org/ftp/python/3.10.2/Python-3.10.2.tar.xz",
+        "size": 18780936,
+        "sha256": "17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7",
+        "version": "3.10.2",
         "licenses": ["Python-2.0", "CNRI-Python"],
         "license_file": "LICENSE.cpython.txt",
         "python_tag": "cp310",