147 files changed, 2221 insertions, 3337 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecff6c83e3f4..39c74ad41c92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-python
 	pkgdesc = Next generation of the python high-level scripting language (mingw-w64)
-	pkgver = 3.9.6
+	pkgver = 3.9.7
 	pkgrel = 1
 	url = https://www.python.org/
 	arch = any
@@ -8,6 +8,7 @@ pkgbase = mingw-w64-python
 	makedepends = mingw-w64-configure
 	makedepends = mingw-w64-wine
 	makedepends = python
+	makedepends = autoconf-archive
 	depends = mingw-w64-crt
 	depends = mingw-w64-expat
 	depends = mingw-w64-bzip2
@@ -21,14 +22,15 @@ pkgbase = mingw-w64-python
 	depends = mingw-w64-xz
 	depends = mingw-w64-mpdecimal
 	depends = mingw-w64-sqlite
+	depends = mingw-w64-tzdata
 	optdepends = mingw-w64-wine: runtime support
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tar.xz
-	source = 0001-make-_sysconfigdata.py-relocatable.patch
+	source = https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tar.xz
+	source = 0001-sysconfig-make-_sysconfigdata.py-relocatable.patch
 	source = 0002-restore-setup-config.patch
-	source = 0003-MINGW-BASE-use-NT-thread-model.patch
+	source = 0003-build-add-with-nt-threads-and-make-it-default-on-min.patch
 	source = 0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch
 	source = 0005-MINGW-configure-MACHDEP-and-platform-for-build.patch
 	source = 0006-MINGW-preset-configure-defaults.patch
@@ -37,269 +39,231 @@ pkgbase = mingw-w64-python
 	source = 0009-MINGW-init-system-calls.patch
 	source = 0010-MINGW-build-in-windows-modules-winreg.patch
 	source = 0011-MINGW-determine-if-pwdmodule-should-be-used.patch
-	source = 0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch
-	source = 0013-MINGW-compiler-enable-new-dtags.patch
-	source = 0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
-	source = 0015-MINGW-configure-for-shared-build.patch
-	source = 0016-MINGW-dynamic-loading-support.patch
-	source = 0017-MINGW-ignore-main-program-for-frozen-scripts.patch
-	source = 0018-MINGW-setup-_multiprocessing-module.patch
-	source = 0019-MINGW-setup-select-module.patch
-	source = 0020-MINGW-setup-_ctypes-module-with-system-libffi.patch
-	source = 0021-MINGW-defect-winsock2-and-setup-_socket-module.patch
-	source = 0022-MINGW-exclude-unix-only-modules.patch
-	source = 0023-MINGW-setup-msvcrt-and-_winapi-modules.patch
-	source = 0024-MINGW-build-extensions-with-GCC.patch
-	source = 0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch
-	source = 0026-MINGW-find-import-library.patch
-	source = 0027-MINGW-setup-_ssl-module.patch
-	source = 0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
-	source = 0029-MINGW-support-stdcall-without-underscore.patch
-	source = 0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch
-	source = 0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch
-	source = 0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch
-	source = 0033-MINGW-customize-site.patch
-	source = 0034-add-python-config-sh.patch
-	source = 0035-cross-darwin-feature.patch
-	source = 0036-py3k-mingw-ntthreads-vs-pthreads.patch
-	source = 0037-mingw-system-libffi.patch
-	source = 0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
-	source = 0039-mingw-use-posix-getpath.patch
-	source = 0040-mingw-add-ModuleFileName-dir-to-PATH.patch
-	source = 0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
-	source = 0042-msys-cygwin-semi-native-build-sysconfig.patch
-	source = 0043-mingw-sysconfig-like-posix.patch
-	source = 0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch
-	source = 0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch
-	source = 0046-mingw-use-backslashes-in-compileall-py.patch
-	source = 0047-msys-convert_path-fix-and-root-hack.patch
-	source = 0048-allow-static-tcltk.patch
-	source = 0049-mingw-pdcurses_ISPAD.patch
-	source = 0050-grammar-fixes.patch
-	source = 0051-builddir-fixes.patch
-	source = 0052-msys-monkeypatch-os-system-via-sh-exe.patch
-	source = 0053-msys-replace-slashes-used-in-io-redirection.patch
-	source = 0054-mingw-install-layout-as-posix.patch
-	source = 0055-remove_path_max.default.patch
-	source = 0056-dont-link-with-gettext.patch
-	source = 0057-ctypes-python-dll.patch
-	source = 0058-gdbm-module-includes.patch
-	source = 0059-use-gnu_printf-in-format.patch
-	source = 0060-mingw-fix-ssl-dont-use-enum_certificates.patch
-	source = 0061-mingw-build-optimized-ext.patch
-	source = 0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch
-	source = 0063-fix-using-dllhandle-and-winver-mingw.patch
-	source = 0064-mingw-add-LIBPL-to-library-dirs.patch
-	source = 0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
-	source = 0066-MINGW-link-with-additional-library.patch
-	source = 0067-install-msilib.patch
-	source = 0068-dont-include-system-ncurses-path.patch
-	source = 0069-fix-signal-module-build.patch
-	source = 0070-build-winconsoleio.patch
-	source = 0071-expose-sem_unlink.patch
-	source = 0072-cygpty-isatty.patch
-	source = 0073-disable-broken-gdbm-module.patch
-	source = 0074-link-win-resource-files-and-build-pythonw.patch
-	source = 0075-3.7-mpdec-mingw.patch
-	source = 0076-disable-readline.patch
-	source = 0077-fix-isselectable.patch
-	source = 0078-use-_wcsnicmp-instead-wcsncasecmp.patch
-	source = 0079-_xxsubinterpretersmodule.patch
-	source = 0080-sqlite3-module-defines.patch
-	source = 0081-configure-have-inet-pton.patch
-	source = 0082-fix-msvc9-import.patch
-	source = 0083-set-venv-activate-path-unix.patch
-	source = 0084-venv-creation-fixes.patch
-	source = 0085-pass-gen-profile-ldflags.patch
-	source = 0086-distutils-add-windmc-to-cygwinccompiler.patch
-	source = 0087-pkg-config-windows-must-link-ext-with-python-lib.patch
-	source = 0088-importlib-bootstrap-path-sep.patch
-	source = 0089-pathlib-path-sep.patch
-	source = 0090-warnings-fixes.patch
-	source = 0091-fix-build-testinternalcapi.patch
-	source = 0092-extend-MS_WINDOWS-flag.patch
-	source = 0093-clang-arm64.patch
-	source = 0094-MINGW-stack-reserve.patch
-	source = 0095-Add-support-for-Windows-7-Python-3.9.patch
-	source = 0096-Add-CI-to-Build-and-Test.patch
-	source = 0097-Don-t-use-os.pathsep-to-find-EOF.patch
-	source = 0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch
-	source = 0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch
-	source = 0100-Add-a-test-to-build-C-Ext.patch
-	source = 0101-Add-some-platform-related-tests.patch
-	source = 0102-squash-CI-use-O2.patch
-	source = 0103-squash-Fixup-.rc-handling.patch
-	source = 0104-squash-Set-MS_DLL_ID.patch
-	source = 0105-squash-CI-Clean-up.patch
-	source = 0106-squash-CI-use-srcdir-builddir.patch
-	source = 0107-squash-fix-srcdir-builddir.patch
-	source = 0108-build-Cleanup-ncursesw-include-lookup-code.patch
-	source = 0109-tests-fix-test_bytes.patch
-	source = 0110-time-fix-strftime-not-raising-for-invalid-year-value.patch
-	source = 0111-winconsoleio-build-_testconsole-which-is-required-fo.patch
-	source = 0112-Adjust-Py_WINVER-for-our-Win-7-target.patch
-	source = 0113-ctypes-find_library-c-should-return-None-with-ucrt.patch
-	source = 0114-build-Disable-checks-for-dlopen-dlfcn.patch
-	source = 0115-Fix-install-location-of-the-import-library.patch
-	source = 0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch
-	source = 0117-build-Integrate-venvlauncher-build-installation-into.patch
-	source = 0118-Update-smoketests.patch
-	source = 0119-CI-clean-up-the-build-enforce-some-tests.patch
-	source = 0120-1-2-AC_RUN_IFELSE-replace.patch
-	source = 0121-Add-return-0-to-the-test-code.patch
-	source = 0122-2-2-AC_RUN_IFELSE-replace.patch
-	source = 0123-Make-sure-MACHDEP-matches-sys.platform.patch
-	source = 0124-CI-add-a-cross-build-job.patch
-	source = 0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch
-	source = 0126-Set-_WIN32_WINNT-version-in-configure.ac.patch
-	source = 0127-CI-cleanup.patch
-	source = 0128-Commit-regenerated-importlib.patch
-	source = 0129-CI-clean-up.patch
-	source = 0130-configure.ac-default-to-with-nt-threads-with-mingw.patch
-	source = 0131-configure.ac-don-t-check-for-clock_-functions.patch
-	source = 0132-CI-clean-up.patch
-	source = 0133-smoketests-update.patch
-	source = 0134-expanduser-normpath-paths-coming-from-env-vars.patch
-	source = 0135-sysconfig-fix-platlib-purelib-paths.patch
-	source = 0136-smoketests-update.patch
+	source = 0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
+	source = 0013-MINGW-configure-for-shared-build.patch
+	source = 0014-MINGW-dynamic-loading-support.patch
+	source = 0015-MINGW-ignore-main-program-for-frozen-scripts.patch
+	source = 0016-MINGW-setup-_multiprocessing-module.patch
+	source = 0017-MINGW-setup-select-module.patch
+	source = 0018-MINGW-setup-_ctypes-module-with-system-libffi.patch
+	source = 0019-MINGW-defect-winsock2-and-setup-_socket-module.patch
+	source = 0020-MINGW-exclude-unix-only-modules.patch
+	source = 0021-MINGW-setup-msvcrt-and-_winapi-modules.patch
+	source = 0022-sysconfig-MINGW-build-extensions-with-GCC.patch
+	source = 0023-MINGW-setup-_ssl-module.patch
+	source = 0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
+	source = 0025-MINGW-support-stdcall-without-underscore.patch
+	source = 0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch
+	source = 0027-MINGW-customize-site.patch
+	source = 0028-add-python-config-sh.patch
+	source = 0029-cross-darwin-feature.patch
+	source = 0030-mingw-system-libffi.patch
+	source = 0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
+	source = 0032-mingw-use-posix-getpath.patch
+	source = 0033-mingw-add-ModuleFileName-dir-to-PATH.patch
+	source = 0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
+	source = 0035-msys-cygwin-semi-native-build-sysconfig.patch
+	source = 0036-sysconfig-mingw-sysconfig-like-posix.patch
+	source = 0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch
+	source = 0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch
+	source = 0039-mingw-use-backslashes-in-compileall-py.patch
+	source = 0040-msys-convert_path-fix-and-root-hack.patch
+	source = 0041-allow-static-tcltk.patch
+	source = 0042-mingw-pdcurses_ISPAD.patch
+	source = 0043-grammar-fixes.patch
+	source = 0044-builddir-fixes.patch
+	source = 0045-msys-monkeypatch-os-system-via-sh-exe.patch
+	source = 0046-msys-replace-slashes-used-in-io-redirection.patch
+	source = 0047-remove_path_max.default.patch
+	source = 0048-dont-link-with-gettext.patch
+	source = 0049-ctypes-python-dll.patch
+	source = 0050-gdbm-module-includes.patch
+	source = 0051-use-gnu_printf-in-format.patch
+	source = 0052-mingw-fix-ssl-dont-use-enum_certificates.patch
+	source = 0053-fix-using-dllhandle-and-winver-mingw.patch
+	source = 0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
+	source = 0055-MINGW-link-with-additional-library.patch
+	source = 0056-install-msilib.patch
+	source = 0057-fix-signal-module-build.patch
+	source = 0058-build-build-winconsoleio-and-_testconsole.patch
+	source = 0059-expose-sem_unlink.patch
+	source = 0060-cygpty-isatty.patch
+	source = 0061-disable-broken-gdbm-module.patch
+	source = 0062-build-link-win-resource-files-and-build-pythonw.patch
+	source = 0063-3.7-mpdec-mingw.patch
+	source = 0064-disable-readline.patch
+	source = 0065-fix-isselectable.patch
+	source = 0066-use-_wcsnicmp-instead-wcsncasecmp.patch
+	source = 0067-_xxsubinterpretersmodule.patch
+	source = 0068-sqlite3-module-defines.patch
+	source = 0069-configure.ac-fix-inet_pton-check.patch
+	source = 0070-set-venv-activate-path-unix.patch
+	source = 0071-venv-creation-fixes.patch
+	source = 0072-pass-gen-profile-ldflags.patch
+	source = 0073-pkg-config-windows-must-link-ext-with-python-lib.patch
+	source = 0074-importlib-bootstrap-path-sep.patch
+	source = 0075-pathlib-path-sep.patch
+	source = 0076-warnings-fixes.patch
+	source = 0077-fix-build-testinternalcapi.patch
+	source = 0078-extend-MS_WINDOWS-flag.patch
+	source = 0079-clang-arm64.patch
+	source = 0080-configure.ac-set-MINGW-stack-reserve.patch
+	source = 0081-Don-t-use-os.pathsep-to-find-EOF.patch
+	source = 0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch
+	source = 0083-Change-the-get_platform-method-in-sysconfig.patch
+	source = 0084-distutils-compiler-customize-mingw-cygwin-compilers.patch
+	source = 0085-distutils-compiler-enable-new-dtags.patch
+	source = 0086-distutils-MINGW-build-extensions-with-GCC.patch
+	source = 0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch
+	source = 0088-distutils-find-import-library.patch
+	source = 0089-distutils-avoid-circular-dependency-from-time-module.patch
+	source = 0090-distutils-generalization-of-posix-build-in-distutils.patch
+	source = 0091-distutils-mingw-sysconfig-like-posix.patch
+	source = 0092-distutils-get_versions-fixes.patch
+	source = 0093-distutils-install-layout-as-posix.patch
+	source = 0094-distutils-msys-convert_path-fix-and-root-hack.patch
+	source = 0095-distutils-mingw-build-optimized-ext.patch
+	source = 0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch
+	source = 0097-distutils-get-compilers-from-env-vars.patch
+	source = 0098-distutils-add-windmc-to-cygwinccompiler.patch
+	source = 0099-distutils-fix-msvc9-import.patch
+	source = 0100-distutils-mingw-add-LIBPL-to-library-dirs.patch
+	source = 0101-distutils-Change-the-get_platform-method-in-distutil.patch
+	source = 0102-build-Fix-ncursesw-include-lookup.patch
+	source = 0103-tests-fix-test_bytes.patch
+	source = 0104-time-fix-strftime-not-raising-for-invalid-year-value.patch
+	source = 0105-ctypes-find_library-c-should-return-None-with-ucrt.patch
+	source = 0106-build-Disable-checks-for-dlopen-dlfcn.patch
+	source = 0107-Fix-install-location-of-the-import-library.patch
+	source = 0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch
+	source = 0109-build-Integrate-venvlauncher-build-installation-into.patch
+	source = 0110-configure.ac-set-_WIN32_WINNT-version.patch
+	source = 0111-configure.ac-don-t-check-for-clock_-functions.patch
+	source = 0112-expanduser-normpath-paths-coming-from-env-vars.patch
+	source = 0113-Add-support-for-Windows-7-Python-3.9.patch
+	source = 0114-Commit-regenerated-importlib.patch
+	source = 0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch
+	source = 0116-decimal-backport-build-fixes.patch
+	source = 0117-smoketests-test-that-_decimal-exists.patch
 	source = wine-python.sh
-	sha512sums = 01c529e3207738d8771caeb5ed6217e10745c21aa39832fe3185e1c87fdb6aedead97ce38dbb11e02d873654028bd8071c3f345c18452769520723284efe9dc1
-	sha512sums = 2f1e91391db0f50e7de5562b9166a83b326c9a6f875011d1c503080f43498a0368c50dab07a655fedcd452ba3f769ee695e3253d2fe541cb29884efdaa4993c2
-	sha512sums = f459f75f47ca756cb8bbe411762c733c5d02382d74d68e57b3a54d8eddf405cfa1e55c2ec45773788aba829e9a9548567557c0d2d306b941f2a530964a07e5a5
-	sha512sums = b06ede9530d27583a8d3538b042ed94fe6f29c16d2f1990d1b6763d7ba448ef721accce086529f84b6b5086ddc6aea1c7393b8e1aaa3a42942cd67619846739c
-	sha512sums = 1b2049a24a539ce4b7ae9d066c5624f42f05067b3a78753f583dd98f02e0455cc5f68d76e09ba3a9616719138533c08fbde598e7c83a93923d67dd018a45b763
-	sha512sums = 80bdd16b5142a244ab2ceaffb50ae3a1b7b93977def05b6dd244e101a1701f2cc01357e1e756c8c548192141247c20ef198789e6923ce5751062eda2ed44da62
-	sha512sums = 181ee229d2b64a6305ff00263b574f1331ba02613ab6a9ed502659a960c7beaee161cea003adef65dcacab4cbbb600668756ea1b87fff06401996f455f950573
-	sha512sums = 0b5e951bd433998a0ceac079aa40a67a0d0ba1679fae2663999eef1024fab5daad5ad67b8e091172aecf0761568b97ac804e51067d83db57b9ab6445562c0737
-	sha512sums = bed18d78b11615ada2063b6246fa501e63dfec5009dd5ee316a39ca6a927fc095762399ecac5c7fb043af4c9a008b145b61ffd7f02b41dbd58a1a9342d1bb202
-	sha512sums = 2981458b0e6448305f3da4e2b328e666f93495216fe72fe21572af1fb945d2da68318789b7c0d5888e7f255c10c041e98758fe17db58a50b269b81fa00e7591e
-	sha512sums = 78f54dc07100bc0cd7ecebb7b7976f17dc959a8c894e32e48a04419eddc04b290e7fc25ec3db2c6da730046d5e571bdf2e64c63dbb8569a7a14d36543d13515e
-	sha512sums = 18244172a9adf349710b8851eae7667926defacb21534ec085b280648effb402e997ca496a52377f8bc10124aa2f8e611f23399cabb719d7493033547b6ad671
-	sha512sums = 0d7354a0846c2c5e3975f7c757b4c3d30392bef511036416c09c43290ca4f34c506d50bb9e59bdbe0ab29b1757b62767b3cf095c5e5d5cf2eae15583674dcc55
-	sha512sums = 444cc70ed2a0ac37f82763ecdcf2024d480e6631583b64fbb34976a5b9fff814b61816f681ed4baf24094ddeb81dbffdc68b0342978a5b5f4eb0d37bb3f0d7f4
-	sha512sums = 16a290ba51c53e902f71b85e8b4bb4f65129b0dc61a571e71c8cf9352307700ddbd6ca9d891c74224ff56eff795face7d228fdf60db3015f3ff61c2e6ce80673
-	sha512sums = 8b99b6332e12d2f84c3f21d90b7ab946a03fba80cf0cee068bc1958a03514db431971ec7db158f5db37f676e6159e50d60fad07f7d6b303c2852922d4241163b
-	sha512sums = 014c379e92eecfe2e22888f039bcb5f26d9c23e33ce29e3905e6d3cec2792de71919a1f6517d528820c7babac163b94bffd684a0404673943335e7f9e61132b2
-	sha512sums = f4a97bd111607c7dda2b0b62dd93c137de89e49c1e2c782efca02a1c0536bdc20b9537c1f0464e383e0e1b29d76ad87470b8bb55ad93725d9075bee36dcadb1d
-	sha512sums = 78db3161f0810c823732302046338a341ee50601b3b6eb9a1eb72f13dc2789eb84c5d8e4c2d9812921b1b7c480c070e1dff5e1bb7236cd278689f200663a82c3
-	sha512sums = f1c5021498addfc076837d94f5ae240cf62a17c9a04f7ec8c9929a25a02fedc0f975f56155be3aa79aa111fb6c01e96b9cfb2a75a81add576884d13fb2b220e6
-	sha512sums = e90da0b8787fdeb9b0c9dc75134e18d23ddbcf0da667402ba80cd43956ee3dc5cc2ffb62a0ff980fe50bb8e7a617a018bc6ba93adffe8d70759a0020ff65749a
-	sha512sums = 32f8b63d344b9438df8794bd76a4d7e95ce25762c2eb1ca9e2b1eab084386936b09b6ad001d8affdac4d6600143ecb043870ec65c20251f05385e3ebcfd2fc67
-	sha512sums = 53ed9e2b211f025986e69da484c2583848822ada0dbfcde01f16202a15a5dde133a4df74d7f900642ad7893d79ece91ab75cb7ec921889dc0391fcbb336d6715
-	sha512sums = 8a7f0c3e7659210618d10d942ba5efab3aa403accc9d360458ad333d7f10656260145e9d0b2588f2cc26f1b2806960a688c565ecf4a9118fd4f071834fa33150
-	sha512sums = ac82ec4597561650f711bef98c94146da8caec5c8c0794d82f7707f6ce89d82dff2b55a91db2c1b778cde11de5cd7350ea57ef4ede2836fad1212ed190affea9
-	sha512sums = 081b954260767bcb49bc3f8f1f35af15d5b261f69cca6697d95ab57bb191622990ba672de54e09fc692777beb31682d49446e387cdd80b4cd280a6869caa53f2
-	sha512sums = 9cd710d2b4a2a029bb89473bfe8212cbf16368c795e45be7acfbb4efbd8a45fc01c90387c6e97a8490d4f04a0cfd34ee16aad094463d159b3aee18bc4da1da6b
-	sha512sums = 7dfd4a36f0ab554edfa6d1be2b1c5892bee41c368cc5e21e0d6126bdca040918068b63fcde07cefcf361d3afee79708ff6631c3f886d85e3b5b60b508a0e67ba
-	sha512sums = a8eede1f4a2844a98be1ff5c7e8eb74b36c8912af9c2381c80e8ec2c19136aed541f3dd4e22de7dd8270b1b11323d6b769b876aaf777f8095aaf431948fd3e73
-	sha512sums = 166ef0748798b284fbc1aee53fe31af8115ad5de47c47ba288deda43d8e578c3e72b14a4a80df17d13b8af8a59787e84e932910840977e60a80afee21fbddb67
-	sha512sums = 99f93ac8e1f1c36e09a4bf3aa556c9fa1dc6c4019ba255aded5552950ff769776c7218d1d65b58f09cee8ed56495f841f013f2c693edb079769a62336274605f
-	sha512sums = c12a277de36c04f80f40c9dbecdb4bf1fa55dcbc393d073083039bd0994e53f57dc3fdb8ee52e80a234ed5b6be25e8a02c06675f0d56cedc201d6b6d02fe67b8
-	sha512sums = 3b5c73ef484f69ad4280078e6e017a5331b9a7f7eb76e52d0883809b5927d63b59fc70233df1bb1253c597693646959dda87112240927840015a91a3c0e53e15
-	sha512sums = 064e14df2333bce7994711ec9631c3a7a5c1dde8b6a188ac7dbe446cc17789433dafbdd7ae6a1ac9f8475bcc7ba643e76c34218c4c53508ea0b070c6abb5b3d7
-	sha512sums = 6f61ccbda6d277a7efa787a2271e98404dd1c0e70f5ba92ca36c3a5d85d1be7d278a24f5e7ec911950218d90e2e93337453f474431e76759a02dea0a95433948
-	sha512sums = bcb1d53e89548b0d146f95fd9ec82680dd3ad0b8aba1db7f6c4b576de63c45a764e142370eaae45d798e198e459ef4fe771494701c944754c3729aca4b08a59b
-	sha512sums = 6eda961b04e1ea775cfeb9fd7451cb1e6521bade46b7671f7c035ac71b9aed6388db627a8b5a4d8945261a772fb0e4b852b5c9dee75f1508509cb1d71cb23145
-	sha512sums = d16762af58a1582d66773e47426f953189415d801af8d47a6968a8e4a87a219bee763292f4ef9bf302186d149fc763841c8f6f17f462ddcde28547cb9a6150d3
-	sha512sums = c2fbfb69a4344f764318ffcb096ad13efb6c00a5f75ee226e88cd2bb90fb0017d5bfdb3fa880f6db1fa522446f64c97c2157fd886f81886904eb233286fb5a71
-	sha512sums = cf28075e8e10ecd9867b7997f6707997c3180151d228809875b6432b44e610784d8647ff3f403196261e993de9184b5f71621e9504d4f54a8c5d52bacce4ceda
-	sha512sums = a8b43befb0ef4b700c1bb22808e4f7b142e2ad0c1ddb3786f7881395b3d34e38dd7d35136c22af5e2f4051fe0d79d97ec0418748ad61eabe97175047d742f39f
-	sha512sums = f0d72cbfc2e6d1b0c93528389b7576221b8a33feeecddfc0653df21b6887ea7ba4dc549044353243e90d0628537e4af6ef890703684aed69d32075889ebd0044
-	sha512sums = 77e8a08cbc638aa6353f564be5e4fb78ee97a4c2d51c741bcb89bcd95b9d029d97a9bfa251a11b9c84f9f75c41c8327890b8c7a041dd12453094d9a41f0fd1d9
-	sha512sums = b98f8dc0b71bd57be7dcd56b28c9534f4175f0407b0eab178e7642149422045a3242ea1257c4aa949e54dcee163529b50b997774507f09fe2ec17b5401d3f8ae
-	sha512sums = ce40ba66738c5bd1494b06c6b09dd3209afed003c097c5ed3be86cd11e3325364a866fd136679ffa9c84ffc69536f3481b88d05774e06460d56543c116735c79
-	sha512sums = 578f1c76f928a1f7a1946830f04b9ebe725b8df3d47d542d48fa1c53fd6a3b862208d481215a750113ae11f0c6762b0bbe382820e620187620410d7e8624f9da
-	sha512sums = 746e8a58e2f6552713334ef4550cb023dab177f5b53bc24cb51255e9a3d655c7734b9441e7396ec004a55d1bc2ce55c352ac394c58213964980334f4d85ad81a
-	sha512sums = a8c13e66d90fe8c75ce146890b38435de0e85984c64dce1e4f118c5fca63efaaafd23911dba1a3f0c8f5a826603573c29ad5ecdadfed2beb436afe67b5ad7272
-	sha512sums = c9ecce52a554955bc62f6baa5d9f2317bf7ffd486182f287eaac401b7216ed6ba00e1a28f7d47991c77abeb43b5fca3f7d33b2b95c4a41b4218bb2d84be275ef
-	sha512sums = d7c5cab9f259d68e75852b58a64c05249c152531a7f89170a22245d22e4b8aa10790f41dfb9aa3e3ca8e0d93bfb310c52d74eed33bc0e6abac6977d2b2565361
-	sha512sums = 43cd5f37bafa14a4b84d4941fced1d8b6ce93197b33bd674abd0a0ea846eb5c1bd0eda1807b1b4c5de392bfe592769eac7dbcd67fc1f453f72e6bbc2724c2ac0
-	sha512sums = b04d2bc12d36dd0a6846f1394e0f2fe5c33cd4fe1edb0fc946ea3dc3ea2654678a7e01de7c10b28f0fb91350b5a9369caf9d86b2f3bea7d6ff26345374106249
-	sha512sums = c421e9a8feba81910d99c8d9a65615d267ca7e4ba0e15a9c0fb8fbf989e923d56fddc2e2e81febf0f21eaa095d4d74ba7022bcfb8b7bba724b190ea4f14fd14c
-	sha512sums = 3b238801ee5c3262dc00dc78339ef3d1f8d0526265d2a1c772416cd0fdbbd75161996a7c8959c36a6711a5f88a4cdc215c374d2a5fa7380c0874e15acfb1d356
-	sha512sums = eda88a2aad8f7cbb47d936ce305c03313355a7e4f17ee3d4f476825d96793f3b362a58b4ec3867e6196097dfea02b577e169e1acd2cbdba241642602ec96233e
-	sha512sums = 19ccbc8ee9e7cfea54df995327e76b4a5777e061f12ebc01b8ce6383b615fd8a656c524ddfbfc0ed03b3b6eefec2c2783a9cb319471f0f59fb17dcc4a6a7d457
-	sha512sums = 5b8ba80290c1f0abf5185be70887bc919f4fd4b304af88de22603a001986054aba91467310532e9997b20887698a16c4939c5af6237f93603999bc8f29d7ae21
-	sha512sums = 7170a09d2e4f5393750f0b3aad92816c2b28fb79036b7fb97b90cd907ba63373e5c745cd246ff357e55274de633f2382242ae285ea3a4d4c6cf589e7dda1d849
-	sha512sums = 72a6c7978044534cdafc8a2ab0000ebc740426943728911084f216255925fcb045c1596190c391b23be23385bc821590314d48db73eeff019219e5b48c66068b
-	sha512sums = 5166bcc2954aed6ff6097e087fcaf6704d4e24237e80c7ae78f6d3c19fe1a74c64d4282797dd93f2b9656a7e6f01b515fe5e50c7382a2ba70d1f2c0f25de60b1
-	sha512sums = 2e3d828e7aa06596a9248ea39e7f2dd75f0fe438474fbacbc6515bf529197e2bab55846cb0023a8184c01329c4fb22a0a3cc76c9618281699efc40e6d58c93de
-	sha512sums = 91ea233217eb507dac62f5a23a33b89b8e042116bb83c4a5b23bcb88a6a80d6390a1bd5e8cc9c3d6432bfc8d9f8f60bf8876863b6e4b0941ad7e42c279a8e7fa
-	sha512sums = b4dd7bbff60416cf94b8d7341841ca9a5c330345c71202eedf2ea7a1d9500d232d678d334d00375d55041454de286c746b21a9181ad06c8991d4d59b503b437d
-	sha512sums = eac1bbc8d254d9e25265601e3604d66800d18c73669f8f0babc8fde516a1268ebea9b57c6daffff54d51c5133c82158347798437e032bed6823f47a3b669fcc0
-	sha512sums = 61a615eefb2202d194fb2295193f8794f8c5087a6156f5dc0ba6b2dc8bbe9d1a330b9ea760eb5981daf20553a5976365fa598ed38b25e5bbce83dc0827e22611
-	sha512sums = b87952f51881854f841191e58199813f93c5464239af42b284e28ad1701491f580720f70e82e4e6bd373446461850c36033c04466708244f34397c73924af929
-	sha512sums = f7a60f1bdcac0dd6933cf6a08ef049c058d782043fde3d5ce0437955d73e3468ffb2b1a6b7a4da1e4f7fe5354a0c8d96e757848bde234e9b9decde53dba4cd33
-	sha512sums = 48facfcdbcd8ad369c709f72fd6b61120112ea5de400eefc4aa8a2bfbbca2181828a4ea54773758b82bea46a349edbba8085065590ea3661f3266e387996cb25
-	sha512sums = ee04223922c59ceb235da46ab5b4b043d41df67f55151eafb177d412ed5b810366b76c755c1d1e9beb312e42e559e218af071f0b8f1d5fcdb8299047ee7ff9b0
-	sha512sums = c121a0873f1adf03e5ba80c23400f82cf9d9ff88e5925e3eca6e9749b56dc3ade2c042db5fe9a91d31995fe7d1a1ba0b89c0a71e11eaf603d8a5fc1fea525a68
-	sha512sums = de2020961d20072cfd05ff04ad05217002d65ff4e1a24e88379d1c9fdb73da968556b7d76920acb93ef752e9077b5798f90172ce7dfb56514b0f5aef09029d6e
-	sha512sums = 6d16c467992bbb320f1ba6c7866dfa6bc5030aece1c5e09e3c088636e0e9460da3b144017c09dc06d8aa82a37237e3cc5b918d861d267780a8e0e92a54c22b53
-	sha512sums = 63202ee776cade95088a53781022ee049e3ca983d1d2462ffc8170376b6170ad783f51de3936695b319ffb24d439085461f94b354b3616948b748e2f3c039c3e
-	sha512sums = 5c2990028fce9093b4c938606e765827b4b516bb585537043bafd5278a406e4bca2f94964fad0811137f8d63a853c5456ac69823cef49c2cee8062e82557c4d9
-	sha512sums = 75e4fbd7d35c7d4382c0f92ffcdc766d11821e429039cee3976a844ea4cb9b0dba7e18db987aa6c16cf12e2c4aec9752167b6d0ca29145f56fa685ecbae519d3
-	sha512sums = 2e8f8ad0c7abd63c1954d568e10816b47bb4c7a51c8238a247749f823e140447d859e2cc3c937cb1a5c29399a40a7a9f595e5a963c3b8b75e40ea905eb72ac9e
-	sha512sums = a621483763be5cdcb7541b92028563f63ae1e0094a69e04b06723eefdd5758b2e3fc4641418b33944abfa4d194115e1302573b2f6fd54582d3a017fa05281c2b
-	sha512sums = 4f061b1efe7b6beafec882893bfb2d39b3d84cee8a9fce8d1c0d57e7d9792c6f8ae121ed2e05f6f8156a36b3c6f4b4bc44453476b510a5b6a14119f40e0a05ba
-	sha512sums = 7f0e20f2faeffb95f4b4d2c6e8863a210bc5daffed8cd78ba1622b4b4ba390d7532b89dec5ad42514072541374905891c7b6d16ace61f2576947c167c582deaa
-	sha512sums = 35e1a070c7361b99e08cc7440098d0cebac085a4542fa20ee811294cbdb8542269ef78841e86e44daeb6fe35580e637b8dc3caac7fb7c114e73727fb27e7d633
-	sha512sums = e7f831c99ff8384bacd10a649e5fa6ee7926f06eeefb6fc6ee016187808cf246948dff17b005f52fd295035a79d0d50604b7c22992447917c39e724de5ed7208
-	sha512sums = 7af4894b4fe448c2ff58df17f6bebee3c058e99618bc678a9270d20e6b93b8b8d6f8e58c1478e52f77a0b6ebb5d4829e3cc1e9f6becf3cbcc48734cb53096329
-	sha512sums = 5ee924adca6ebc77562cf9353a7c810d4cb8f9c4e1a22eac7d4cf25975e9372d7e71b8a7bdba82692a66b7d17307ff5be7d10965310113737a5dde535446f667
-	sha512sums = 0676b2c4c8e5e076f44feb3cc62eee656376903cc18062dd8adaeaa33c5c5bbc678384796740286b3049aa1d2e543c445f1718fd30e9b7f49e6071d2532d9110
-	sha512sums = 3149f70d0a8b0d1992b057c6416e915fa387d9880ac7df46ee0613d9e02610ac07ab52d64a2548a259a2dcebd327b801e0362a5b27e3f7770a3ca6e508a8c106
-	sha512sums = 9d80879db19f8613d04e0ff15d2ea572c59eaf3c9a999350943b7db34afb985da2e7129468c56584f307ce291ebe7b86d2311bc0d786127f2e227f7c78287426
-	sha512sums = 25419951979253ab0d78711146285f7e5c85683d7bcafd474c752530fc3d380e920d22f2faf0571059388a011a890c2214d91fe0bcb31ae6f0ce131e1bcdab50
-	sha512sums = f9109a1973a99082c19a55b061cf08a483890db92bb2232d90f9b08ef56c9dc5afa084088b31a04ca30e85c32c9793e21c9757106d822f81b62574c3c9f0a8d6
-	sha512sums = b02d032b27d85b820bb2cb11f409f4e57d15e8f32603ed10f0691c6fe71d496b18cea96456e2595e0b0a41e45c798504b079842745082b392bc6e23313ac0738
-	sha512sums = 6f4f7aff59113cb17f07f4af062d9388af490f6bb1fb4ddbbfebc58ff390113b575b08ff6a7267092345bb5a335749fb2f763b0979d8cee5e3a0c905f06f433e
-	sha512sums = f66dfe7cc661d46509003af8aadf0357272554cc5d0a6f102fd59cf1f3888ea38e5d37a40acb5345677120a6393ed054bdaa97fdc27fa6a5b3b683bf462d2791
-	sha512sums = 4dd44f7136f9b7dd4ff32853ab6780a0f7fc99731f8c67ba67bcefc01d17473d59f0f1760fe71832ffe0307b4b2eeb3493b4edb507fc1ed419c47dcd08f65b56
-	sha512sums = a7a41122ea5af5148bba296b6fa20e59443ede8a18cf6218a31c1d3ebf09859d10172f3dd95b4080458d0de1dd3a1cd1b1564cb54527e388818a9c7d4c3f3b2a
-	sha512sums = e8c9ad4bf41530f6015113e42f0fedb05b746f6920ffb73c26620b6db298fb4bb7bf64baff52e2d054b2ea4d1efb39a164c3973b0aaf82a7abb23a5df09a9a75
-	sha512sums = 55b695b99f837449338884cdd64185a68bc8e80c8315548c7aff35ee81dac858cece895cecc1a206edd9eb50b003052dcaf84b1e6b49b7f44669d09e365f58d8
-	sha512sums = 06bbce5be2330ef8e1a3723b227c84edceca7cb421e80484b66053022ac0ac2b7ef3be634bb037bca4f969866c0c910253bfa347b93bc652e3655df6a6b84945
-	sha512sums = 05e6eefb297cfdc8562388305a8bd8ac095a2566fe26bd47b92e43d2c65ceea48ce36cd5bc091a7a2748d3e8a71010bb7f8d9598fa76a15e3a940eca82f2bab2
-	sha512sums = 826b307d3f51b4c9fad52dc51475ec283523a58f5e4ed599d1ff2db7ad2fed6bd7601dfaee6a84939fc40bdea2918c7a0375d5557b4d31cd2af78c750df203e8
-	sha512sums = ac201bfd778e8206446cd2084e9971bae3133b8a86fad8b1ec0391e4435f54d464300e8d693153ab3f490e053725d00edf8f24848ede0511f28a041a166f8694
-	sha512sums = c8f086c3ddaa8761ff84b165bda8f72796580b79064e74c53c133273c5f8e4eb0ce426174a3395bf402e6a0bb4f481e3ced82ed07fd8de1c30f06890fad1b85b
-	sha512sums = 4e8bf98ec7ee79766aca2ddb65973fe48916a84943b6531683dc0e8964c7fe93afbe022b5188e11e22645482d91ce64250e183ba82ccf23f68e5776b5ace01ad
-	sha512sums = 6d174ea91cde2d45078a639e99921056e88f9bd5bc5ec0e037b62655cb4cc798fa55c392b789e6c8ef5ffe914eecdc0b3a1d2878d619ba430b5781a634b305fc
-	sha512sums = fc6583dabdf7558879e5c9a2c2da86d91bcfa39583aeb9dc3de9fe70f69f2945ab9b149f13f024b2103bf9b3da7ac87e679167d3deabe87213da839760b73e31
-	sha512sums = 09413a07437cbe8e5929a23b0317f315e1807750abeba0c809e50ff14953db445d69a88b263efcde267a16db79add7870632e5f70411c98c22af97255678238f
-	sha512sums = e8902aa546ead9a05cba7b5725351af6336f97588b8c73b00cc7bcbd79d5b0358e9d731a8e2b1164d289569cd093bd198f21fe923c51cdd66e15f7341d3e2c43
-	sha512sums = bc3b8bcb596335205b925af5df58625095b896b74504c203c1efdc5fa7ce7e2b0f48241064758f10625a8d340328f34ac0aa6efd4f062afba76897e3449955d7
-	sha512sums = d30dcaa9a11cdd0b3908d209432409e6d46ecd9f8c83d10ba2c016b5fbd8cc74b14d97b20e236149ef6cc8b7c449ff573f65f63e33a72f13c23593a2773d39d8
-	sha512sums = 953f26172c0e0b5dc63fe3e1f4938cdf1f753be8e0b907e3f8934e76ab09dd705c28297da7b049ab01b2b0a939ab522d465408f8fea6b0bfa997972259a2c113
-	sha512sums = e14329c3f63edb2547a92063e4fcfe6622431ac1e0bbcdab68a4523f5faa30d817574e786085b08791f0d2ebcd5198f7d29f4f8c5748f0a87b8798e7dd5bb974
-	sha512sums = f5a1f28ea40fcb422fdeed18d284ecaab69a45569eda1415d976433e6f50fc0f6e1dfb8b0ae4f074cdd6ccf53d6b0999798190e0a953a13d0d93a5c65a3ebfa8
-	sha512sums = 5246234f40c23cd3bf3d132692b6ebd25e5a2af1aafa59c34c99c8b93baa61c3dcfef3ab2dfc53c52c2d6962bb10616dea42514d88e341c5c48be0cd9b66aad4
-	sha512sums = 5020931d834735c3c998ff12f9b4fb876cf175b2405b6a8198ac237960fb68f81a7008bd1862721cffc72e06dd91f76636e68792946bc0a3e7f0cb7e4303a8c9
-	sha512sums = d8bd4a4499805d967d334e80732c1c674f7b7d4420a821b5bdbbf096c9160c081d843e7c7349a64233d3da5bb27fdb3e2fdda11570f2c1c4e08e6e773325516d
-	sha512sums = 4fd4e90a56ea415f6dbd17b1833e2fc3bf4679d9e158109d9695382b0548fce8de37346c411de074c4075f49752ce36cbad9abf0f17c5a282f7ea1b07f2af6c5
-	sha512sums = 96c0b3e4ef20ef29dba1d099e7b5152c3593c746aa05d2bc11b2694f63627d810602fdb90d6e4f769dc847606d565cf9317f3cb36ff74ff1fd1de71316127c01
-	sha512sums = 02df218e0232fb31cbb41ad0da855e8b09b142bfeeb6a6fa73d36b14d4024483b173f39d027e84db8597ec1d647a348902c54e98a80873dd49b0c0319fd3b181
-	sha512sums = c453f43af49a3ada8017ff9c295dbaa3c7360c508fa792d9f110f7913c5642cb0adb5b6d82c04ac4faa31dd93ff43e7d9ec5015adf4008a158626b07cb4e502b
-	sha512sums = 4f262b536d0751b643e879808121aaa95d1300ea47c6e7e6c0727d392902704eb943242307845030434fdde2b868c29f3728acb76222d3d98ccfdd0ad509766c
-	sha512sums = e123b44352e247cd4c82a01c36c8a356fb2a395c98a853ac4d5451e2018468092cba969db76bb2f7832397365c75a6cdb6dbb4f0e2b39c273ffb3b39874a657f
-	sha512sums = 649b42db20470c194b15b03c56e73b6170b8d2d30624135e2949fc9c0fcb96dc8b55dc676559514ca9badd662e900558c274d1c8c6382833ec53ac1cb7a486df
-	sha512sums = ccd84813417ef7d9230a794a4e0eb778a236f6d465a999143429d25b0ad65546faf983f2b52cc192204453c25bcfff7fe33816b1cca0e0b81f52892e6038aa5e
-	sha512sums = 8fe2a5536d144e70b3858561dc19407eb1672aa905eea724f0f8140097659e7c016928b500810c0e5f0eda2d7a1286bb5ffe4501eb9734e26438c6225655b5e7
-	sha512sums = 1ee6f2c2e3d17876fdd28d4a4e311eba9d45f145a1b36b0a84ebf1a1f1ce90807bb76b7449cbe8de21aa045b43c0b4e4f8968f160d74dd74963f7930b47f9c81
-	sha512sums = e49bca267236c7b543c0839d9ac751c23e82947f9df6de9d758c1727d48e9ff8843c2a2f4f94101fb19e33acc6457f72fa9a59f3f4e39e5ec10feb6093732409
-	sha512sums = 6fbc925a94e7343688f38ed2d226e17cbfac82b9cd604d15272e51adc6f1133b9804b53f24921315696031fe9fcd34264242d7808955b714c0ae9025999dd338
-	sha512sums = a9a9422062e42b4ae14d0f7edc641d6014e1c574e537c804f52a61efd7843ef1214a2a462ec1da14f9ed2c03c12607d416d62a4b4873310005f6589a48568527
-	sha512sums = d5b5d32201bafdab4aa82ef5920c9e514b3e52f2d7d05385ebbb0101ebbce382ce8c55522a687d4c896cc4665437b4634da9ed0180661a797c644850d47b019c
-	sha512sums = ec8bbff8278e0eff0f708dfaf6fcfc303dcd99dab7fd343312f593d2e8d8794901578e5a13150a21cef02841db76b486c48c01a126b8717e812d77b094e62d43
-	sha512sums = 6d0be15d5feea6a8e46e892b9b5db2af47d0970c829a6895486c49a0a1aee88adebad54c2ac84dbdb78a80ab05270b7f2744064260c3b96fcab8d7629f0c55f9
-	sha512sums = f6cbed91352c29d618f529cb5ab79ff0acfd236e755641aaece309695e7dac05f4c6beb49b6e54921fc6eb21b22495459cd6e8a84e344e5a7ec1b6314bf1251a
-	sha512sums = 7cada3319b02a338c5f32eabe99be0f9ea35412759614f31ac77d310d6848a6b938143744d40d07721241d438d01781b456bda1781bfb37d4839a540b600458c
-	sha512sums = 64d9a43b1ff38813d567f1c2a5ac48ed72907e1438e76188bdfc22bc463eff887f34f5d1ad524aab77d61e358e5b87ed6f05bd9e9e46d66c03cb7e3c0c980ca4
-	sha512sums = 40852c5f7a2e0cff440ac61cc8d1dd53d3c4641abcf12ba8c87d5a804161c00c7820cdfdf4d3853a145915e0bd2a428a8c868d58bff2377f38c979bd8eb99a55
-	sha512sums = 79cd9bfb6984ae69560c71dc886adc272688871d95a9bb01da2b154671240b1fcd5e837396796d75a9487803d88cf7af484f932f3fb56402f5a2c7dc3d8e463e
-	sha512sums = b4e6018ac6b546bfbc1b788e20192615eb2f184b209b85e2209cf5976f74cd15c9a63c727455d1ca0e6e1cadc36a908b3e4a1a7efb5b0e453e1f562b4bb9a5e4
-	sha512sums = aecf9e0a168e58db338c0ca12830c42d279b77962735b69c1b2f7cd056e7d2cfafff565e3bd5fd3dca26fd30b3d4f83760a6f191155f7c2a8592934b882a6ec0
-	sha512sums = a2d924fb4c87da54b79549a2d77116c2f29fde7b5ecab059dacc83e0deeaf2e78325cf7d7d97047c85bc66afc672c95da2b83504bc12b0aa1500678af460852b
+	sha512sums = 55139776ab58a40f9e1e70613d7071d559ef9e51e32a77791422aac134322c21a49f0348c42813214b69789c589367eae43e16d4ae838a73daf37617e966b735
+	sha512sums = f0cfb67ba0127995074990c71ff9dd8a722fcb89c8f6ec700f35fd5de749dfaea2c4794613fb5b2e0c13b8cd4a82bc26f067b577a3e5a74a60914b14b4c872a7
+	sha512sums = 26e51df2c56e3cb221841dfbe97e0110bd4aef17dc223992271a6217e4a716e0b67ff88f8bb8757c2a0e197cae5725dafbb87dd474d46882507d6e9c23a6ead4
+	sha512sums = 41c6f727660051ea03866d6afa4e799c611a6cce3f1d4765de28e6066c13d0ea1ed7f1d579d80b641df2819cf7c53b736a13be6e5bb5f5c52607422eeb8201e3
+	sha512sums = 6c56e0b11105d642c2b34b29f64a636471d74d4cfa319cf057e7149bb89068519c9941b4fb9a979480f250fae720b18b849c62cbce9671d690f207c1d4e52aa4
+	sha512sums = 8e7b12a59ddd91b73c88e8f4936d382faeac90b9ce915e1f32efafe48ffe217c5abbb834966779e601ae74a1116832a7ca8b383337a76e2c525cbf406e7e601f
+	sha512sums = 03a6449306e2332b439b2b8b8fa8176f0754351c1d773ae54ad940c975b8d8033f77b6cede17230f9a80d31715540fe0ca22a01dc517dc6fcfc18f937df11284
+	sha512sums = 5ac61ffaacf9d31c1c24691b3b7cf5b89df176a2e4e7ad303c9df4a06998a264cdb6ece7374a56abb914558513a553f63980ac6a34bde11919718d57695a4358
+	sha512sums = b2d3616cb006995f3ace570ac8fbd203ce73aa91a7c25507eb5af887256500bf0a1d792e24d562db5995ef968d9c624b2bbbd6222d848f20b342e2437ba2c2a0
+	sha512sums = c97011cdf741b22953493e7f5bd7cccbebaea2d77b0696c6fd54027d5b3670922da14015674d5a9c92c92e7df9f635ca5cc9ffed5da3329eb1886727d7970e30
+	sha512sums = 23c24a2f277d57e330659c26ce3e0e76aea619a6dcc726228c7d6592a5b1c5aa61dc4c7f55c6d289f0cbbfdc75f8b1a143fcd6aa8d197e9d9c7c5bab126a8a42
+	sha512sums = 19231e5e5f19bc3eb921ba7272c4f6e867ad19f94259e16a884ab755bdae8da6ef35274f360552c72e8b41bff14e75a89efe6908567b1d8f32832caed5888864
+	sha512sums = 1b80d9b88ed5f80587e0e182b19d3581ed6a4671e5b6ce78df2c9a2c7eb48e329bcc60b1fe6f29297b5cc537867fdd54c0444c1ee53986d400de4d2f7daa573a
+	sha512sums = 63eb5f4e3e48919be6630d8732a40349577c7924b4ddaf669931ddea89f5c88f56523ad24f16df03669325dc538a1b2b6f271f0858fb5b3b2e6c0d07262c1e52
+	sha512sums = b6d15b8d3c9f2e6b45b0f41657e30ed8b4454a65c1b4395c178d56c1050ccb7c853ecbaca8ba0db24990e5c3264fbfe91529e5daf69b725b9a19ff891413c514
+	sha512sums = cf864b7292a0e34622f532e536eba88358f9be290b3924396730d617c84d440b8f82557766cde336f9ef24f4bee47fea198fc8f6dd06ed8d0eba66b261ab87a3
+	sha512sums = 8196a95a830360c10d8c92ce905a12872fde802de83d1a1182cce91da3c8fa6792b99e26b57cfb6fd8687cfec6c5f71733363a6a14a1e223211b7355a5b30e20
+	sha512sums = 8351e50886702b7798ed153e2b90349ecfc62e32d5f223b10d95574fd0bdf3e2ce283f7b765005cd689f6a488f9cd26adf7c815508159f447b1cad7d6d1cebed
+	sha512sums = d321ddc7e003c9a21185283a36eb719ce54973faaf822b43e88f33a9dc64382d57b98d5068d0ef2fec5c2fbde825ab5c1d006eef5610a9b5fdfb2355a605d013
+	sha512sums = 6ab2fb94b45d9931f3ee7e1323526760f21882432f546fb9d3e04216ddf99434da6596d8cdbdfdf46d07ea7a6e2a03691e1122c49f9462bb9bbc62b10a634043
+	sha512sums = 3d54eec19d4d875d792ddc100d5d90c070b485d5b46365411b618db891d7eb979d7edf23809d25559bfd46a1a989ebbd3e811d5f33f72547cc7892711440138f
+	sha512sums = 5f6edb6019a1632e36310aa03f8ba5884909a464130eea4fc3fb2b51cd1272eb6fb5d32d72abee22cb1193a8d01d0e9b4e5f831ace4eee3843aa47ac3520dc2b
+	sha512sums = cb0a8d61e4e6c89dd6f0577e62acb0c886eaf0f1a13903fb846ae8e6953a6317ac3f443fae8bd43ce0f742dab51935a614f4a6ef316b47d02a1d3adadb420098
+	sha512sums = 10c6d3f0f5dd1e5ef50404540c9fa51f7db331421f924a53d10987e7fb943c0d8e1b1502c8cc6d82090811fe50af6282d422eb5dbd719b442502898b7fa37cbf
+	sha512sums = 006a4ded4d8c06449f524a14ac2a8e7bdfefc171e7e630e06c380c56898799b63bfecfbb5536118b1648f883ffa1b29d452fcef733cd9c33b40fc64eeadd7cb8
+	sha512sums = bab6fac212cb334c176b5a5066e20fe42043ec0034cd73411643bcc1f2451661d35645199eba16ccd06c6a9684855f0ba20136b45adc1ec34a03a486d4b310ad
+	sha512sums = 2f5e542d145976d18478323ea64c4755de17271030e7674295634cef3c2a3b1c89c205530ee869875e5ce462f07c10d6976013046351e261e2d6e717cef28d67
+	sha512sums = f7d386022831d80974983dd670251a42e1d649b14a0581458ae8f6c472b69c33536ffc5d09d700cfb89b24b517a8e0981d91fc356712414995240f36ca84155a
+	sha512sums = 6ca5485f5a6fb9bc3aa0d6fa4fb96598c6a642dd6ad3f4566d1f3183c584d3983c14d763fee6aa01429e4e204999da7cf8b684292eb7fa528374915a3117e1ab
+	sha512sums = aa43fe53bff733b7acbebaea24fc74df1968c51577dbc8176b363efc5087b1a4d302e30d2b1a606a4db5863894cc73ef7293df6f1dcc61eb94ebfb67b5630a6f
+	sha512sums = 09b0d97269cd9d9d63408cdc34d7600a743150cafdde8ae09c0d0569988c466d6a481d4c1caf57b1e8a9034a01afc3580621ad1bdb8bb0b113c930045ed737e4
+	sha512sums = 62f1f7e1eb49ff8bedbd3e54c33fb3468c63de909b3d9754d1b2e46b7b14e2eaec483f03e8a45eaf3599af3b304054862735d38e22659437cbafe39d510d553d
+	sha512sums = d3cec955e9a2ec8358df5110d38254fc09fd2b67c9c4363691f69c9cfd3f435d3eff861cafee1c27cfb22182f53dde22b27cb41d679292555e91ee2201b24176
+	sha512sums = 0e0ff5f38bf184db1a5553dc95b6455a3564d1273d21f41c672d80f3e98b3fa7477994624864d23c363ddba3a29c418a1025c32942d7d2e40ea38e930679cb09
+	sha512sums = d3a059155610009ec18a92b260e616d57550557c871f0d1d1b73e00ce8cf9883bb968e957cfd40d494cd3a93c32b8bf3494c0e1b49229738d57d4674443c14fe
+	sha512sums = 17bd36cd016441e70601fabb3b08a7ed56d8a38f42b42bf43913b0a4913a47a4beed45ebf89e33ee17b833f13fe26b5abce2effa6343d21b3d14283c682c18c1
+	sha512sums = 3db56ee71963bae7eb187a1b9c7c0e6e346227601b1624e0e83308da5c3e4c4cf78ce2d7453f58c66bcb35aa0810dca9d561bf7f63ebddbc52063da0301c1839
+	sha512sums = f5e2239ed4de3157647b742d518acbbb06b041e7504174b7dd730d269a69cf97a03a4d13e86afd570fffe0546fda83084c7ad8faa7d2878fc7a632cc20ba6f6e
+	sha512sums = 82c9eb8ab7238ca1ee8e884445aab8d6bf20e4a6fed96278874e23494b138b51c8bda65ca6b7d14f309f011d182c33ce7a10c75c931cd170e03960193e374378
+	sha512sums = 5a3cfe5541c72fe0c6642930ca9854ee84bea11cffe8ce84027a71ac9eabb1da11eca49bb0cfb43dd9a80923e8fce43aa96e2390a7910aaa7f56f8f9662f7094
+	sha512sums = 8fdca783601af8fb606513947beaa41292d2282c3273c82ca80efe8f203b37ae3213f2a44ed660fb55aaca44c9322e8c6f1c8713f8d2dbbef5859ce66daf0848
+	sha512sums = f5d451b2cb865447dd4720d99c0bb84054e4043601ed43343309c7f4e3a13fd58e158549100d3ad6c9061b0cb016ee09993eaa832c527eff40d70bbb0a80c858
+	sha512sums = 9bc05b7abddcee927eefc7a5e03507006eba5103d370474f04a27556a2d4bd2ab9e1abdf223b274794c855d4ea15af9e7bb53dbf6ddc3500bceaa43772aa4317
+	sha512sums = 0e7c6eef21a78a4acf7916bde9dd4916837a7946560f0507630585144dedbb58394def311bb8541ecc2d790bd99438865ea4ea3877c0dc4c07321894c7e1c41c
+	sha512sums = 3bc90cefe1e373a29e26513276a3523663d4478b26c6c44db21a2d0800aff3e8604f202a1c21a3223b10c3fb819f2a5291081211a760021f74622cd3db6cdd20
+	sha512sums = 758be0f6cd6d1783eaeb80fe68776972915a0b86a507d060b317fe03be635e28540503f75809c25e759ec9f8ec197febbd3557b6dbf918b53f128a9b836663f6
+	sha512sums = 09a979c05a8203dad129456f1cb639e2aac3a1fdcdfbdd96c60821724a0989ba9f934b0c86fe0149a002cd4e40e87588741b2e742e7c2480341efeeded008359
+	sha512sums = af2cbcf9bb1a73ab4548b6a769bb6d85ffa1ac76509c0d28647fe98708bec302c82aa0ca5c8c4729073ea89e8974b4f7fae90224c3dfbddca55a72d2a53f6ea9
+	sha512sums = 9ec71c28cdb3cd4b71582e851035657f2d69f8d7da7b8b4ecf7fe3691c7f268b363b86ba6dbb3d972de454f4134ba809afd0c9969bc9db028c0e3611be72771b
+	sha512sums = 99b43630f06126d7780d80876c85ce566e10e8c4b01a208fa9095de4910d012dd2d73b415f2b1d9585640f8b6ec456050d92723e03893b7ecd0e7ca723c32f2a
+	sha512sums = 1d68d6adac2aa3480d804e5468043ca9f225c0d3ebf8d58349072ba4636aa7663d15bb4c72834326f73e146dac9cb57074c758b2d2252e1db2c2a886f47f31bb
+	sha512sums = ae2665aa94448fca188fcd02260b76f9a151935d49e60bb6618bb8104efcc7913b2c9baa563540d9ae9af48c55b7fafe8b07c59eab86f558af957527185d9214
+	sha512sums = eaa428695422df02bfbfd5dcec30375dd1bbd0f38b05f08b376788d22944f02af3b1cd205e96731cb78a32b7a262286380a568ab81ab385acf358d8e3f1595d1
+	sha512sums = b10268ab74c988da9ac6dfe36e639a4103e32bfd6aa317595fb08137ad34f3e200c61c00ce6f796a4dc3f6aa72032347f14cd70e01ff36638c544dd7f78cd849
+	sha512sums = bd091940af14a616c2d3d159a1fd4caa7b938eb2ef4b947652eec8cdb2ccc7e81c02d0c70bfc0062c9d8e6e5e86a305e90cc9bbfe1b4ab0aa108a4037a5a1812
+	sha512sums = 542116ce563e2e4228d3a1dc7a8ff985e43966f668ed008249f313cb93e4f2bbb4297395337dcef660775c419db2443ada0dae9b2d73f1d2e0d5c235ad57b2ef
+	sha512sums = 64a45f0e0c144e80a2de9250fbed4e5e8870e6a80d29c2190c6ffdb997bcdf8ad1f06fa0c5ebb264ddf2dbe68de9a015c9606582302de102434bf1cd8a57d188
+	sha512sums = bd4cb8ab81cc92b32aaa49679551b212b5965c11a6bac92cf127b481e0d0999d8023068f7c2d4fbc30ef91ff024319dc73b61c20e2cba94efcdcc83a684fc7fb
+	sha512sums = ded210698a47892484e12eb016b493578f0f2932b372475fd86eea6d1ebffd411855961b04387f8e3e2a6dc40eba9aa8c7820aa0e76ee11b1436a0b9560ac959
+	sha512sums = 69766fc79023a261f958dca1c370e3f097cf2fdf6a8ef1ea3ca572f78170d3e71bad739d0d469122b2955992b3b7177cea34865eefd0235907e8a4cf936f119b
+	sha512sums = f85708ea96b06fd2acf57a712e868228f8d80e7dd0fe72c5916cfd91f383ec091dbc7da714559c37848f4fc1d00b9c45700aa15e8ca53899c1a156bb307691a4
+	sha512sums = bc312860f88f120c1ca28d9982c37131e92210f09e097cc21ad245b5168df46714886a3dc13969f619bf205413d6224ecdb4fb0c894b6b12920ef983ce24006d
+	sha512sums = a591c1c937bc8d6cdb744636bd2e347cfbceba1bfd4ee23e450373fcb37c4827230814b739dcab6dd1e199520020e823db36d25f2576e6cde4d1a0bec66b878b
+	sha512sums = 34c2577f535b79f3ad44fd986de8ef89e66b0a43091d5e171e21ef3e3ae32883a7d8ea0de0e23c50480b814ad3bfc15be30a8cc38c26da234a8df1c1d059a9b8
+	sha512sums = 705d984f9bd265ed497a6e6b2a3baa0f247d5310a909ee86e60802de5d3c6df36464f5b2cc0ff8946a9e90d4ec8f98151352a79cabe487384ad00f81c89fd9d3
+	sha512sums = 224b87b4a5b64a490f17cb8df750d4a5a71dbf0edfcb0be69f9cf3c305c968bfabdef185dc32b0658686a8b57129abb5fac5bc48a1fc7cb0634b14b83a8ccc13
+	sha512sums = 477a884ea80ec894dbbb4dd69f0ae981c0b7537268938aeba6fb103ebb7fbfcb0bd3099227b81583f65417441e8218ce12d4d109af5b99c164502a67cc902144
+	sha512sums = 1c2e5d196076cec19a409b655fa298406230f02631bf75445eaebc2605ea0c28fb4572a436b7be82e8e7f2f606135760230518381dc5c983ed2c294e6b02aa1f
+	sha512sums = 36af8b7e51a1d0d9e03d64ccf49caff8d3afefac1d2fb75712f09e1544549d36cda903d9029a5552189a4474b517fe8c7d988b6047758b9ae39a9a7b1a0f3ebc
+	sha512sums = 63649fa9edfb4c717020f6b425800c5fa300ecceea8509706143b9fdcf3032711e6ae018e2ceeb2adf409942a992561e840eb094f09e359507910b742179291c
+	sha512sums = ed181186baf02cb4f176cd5c90a83d05011a373b3cd3d977aa2e23b8177eb0712a86630ab881c609cc17d59803776c535a83c6ff8c45fb274dcfbd4eb2a6e402
+	sha512sums = b4ae314acdd382e5a96839a711fd66985cceb0bd74a6b0aef159d50b86e03701029681a94811de8be36012d2fcdaadafbbf3275e89e065fd96c87f52c76e05a6
+	sha512sums = 9e506d09e8f1a2901f8333f60888f711d83f8f454caf0ecf842396fa7a918db68ab2908b9b396003b2d554503a956c236b979c0fb535c7eea4ec65e7ad50c717
+	sha512sums = aad88f476a8e025ca021567a0bc06228c36594677f3994d61aa9fa95de77f2fcd4df2f5a47315fde8c3cd08012684f1e7ddaa29531951d831b7e98eada096d01
+	sha512sums = 5e740bdc4bf657319e8ef9b13aef2e3f1f2999ddd86c53d16b40b6135b9102efe0236338b3e67ceaecaa884c490e464028bead43bc0bc76a5326098853c66e0b
+	sha512sums = a942ef01e9784017756ef239332ac763f74d14f546aa7706813543d76c735564b23e1b2156b50cefa78774095d04dc7a7ab201b5a635ad495d60db543225c9f9
+	sha512sums = 10bf51d31afb2f5780b7d97501f7931c4bd7844c852a750f95db4c0314f139d9cb703833106214d13f3301677357b5ed9b23d7d0d549a598e7af58caee72cdc1
+	sha512sums = 83e16a9f40d96e88cc6ca0cfecef46386a0fad42c1a283b1a391e5be50825448c0d711c36af9fdf5d9d0c17c9ea5d6618a75fa0a69bced702911c705bbe9be0a
+	sha512sums = be9fab09e27c3d0e0df4686933a133897e7eef7141095e27b3c7991deac2a948859f582334523438d4a65376086b89a6a4ff34582a20b0d46fe01677610eebc4
+	sha512sums = bbc2b8cd47c0dd902ddf75a64e469fb1eece28c71eaecd100e0777e288b48603a496b3608fc0f52ce78c51cf4fe7554e7bf7bcdda9b1a89fa7f5ccaec94873fa
+	sha512sums = 66229c6f3bf9a7f99595b7bf2e254f8ce4519c50c7dd3245b7c61c721dbd3cbcc8a3279c289f9b00f6c4f603379de91fe99425a537ff3176eadf55b9cfc8946f
+	sha512sums = e50eb2ff2a54217e20bfa030784766fabfb19cdc020b817631eefdd81e6b46a31b42dae4ff828152ead8620e4af3a77a3e73e32729691ad98ad906f35ed26f15
+	sha512sums = 8b5385f434300eda9dead082bf15fbff59f985b1b43ad2c2a14a4d292f2767a7a5e0a17a474e6f5c3bf8d7afe4d0fd7ccfbc6e86fc325f231747d441eb726e02
+	sha512sums = 4c2d8ed24f0a60f63f6b2d6de06c00f6ff6341f0eeafdbadbff6420d155004d9056cc1ed85bd56bd53c41b3cfea54c9dd798307b6cd32d492f7d5abc911b255a
+	sha512sums = e6e439a611cdb5389a255503a6f54cdc9d67fe0ecd410f2a009e16386abdcceb04e8b260b131a094de82ae1dbfc222a0a215570d9bb50156a6ae2f7840d39cab
+	sha512sums = 3d601e605747a8c8f4be163f5c74db1800b0247eacc1794dc1241c70feb309dc5a35c30408f508a8c3200ff5f0ad7781564876063c09d16d3d50c8992a1bf957
+	sha512sums = cdc167038762a7d12dbb42912eb8def746ac682881af60b43f4ded9fc4ce1aff0c06a761a1ffe6994029dbde6689b999f8809c0396b40b64d8505ce4ed9ef032
+	sha512sums = c053dbfa6bd50a7b734e9d4365273a10986b655508c8c01f00c513e20c1a2b859b8d0a05c56d64000eb44470058db1243ca66f09064524e6a4d4f57b64580762
+	sha512sums = cd6df02ddf052ae0f4ee22fc2343311b90f1af49ef92eed9cc7e0d251d310fc64c6e78cc552840c6e99aa86b5cb9bda92b038235ced3203f6752507bf818ff38
+	sha512sums = e9bce0c1f3b9c65ef486dd084b380a260b3b004a8f9f9b861147c9da7be822c78083bf89790bc39f791be67e6d23a32775e061c0a4c531ae010bece1888b0f47
+	sha512sums = 54903be20d3ee706bea2ea814ea9dab8026f5f81367ce3bb04bbf04e60bb83abac70a0b31d99c36c05709acce94ef8f08da402027374b0b648fe474cd94e8048
+	sha512sums = 6cba19596a67d77cd3cbd2374bca4cace0ad3062289832c62fddf37366c2f32d67b13ccb1f49efb2e24749effcea4ad446d46dad2a7279196a3692538367ab24
+	sha512sums = 926431b225a737763761558bdc0e20c59085ac3d7a719ace7ac24c5cd20700fbfa2b57a1291879c6087ee5956409adbe61ea477a0aa7ac6d5bef57aaf5d139a3
+	sha512sums = 64fb10774ff20a0bb064f6d2a2f4beb8ec83e78cd184661c154778c9ce0d701fd83596ad94cafa82c3c9d7799b3c8756418951206a9d3a010738be96fa655023
+	sha512sums = e93285bad68022a6aa74d3b42550b7799b9b5b65a0a40bc001c14bd88f471ca2d78a39d852c2331cffe0d05d5d8bc18e1d1779f29052001389b88cadd76de031
+	sha512sums = 29b16193f9e01e2b7e5cbfa8894d7b44cea6dbdcce11b0be764aeefd83d0a66a20a5ec7f7e7368351b4c9ea8c759a504c392df98e3771f8dbe719797b406cd25
+	sha512sums = a8802bfc661db74da05d996d1967328e10d4cd787aa576451a2a7f6c5b2a2edc72aeb3ed986ae0364056aa1f11670a48abe0ceae7bb073fe39d0ee4704540ef5
+	sha512sums = 1b444ffe1ccb79e7b794032367ceb998f31cf7c3d302636b774681147a0db8b8d53ca5755094177e08f4886a5436e753ab3a632e3bbf97d780e05f19d017767a
+	sha512sums = 0953789fba110e76b09c1a40b05e22ddf1c723379bd7d93979180c0f83e9b6553a3a3d87a1a6a5834d46f33c93b408271cf5bbf47c6e6e28cc29a35c6b03479a
+	sha512sums = b6ca7628cc26c8115462accdac8c033ff9eaf4188e9350b18de21c126c9774ad41adfd4fd0660c0f89b0bb160481174b22274a87c48fb98156081cca76c30ca8
+	sha512sums = 784fc12065cd2eec1f5990bcbe90ead94cb7d51a15c32cfa7e16e9e18751ab67d026fa56414be8f992a00e80b333e28d77108e7c563ebd657ddbc54e1d47654f
+	sha512sums = 712ba4c9690535e0b3c93c9fa12689d84dc5b508074fc5aeb074072a96514826b41e8d269d5d38e5f2c25e10000b072fe2e9f675d899d63f5131f2e13684d7c9
+	sha512sums = 35f7f7b697156fd18e0ab80c9e8b1f23763732f14b278f7395377add69646a1a7abe2ab760684dd3d8ef5dd37fa0f3c78b19f7d3fe5c7be120c3406b7382f70b
+	sha512sums = cc578d556bc82247d28742eb2b8d8ddafac3e02af7a4effcd65528fd63b512cede85972102aef21b323095687c59da70904c5946922d3b6012ce9b9ce3c4e54c
+	sha512sums = 26c8ec091b32da935f1f8e56ccb33081beb7e30f27963107388c8490dfd321516908fe1f4d43b216591276cf484797d16ac15d16599e04e05e5545e4fd1979c0
+	sha512sums = 41b92e526c4aa9c90b3a9129133f6f5c264ec41806178d35e864a2c93c0c5d7200a2443c82ef0c02af453074f86463589eaa809b695996eb14b4b99aaf18f64f
+	sha512sums = 233f271511cc1475fa019b0cc0ebbf8a40209a65be9bb1b1245aaf237a5e44f9acb073b066d4bf35f25655db7a73fd21f7d08cd1e6219d2931053f770e64ae4c
+	sha512sums = 5f1d743bb9aab98eea8ced0e1c179ca18046a99394da34b7529b5ba41b197b657d71aa7993a8bda8604c1b6ae20c4e95881307dce9a9805ca78ffbf537c6131a
+	sha512sums = 305a8cbf21b63d230ab7e7bad5c796192f9056477ecd944e9f529afcc13d4cdf5f36285f819220e880633d759ee3399bcc48fc08fe5ad31de538c1f991c64c04
+	sha512sums = 942d6d7bbab6684d60c63ec77bfc380da8c0cd9f7be8ddba176b5285af770a518be073abcde92e0bb12ace96082643010c45c213b1dd2e8033a73aa2bc886ad1
+	sha512sums = 8799bb502dd2eda984b71ca3b8b873528863b698c615c217adf5ca5491b2223775721aa292d4d6e1b22b30a44554972bbd062df9f07f879d041dff9020dc9166
+	sha512sums = df578a48589968bf5c8e1afa3b4d9fca3674ea19d9cd2b4b42ab745cffe0dde611ecdd2517a85a2ee26cfb5639423a1efa4b57746688952f48014af02c5d3d49
+	sha512sums = c986f5ccbf19a26758f49c87e11ba45c803d7b01b54927e9b0c18a16bcad0c2886d910480577cd5470e5e7a63f232300658ae2826b07e9bc38988c63d4e7bd5a
+	sha512sums = 4e9e9e2a4d08accd6641b6266caa47f12bd657bb1a7291a20b360c1b9d6c83d320be3fe475bb6b62bc172a14fe684b3ecb6ad7a8dbb0b391660bc3c30bd66347
+	sha512sums = 552d1bde7a7e93b8ee35218d51bcd30d8e8e3e23287d02b157b17a7f4f5b6eeabcdefd412f08f25e8028dc7c0f66a938ae6a855675277e787aa1f3a35abf4e58
+	sha512sums = c0b00680c41b4f9cd9e5fac6b33eada3565c4ed45caf16a2d0abd7b02ddf70b30c0b425919abf2eb6fa22a46416b69073ad71c6368fb699228f4a3f21f2c36f6
+	sha512sums = 6f689a54ac0dfc09dbaba5693d484d265dae7ef92887ec5330bd3fdca90c2af4b42a6d2c79074f09510bc643dd22048400b5f65918b4ce880fe01da36f5ecc9e
+	sha512sums = e48cd4f4de571784ad172f592c710ef1fdc5f72c426951252f32b4c7fd33c7dffcca0208a188903e48c0fae568d5c4d1de47d32492aa7511261e20f1e4d8558c
 	sha512sums = d0fb7f0e1a3d98a170ebea301226ad8caa7ffab9fc0bee224abc31c22875c892b43d3468dffbdd15eb71ca1b5260e039d0fceb21ecc92341b9bb6949d7e9be6a
 
 pkgname = mingw-w64-python
diff --git a/0001-make-_sysconfigdata.py-relocatable.patch b/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch
index 119d5ccdd53c..19ba00d56d62 100644
--- a/0001-make-_sysconfigdata.py-relocatable.patch
+++ b/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch
@@ -1,7 +1,7 @@
-From 601fde65f126300e8fd67ec491cbbbf4ecda0571 Mon Sep 17 00:00:00 2001
+From 6ca397e7d4776d652e039ed57779ed4d0d4e7898 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:10 +0530
-Subject: [PATCH 001/N] make _sysconfigdata.py relocatable
+Subject: [PATCH 001/N] sysconfig: make _sysconfigdata.py relocatable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -9,11 +9,11 @@ Content-Transfer-Encoding: 8bit
 Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 Co-authored-by: lovetox <8661218+lovetox@users.noreply.github.com>
 ---
- Lib/sysconfig.py | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
+ Lib/sysconfig.py | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
 
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index e3f79bf..505d538 100644
+index e3f79bf..45eab2a 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
 @@ -2,6 +2,7 @@
@@ -24,7 +24,7 @@ index e3f79bf..505d538 100644
  from os.path import pardir, realpath
  
  __all__ = [
-@@ -413,11 +414,29 @@ def _generate_posix_vars():
+@@ -413,11 +414,30 @@ def _generate_posix_vars():
      os.makedirs(pybuilddir, exist_ok=True)
      destfile = os.path.join(pybuilddir, name + '.py')
  
@@ -35,6 +35,7 @@ index e3f79bf..505d538 100644
 +            'INCLDIRSTOMAKE', 'INCLUDEDIR', 'INCLUDEPY',
 +            'LIBDEST', 'LIBDIR', 'LIBPC', 'LIBPL', 'MACHDESTLIB',
 +            'MANDIR', 'SCRIPTDIR', 'datarootdir', 'exec_prefix',
++            'TZPATH',
 +        ]
 +
 +        prefix = build_time_vars['BINDIR'][:-4]
@@ -55,5 +56,5 @@ index e3f79bf..505d538 100644
      # Create file used for sys.path fixup -- see Modules/getpath.c
      with open('pybuilddir.txt', 'w', encoding='utf8') as f:
 -- 
-2.32.0
+2.33.0
 
diff --git a/0002-restore-setup-config.patch b/0002-restore-setup-config.patch
index c268c922cf92..ad65a06daa2b 100644
--- a/0002-restore-setup-config.patch
+++ b/0002-restore-setup-config.patch
@@ -1,4 +1,4 @@
-From 65c19d285901d1791ae1bc3628550c9c4db948c1 Mon Sep 17 00:00:00 2001
+From 2a25da9a573828b206180522b02633a1a128a2dd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:12 +0530
@@ -12,7 +12,7 @@ Subject: [PATCH 002/N] restore setup config
  create mode 100644 Modules/Setup.config.in
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 2b68571..f738b3b 100644
+index 6ce7a61..e8e8e71 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -714,10 +714,12 @@ oldsharedmods: $(SHAREDMODS)
@@ -78,5 +78,5 @@ index 8fe5fa5..6ae56e1 100644
  mv config.c Modules
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0003-MINGW-BASE-use-NT-thread-model.patch b/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch
index 6f354d35383e..5071799b7612 100644
--- a/0003-MINGW-BASE-use-NT-thread-model.patch
+++ b/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch
@@ -1,8 +1,9 @@
-From 51eb50d174eed9942b5edb3f227e1866d9eee092 Mon Sep 17 00:00:00 2001
+From 80666900d875a95b06f1baf7f9c57a38e4831764 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:12 +0530
-Subject: [PATCH 003/N] MINGW BASE use NT thread model
+Subject: [PATCH 003/N] build: add --with-nt-threads and make it default on
+ mingw
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -10,11 +11,58 @@ Content-Transfer-Encoding: 8bit
 Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
 ---
- Modules/_multiprocessing/multiprocessing.h |  3 +
- configure.ac                               | 94 +++++++++++++++++++++-
- pyconfig.h.in                              |  3 +
- 3 files changed, 98 insertions(+), 2 deletions(-)
+ Include/internal/pycore_condvar.h          |  10 ++
+ Include/pythread.h                         |   6 ++
+ Modules/_multiprocessing/multiprocessing.h |   3 +
+ configure.ac                               | 101 ++++++++++++++++++++-
+ pyconfig.h.in                              |   3 +
+ 5 files changed, 121 insertions(+), 2 deletions(-)
 
+diff --git a/Include/internal/pycore_condvar.h b/Include/internal/pycore_condvar.h
+index 8b89d70..dd98245 100644
+--- a/Include/internal/pycore_condvar.h
++++ b/Include/internal/pycore_condvar.h
+@@ -5,6 +5,12 @@
+ #  error "this header requires Py_BUILD_CORE define"
+ #endif
+ 
++#ifdef __MINGW32__
++# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS)
++#  undef _POSIX_THREADS
++# endif
++#endif
++
+ #ifndef _POSIX_THREADS
+ /* This means pthreads are not implemented in libc headers, hence the macro
+    not present in unistd.h. But they still can be implemented as an external
+@@ -37,6 +43,10 @@
+ /* include windows if it hasn't been done before */
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++/* winpthreads are involved via windows header, so need undef _POSIX_THREADS after header include */
++#if defined(_POSIX_THREADS)
++#undef _POSIX_THREADS
++#endif
+ 
+ /* options */
+ /* non-emulated condition variables are provided for those that want
+diff --git a/Include/pythread.h b/Include/pythread.h
+index bb9d864..f1e52c6 100644
+--- a/Include/pythread.h
++++ b/Include/pythread.h
+@@ -8,6 +8,12 @@ typedef void *PyThread_type_lock;
+ extern "C" {
+ #endif
+ 
++#ifdef __MINGW32__
++# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS)
++#  undef _POSIX_THREADS
++# endif
++#endif
++
+ /* Return status codes for Python lock acquisition.  Chosen for maximum
+  * backwards compatibility, ie failure -> 0, success -> 1.  */
+ typedef enum PyLockStatus {
 diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
 index fe78135..344b76e 100644
 --- a/Modules/_multiprocessing/multiprocessing.h
@@ -30,10 +78,10 @@ index fe78135..344b76e 100644
  #  include <fcntl.h>                 /* O_CREAT and O_EXCL */
  #  if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
 diff --git a/configure.ac b/configure.ac
-index 6ae56e1..005fc8f 100644
+index 6ae56e1..d5766cf 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2040,6 +2040,46 @@ then
+@@ -2040,6 +2040,53 @@ then
  	BASECFLAGS="$BASECFLAGS $ac_arch_flags"
  fi
  
@@ -50,24 +98,31 @@ index 6ae56e1..005fc8f 100644
 +dnl are responsible to update configure script to avoid thread models
 +dnl to be mixed.
 +
-+AC_MSG_CHECKING([for NT threads])
++AC_MSG_CHECKING([for --with-nt-threads])
 +AC_ARG_WITH(nt-threads,
-+            AS_HELP_STRING([--with-nt-threads], [build with windows threads]),
++            AS_HELP_STRING([--with-nt-threads], [build with windows threads (default is system-dependent)]),
 +[
 +	case $withval in
 +	no)	with_nt_threads=no;;
 +	yes)	with_nt_threads=yes;;
 +	*)	with_nt_threads=yes;;
-+	esac], [
-+	with_nt_threads=no])
++	esac
++], [
++	case $host in
++		*-*-mingw*) with_nt_threads=yes;;
++		*) with_nt_threads=no;;
++	esac
++])
++AC_MSG_RESULT([$with_nt_threads])
++
 +if test $with_nt_threads = yes ; then
++AC_MSG_CHECKING([whether linking with nt-threads work])
 +AC_LINK_IFELSE([
 +    AC_LANG_PROGRAM([[]],[[_beginthread(0, 0, 0);]])
 +  ],
-+  [with_nt_threads=yes],
-+  [with_nt_threads=no])
++  [AC_MSG_RESULT([yes])],
++  [AC_MSG_ERROR([failed to link with nt-threads])])
 +fi
-+AC_MSG_RESULT([$with_nt_threads])
 +
 +if test $with_nt_threads = yes ; then
 +  dnl temporary default flag to avoid additional pthread checks
@@ -80,7 +135,7 @@ index 6ae56e1..005fc8f 100644
  # On some compilers, pthreads are available without further options
  # (e.g. MacOS X). On some of these systems, the compiler will not
  # complain if unaccepted options are passed (e.g. gcc on Mac OS X).
-@@ -2158,6 +2198,8 @@ CC="$ac_save_cc"])
+@@ -2158,6 +2205,8 @@ CC="$ac_save_cc"])
  AC_MSG_RESULT($ac_cv_pthread)
  fi
  
@@ -89,7 +144,7 @@ index 6ae56e1..005fc8f 100644
  # If we have set a CC compiler flag for thread support then
  # check if it works for CXX, too.
  ac_cv_cxx_thread=no
-@@ -2178,6 +2220,10 @@ elif test "$ac_cv_pthread" = "yes"
+@@ -2178,6 +2227,10 @@ elif test "$ac_cv_pthread" = "yes"
  then
    CXX="$CXX -pthread"
    ac_cv_cxx_thread=yes
@@ -100,7 +155,7 @@ index 6ae56e1..005fc8f 100644
  fi
  
  if test $ac_cv_cxx_thread = yes
-@@ -2210,8 +2256,8 @@ dnl AC_MSG_RESULT($cpp_type)
+@@ -2210,8 +2263,8 @@ dnl AC_MSG_RESULT($cpp_type)
  AC_HEADER_STDC
  AC_CHECK_HEADERS(asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \
  fcntl.h grp.h \
@@ -111,7 +166,7 @@ index 6ae56e1..005fc8f 100644
  utime.h \
  poll.h sys/devpoll.h sys/epoll.h sys/poll.h \
  sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \
-@@ -2225,6 +2271,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h)
+@@ -2225,6 +2278,14 @@ sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h sys/mman.h)
  AC_HEADER_DIRENT
  AC_HEADER_MAJOR
  
@@ -126,7 +181,7 @@ index 6ae56e1..005fc8f 100644
  # bluetooth/bluetooth.h has been known to not compile with -std=c99.
  # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294
  SAVE_CFLAGS=$CFLAGS
-@@ -2422,6 +2476,10 @@ fi
+@@ -2422,6 +2483,10 @@ fi
  
  AC_MSG_CHECKING(for pthread_t)
  have_pthread_t=no
@@ -137,7 +192,7 @@ index 6ae56e1..005fc8f 100644
  AC_COMPILE_IFELSE([
    AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])
  ],[have_pthread_t=yes],[])
-@@ -2452,6 +2510,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then
+@@ -2452,6 +2517,7 @@ if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then
  else
    AC_MSG_RESULT(no)
  fi
@@ -145,7 +200,7 @@ index 6ae56e1..005fc8f 100644
  CC="$ac_save_cc"
  
  AC_SUBST(OTHER_LIBTOOL_OPT)
-@@ -2897,10 +2956,15 @@ void *x = uuid_enc_be
+@@ -2897,10 +2963,15 @@ void *x = uuid_enc_be
    [AC_MSG_RESULT(no)]
  )
  
@@ -161,7 +216,7 @@ index 6ae56e1..005fc8f 100644
  
  # check if we need libintl for locale functions
  AC_CHECK_LIB(intl, textdomain,
-@@ -3232,6 +3296,11 @@ then
+@@ -3232,6 +3303,11 @@ then
          CXX="$CXX -pthread"
      fi
      posix_threads=yes
@@ -173,7 +228,7 @@ index 6ae56e1..005fc8f 100644
  else
      if test ! -z "$withval" -a -d "$withval"
      then LDFLAGS="$LDFLAGS -L$withval"
-@@ -3692,6 +3761,15 @@ else
+@@ -3692,6 +3768,15 @@ else
  fi
  
  # checks for library functions
@@ -189,7 +244,7 @@ index 6ae56e1..005fc8f 100644
  AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
   clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
   faccessat fchmod fchmodat fchown fchownat \
-@@ -4613,6 +4691,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include <math.h>]])
+@@ -4613,6 +4698,10 @@ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include <math.h>]])
  # the kernel module that provides POSIX semaphores
  # isn't loaded by default, so an attempt to call
  # sem_open results in a 'Signal 12' error.
@@ -200,7 +255,7 @@ index 6ae56e1..005fc8f 100644
  AC_MSG_CHECKING(whether POSIX semaphores are enabled)
  AC_CACHE_VAL(ac_cv_posix_semaphores_enabled,
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
-@@ -4646,6 +4728,14 @@ fi
+@@ -4646,6 +4735,14 @@ fi
  
  # Multiprocessing check for broken sem_getvalue
  AC_MSG_CHECKING(for broken sem_getvalue)
@@ -230,5 +285,5 @@ index 6358e56..5f63cae 100644
  #undef PACKAGE_BUGREPORT
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch
index bf0b6159c7ae..8ddf9cb8b8d1 100644
--- a/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch
+++ b/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch
@@ -1,4 +1,4 @@
-From 42ac5c820eafdec381202e36f73ce50b588ce8a7 Mon Sep 17 00:00:00 2001
+From 96c05432383cc3468538aadd7f1a440ffda4165d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:13 +0530
@@ -40,5 +40,5 @@ index 4bd4eb4..475c2a8 100644
  Symbols and macros to supply platform-independent interfaces to basic
  C language & library operations whose spellings vary across platforms.
 -- 
-2.32.0
+2.33.0
 
diff --git a/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch b/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch
index 1d90fd3be106..bfc88a442506 100644
--- a/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch
+++ b/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch
@@ -1,4 +1,4 @@
-From fa68425708485de2cea225d6c3ff58bff6965ab5 Mon Sep 17 00:00:00 2001
+From c2c04f16d3f6761a9ee768507c0ca8330c976ce6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:14 +0530
@@ -9,50 +9,32 @@ Content-Transfer-Encoding: 8bit
 
 Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 ---
- Python/getplatform.c |  6 ++++++
- configure.ac         | 22 ++++++++++++++++++++++
- 2 files changed, 28 insertions(+)
+ configure.ac | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
 
-diff --git a/Python/getplatform.c b/Python/getplatform.c
-index 81a0f7a..636b0a8 100644
---- a/Python/getplatform.c
-+++ b/Python/getplatform.c
-@@ -1,6 +1,12 @@
- 
- #include "Python.h"
- 
-+#ifdef __MINGW32__
-+#  undef PLATFORM
-+/* see PC/pyconfig.h */
-+#  define PLATFORM "win32"
-+#endif
-+
- #ifndef PLATFORM
- #define PLATFORM "unknown"
- #endif
 diff --git a/configure.ac b/configure.ac
-index 005fc8f..ecdf22d 100644
+index d5766cf..a9936de 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -383,6 +383,17 @@ AC_DEFINE_UNQUOTED(_PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name])
- # Set name for machine-dependent library files
- AC_ARG_VAR([MACHDEP], [name for machine-dependent library files])
- AC_MSG_CHECKING(MACHDEP)
-+case $host in
-+  *-*-mingw*)
-+    # On those hosts MACHDEP is 'win', as platform specific files
-+    # go in plat-$(MACHDEP), but runtime platform is 'win32'
-+    test -z "$MACHDEP" && MACHDEP=win
-+
-+    dnl Configuration will be based only on "host triplet" as build
-+    dnl must not depend from posix compatible environement.
-+    ac_sys_system=ignore
-+    ;;
-+esac
- if test -z "$MACHDEP"
- then
-     # avoid using uname for cross builds
-@@ -452,12 +463,23 @@ if test "$cross_compiling" = yes; then
+@@ -400,6 +400,9 @@ then
+ 	*-*-cygwin*)
+ 		ac_sys_system=Cygwin
+ 		;;
++	*-*-mingw*)
++		ac_sys_system=MINGW
++		;;
+ 	*-*-vxworks*)
+ 	    ac_sys_system=VxWorks
+ 	    ;;
+@@ -429,6 +432,7 @@ then
+ 	linux*) MACHDEP="linux";;
+ 	cygwin*) MACHDEP="cygwin";;
+ 	darwin*) MACHDEP="darwin";;
++	mingw*) MACHDEP="win32";;
+ 	'')	MACHDEP="unknown";;
+     esac
+ fi
+@@ -452,12 +456,23 @@ if test "$cross_compiling" = yes; then
  	*-*-vxworks*)
  		_host_cpu=$host_cpu
  		;;
@@ -77,5 +59,5 @@ index 005fc8f..ecdf22d 100644
  
  # Some systems cannot stand _XOPEN_SOURCE being defined at all; they
 -- 
-2.32.0
+2.33.0
 
diff --git a/0006-MINGW-preset-configure-defaults.patch b/0006-MINGW-preset-configure-defaults.patch
index 144c4f12488a..67990c428873 100644
--- a/0006-MINGW-preset-configure-defaults.patch
+++ b/0006-MINGW-preset-configure-defaults.patch
@@ -1,4 +1,4 @@
-From 7c50215fdb389f4c094e15411732fe218b4fa261 Mon Sep 17 00:00:00 2001
+From 3cdb748058d33d3538a5db1c5b07251cebbd10c9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:15 +0530
@@ -53,10 +53,10 @@ index 0000000..03fde9e
 +
 +ac_cv_have_size_t_format=no
 diff --git a/configure.ac b/configure.ac
-index ecdf22d..6058002 100644
+index a9936de..a2cec23 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -920,6 +920,28 @@ if test x$MULTIARCH != x; then
+@@ -913,6 +913,28 @@ if test x$MULTIARCH != x; then
  fi
  AC_SUBST(MULTIARCH_CPPFLAGS)
  
@@ -86,5 +86,5 @@ index ecdf22d..6058002 100644
  save_LDFLAGS="$LDFLAGS"
  LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
 -- 
-2.32.0
+2.33.0
 
diff --git a/0007-MINGW-configure-largefile-support-for-windows-builds.patch b/0007-MINGW-configure-largefile-support-for-windows-builds.patch
index c74382900645..23c2d9dba5d3 100644
--- a/0007-MINGW-configure-largefile-support-for-windows-builds.patch
+++ b/0007-MINGW-configure-largefile-support-for-windows-builds.patch
@@ -1,4 +1,4 @@
-From c4ec9b26b76ebaa442ed3ae3fa10442869e66038 Mon Sep 17 00:00:00 2001
+From 0d783f83aadf8f7dd64bf81684942be2cde01df6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:16 +0530
@@ -14,7 +14,7 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
  1 file changed, 12 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 6058002..4c964ae 100644
+index a2cec23..61a7608 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2487,8 +2487,20 @@ AC_CHECK_SIZEOF(off_t, [], [
@@ -39,5 +39,5 @@ index 6058002..4c964ae 100644
    [Defined to enable large file support when an off_t is bigger than a long
     and long long is at least as big as an off_t. You may need
 -- 
-2.32.0
+2.33.0
 
diff --git a/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch
index 8a3d7b5e5c38..357dd5f653bc 100644
--- a/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch
+++ b/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch
@@ -1,4 +1,4 @@
-From 8dbbd779f9d2b7d01bc143deb70f3e522978f0b8 Mon Sep 17 00:00:00 2001
+From af4cca07445296c92dedffde8191e96e3c468adf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:18 +0530
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 13 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 4c964ae..f335c48 100644
+index 61a7608..1f3c8af 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -5642,8 +5642,21 @@ do
@@ -39,5 +39,5 @@ index 4c964ae..f335c48 100644
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
 -- 
-2.32.0
+2.33.0
 
diff --git a/0009-MINGW-init-system-calls.patch b/0009-MINGW-init-system-calls.patch
index c7a18c9280b3..2d10c54bde81 100644
--- a/0009-MINGW-init-system-calls.patch
+++ b/0009-MINGW-init-system-calls.patch
@@ -1,4 +1,4 @@
-From c6e239410fcc24e73eb239b391b5670f7ec41c2f Mon Sep 17 00:00:00 2001
+From a2e178675d5376e8985c489a6cb3bb463909fb41 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:19 +0530
@@ -101,10 +101,10 @@ index c984e2e..3f3e1f3 100644
  static PyObject *
  convertenviron(void)
 diff --git a/configure.ac b/configure.ac
-index f335c48..19c3ec2 100644
+index 1f3c8af..ba8736b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -601,6 +601,14 @@ then
+@@ -594,6 +594,14 @@ then
    AC_DEFINE(_INCLUDE__STDC_A1_SOURCE, 1, Define to include mbstate_t for mbrtowc)
  fi
  
@@ -120,5 +120,5 @@ index f335c48..19c3ec2 100644
  # it may influence the way we can build extensions, so distutils
  # needs to check it
 -- 
-2.32.0
+2.33.0
 
diff --git a/0010-MINGW-build-in-windows-modules-winreg.patch b/0010-MINGW-build-in-windows-modules-winreg.patch
index 63e63c3c0a1b..c91d837697a3 100644
--- a/0010-MINGW-build-in-windows-modules-winreg.patch
+++ b/0010-MINGW-build-in-windows-modules-winreg.patch
@@ -1,4 +1,4 @@
-From d00c155c97977adb8109f0764efb1100d6079800 Mon Sep 17 00:00:00 2001
+From 08880ce168fbb08e6476a246fd80e141ebf2eed7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:20 +0530
@@ -57,7 +57,7 @@ index fd1ccb7..b6f1a8f 100644
  static BOOL clinic_HKEY_converter(PyObject *ob, void *p);
  static PyObject *PyHKEY_FromHKEY(HKEY h);
 diff --git a/configure.ac b/configure.ac
-index 19c3ec2..e307fe3 100644
+index ba8736b..59f3edc 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -3326,6 +3326,13 @@ else
@@ -75,5 +75,5 @@ index 19c3ec2..e307fe3 100644
  # For a single AC_DEFINE, no template is needed.
  AH_TEMPLATE(_REENTRANT,
 -- 
-2.32.0
+2.33.0
 
diff --git a/0011-MINGW-determine-if-pwdmodule-should-be-used.patch b/0011-MINGW-determine-if-pwdmodule-should-be-used.patch
index 58ff71c09b20..06e38e5c3f1c 100644
--- a/0011-MINGW-determine-if-pwdmodule-should-be-used.patch
+++ b/0011-MINGW-determine-if-pwdmodule-should-be-used.patch
@@ -1,4 +1,4 @@
-From 40d6aaa0260b733a5bb004fd90287148e09a249c Mon Sep 17 00:00:00 2001
+From 892c8b91944241a71222a04d9276fdd409479408 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:21 +0530
@@ -43,7 +43,7 @@ index 612cabd..d071a74 100644
  @USE_WIN32_MODULE@winreg ../PC/winreg.c
  
 diff --git a/configure.ac b/configure.ac
-index e307fe3..52b3120 100644
+index 59f3edc..806ebe0 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -3333,6 +3333,13 @@ case $host in
@@ -61,5 +61,5 @@ index e307fe3..52b3120 100644
  # For a single AC_DEFINE, no template is needed.
  AH_TEMPLATE(_REENTRANT,
 -- 
-2.32.0
+2.33.0
 
diff --git a/0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
index b5e8cb1bcaea..dcbaa45b0226 100644
--- a/0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
+++ b/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
@@ -1,8 +1,8 @@
-From 5cf0ca1ebaec17df425a2b2829f6520e355f81cc Mon Sep 17 00:00:00 2001
+From b04a5d9e049ad86d70f3977cb2604b2e6b7e0bca Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:23 +0530
-Subject: [PATCH 014/N] issue6672 v2 Add Mingw recognition to pyport.h to al
+Subject: [PATCH 012/N] issue6672 v2 Add Mingw recognition to pyport.h to al
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -64,7 +64,7 @@ index 475c2a8..a05fa3a 100644
          /* module init functions outside the core must be exported */
  #                       if defined(__cplusplus)
 diff --git a/setup.py b/setup.py
-index 04eb6b2..b483dd3 100644
+index 54d4b94..d7a4e3f 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -444,6 +444,9 @@ class PyBuildExt(build_ext):
@@ -78,5 +78,5 @@ index 04eb6b2..b483dd3 100644
          self.detect_modules()
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0015-MINGW-configure-for-shared-build.patch b/0013-MINGW-configure-for-shared-build.patch
index de3942af82ed..43a074da2c61 100644
--- a/0015-MINGW-configure-for-shared-build.patch
+++ b/0013-MINGW-configure-for-shared-build.patch
@@ -1,8 +1,8 @@
-From 914f08e27ac82a95ce0ddedfbb15d53415406050 Mon Sep 17 00:00:00 2001
+From ed8995bda0e5acd112b43ee5662df3640f6154f3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:24 +0530
-Subject: [PATCH 015/N] MINGW configure for shared build
+Subject: [PATCH 013/N] MINGW configure for shared build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 52b3120..592b61a 100644
+index 806ebe0..6ebf250 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1240,6 +1240,13 @@ if test $enable_shared = "yes"; then
+@@ -1233,6 +1233,13 @@ if test $enable_shared = "yes"; then
  	;;
  
    esac
@@ -30,7 +30,7 @@ index 52b3120..592b61a 100644
  else # shared is disabled
    PY_ENABLE_SHARED=0
    case $ac_sys_system in
-@@ -1248,6 +1255,10 @@ else # shared is disabled
+@@ -1241,6 +1248,10 @@ else # shared is disabled
            LDLIBRARY='libpython$(LDVERSION).dll.a'
            ;;
    esac
@@ -65,5 +65,5 @@ index 52b3120..592b61a 100644
  esac
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0016-MINGW-dynamic-loading-support.patch b/0014-MINGW-dynamic-loading-support.patch
index c87ab362f002..3c02197510d3 100644
--- a/0016-MINGW-dynamic-loading-support.patch
+++ b/0014-MINGW-dynamic-loading-support.patch
@@ -1,8 +1,8 @@
-From ae8ad2a897af02bb36b723276f7382c5dd240447 Mon Sep 17 00:00:00 2001
+From 4eb264922b5a1abfa9400662d88c10a3b5f447bd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:25 +0530
-Subject: [PATCH 016/N] MINGW dynamic loading support
+Subject: [PATCH 014/N] MINGW dynamic loading support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -11,11 +11,11 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 ---
  Makefile.pre.in      |  6 ++++++
  Python/dynload_win.c |  9 +++++++--
- configure.ac         | 15 +++++++++++++++
- 3 files changed, 28 insertions(+), 2 deletions(-)
+ configure.ac         | 16 ++++++++++++++++
+ 3 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index f738b3b..9f2475d 100644
+index e8e8e71..332f9a5 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -823,6 +823,12 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
@@ -59,7 +59,7 @@ index 81787e5..9d7690e 100644
  
          /* restore old error mode settings */
 diff --git a/configure.ac b/configure.ac
-index 592b61a..dfe55ad 100644
+index 6ebf250..a8c64a7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2718,6 +2718,9 @@ if test -z "$SHLIB_SUFFIX"; then
@@ -72,7 +72,7 @@ index 592b61a..dfe55ad 100644
  fi
  AC_MSG_RESULT($SHLIB_SUFFIX)
  
-@@ -3831,6 +3834,12 @@ then
+@@ -3831,6 +3834,13 @@ then
  	fi
  	;;
  	esac
@@ -80,12 +80,13 @@ index 592b61a..dfe55ad 100644
 +	*-*-mingw*)
 +	DYNLOADFILE="dynload_win.o"
 +	extra_machdep_objs="$extra_machdep_objs PC/dl_nt.o"
++	CFLAGS_NODIST="$CFLAGS_NODIST -DMS_DLL_ID='\"$VERSION\"'"
 +	;;
 +	esac
  fi
  AC_MSG_RESULT($DYNLOADFILE)
  if test "$DYNLOADFILE" != "dynload_stub.o"
-@@ -5667,6 +5676,12 @@ case "$ac_cv_computed_gotos" in yes*)
+@@ -5667,6 +5677,12 @@ case "$ac_cv_computed_gotos" in yes*)
    AC_DEFINE(HAVE_COMPUTED_GOTOS, 1,
    [Define if the C compiler supports computed gotos.])
  esac
@@ -99,5 +100,5 @@ index 592b61a..dfe55ad 100644
  case $ac_sys_system in
  AIX*)
 -- 
-2.32.0
+2.33.0
 
diff --git a/0017-MINGW-ignore-main-program-for-frozen-scripts.patch b/0015-MINGW-ignore-main-program-for-frozen-scripts.patch
index cc205a5a78f0..4477d6a9ede7 100644
--- a/0017-MINGW-ignore-main-program-for-frozen-scripts.patch
+++ b/0015-MINGW-ignore-main-program-for-frozen-scripts.patch
@@ -1,8 +1,8 @@
-From 5230e91dc7c783925a609e8fec18955546a0cbe7 Mon Sep 17 00:00:00 2001
+From bd06581551552ea5206d6af8c757181864b11066 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:26 +0530
-Subject: [PATCH 017/N] MINGW ignore main program for frozen scripts
+Subject: [PATCH 015/N] MINGW ignore main program for frozen scripts
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,7 +14,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 9f2475d..223a266 100644
+index 332f9a5..8c8363a 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -352,7 +352,7 @@ PYTHON_OBJS=	\
@@ -27,10 +27,10 @@ index 9f2475d..223a266 100644
  		Python/getargs.o \
  		Python/getcompiler.o \
 diff --git a/configure.ac b/configure.ac
-index dfe55ad..ccc558e 100644
+index a8c64a7..7fcdd47 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5707,6 +5707,16 @@ case $host in
+@@ -5708,6 +5708,16 @@ case $host in
      ;;
  esac
  
@@ -48,5 +48,5 @@ index dfe55ad..ccc558e 100644
  SRCDIRS="Parser Parser/pegen Objects Python Modules Modules/_io Programs"
  case $host in
 -- 
-2.32.0
+2.33.0
 
diff --git a/0018-MINGW-setup-_multiprocessing-module.patch b/0016-MINGW-setup-_multiprocessing-module.patch
index 6020e8f26682..642c9336fb34 100644
--- a/0018-MINGW-setup-_multiprocessing-module.patch
+++ b/0016-MINGW-setup-_multiprocessing-module.patch
@@ -1,8 +1,8 @@
-From ad9ea63b35c8eb32a43f69530ebc798b5ac12553 Mon Sep 17 00:00:00 2001
+From 0dca777395cc304349d9d90e631407374e2c6de0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:26 +0530
-Subject: [PATCH 018/N] MINGW setup _multiprocessing module
+Subject: [PATCH 016/N] MINGW setup _multiprocessing module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index b483dd3..1f96ad4 100644
+index d7a4e3f..a15718e 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1761,7 +1761,12 @@ class PyBuildExt(build_ext):
+@@ -1766,7 +1766,12 @@ class PyBuildExt(build_ext):
                                     libraries=libs,
                                     include_dirs=["Modules/_multiprocessing"]))
  
@@ -30,5 +30,5 @@ index b483dd3..1f96ad4 100644
  
      def detect_uuid(self):
 -- 
-2.32.0
+2.33.0
 
diff --git a/0019-MINGW-setup-select-module.patch b/0017-MINGW-setup-select-module.patch
index 188314388008..9e4b3792b451 100644
--- a/0019-MINGW-setup-select-module.patch
+++ b/0017-MINGW-setup-select-module.patch
@@ -1,8 +1,8 @@
-From d8df9cbea83b1d7c1cd27cd1ab52feb6b6a882f7 Mon Sep 17 00:00:00 2001
+From 1dcb2cc12d447b3be226f61699d2570c921b67bb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:29 +0530
-Subject: [PATCH 019/N] MINGW setup select module
+Subject: [PATCH 017/N] MINGW setup select module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -39,10 +39,10 @@ index fb71e91..ad3990c 100644
  
          /* add object and its file descriptor to the list */
 diff --git a/setup.py b/setup.py
-index 1f96ad4..a6145c4 100644
+index a15718e..7914821 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -903,7 +903,11 @@ class PyBuildExt(build_ext):
+@@ -906,7 +906,11 @@ class PyBuildExt(build_ext):
              self.missing.append('spwd')
  
          # select(2); not on ancient System V
@@ -56,5 +56,5 @@ index 1f96ad4..a6145c4 100644
          # Fred Drake's interface to the Python parser
          self.add(Extension('parser', ['parsermodule.c']))
 -- 
-2.32.0
+2.33.0
 
diff --git a/0020-MINGW-setup-_ctypes-module-with-system-libffi.patch b/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch
index 3006e0ebd88d..61bf9d079fd9 100644
--- a/0020-MINGW-setup-_ctypes-module-with-system-libffi.patch
+++ b/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch
@@ -1,8 +1,8 @@
-From 63b12b21aae2268da35cd557e526b241a65198c2 Mon Sep 17 00:00:00 2001
+From f863b526f355dbc2dd1539be76a0f95f7abec559 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:30 +0530
-Subject: [PATCH 020/N] MINGW setup _ctypes module with system libffi
+Subject: [PATCH 018/N] MINGW setup _ctypes module with system libffi
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index a6145c4..e36ef5d 100644
+index 7914821..60f6243 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2149,9 +2149,12 @@ class PyBuildExt(build_ext):
+@@ -2154,9 +2154,12 @@ class PyBuildExt(build_ext):
          self.add(ext)
          if TEST_EXTENSIONS:
              # function my_sqrt() needs libm for sqrt()
@@ -31,7 +31,7 @@ index a6145c4..e36ef5d 100644
  
          ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR")
          ffi_lib = None
-@@ -2196,6 +2199,8 @@ class PyBuildExt(build_ext):
+@@ -2201,6 +2204,8 @@ class PyBuildExt(build_ext):
  
              ext.include_dirs.append(ffi_inc)
              ext.libraries.append(ffi_lib)
@@ -41,5 +41,5 @@ index a6145c4..e36ef5d 100644
  
          if sysconfig.get_config_var('HAVE_LIBDL'):
 -- 
-2.32.0
+2.33.0
 
diff --git a/0021-MINGW-defect-winsock2-and-setup-_socket-module.patch b/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch
index f7240eeba2c2..ee2addd574b6 100644
--- a/0021-MINGW-defect-winsock2-and-setup-_socket-module.patch
+++ b/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch
@@ -1,8 +1,8 @@
-From 9b48dc123e5baf45c7e2180d46b13ae3aaeead8b Mon Sep 17 00:00:00 2001
+From 0a6c242ff914437f5feb80ee638b592667a519b2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:30 +0530
-Subject: [PATCH 021/N] MINGW defect winsock2 and setup _socket module
+Subject: [PATCH 019/N] MINGW defect winsock2 and setup _socket module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -61,10 +61,10 @@ index 8953185..d15bb4f 100644
  #  include "addrinfo.h"
  #endif
 diff --git a/configure.ac b/configure.ac
-index ccc558e..fc287de 100644
+index 7fcdd47..5459145 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4442,21 +4442,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@@ -4443,21 +4443,36 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
  ],[])
  AC_MSG_RESULT($was_it_defined)
  
@@ -105,7 +105,7 @@ index ccc558e..fc287de 100644
    [ac_cv_struct_sockaddr_storage=yes],
    [ac_cv_struct_sockaddr_storage=no]))
  AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
-@@ -5597,7 +5612,10 @@ fi
+@@ -5598,7 +5613,10 @@ fi
  
  AC_CHECK_TYPE(socklen_t,,
    AC_DEFINE(socklen_t,int,
@@ -150,10 +150,10 @@ index 5f63cae..b69a7c7 100644
  
  /* Define to `int' if <sys/types.h> doesn't define. */
 diff --git a/setup.py b/setup.py
-index e36ef5d..b29d23b 100644
+index 60f6243..c8242ac 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1140,6 +1140,8 @@ class PyBuildExt(build_ext):
+@@ -1143,6 +1143,8 @@ class PyBuildExt(build_ext):
              if MACOS:
                  # Issue #35569: Expose RFC 3542 socket options.
                  kwargs['extra_compile_args'] = ['-D__APPLE_USE_RFC_3542']
@@ -163,5 +163,5 @@ index e36ef5d..b29d23b 100644
              self.add(Extension('_socket', ['socketmodule.c'], **kwargs))
          elif self.compiler.find_library_file(self.lib_dirs, 'net'):
 -- 
-2.32.0
+2.33.0
 
diff --git a/0022-MINGW-exclude-unix-only-modules.patch b/0020-MINGW-exclude-unix-only-modules.patch
index f69bb3c4b8e5..233bfbf86249 100644
--- a/0022-MINGW-exclude-unix-only-modules.patch
+++ b/0020-MINGW-exclude-unix-only-modules.patch
@@ -1,8 +1,8 @@
-From 44e8fbcb587f72cbfb477128f50524cb3c1ad021 Mon Sep 17 00:00:00 2001
+From 43127485a0b9ef0e6eb88436cbd3691114203324 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:31 +0530
-Subject: [PATCH 022/N] MINGW exclude unix only modules
+Subject: [PATCH 020/N] MINGW exclude unix only modules
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 29 insertions(+), 12 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index b29d23b..5280ea0 100644
+index c8242ac..f317bf3 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -886,13 +886,21 @@ class PyBuildExt(build_ext):
+@@ -889,13 +889,21 @@ class PyBuildExt(build_ext):
          if (self.config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
              # May be necessary on AIX for flock function
              libs = ['bsd']
@@ -42,7 +42,7 @@ index b29d23b..5280ea0 100644
          # spwd, shadow passwords
          if (self.config_h_vars.get('HAVE_GETSPNAM', False) or
                  self.config_h_vars.get('HAVE_GETSPENT', False)):
-@@ -917,7 +925,10 @@ class PyBuildExt(build_ext):
+@@ -920,7 +928,10 @@ class PyBuildExt(build_ext):
  
          # Lance Ellinghaus's syslog module
          # syslog daemon interface
@@ -54,7 +54,7 @@ index b29d23b..5280ea0 100644
  
          # Python interface to subinterpreter C-API.
          self.add(Extension('_xxsubinterpreters', ['_xxsubinterpretersmodule.c']))
-@@ -943,7 +954,10 @@ class PyBuildExt(build_ext):
+@@ -946,7 +957,10 @@ class PyBuildExt(build_ext):
          self.add(Extension('_csv', ['_csv.c']))
  
          # POSIX subprocess module helper.
@@ -66,7 +66,7 @@ index b29d23b..5280ea0 100644
  
      def detect_test_extensions(self):
          # Python C API test module
-@@ -1125,13 +1139,16 @@ class PyBuildExt(build_ext):
+@@ -1128,13 +1142,16 @@ class PyBuildExt(build_ext):
              # the encryption.
              return
  
@@ -90,5 +90,5 @@ index b29d23b..5280ea0 100644
      def detect_socket(self):
          # socket(2)
 -- 
-2.32.0
+2.33.0
 
diff --git a/0023-MINGW-setup-msvcrt-and-_winapi-modules.patch b/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch
index 01567a20eafa..edb701458af4 100644
--- a/0023-MINGW-setup-msvcrt-and-_winapi-modules.patch
+++ b/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch
@@ -1,8 +1,8 @@
-From 78ba60f537dc443ef5bc912e650e688619b9e798 Mon Sep 17 00:00:00 2001
+From 71342683a28f2826c9738951706c167226c2f093 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:33 +0530
-Subject: [PATCH 023/N] MINGW setup msvcrt and _winapi modules
+Subject: [PATCH 021/N] MINGW setup msvcrt and _winapi modules
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -16,7 +16,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  4 files changed, 26 insertions(+), 1 deletion(-)
 
 diff --git a/Modules/_winapi.c b/Modules/_winapi.c
-index e1672c4..ba318a1 100644
+index 1e0e4ec..1058184 100644
 --- a/Modules/_winapi.c
 +++ b/Modules/_winapi.c
 @@ -39,7 +39,9 @@
@@ -57,10 +57,10 @@ index 7febaa0..70d5b3d 100644
  #endif
  
 diff --git a/setup.py b/setup.py
-index 5280ea0..736b0f0 100644
+index f317bf3..5466e9b 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1599,6 +1599,27 @@ class PyBuildExt(build_ext):
+@@ -1604,6 +1604,27 @@ class PyBuildExt(build_ext):
                                     '-framework', 'SystemConfiguration',
                                     '-framework', 'CoreFoundation']))
  
@@ -89,5 +89,5 @@ index 5280ea0..736b0f0 100644
          # Andrew Kuchling's zlib module.  Note that some versions of zlib
          # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
 -- 
-2.32.0
+2.33.0
 
diff --git a/0022-sysconfig-MINGW-build-extensions-with-GCC.patch b/0022-sysconfig-MINGW-build-extensions-with-GCC.patch
new file mode 100644
index 000000000000..a7e38fd4485b
--- /dev/null
+++ b/0022-sysconfig-MINGW-build-extensions-with-GCC.patch
@@ -0,0 +1,25 @@
+From 81df7b055662ed80b952de911ec0c25df3e40e1f Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 20:52:42 +0200
+Subject: [PATCH 022/N] sysconfig: MINGW build extensions with GCC
+
+---
+ Lib/sysconfig.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
+index 45eab2a..42de9b3 100644
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
+@@ -657,6 +657,8 @@ def get_platform():
+ 
+     """
+     if os.name == 'nt':
++        if 'GCC' in sys.version:
++            return 'mingw'
+         if 'amd64' in sys.version.lower():
+             return 'win-amd64'
+         if '(arm)' in sys.version.lower():
+-- 
+2.33.0
+
diff --git a/0027-MINGW-setup-_ssl-module.patch b/0023-MINGW-setup-_ssl-module.patch
index b2a040251170..99a426b7b05c 100644
--- a/0027-MINGW-setup-_ssl-module.patch
+++ b/0023-MINGW-setup-_ssl-module.patch
@@ -1,8 +1,8 @@
-From be2b7c5a9e045188cece8694358871525686d77c Mon Sep 17 00:00:00 2001
+From 3d38194a6e0ff4c07988064d51fa10ecbf7b450d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:37 +0530
-Subject: [PATCH 027/N] MINGW setup _ssl module
+Subject: [PATCH 023/N] MINGW setup _ssl module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 736b0f0..143a1c9 100644
+index 5466e9b..51d3f59 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2381,6 +2381,8 @@ class PyBuildExt(build_ext):
+@@ -2386,6 +2386,8 @@ class PyBuildExt(build_ext):
          openssl_includes = split_var('OPENSSL_INCLUDES', '-I')
          openssl_libdirs = split_var('OPENSSL_LDFLAGS', '-L')
          openssl_libs = split_var('OPENSSL_LIBS', '-l')
@@ -26,5 +26,5 @@ index 736b0f0..143a1c9 100644
              # libssl and libcrypto not found
              self.missing.extend(['_ssl', '_hashlib'])
 -- 
-2.32.0
+2.33.0
 
diff --git a/0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
index 95509fdd383d..f3e36a97e516 100644
--- a/0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
+++ b/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
@@ -1,8 +1,8 @@
-From b29739b0545771c80eadc505b6f661b0678ed0cf Mon Sep 17 00:00:00 2001
+From 9cd7f11ee87717152eb4deebdf74217495440b11 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:38 +0530
-Subject: [PATCH 028/N] MINGW generalization of posix build in sysconfig.py
+Subject: [PATCH 024/N] MINGW generalization of posix build in sysconfig.py
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index aa49d80..d4298f7 100644
+index 42de9b3..65cb345 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
 @@ -100,6 +100,9 @@ _BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
@@ -44,7 +44,7 @@ index aa49d80..d4298f7 100644
          base = os.environ.get("APPDATA") or "~"
          return joinuser(base, "Python")
  
-@@ -504,7 +507,7 @@ def parse_config_h(fp, vars=None):
+@@ -505,7 +508,7 @@ def parse_config_h(fp, vars=None):
  def get_config_h_filename():
      """Return the path of pyconfig.h."""
      if _PYTHON_BUILD:
@@ -53,7 +53,7 @@ index aa49d80..d4298f7 100644
              inc_dir = os.path.join(_sys_home or _PROJECT_BASE, "PC")
          else:
              inc_dir = _sys_home or _PROJECT_BASE
-@@ -576,10 +579,10 @@ def get_config_vars(*args):
+@@ -577,10 +580,10 @@ def get_config_vars(*args):
              # sys.abiflags may not be defined on all platforms.
              _CONFIG_VARS['abiflags'] = ''
  
@@ -66,7 +66,7 @@ index aa49d80..d4298f7 100644
              _init_posix(_CONFIG_VARS)
          # For backward compatibility, see issue19555
          SO = _CONFIG_VARS.get('EXT_SUFFIX')
-@@ -592,7 +595,7 @@ def get_config_vars(*args):
+@@ -593,7 +596,7 @@ def get_config_vars(*args):
  
          # Always convert srcdir to an absolute path
          srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE)
@@ -76,5 +76,5 @@ index aa49d80..d4298f7 100644
                  # If srcdir is a relative path (typically '.' or '..')
                  # then it should be interpreted relative to the directory
 -- 
-2.32.0
+2.33.0
 
diff --git a/0029-MINGW-support-stdcall-without-underscore.patch b/0025-MINGW-support-stdcall-without-underscore.patch
index 8275227ab444..25bb46c8b124 100644
--- a/0029-MINGW-support-stdcall-without-underscore.patch
+++ b/0025-MINGW-support-stdcall-without-underscore.patch
@@ -1,8 +1,8 @@
-From 8353a7f30f7dc0a33111f43ad2ce7acfa6de0a32 Mon Sep 17 00:00:00 2001
+From 15b977a7de9a992afdb0af75ae3c3d84a524d7df Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:39 +0530
-Subject: [PATCH 029/N] MINGW support stdcall without underscore
+Subject: [PATCH 025/N] MINGW support stdcall without underscore
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -50,5 +50,5 @@ index ceae67e..b9cf96b 100644
      return NULL;
  #endif
 -- 
-2.32.0
+2.33.0
 
diff --git a/0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch
index c8af1f19f26e..197d71277ca2 100644
--- a/0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch
+++ b/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch
@@ -1,8 +1,8 @@
-From 8ce7dcc50395d138e1ec6b303c46a89ae7b98c24 Mon Sep 17 00:00:00 2001
+From b14a7592f54a2230d5b087e15a4547d23eeed6e1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:40 +0530
-Subject: [PATCH 030/N] use replace instead rename to avoid failure on windo
+Subject: [PATCH 026/N] use replace instead rename to avoid failure on windo
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 143a1c9..23e7689 100644
+index 51d3f59..ea08edf 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2602,7 +2602,7 @@ class PyBuildScripts(build_scripts):
+@@ -2607,7 +2607,7 @@ class PyBuildScripts(build_scripts):
              else:
                  newfilename = filename + minoronly
              log.info('renaming %s to %s', filename, newfilename)
@@ -27,5 +27,5 @@ index 143a1c9..23e7689 100644
              if filename in updated_files:
                  newupdated_files.append(newfilename)
 -- 
-2.32.0
+2.33.0
 
diff --git a/0033-MINGW-customize-site.patch b/0027-MINGW-customize-site.patch
index bf0282aaabda..215c3947dac4 100644
--- a/0033-MINGW-customize-site.patch
+++ b/0027-MINGW-customize-site.patch
@@ -1,8 +1,8 @@
-From 8baa74769c98ae5a10f2766806f282d8a5980cf3 Mon Sep 17 00:00:00 2001
+From 7edbdbe649d050d6753289b61ad5d2883b5338cd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:42 +0530
-Subject: [PATCH 033/N] MINGW customize site
+Subject: [PATCH 027/N] MINGW customize site
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -55,5 +55,5 @@ index 9e617af..b344f03 100644
                  path = os.path.join(prefix, libdir,
                                      "python%d.%d" % sys.version_info[:2],
 -- 
-2.32.0
+2.33.0
 
diff --git a/0034-add-python-config-sh.patch b/0028-add-python-config-sh.patch
index 3f8d14a3ed95..ddea647c422f 100644
--- a/0034-add-python-config-sh.patch
+++ b/0028-add-python-config-sh.patch
@@ -1,8 +1,8 @@
-From b650a9cb9202cbb9acedc6cc043c622bf815ab1d Mon Sep 17 00:00:00 2001
+From 6c65a9a8245268b2260c99db33e27205d9a67837 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:43 +0530
-Subject: [PATCH 034/N] add python config sh
+Subject: [PATCH 028/N] add python config sh
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -158,5 +158,5 @@ index 2602fe2..e0e048a 100644
  esac
  done
 -- 
-2.32.0
+2.33.0
 
diff --git a/0035-cross-darwin-feature.patch b/0029-cross-darwin-feature.patch
index b3efb781a140..39fa9c9e1193 100644
--- a/0035-cross-darwin-feature.patch
+++ b/0029-cross-darwin-feature.patch
@@ -1,8 +1,8 @@
-From a75a88113ad8b46cb82be6a75de750d2407bf2fa Mon Sep 17 00:00:00 2001
+From 28b76e2a3d4a629a2e5280c760fce8d661909ae0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:44 +0530
-Subject: [PATCH 035/N] cross darwin feature
+Subject: [PATCH 029/N] cross darwin feature
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 49 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index fc287de..453b80f 100644
+index 5459145..bd4ff50 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -398,6 +398,7 @@ if test -z "$MACHDEP"
+@@ -387,6 +387,7 @@ if test -z "$MACHDEP"
  then
      # avoid using uname for cross builds
      if test "$cross_compiling" = yes; then
@@ -24,9 +24,9 @@ index fc287de..453b80f 100644
         # ac_sys_system and ac_sys_release are used for setting
         # a lot of different things including 'define_xopen_source'
         # in the case statement below.
-@@ -411,6 +412,27 @@ then
- 	*-*-cygwin*)
- 		ac_sys_system=Cygwin
+@@ -403,6 +404,27 @@ then
+ 	*-*-mingw*)
+ 		ac_sys_system=MINGW
  		;;
 +	*-*-darwin*)
 +		ac_sys_system=Darwin
@@ -52,7 +52,7 @@ index fc287de..453b80f 100644
  	*-*-vxworks*)
  	    ac_sys_system=VxWorks
  	    ;;
-@@ -419,7 +441,6 @@ then
+@@ -411,7 +433,6 @@ then
  		MACHDEP="unknown"
  		AC_MSG_ERROR([cross build not supported for $host])
  	esac
@@ -60,7 +60,7 @@ index fc287de..453b80f 100644
      else
  	ac_sys_system=`uname -s`
  	if test "$ac_sys_system" = "AIX" \
-@@ -466,6 +487,9 @@ if test "$cross_compiling" = yes; then
+@@ -459,6 +480,9 @@ if test "$cross_compiling" = yes; then
  	*-*-mingw*)
  		_host_cpu=
  		;;
@@ -70,7 +70,7 @@ index fc287de..453b80f 100644
  	*)
  		# for now, limit cross builds to known configurations
  		MACHDEP="unknown"
-@@ -1662,6 +1686,26 @@ AC_SUBST(BASECFLAGS)
+@@ -1655,6 +1679,26 @@ AC_SUBST(BASECFLAGS)
  AC_SUBST(CFLAGS_NODIST)
  AC_SUBST(LDFLAGS_NODIST)
  
@@ -97,7 +97,7 @@ index fc287de..453b80f 100644
  # The -arch flags for universal builds on macOS
  UNIVERSAL_ARCH_FLAGS=
  AC_SUBST(UNIVERSAL_ARCH_FLAGS)
-@@ -2040,7 +2084,7 @@ yes)
+@@ -2033,7 +2077,7 @@ yes)
                      ;;
                  esac
              else
@@ -134,5 +134,5 @@ index fc287de..453b80f 100644
      		MACOSX_DEFAULT_ARCH="x86_64"
      		;;
 -- 
-2.32.0
+2.33.0
 
diff --git a/0037-mingw-system-libffi.patch b/0030-mingw-system-libffi.patch
index 2a2c2330f69e..cc6e975d947b 100644
--- a/0037-mingw-system-libffi.patch
+++ b/0030-mingw-system-libffi.patch
@@ -1,8 +1,8 @@
-From db3e4998d4ab6a11e3e263a848ebd332f25d77c6 Mon Sep 17 00:00:00 2001
+From 97a76defea005fff27a7f019c7ecde3f43a8ee64 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:45 +0530
-Subject: [PATCH 037/N] mingw system libffi
+Subject: [PATCH 030/N] mingw system libffi
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 23e7689..72f1281 100644
+index ea08edf..c52fd3b 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2241,6 +2241,8 @@ class PyBuildExt(build_ext):
+@@ -2246,6 +2246,8 @@ class PyBuildExt(build_ext):
              ext.libraries.append(ffi_lib)
              if MS_WINDOWS:
                  ext.libraries.extend(['ole32', 'oleaut32', 'uuid'])
@@ -26,5 +26,5 @@ index 23e7689..72f1281 100644
  
          if sysconfig.get_config_var('HAVE_LIBDL'):
 -- 
-2.32.0
+2.33.0
 
diff --git a/0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
index cfe1e8cc17b2..3c426157405e 100644
--- a/0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
+++ b/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
@@ -1,7 +1,7 @@
-From 8264c28205f988c0e7147f4f82c68511bb5ec611 Mon Sep 17 00:00:00 2001
+From eef4cbef8040e29440e645138de2184bcc82c3d0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:46 +0530
-Subject: [PATCH 038/N] msys mingw prefer unix sep if MSYSTEM
+Subject: [PATCH 031/N] msys mingw prefer unix sep if MSYSTEM
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -380,7 +380,7 @@ index 9a30221..267ee4d 100644
  
  
 diff --git a/Python/traceback.c b/Python/traceback.c
-index a9a9dd9..e8d2786 100644
+index 83f3074..c0e463a 100644
 --- a/Python/traceback.c
 +++ b/Python/traceback.c
 @@ -314,7 +314,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject *
@@ -393,5 +393,5 @@ index a9a9dd9..e8d2786 100644
          tail = filepath;
      else
 -- 
-2.32.0
+2.33.0
 
diff --git a/0039-mingw-use-posix-getpath.patch b/0032-mingw-use-posix-getpath.patch
index 608e6aa64867..ad1f652c1b88 100644
--- a/0039-mingw-use-posix-getpath.patch
+++ b/0032-mingw-use-posix-getpath.patch
@@ -1,8 +1,8 @@
-From afe9fc7a1ffad8f5054050ecdc79203359c55d60 Mon Sep 17 00:00:00 2001
+From 81023c047fed86a16c63b8a185abbb34c54b023b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:47 +0530
-Subject: [PATCH 039/N] mingw use posix getpath
+Subject: [PATCH 032/N] mingw use posix getpath
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -463,10 +463,10 @@ index 9d7690e..bd34310 100644
  _Py_COMP_DIAG_PUSH
  _Py_COMP_DIAG_IGNORE_DEPR_DECLS
 diff --git a/Python/fileutils.c b/Python/fileutils.c
-index 45ea204..d5f8b79 100644
+index 11c659d..4b299b2 100644
 --- a/Python/fileutils.c
 +++ b/Python/fileutils.c
-@@ -1924,13 +1924,31 @@ _Py_wrealpath(const wchar_t *path,
+@@ -1925,13 +1925,31 @@ _Py_wrealpath(const wchar_t *path,
  #endif
  
  
@@ -501,5 +501,5 @@ index 45ea204..d5f8b79 100644
  
  /* Get an absolute path.
 -- 
-2.32.0
+2.33.0
 
diff --git a/0040-mingw-add-ModuleFileName-dir-to-PATH.patch b/0033-mingw-add-ModuleFileName-dir-to-PATH.patch
index c04ca93b169c..11f9d2210b7c 100644
--- a/0040-mingw-add-ModuleFileName-dir-to-PATH.patch
+++ b/0033-mingw-add-ModuleFileName-dir-to-PATH.patch
@@ -1,7 +1,7 @@
-From a8c10ce1867cef6470abf110d26cfc47ed4c5e5a Mon Sep 17 00:00:00 2001
+From 1a866712f70f3f146587b0d25ad7f66b185a0afc Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:48 +0530
-Subject: [PATCH 040/N] mingw add ModuleFileName dir to PATH
+Subject: [PATCH 033/N] mingw add ModuleFileName dir to PATH
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -54,5 +54,5 @@ index 3010182..c52e0df 100644
          && calculate->warnings)
      {
 -- 
-2.32.0
+2.33.0
 
diff --git a/0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
index a16cf46bfc37..dc2cb6c5c956 100644
--- a/0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
+++ b/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
@@ -1,8 +1,8 @@
-From 6bd3b909a390939df82bdecf650f75509b752bd2 Mon Sep 17 00:00:00 2001
+From e9e44cbc990a6d1be36bc7739de1b365bd5f3deb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:49 +0530
-Subject: [PATCH 041/N] mingw add BUILDIN_WIN32_MODULEs time msvcrt
+Subject: [PATCH 034/N] mingw add BUILDIN_WIN32_MODULEs time msvcrt
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -23,5 +23,5 @@ index d071a74..825ce5d 100644
 +@USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0042-msys-cygwin-semi-native-build-sysconfig.patch b/0035-msys-cygwin-semi-native-build-sysconfig.patch
index 010c212942a3..77e4352d876a 100644
--- a/0042-msys-cygwin-semi-native-build-sysconfig.patch
+++ b/0035-msys-cygwin-semi-native-build-sysconfig.patch
@@ -1,8 +1,8 @@
-From ae4be49d5a7fbdcbc2c82aa1359e7ead2c393854 Mon Sep 17 00:00:00 2001
+From 87605ef6c8e472a8b1e38d0fbeaf4f75b87a9964 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:50 +0530
-Subject: [PATCH 042/N] msys cygwin semi native build sysconfig
+Subject: [PATCH 035/N] msys cygwin semi native build sysconfig
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  3 files changed, 74 insertions(+)
 
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index d4298f7..5d336d8 100644
+index 65cb345..f69d0db 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
 @@ -337,6 +337,14 @@ def _parse_makefile(filename, vars=None):
@@ -34,7 +34,7 @@ index d4298f7..5d336d8 100644
      vars.update(done)
      return vars
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 223a266..5271dd8 100644
+index 8c8363a..e0b8155 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -137,6 +137,13 @@ exec_prefix=	@exec_prefix@
@@ -52,10 +52,10 @@ index 223a266..5271dd8 100644
  BINDIR=		@bindir@
  LIBDIR=		@libdir@
 diff --git a/configure.ac b/configure.ac
-index 453b80f..4586602 100644
+index bd4ff50..a9640e9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -625,6 +625,65 @@ then
+@@ -618,6 +618,65 @@ then
    AC_DEFINE(_INCLUDE__STDC_A1_SOURCE, 1, Define to include mbstate_t for mbrtowc)
  fi
  
@@ -122,5 +122,5 @@ index 453b80f..4586602 100644
  AC_SUBST(INITSYS)
  case $host in
 -- 
-2.32.0
+2.33.0
 
diff --git a/0036-py3k-mingw-ntthreads-vs-pthreads.patch b/0036-py3k-mingw-ntthreads-vs-pthreads.patch
deleted file mode 100644
index ec8870b6b8eb..000000000000
--- a/0036-py3k-mingw-ntthreads-vs-pthreads.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From cef46d4d01202b0297badf3d715928e3b7406357 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
- <alexey.pawlow@gmail.com>
-Date: Thu, 17 Jun 2021 18:51:45 +0530
-Subject: [PATCH 036/N] py3k mingw ntthreads vs pthreads
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Co-authored-by: Алексей <alexey.pawlow@gmail.com>
-Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
----
- Include/internal/pycore_condvar.h | 10 ++++++++++
- Include/pythread.h                |  6 ++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/Include/internal/pycore_condvar.h b/Include/internal/pycore_condvar.h
-index 8b89d70..dd98245 100644
---- a/Include/internal/pycore_condvar.h
-+++ b/Include/internal/pycore_condvar.h
-@@ -5,6 +5,12 @@
- #  error "this header requires Py_BUILD_CORE define"
- #endif
- 
-+#ifdef __MINGW32__
-+# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS)
-+#  undef _POSIX_THREADS
-+# endif
-+#endif
-+
- #ifndef _POSIX_THREADS
- /* This means pthreads are not implemented in libc headers, hence the macro
-    not present in unistd.h. But they still can be implemented as an external
-@@ -37,6 +43,10 @@
- /* include windows if it hasn't been done before */
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-+/* winpthreads are involved via windows header, so need undef _POSIX_THREADS after header include */
-+#if defined(_POSIX_THREADS)
-+#undef _POSIX_THREADS
-+#endif
- 
- /* options */
- /* non-emulated condition variables are provided for those that want
-diff --git a/Include/pythread.h b/Include/pythread.h
-index bb9d864..f1e52c6 100644
---- a/Include/pythread.h
-+++ b/Include/pythread.h
-@@ -8,6 +8,12 @@ typedef void *PyThread_type_lock;
- extern "C" {
- #endif
- 
-+#ifdef __MINGW32__
-+# if !defined(HAVE_PTHREAD_H) || defined(NT_THREADS)
-+#  undef _POSIX_THREADS
-+# endif
-+#endif
-+
- /* Return status codes for Python lock acquisition.  Chosen for maximum
-  * backwards compatibility, ie failure -> 0, success -> 1.  */
- typedef enum PyLockStatus {
--- 
-2.32.0
-
diff --git a/0043-mingw-sysconfig-like-posix.patch b/0036-sysconfig-mingw-sysconfig-like-posix.patch
index 71703067e972..0578e296e83f 100644
--- a/0043-mingw-sysconfig-like-posix.patch
+++ b/0036-sysconfig-mingw-sysconfig-like-posix.patch
@@ -1,36 +1,14 @@
-From 893ba3a5e55dc3e07bac6407075e3461a24f979f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
- <alexey.pawlow@gmail.com>
-Date: Thu, 17 Jun 2021 18:51:50 +0530
-Subject: [PATCH 043/N] mingw sysconfig like posix
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+From ab96d425d200796577c4d9eef79cc1e0e62a39dc Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 20:53:59 +0200
+Subject: [PATCH 036/N] sysconfig: mingw sysconfig like posix
 
-Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 ---
- Lib/distutils/command/build_ext.py |  3 ++-
- Lib/sysconfig.py                   | 28 ++++++++++++++--------------
- 2 files changed, 16 insertions(+), 15 deletions(-)
+ Lib/sysconfig.py | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
 
-diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
-index 1c9d471..1dbdfe0 100644
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -221,9 +221,10 @@ class build_ext(Command):
-         if sys.platform[:6] == 'cygwin':
-             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
-                 # building third party extensions
-+                config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL'))
-                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
-                                                       "python" + get_python_version(),
--                                                      "config"))
-+                                                      config_dir_name))
-             else:
-                 # building python standard extensions
-                 self.library_dirs.append('.')
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 5d336d8..c0695e2 100644
+index f69d0db..64f7719 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
 @@ -48,23 +48,23 @@ _INSTALL_SCHEMES = {
@@ -46,8 +24,8 @@ index 5d336d8..c0695e2 100644
 -        'scripts': '{base}/Scripts',
 +        'stdlib': '{installed_base}/lib/python{py_version_short}',
 +        'platstdlib': '{base}/lib/python{py_version_short}',
-+        'purelib': '{base}/lib/python{py_version_short}',
-+        'platlib': '{base}/lib/python{py_version_short}',
++        'purelib': '{base}/lib/python{py_version_short}/site-packages',
++        'platlib': '{base}/lib/python{py_version_short}/site-packages',
 +        'include': '{installed_base}/include/python{py_version_short}',
 +        'platinclude': '{installed_base}/include/python{py_version_short}',
 +        'scripts': '{base}/bin',
@@ -70,7 +48,7 @@ index 5d336d8..c0695e2 100644
          'data': '{userbase}',
          },
      'posix_user': {
-@@ -470,7 +470,7 @@ def _init_non_posix(vars):
+@@ -471,7 +471,7 @@ def _init_non_posix(vars):
      vars['INCLUDEPY'] = get_path('include')
      vars['EXT_SUFFIX'] = _imp.extension_suffixes()[0]
      vars['EXE'] = '.exe'
@@ -80,5 +58,5 @@ index 5d336d8..c0695e2 100644
  
  #
 -- 
-2.32.0
+2.33.0
 
diff --git a/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch b/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch
new file mode 100644
index 000000000000..61efc9189cfc
--- /dev/null
+++ b/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch
@@ -0,0 +1,39 @@
+From fa3d5a352904467d12247164a7673033c5e95d2a Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 21:13:57 +0200
+Subject: [PATCH 037/N] build _winapi earlier so we can use it in distutils
+ via subprocess
+
+---
+ Modules/Setup.config.in | 1 +
+ setup.py                | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in
+index 825ce5d..b4e7ff7 100644
+--- a/Modules/Setup.config.in
++++ b/Modules/Setup.config.in
+@@ -12,4 +12,5 @@
+ # build-in modules for windows platform:
+ @USE_WIN32_MODULE@winreg ../PC/winreg.c
+ @USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c
++@USE_WIN32_MODULE@_winapi _winapi.c
+ 
+diff --git a/setup.py b/setup.py
+index c52fd3b..6a352af 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1612,7 +1612,9 @@ class PyBuildExt(build_ext):
+             self.add(Extension('msvcrt', [os.path.join(pc_srcdir, p)
+                                for p in ['msvcrtmodule.c']]))
+ 
+-            self.add(Extension('_winapi', ['_winapi.c']))
++            # Added to Setup.config.in as now needed earlier since I
++            # use subprocess (which uses Popen) in cygwinccompiler.py
++            # self.add(Extension('_winapi', ['_winapi.c']))
+ 
+             self.add(Extension('_msi', [os.path.join(pc_srcdir, p)
+                                for p in ['_msi.c']],
+-- 
+2.33.0
+
diff --git a/0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch
index e65d5bb1aa37..db7535fa3fe4 100644
--- a/0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch
+++ b/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch
@@ -1,8 +1,8 @@
-From c919ed9405978c2261712b8e8e860b12f7001057 Mon Sep 17 00:00:00 2001
+From 64886b38c5ad2d78730ed147ba398693731a8e89 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:52 +0530
-Subject: [PATCH 045/N] cross dont add multiarch paths if cross compiling
+Subject: [PATCH 038/N] cross dont add multiarch paths if cross compiling
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 36af6e9..55c7382 100644
+index 6a352af..497abbf 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -734,10 +734,10 @@ class PyBuildExt(build_ext):
+@@ -737,10 +737,10 @@ class PyBuildExt(build_ext):
          if not CROSS_COMPILING:
              add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
              add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
@@ -29,5 +29,5 @@ index 36af6e9..55c7382 100644
  
      def init_inc_lib_dirs(self):
 -- 
-2.32.0
+2.33.0
 
diff --git a/0046-mingw-use-backslashes-in-compileall-py.patch b/0039-mingw-use-backslashes-in-compileall-py.patch
index f7a383a0b58f..cd6c55ba14f0 100644
--- a/0046-mingw-use-backslashes-in-compileall-py.patch
+++ b/0039-mingw-use-backslashes-in-compileall-py.patch
@@ -1,8 +1,8 @@
-From 0525d209616594f74c395e8db04aa745f6b190e2 Mon Sep 17 00:00:00 2001
+From 47c94ca56a6ebe7423ed267a69d1b9931893da3b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:53 +0530
-Subject: [PATCH 046/N] mingw use backslashes in compileall py
+Subject: [PATCH 039/N] mingw use backslashes in compileall py
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/Lib/compileall.py b/Lib/compileall.py
-index fe7f450..4102839 100644
+index 39f4bb3..3490c09 100644
 --- a/Lib/compileall.py
 +++ b/Lib/compileall.py
 @@ -38,6 +38,8 @@ def _walk_dir(dir, maxlevels, quiet=0):
@@ -26,5 +26,5 @@ index fe7f450..4102839 100644
              yield fullname
          elif (maxlevels > 0 and name != os.curdir and name != os.pardir and
 -- 
-2.32.0
+2.33.0
 
diff --git a/0040-msys-convert_path-fix-and-root-hack.patch b/0040-msys-convert_path-fix-and-root-hack.patch
new file mode 100644
index 000000000000..a6ddfec361b9
--- /dev/null
+++ b/0040-msys-convert_path-fix-and-root-hack.patch
@@ -0,0 +1,42 @@
+From 22fc2593de88d46a11786898d401e4801faeb125 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 21:18:36 +0200
+Subject: [PATCH 040/N] msys convert_path fix and root hack
+
+---
+ Makefile.pre.in | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index e0b8155..cf16e93 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1707,6 +1707,12 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+ 	else true; \
+ 	fi
+ 
++ifeq ($(shell uname -o),Msys)
++DESTDIRFINAL=$(DESTDIR)
++else
++DESTDIRFINAL=$(DESTDIR)/
++endif
++
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+@@ -1714,9 +1720,9 @@ sharedinstall: sharedmods
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
+-		--root=$(DESTDIR)/
+-	-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
+-	-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
++		--root=$(DESTDIRFINAL)
++	-rm $(DESTDIRFINAL)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
++	-rm -r $(DESTDIRFINAL)$(DESTSHARED)/__pycache__
+ 
+ # Here are a couple of targets for MacOSX again, to install a full
+ # framework-based Python. frameworkinstall installs everything, the
+-- 
+2.33.0
+
diff --git a/0048-allow-static-tcltk.patch b/0041-allow-static-tcltk.patch
index 328021e72e4b..df8ed5db72ab 100644
--- a/0048-allow-static-tcltk.patch
+++ b/0041-allow-static-tcltk.patch
@@ -1,8 +1,8 @@
-From 6777f17ccae090e6687d6317b4dafcb0c8899f8f Mon Sep 17 00:00:00 2001
+From 096b2ca2e049158126943fbd39eb969d2e040262 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:54 +0530
-Subject: [PATCH 048/N] allow static tcltk
+Subject: [PATCH 041/N] allow static tcltk
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +13,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 25 insertions(+), 10 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 55c7382..d8fc413 100644
+index 497abbf..31b08de 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -783,7 +783,7 @@ class PyBuildExt(build_ext):
+@@ -786,7 +786,7 @@ class PyBuildExt(build_ext):
          if HOST_PLATFORM == 'hp-ux11':
              self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
  
@@ -25,7 +25,7 @@ index 55c7382..d8fc413 100644
              # This should work on any unixy platform ;-)
              # If the user has bothered specifying additional -I and -L flags
              # in OPT and LDFLAGS we might as well use them here.
-@@ -793,6 +793,8 @@ class PyBuildExt(build_ext):
+@@ -796,6 +796,8 @@ class PyBuildExt(build_ext):
              # directories with whitespace in the name to store libraries.
              cflags, ldflags = sysconfig.get_config_vars(
                      'CFLAGS', 'LDFLAGS')
@@ -34,7 +34,7 @@ index 55c7382..d8fc413 100644
              for item in cflags.split():
                  if item.startswith('-I'):
                      self.inc_dirs.append(item[2:])
-@@ -2042,14 +2044,19 @@ class PyBuildExt(build_ext):
+@@ -2047,14 +2049,19 @@ class PyBuildExt(build_ext):
          # The versions with dots are used on Unix, and the versions without
          # dots on Windows, for detection by cygwin.
          tcllib = tklib = tcl_includes = tk_includes = None
@@ -62,7 +62,7 @@ index 55c7382..d8fc413 100644
                  break
  
          # Now check for the header files
-@@ -2120,10 +2127,18 @@ class PyBuildExt(build_ext):
+@@ -2125,10 +2132,18 @@ class PyBuildExt(build_ext):
          # Add the Tcl/Tk libraries
          libs.append('tk'+ version)
          libs.append('tcl'+ version)
@@ -83,5 +83,5 @@ index 55c7382..d8fc413 100644
          # XXX handle these, but how to detect?
          # *** Uncomment and edit for PIL (TkImaging) extension only:
 -- 
-2.32.0
+2.33.0
 
diff --git a/0049-mingw-pdcurses_ISPAD.patch b/0042-mingw-pdcurses_ISPAD.patch
index 1417c8f4698b..a661d7c687bf 100644
--- a/0049-mingw-pdcurses_ISPAD.patch
+++ b/0042-mingw-pdcurses_ISPAD.patch
@@ -1,8 +1,8 @@
-From 88deca4afdb3762987227d4aa3cd50cfc8658ea7 Mon Sep 17 00:00:00 2001
+From 2b8402c1cab75d631728eb1aecf02eb0f0f66265 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:55 +0530
-Subject: [PATCH 049/N] mingw pdcurses_ISPAD
+Subject: [PATCH 042/N] mingw pdcurses_ISPAD
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -31,5 +31,5 @@ index b70252d..0d5cee2 100644
  /* configure was checking <curses.h>, but we will
     use <ncurses.h>, which has some or all these features. */
 -- 
-2.32.0
+2.33.0
 
diff --git a/0050-grammar-fixes.patch b/0043-grammar-fixes.patch
index cc3d5f8eb08d..184934724206 100644
--- a/0050-grammar-fixes.patch
+++ b/0043-grammar-fixes.patch
@@ -1,8 +1,8 @@
-From ece4431ade66c4abb835a489cacc002545ccb13a Mon Sep 17 00:00:00 2001
+From 36b85a28791eb087338e12f796e8d473d22f3ace Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:56 +0530
-Subject: [PATCH 050/N] grammar fixes
+Subject: [PATCH 043/N] grammar fixes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -41,5 +41,5 @@ index b7aa528..4a1ee9a 100644
      {2, 1},
      {3, 2},
 -- 
-2.32.0
+2.33.0
 
diff --git a/0051-builddir-fixes.patch b/0044-builddir-fixes.patch
index b23275dc8762..e3318b172f67 100644
--- a/0051-builddir-fixes.patch
+++ b/0044-builddir-fixes.patch
@@ -1,8 +1,8 @@
-From 6e9ed94084c501600e2ba6fdaac4b49b252e654d Mon Sep 17 00:00:00 2001
+From e835e97afda8c4c672defae902194866fc3df0a4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:57 +0530
-Subject: [PATCH 051/N] builddir fixes
+Subject: [PATCH 044/N] builddir fixes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 72be72d..7badeec 100644
+index cf16e93..7b3fdf6 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -741,20 +741,20 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
@@ -66,5 +66,5 @@ index 2e4ccbb..a8d5c31 100644
     from frozen.obj. In the Makefile, frozen.o is not linked into this executable,
     so we define the variable here. */
 -- 
-2.32.0
+2.33.0
 
diff --git a/0052-msys-monkeypatch-os-system-via-sh-exe.patch b/0045-msys-monkeypatch-os-system-via-sh-exe.patch
index 185b77473043..783c5082bdd7 100644
--- a/0052-msys-monkeypatch-os-system-via-sh-exe.patch
+++ b/0045-msys-monkeypatch-os-system-via-sh-exe.patch
@@ -1,8 +1,8 @@
-From 2cafb98ac994c8befe0d053e6e1524af8ec6e180 Mon Sep 17 00:00:00 2001
+From 74ee0fa7cbd23e29f60d03606ee32b34bc0dbc6c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:57 +0530
-Subject: [PATCH 052/N] msys monkeypatch os system via sh exe
+Subject: [PATCH 045/N] msys monkeypatch os system via sh exe
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 11 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index d8fc413..20fff27 100644
+index 31b08de..207a61c 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -58,6 +58,17 @@ def get_platform():
@@ -35,5 +35,5 @@ index d8fc413..20fff27 100644
  HOST_PLATFORM = get_platform()
  MS_WINDOWS = (HOST_PLATFORM == 'win32')
 -- 
-2.32.0
+2.33.0
 
diff --git a/0053-msys-replace-slashes-used-in-io-redirection.patch b/0046-msys-replace-slashes-used-in-io-redirection.patch
index 2d9f4a5aeea8..c99d0ff5fb46 100644
--- a/0053-msys-replace-slashes-used-in-io-redirection.patch
+++ b/0046-msys-replace-slashes-used-in-io-redirection.patch
@@ -1,8 +1,8 @@
-From c403bd9ac50aeda60b91f6c990f4f34bedf93bd3 Mon Sep 17 00:00:00 2001
+From a85ea70acca8b8d49c5dea8451ec512ea979d88d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:58 +0530
-Subject: [PATCH 053/N] msys replace slashes used in io redirection
+Subject: [PATCH 046/N] msys replace slashes used in io redirection
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,10 +14,10 @@ Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 20fff27..f5914d8 100644
+index 207a61c..d7a60e0 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -643,7 +643,7 @@ class PyBuildExt(build_ext):
+@@ -646,7 +646,7 @@ class PyBuildExt(build_ext):
          # Debian/Ubuntu multiarch support.
          # https://wiki.ubuntu.com/MultiarchSpec
          cc = sysconfig.get_config_var('CC')
@@ -26,7 +26,7 @@ index 20fff27..f5914d8 100644
          if not os.path.exists(self.build_temp):
              os.makedirs(self.build_temp)
          ret = run_command(
-@@ -668,7 +668,7 @@ class PyBuildExt(build_ext):
+@@ -671,7 +671,7 @@ class PyBuildExt(build_ext):
          opt = ''
          if CROSS_COMPILING:
              opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
@@ -35,7 +35,7 @@ index 20fff27..f5914d8 100644
          if not os.path.exists(self.build_temp):
              os.makedirs(self.build_temp)
          ret = run_command(
-@@ -687,7 +687,7 @@ class PyBuildExt(build_ext):
+@@ -690,7 +690,7 @@ class PyBuildExt(build_ext):
  
      def add_cross_compiling_paths(self):
          cc = sysconfig.get_config_var('CC')
@@ -44,7 +44,7 @@ index 20fff27..f5914d8 100644
          if not os.path.exists(self.build_temp):
              os.makedirs(self.build_temp)
          ret = run_command('%s -E -v - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile))
-@@ -1001,7 +1001,7 @@ class PyBuildExt(build_ext):
+@@ -1004,7 +1004,7 @@ class PyBuildExt(build_ext):
          readline_termcap_library = ""
          curses_library = ""
          # Cannot use os.popen here in py3k.
@@ -53,7 +53,7 @@ index 20fff27..f5914d8 100644
          if not os.path.exists(self.build_temp):
              os.makedirs(self.build_temp)
          # Determine if readline is already linked against curses or tinfo.
-@@ -1998,12 +1998,12 @@ class PyBuildExt(build_ext):
+@@ -2003,12 +2003,12 @@ class PyBuildExt(build_ext):
          cflags = sysconfig.get_config_vars('CFLAGS')[0]
          archs = re.findall(r'-arch\s+(\w+)', cflags)
  
@@ -69,5 +69,5 @@ index 20fff27..f5914d8 100644
          with open(tmpfile) as fp:
              detected_archs = []
 -- 
-2.32.0
+2.33.0
 
diff --git a/0055-remove_path_max.default.patch b/0047-remove_path_max.default.patch
index 864103a08d94..e0cdf36e24e9 100644
--- a/0055-remove_path_max.default.patch
+++ b/0047-remove_path_max.default.patch
@@ -1,8 +1,8 @@
-From d7ddae846cd17e00caca8c969b55a057f3589fec Mon Sep 17 00:00:00 2001
+From 01d2127df3190c472307aff3aaa71ab65e2450e4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:59 +0530
-Subject: [PATCH 055/N] remove_path_max.default
+Subject: [PATCH 047/N] remove_path_max.default
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index 3243944..99d4977 100644
  #endif
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0056-dont-link-with-gettext.patch b/0048-dont-link-with-gettext.patch
index 29901d402e19..b70260cc2ed0 100644
--- a/0056-dont-link-with-gettext.patch
+++ b/0048-dont-link-with-gettext.patch
@@ -1,8 +1,8 @@
-From fbe0b754bebcb09130fe8303ca180ef2221a8372 Mon Sep 17 00:00:00 2001
+From 9b3cfc647bdeedc9caa6d89cdbcb4dfcdb3490f8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:00 +0530
-Subject: [PATCH 056/N] dont link with gettext
+Subject: [PATCH 048/N] dont link with gettext
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -32,7 +32,7 @@ index 2e353bb..ea222af 100644
  #include <stdio.h>
  #include <locale.h>
 diff --git a/configure.ac b/configure.ac
-index 4586602..1599c74 100644
+index a9640e9..0e1e9e4 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -3154,10 +3154,19 @@ AC_SEARCH_LIBS(sem_init, pthread rt posix4)
@@ -56,5 +56,5 @@ index 4586602..1599c74 100644
  # checks for system dependent C++ extensions support
  case "$ac_sys_system" in
 -- 
-2.32.0
+2.33.0
 
diff --git a/0057-ctypes-python-dll.patch b/0049-ctypes-python-dll.patch
index 20359a481ec2..158470a4d174 100644
--- a/0057-ctypes-python-dll.patch
+++ b/0049-ctypes-python-dll.patch
@@ -1,8 +1,8 @@
-From 3347f3abb6dac9690e21055bb8a823870d4c9edd Mon Sep 17 00:00:00 2001
+From 2a0f9b8311884449312bb934557f43a93a7ab426 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:01 +0530
-Subject: [PATCH 057/N] ctypes python dll
+Subject: [PATCH 049/N] ctypes python dll
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -29,5 +29,5 @@ index 4afa4eb..2fe2eec 100644
  elif _sys.platform == "cygwin":
      pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2])
 -- 
-2.32.0
+2.33.0
 
diff --git a/0058-gdbm-module-includes.patch b/0050-gdbm-module-includes.patch
index 95e45acf78d2..ce5f06ab6a5e 100644
--- a/0058-gdbm-module-includes.patch
+++ b/0050-gdbm-module-includes.patch
@@ -1,8 +1,8 @@
-From 886617c8d1d880ef0206debff313a068669e4e6f Mon Sep 17 00:00:00 2001
+From 34ca4e0b61ce539fee85e283e71d147d4035ae72 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:02 +0530
-Subject: [PATCH 058/N] gdbm module includes
+Subject: [PATCH 050/N] gdbm module includes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -26,5 +26,5 @@ index dd4c6b1..d51015c 100644
  extern const char * gdbm_strerror(gdbm_error);
  #endif
 -- 
-2.32.0
+2.33.0
 
diff --git a/0059-use-gnu_printf-in-format.patch b/0051-use-gnu_printf-in-format.patch
index adab14b23a0d..d73adaa667d8 100644
--- a/0059-use-gnu_printf-in-format.patch
+++ b/0051-use-gnu_printf-in-format.patch
@@ -1,8 +1,8 @@
-From 3f773a3fb7c2ff965f5ec8dadb348a99ca5c2874 Mon Sep 17 00:00:00 2001
+From c25ea3b8769fa270074f16ead5f119260219d127 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:03 +0530
-Subject: [PATCH 059/N] use gnu_printf in format
+Subject: [PATCH 051/N] use gnu_printf in format
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -81,5 +81,5 @@ index 670e5d2..d582963 100644
  PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...);
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0060-mingw-fix-ssl-dont-use-enum_certificates.patch b/0052-mingw-fix-ssl-dont-use-enum_certificates.patch
index 92472c3da3a0..e4f7dc678d04 100644
--- a/0060-mingw-fix-ssl-dont-use-enum_certificates.patch
+++ b/0052-mingw-fix-ssl-dont-use-enum_certificates.patch
@@ -1,7 +1,7 @@
-From 1d256fa194a67c65adab63f98e3129f203b0f3fa Mon Sep 17 00:00:00 2001
+From f5d305af4ee0826f1dcafe85fc7493657e667cb0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:03 +0530
-Subject: [PATCH 060/N] mingw fix ssl dont use enum_certificates
+Subject: [PATCH 052/N] mingw fix ssl dont use enum_certificates
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -35,5 +35,5 @@ index 30f4e59..dda3ae1 100644
                  self._load_windows_store_certs(storename, purpose)
          self.set_default_verify_paths()
 -- 
-2.32.0
+2.33.0
 
diff --git a/0063-fix-using-dllhandle-and-winver-mingw.patch b/0053-fix-using-dllhandle-and-winver-mingw.patch
index 71966ad3c2e1..9f83ec4541df 100644
--- a/0063-fix-using-dllhandle-and-winver-mingw.patch
+++ b/0053-fix-using-dllhandle-and-winver-mingw.patch
@@ -1,8 +1,8 @@
-From 86c9d4a3a9b44f10b1c4c638243ed1f0b783901a Mon Sep 17 00:00:00 2001
+From 70aae126fda0fca2f004edd82894c13f0b279b00 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:06 +0530
-Subject: [PATCH 063/N] fix using dllhandle and winver mingw
+Subject: [PATCH 053/N] fix using dllhandle and winver mingw
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -35,5 +35,5 @@ index 3e4115f..839ed1c 100644
                          PyLong_FromVoidPtr(PyWin_DLLhModule));
      SET_SYS_FROM_STRING("winver",
 -- 
-2.32.0
+2.33.0
 
diff --git a/0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
index b9981c9427c5..27b75594704d 100644
--- a/0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
+++ b/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
@@ -1,8 +1,8 @@
-From 1c81c81b5e7f5ba55927e8ae64e148731ed9b04f Mon Sep 17 00:00:00 2001
+From 887b0e7895143809d0c8170caa3a4dd2306efefd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:07 +0530
-Subject: [PATCH 065/N] Add AMD64 to sys config so msvccompiler
+Subject: [PATCH 054/N] Add AMD64 to sys config so msvccompiler
  get_build_version works
 
 ---
@@ -38,5 +38,5 @@ index 59c0dbf..adccaa7 100644
  #elif defined(__cplusplus)
  #define COMPILER "[C++]"
 -- 
-2.32.0
+2.33.0
 
diff --git a/0066-MINGW-link-with-additional-library.patch b/0055-MINGW-link-with-additional-library.patch
index 490e2703cbc8..b96843f83e5c 100644
--- a/0066-MINGW-link-with-additional-library.patch
+++ b/0055-MINGW-link-with-additional-library.patch
@@ -1,18 +1,18 @@
-From 5e0de2a63f9534dabbdfbe422cb7952afa4b7ce2 Mon Sep 17 00:00:00 2001
+From 1d8904ee69999ae9e58bec2b177472e67493628a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:08 +0530
-Subject: [PATCH 066/N] MINGW link with additional library
+Subject: [PATCH 055/N] MINGW link with additional library
 
 ---
  configure.ac | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 1599c74..28b69be 100644
+index 0e1e9e4..4316338 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5860,6 +5860,15 @@ for dir in $SRCDIRS; do
+@@ -5861,6 +5861,15 @@ for dir in $SRCDIRS; do
  done
  AC_MSG_RESULT(done)
  
@@ -29,5 +29,5 @@ index 1599c74..28b69be 100644
  AC_MSG_CHECKING(for -O2)
  saved_cflags="$CFLAGS"
 -- 
-2.32.0
+2.33.0
 
diff --git a/0067-install-msilib.patch b/0056-install-msilib.patch
index d8df55c7aedd..7f2fd35a8cc6 100644
--- a/0067-install-msilib.patch
+++ b/0056-install-msilib.patch
@@ -1,7 +1,7 @@
-From 408a59388df34c484cc3bfc7d7465ca7ea9c6f05 Mon Sep 17 00:00:00 2001
+From 63cdce7b086866930e5d34b1ade187dc0f92309d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
 Date: Thu, 17 Jun 2021 18:52:09 +0530
-Subject: [PATCH 067/N] install msilib
+Subject: [PATCH 056/N] install msilib
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,7 +14,7 @@ Co-authored-by: Ray Donnelly <mingw.android@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 7badeec..f6d0247 100644
+index 7b3fdf6..87e95ec 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -1497,6 +1497,7 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
@@ -26,5 +26,5 @@ index 7badeec..f6d0247 100644
  		unittest unittest/test unittest/test/testmock \
  		venv venv/scripts venv/scripts/common venv/scripts/posix \
 -- 
-2.32.0
+2.33.0
 
diff --git a/0069-fix-signal-module-build.patch b/0057-fix-signal-module-build.patch
index 5bd32b1ba278..3988173e4520 100644
--- a/0069-fix-signal-module-build.patch
+++ b/0057-fix-signal-module-build.patch
@@ -1,7 +1,7 @@
-From a79c0b4716a86e95e7b41f9f64a51492ad2440a6 Mon Sep 17 00:00:00 2001
+From 9aea35d5abfebe9c7db885e7675f29d82a253b3b Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:10 +0530
-Subject: [PATCH 069/N] fix signal module build
+Subject: [PATCH 057/N] fix signal module build
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index 2bafdd0..7ce4355 100644
  time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c	# -lm # time operations and variables
  _thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c	# low-level threading interface
 -- 
-2.32.0
+2.33.0
 
diff --git a/0070-build-winconsoleio.patch b/0058-build-build-winconsoleio-and-_testconsole.patch
index 54a404c3c8ac..406dcf169ad2 100644
--- a/0070-build-winconsoleio.patch
+++ b/0058-build-build-winconsoleio-and-_testconsole.patch
@@ -1,7 +1,7 @@
-From a6869a3b49e6a333b907061339eeef622a6d4e08 Mon Sep 17 00:00:00 2001
+From 3ebd25cabfc22fab766e53b0e7b8f60d04073f2f Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:11 +0530
-Subject: [PATCH 070/N] build winconsoleio
+Subject: [PATCH 058/N] build: build winconsoleio and _testconsole
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -9,7 +9,8 @@ Content-Transfer-Encoding: 8bit
 Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 ---
  Modules/Setup | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ setup.py      | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/Modules/Setup b/Modules/Setup
 index 7ce4355..6bb5e51 100644
@@ -24,6 +25,20 @@ index 7ce4355..6bb5e51 100644
  
  # faulthandler module
  faulthandler faulthandler.c
+diff --git a/setup.py b/setup.py
+index d7a60e0..ede0e72 100644
+--- a/setup.py
++++ b/setup.py
+@@ -998,6 +998,9 @@ class PyBuildExt(build_ext):
+                            ['_xxtestfuzz/_xxtestfuzz.c',
+                             '_xxtestfuzz/fuzzer.c']))
+ 
++        if MS_WINDOWS:
++            self.add(Extension('_testconsole', ['../PC/_testconsole.c']))
++
+     def detect_readline_curses(self):
+         # readline
+         do_readline = self.compiler.find_library_file(self.lib_dirs, 'readline')
 -- 
-2.32.0
+2.33.0
 
diff --git a/0071-expose-sem_unlink.patch b/0059-expose-sem_unlink.patch
index 579f5f02f256..7f1859461381 100644
--- a/0071-expose-sem_unlink.patch
+++ b/0059-expose-sem_unlink.patch
@@ -1,7 +1,7 @@
-From 15f50a4e53545b16eaaf9b9fade68a828a6e0503 Mon Sep 17 00:00:00 2001
+From 9aca6a28934f67df24b2b640c1d8c40623f40afd Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:12 +0530
-Subject: [PATCH 071/N] expose sem_unlink
+Subject: [PATCH 059/N] expose sem_unlink
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index 806e638..d7954d1 100644
  #endif
      {NULL}
 -- 
-2.32.0
+2.33.0
 
diff --git a/0072-cygpty-isatty.patch b/0060-cygpty-isatty.patch
index 21031bac83d3..e639c91f2e1c 100644
--- a/0072-cygpty-isatty.patch
+++ b/0060-cygpty-isatty.patch
@@ -1,7 +1,7 @@
-From 9fb465b60da98040bbc8ee649f17cfb6dbe3f293 Mon Sep 17 00:00:00 2001
+From 0255306a4066705227cd3d903290d9550593e295 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:14 +0530
-Subject: [PATCH 072/N] cygpty isatty
+Subject: [PATCH 060/N] cygpty isatty
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -71,7 +71,7 @@ index 0000000..82fd0af
 +
 +#endif /* _ISCYGPTY_H */
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index f6d0247..126131c 100644
+index 87e95ec..e351cae 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -372,6 +372,7 @@ PYTHON_OBJS=	\
@@ -175,7 +175,7 @@ index 1c6ecaf..afddc4f 100644
  
      return PyBool_FromLong(res);
 diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
-index 614012d..d29d06d 100644
+index 21c70f9..58d7512 100644
 --- a/Python/bltinmodule.c
 +++ b/Python/bltinmodule.c
 @@ -1,6 +1,7 @@
@@ -186,7 +186,7 @@ index 614012d..d29d06d 100644
  #include <ctype.h>
  #include "ast.h"
  #undef Yield   /* undefine macro conflicting with <winbase.h> */
-@@ -1980,7 +1981,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
+@@ -1971,7 +1972,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
          Py_DECREF(tmp);
          if (fd < 0 && PyErr_Occurred())
              return NULL;
@@ -195,7 +195,7 @@ index 614012d..d29d06d 100644
      }
      if (tty) {
          tmp = _PyObject_CallMethodIdNoArgs(fout, &PyId_fileno);
-@@ -1993,7 +1994,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
+@@ -1984,7 +1985,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
              Py_DECREF(tmp);
              if (fd < 0 && PyErr_Occurred())
                  return NULL;
@@ -205,7 +205,7 @@ index 614012d..d29d06d 100644
      }
  
 diff --git a/Python/fileutils.c b/Python/fileutils.c
-index d5f8b79..a47f12b 100644
+index 4b299b2..573a5c2 100644
 --- a/Python/fileutils.c
 +++ b/Python/fileutils.c
 @@ -1,4 +1,5 @@
@@ -457,5 +457,5 @@ index 60f091c..734084c 100644
      if (!Py_InteractiveFlag)
          return 0;
 -- 
-2.32.0
+2.33.0
 
diff --git a/0073-disable-broken-gdbm-module.patch b/0061-disable-broken-gdbm-module.patch
index 79a3c181d214..5b3d26f49774 100644
--- a/0073-disable-broken-gdbm-module.patch
+++ b/0061-disable-broken-gdbm-module.patch
@@ -1,7 +1,7 @@
-From e486b493d937ef113c8cfc1904362196a31ba605 Mon Sep 17 00:00:00 2001
+From 391cfafdf3cd9cc56516cd6d3d8d37bf68ef870c Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:15 +0530
-Subject: [PATCH 073/N] disable broken gdbm module
+Subject: [PATCH 061/N] disable broken gdbm module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,10 +12,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index f5914d8..a709723 100644
+index ede0e72..74b844c 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1399,7 +1399,7 @@ class PyBuildExt(build_ext):
+@@ -1405,7 +1405,7 @@ class PyBuildExt(build_ext):
              if dbm_args:
                  dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":")
              else:
@@ -25,5 +25,5 @@ index f5914d8..a709723 100644
              for cand in dbm_order:
                  if cand == "ndbm":
 -- 
-2.32.0
+2.33.0
 
diff --git a/0074-link-win-resource-files-and-build-pythonw.patch b/0062-build-link-win-resource-files-and-build-pythonw.patch
index cf72ae35c9f2..afd02349ff36 100644
--- a/0074-link-win-resource-files-and-build-pythonw.patch
+++ b/0062-build-link-win-resource-files-and-build-pythonw.patch
@@ -1,19 +1,19 @@
-From d25e8cea94e811159605490e7b383521024c563b Mon Sep 17 00:00:00 2001
+From 17ac3e7063af45b116396303f85be4eb95f0e9d9 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:16 +0530
-Subject: [PATCH 074/N] link win resource files and build pythonw
+Subject: [PATCH 062/N] build: link win resource files and build pythonw
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 ---
- Makefile.pre.in | 29 ++++++++++++++++++++++++-----
- configure.ac    | 10 ++++++++++
- 2 files changed, 34 insertions(+), 5 deletions(-)
+ Makefile.pre.in | 26 +++++++++++++++++++++-----
+ configure.ac    | 26 ++++++++++++++++++++++++++
+ 2 files changed, 47 insertions(+), 5 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 126131c..7c1a775 100644
+index e351cae..afeee0e 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -38,6 +38,7 @@ CXX=		@CXX@
@@ -49,21 +49,18 @@ index 126131c..7c1a775 100644
  		Programs/_testembed python-config
  
  # Check that the source is clean when building out of source.
-@@ -596,9 +599,24 @@ coverage-report: regen-grammar regen-token regen-importlib
+@@ -596,9 +599,21 @@ coverage-report: regen-grammar regen-token regen-importlib
  clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
  	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
  
-+pythonnt_rc.h:
-+	@echo '#define PYTHON_DLL_NAME "$(DLLLIBRARY)"' >> $@
-+
-+python_exe.o: pythonnt_rc.h $(srcdir)/PC/python_exe.rc
++python_exe.o: $(srcdir)/PC/python_exe.rc
 +	$(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_exe.rc $@
 +
-+pythonw_exe.o: pythonnt_rc.h $(srcdir)/PC/pythonw_exe.rc
++pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc
 +	$(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pythonw_exe.rc $@
 +
-+python_nt.o: pythonnt_rc.h $(srcdir)/PC/python_nt.rc
-+	$(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@
++python_nt.o: $(srcdir)/PC/python_nt.rc
++	$(WINDRES) $(RCFLAGS) -DORIGINAL_FILENAME=\\\"$(DLLLIBRARY)\\\" -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@
 +
 +$(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw_exe.o
 +	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -mwindows -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) pythonw_exe.o
@@ -76,7 +73,7 @@ index 126131c..7c1a775 100644
  
  platform: $(BUILDPYTHON) pybuilddir.txt
  	$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
-@@ -708,10 +726,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
+@@ -708,10 +723,10 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
  
  # This rule builds the Cygwin Python DLL and import library if configured
  # for a shared core library; otherwise, this rule is a noop.
@@ -89,7 +86,7 @@ index 126131c..7c1a775 100644
  	else true; \
  	fi
  
-@@ -1325,6 +1343,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
+@@ -1325,6 +1340,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
  	done
  	if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \
  		$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
@@ -98,10 +95,10 @@ index 126131c..7c1a775 100644
  		$(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
  	fi
 diff --git a/configure.ac b/configure.ac
-index 25aecf9..cea888c 100644
+index 4316338..be8ede9 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1350,6 +1350,9 @@ fi
+@@ -1343,6 +1343,9 @@ fi
  
  AC_MSG_RESULT($LDLIBRARY)
  
@@ -111,11 +108,27 @@ index 25aecf9..cea888c 100644
  AC_SUBST(AR)
  AC_CHECK_TOOLS(AR, ar aal, ar)
  
-@@ -5870,10 +5873,17 @@ AC_MSG_RESULT(done)
+@@ -5865,10 +5868,33 @@ AC_MSG_RESULT(done)
  case $host in
    *-*-mingw*)
      LIBS="$LIBS -lversion -lshlwapi -lpathcch"
-+    RCFLAGS="$RCFLAGS -O COFF"
++    AC_PROG_AWK
++    if test "$AWK" = "gawk"; then
++      awk_extra_flag="--non-decimal-data"
++    fi
++    AC_MSG_CHECKING([FIELD3])
++    FIELD3=$($AWK $awk_extra_flag '\
++      /^#define PY_RELEASE_LEVEL_/             {levels[$2]=$3}    \
++      /^#define PY_MICRO_VERSION[[:space:]]+/  {micro=$3}         \
++      /^#define PY_RELEASE_LEVEL[[:space:]]+/  {level=levels[$3]} \
++      /^#define PY_RELEASE_SERIAL[[:space:]]+/ {serial=$3}        \
++      END {print micro * 1000 + level * 10 + serial}' \
++      $srcdir/Include/patchlevel.h
++    )
++    
++    AC_MSG_RESULT([${FIELD3}])
++    RCFLAGS="$RCFLAGS -DFIELD3=$FIELD3 -O COFF"
++
 +    case $host in
 +      i686*)  RCFLAGS="$RCFLAGS --target=pe-i386" ;;
 +      x86_64*)  RCFLAGS="$RCFLAGS --target=pe-x86-64" ;;
@@ -130,5 +143,5 @@ index 25aecf9..cea888c 100644
  # Availability of -O2:
  AC_MSG_CHECKING(for -O2)
 -- 
-2.32.0
+2.33.0
 
diff --git a/0075-3.7-mpdec-mingw.patch b/0063-3.7-mpdec-mingw.patch
index ede7f5473b49..6053fd453831 100644
--- a/0075-3.7-mpdec-mingw.patch
+++ b/0063-3.7-mpdec-mingw.patch
@@ -1,18 +1,18 @@
-From 0669b928b1aeaedc039a0c7bc1e688b4190fdf8e Mon Sep 17 00:00:00 2001
+From a15d5dafd3604b7f6ddb3fa99dd26ec0757024a9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:17 +0530
-Subject: [PATCH 075/N] 3.7 mpdec mingw
+Subject: [PATCH 063/N] 3.7 mpdec mingw
 
 ---
  setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index a709723..79111ab 100644
+index 74b844c..a4222fc 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -2283,7 +2283,7 @@ class PyBuildExt(build_ext):
+@@ -2291,7 +2291,7 @@ class PyBuildExt(build_ext):
          undef_macros = []
          if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
              include_dirs = []
@@ -22,5 +22,5 @@ index a709723..79111ab 100644
              depends = ['_decimal/docstrings.h']
          else:
 -- 
-2.32.0
+2.33.0
 
diff --git a/0076-disable-readline.patch b/0064-disable-readline.patch
index 8790fec5525a..ee9b0494a8f0 100644
--- a/0076-disable-readline.patch
+++ b/0064-disable-readline.patch
@@ -1,7 +1,7 @@
-From 9e98fd461e9504b1275c883f7edb59258d2cf087 Mon Sep 17 00:00:00 2001
+From 7dc48f709c1ac3fd9d05b0f50ce4056bd3bf5268 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:17 +0530
-Subject: [PATCH 076/N] disable readline
+Subject: [PATCH 064/N] disable readline
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,10 +12,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 79111ab..ea2aa96 100644
+index a4222fc..a4d206e 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -997,7 +997,10 @@ class PyBuildExt(build_ext):
+@@ -1003,7 +1003,10 @@ class PyBuildExt(build_ext):
  
      def detect_readline_curses(self):
          # readline
@@ -28,5 +28,5 @@ index 79111ab..ea2aa96 100644
          curses_library = ""
          # Cannot use os.popen here in py3k.
 -- 
-2.32.0
+2.33.0
 
diff --git a/0077-fix-isselectable.patch b/0065-fix-isselectable.patch
index fe0657173b8c..9e4bb58673bf 100644
--- a/0077-fix-isselectable.patch
+++ b/0065-fix-isselectable.patch
@@ -1,7 +1,7 @@
-From 83d74ec0106b0a55fbb29324eb4961d1f5f92cef Mon Sep 17 00:00:00 2001
+From 27e5727fb44af8826b8725b2bc6de09e79e1b78f Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:18 +0530
-Subject: [PATCH 077/N] fix isselectable
+Subject: [PATCH 065/N] fix isselectable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index 6ec2994..a80f195 100644
      #define _PyIsSelectable_fd(FD) (1)
  #else
 -- 
-2.32.0
+2.33.0
 
diff --git a/0078-use-_wcsnicmp-instead-wcsncasecmp.patch b/0066-use-_wcsnicmp-instead-wcsncasecmp.patch
index bd889d2c6f73..0e1a563ca335 100644
--- a/0078-use-_wcsnicmp-instead-wcsncasecmp.patch
+++ b/0066-use-_wcsnicmp-instead-wcsncasecmp.patch
@@ -1,8 +1,8 @@
-From bc513cec0134febc13c4033ea8e9d839c3f3d6d1 Mon Sep 17 00:00:00 2001
+From c217628934d0d7a1b440eae998a7813702e320c2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:19 +0530
-Subject: [PATCH 078/N] use _wcsnicmp instead wcsncasecmp
+Subject: [PATCH 066/N] use _wcsnicmp instead wcsncasecmp
 
 ---
  Modules/getpath.c | 2 +-
@@ -22,5 +22,5 @@ index c52e0df..2018495 100644
      }
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0079-_xxsubinterpretersmodule.patch b/0067-_xxsubinterpretersmodule.patch
index be85e20e8ea6..9d9e160d7194 100644
--- a/0079-_xxsubinterpretersmodule.patch
+++ b/0067-_xxsubinterpretersmodule.patch
@@ -1,8 +1,8 @@
-From c20ac221468e3770baa22b7f853395e2e8a9df33 Mon Sep 17 00:00:00 2001
+From c392c6966b0f46197e48dfd89b9361358be823ab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:20 +0530
-Subject: [PATCH 079/N] _xxsubinterpretersmodule
+Subject: [PATCH 067/N] _xxsubinterpretersmodule
 
 ---
  Modules/_xxsubinterpretersmodule.c | 2 +-
@@ -22,5 +22,5 @@ index 314059d..f26e662 100644
      sizeof(channelid),              /* tp_basicsize */
      0,                              /* tp_itemsize */
 -- 
-2.32.0
+2.33.0
 
diff --git a/0068-dont-include-system-ncurses-path.patch b/0068-dont-include-system-ncurses-path.patch
deleted file mode 100644
index 59bf520622b9..000000000000
--- a/0068-dont-include-system-ncurses-path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 430aee7255b2ebf1947c8670db95f017e41aecc6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
- <alexey.pawlow@gmail.com>
-Date: Thu, 17 Jun 2021 18:52:09 +0530
-Subject: [PATCH 068/N] dont include system ncurses path
-
----
- configure.ac | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 28b69be..25aecf9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5479,9 +5479,15 @@ fi
- 
- # first curses header check
- ac_save_cppflags="$CPPFLAGS"
--if test "$cross_compiling" = no; then
--  CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
--fi
-+case $host_os in
-+    mingw*)
-+    ;;
-+    *)
-+      if test "$cross_compiling" = no; then
-+        CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
-+      fi
-+    ;;
-+esac
- 
- AC_CHECK_HEADERS(curses.h ncurses.h)
- 
--- 
-2.32.0
-
diff --git a/0080-sqlite3-module-defines.patch b/0068-sqlite3-module-defines.patch
index 0677a1ba601c..7ee187fcb9db 100644
--- a/0080-sqlite3-module-defines.patch
+++ b/0068-sqlite3-module-defines.patch
@@ -1,17 +1,17 @@
-From 5fd45d9433577159d5ca4080fc338030f7a9e367 Mon Sep 17 00:00:00 2001
+From fdb194111cc3b59ae7193577e9c63d1367a6a6f2 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:21 +0530
-Subject: [PATCH 080/N] sqlite3 module defines
+Subject: [PATCH 068/N] sqlite3 module defines
 
 ---
  setup.py | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index ea2aa96..14e1396 100644
+index a4d206e..8458232 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1554,10 +1554,7 @@ class PyBuildExt(build_ext):
+@@ -1560,10 +1560,7 @@ class PyBuildExt(build_ext):
                  '_sqlite/util.c', ]
  
              sqlite_defines = []
@@ -24,5 +24,5 @@ index ea2aa96..14e1396 100644
              # Enable support for loadable extensions in the sqlite3 module
              # if --enable-loadable-sqlite-extensions configure option is used.
 -- 
-2.32.0
+2.33.0
 
diff --git a/0081-configure-have-inet-pton.patch b/0069-configure.ac-fix-inet_pton-check.patch
index a233867adcba..6caa8692c86c 100644
--- a/0081-configure-have-inet-pton.patch
+++ b/0069-configure.ac-fix-inet_pton-check.patch
@@ -1,7 +1,7 @@
-From a59150eaa982d06c28e04305056e6064de57bcd0 Mon Sep 17 00:00:00 2001
+From e76cda7b6d05184ac17991dc46a568c42763a94a Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:23 +0530
-Subject: [PATCH 081/N] configure have inet pton
+Subject: [PATCH 069/N] configure.ac: fix inet_pton check
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,10 +12,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index cea888c..fb15812 100644
+index be8ede9..032d658 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4273,10 +4273,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+@@ -4274,10 +4274,14 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
  
  AC_MSG_CHECKING(for inet_pton)
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -31,5 +31,5 @@ index cea888c..fb15812 100644
    [AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.)
     AC_MSG_RESULT(yes)],
 -- 
-2.32.0
+2.33.0
 
diff --git a/0083-set-venv-activate-path-unix.patch b/0070-set-venv-activate-path-unix.patch
index 4788ec5e852b..b11395d40d63 100644
--- a/0083-set-venv-activate-path-unix.patch
+++ b/0070-set-venv-activate-path-unix.patch
@@ -1,7 +1,7 @@
-From d13ab42085ab58f7114dbe9e50a9431dd0a5b9f4 Mon Sep 17 00:00:00 2001
+From 737d758a51b3e1778df4594ffbc671785c5a6425 Mon Sep 17 00:00:00 2001
 From: Dan Yeaw <dan@yeaw.me>
 Date: Thu, 17 Jun 2021 18:52:25 +0530
-Subject: [PATCH 083/N] set venv activate path unix
+Subject: [PATCH 070/N] set venv activate path unix
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index 45af353..877b5d3 100644
  
  _OLD_VIRTUAL_PATH="$PATH"
 -- 
-2.32.0
+2.33.0
 
diff --git a/0084-venv-creation-fixes.patch b/0071-venv-creation-fixes.patch
index 1b84a2279970..fb3f5d66d30d 100644
--- a/0084-venv-creation-fixes.patch
+++ b/0071-venv-creation-fixes.patch
@@ -1,7 +1,7 @@
-From eb0b0f383d56454cc6fde8f19ea056bf5bed75ce Mon Sep 17 00:00:00 2001
+From c82449ed5fed227754cfe841e67b7591b8683ed7 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:26 +0530
-Subject: [PATCH 084/N] venv creation fixes
+Subject: [PATCH 071/N] venv creation fixes
 
 ---
  Lib/venv/__init__.py | 19 ++++++++++++++-----
@@ -67,5 +67,5 @@ index 8009deb..b471006 100644
      def setup_scripts(self, context):
          """
 -- 
-2.32.0
+2.33.0
 
diff --git a/0085-pass-gen-profile-ldflags.patch b/0072-pass-gen-profile-ldflags.patch
index b67e10c61efb..6d623b02ec36 100644
--- a/0085-pass-gen-profile-ldflags.patch
+++ b/0072-pass-gen-profile-ldflags.patch
@@ -1,7 +1,7 @@
-From d7dcc7c569482c7b1d2bc811b12e1f6a82d75cb3 Mon Sep 17 00:00:00 2001
+From 6e6cac92a946334a81bb08adbc54902d428b2dc5 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:27 +0530
-Subject: [PATCH 085/N] pass gen profile ldflags
+Subject: [PATCH 072/N] pass gen profile ldflags
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,10 +12,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 7c1a775..3331d5c 100644
+index afeee0e..2018514 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -729,7 +729,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
+@@ -726,7 +726,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
  $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o
  	if test -n "$(DLLLIBRARY)"; then \
  		$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
@@ -25,5 +25,5 @@ index 7c1a775..3331d5c 100644
  	fi
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0087-pkg-config-windows-must-link-ext-with-python-lib.patch b/0073-pkg-config-windows-must-link-ext-with-python-lib.patch
index 0110603636b0..e01ff57871ae 100644
--- a/0087-pkg-config-windows-must-link-ext-with-python-lib.patch
+++ b/0073-pkg-config-windows-must-link-ext-with-python-lib.patch
@@ -1,8 +1,8 @@
-From 2834911199728b44d81ab258423b7fdbabd4753a Mon Sep 17 00:00:00 2001
+From 95164a8cedfca44250dd81d98d92cfc8d4c7f0b1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:29 +0530
-Subject: [PATCH 087/N] pkg config windows must link ext with python lib
+Subject: [PATCH 073/N] pkg config windows must link ext with python lib
 
 ---
  Misc/python.pc.in | 2 +-
@@ -21,18 +21,18 @@ index 87e04de..3900190 100644
 +Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
  Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@
 diff --git a/configure.ac b/configure.ac
-index fb15812..d8b1eb3 100644
+index 032d658..588ffd4 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5149,7 +5149,7 @@ AC_MSG_RESULT($LDVERSION)
+@@ -5150,7 +5150,7 @@ AC_MSG_RESULT($LDVERSION)
  
  # On Android and Cygwin the shared libraries must be linked with libpython.
  AC_SUBST(LIBPYTHON)
 -if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin"; then
-+if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin" -o "$MACHDEP" = "win"; then
++if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin" -o "$MACHDEP" = "win32"; then
    LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
  else
    LIBPYTHON=''
 -- 
-2.32.0
+2.33.0
 
diff --git a/0088-importlib-bootstrap-path-sep.patch b/0074-importlib-bootstrap-path-sep.patch
index f16c8398ec21..45ebba486683 100644
--- a/0088-importlib-bootstrap-path-sep.patch
+++ b/0074-importlib-bootstrap-path-sep.patch
@@ -1,7 +1,7 @@
-From 70b8703cafcfd25608f53a4a70403700dd695202 Mon Sep 17 00:00:00 2001
+From 3fa40ebd03d9cd5b0ab7341344f5d3c31647680f Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:30 +0530
-Subject: [PATCH 088/N] importlib bootstrap path sep
+Subject: [PATCH 074/N] importlib bootstrap path sep
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -27,5 +27,5 @@ index fe31f43..229d9aa 100644
      setattr(self_module, 'path_sep', path_sep)
      setattr(self_module, 'path_separators', ''.join(path_separators))
 -- 
-2.32.0
+2.33.0
 
diff --git a/0089-pathlib-path-sep.patch b/0075-pathlib-path-sep.patch
index ca87d8ae15ac..9adef32da169 100644
--- a/0089-pathlib-path-sep.patch
+++ b/0075-pathlib-path-sep.patch
@@ -1,14 +1,14 @@
-From df3c78d7fbec2a02d559d26315c00d8f29e0a6c8 Mon Sep 17 00:00:00 2001
+From 81189e3707d4f72b57e86e40f065f811d80a97ac Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:31 +0530
-Subject: [PATCH 089/N] pathlib path sep
+Subject: [PATCH 075/N] pathlib path sep
 
 ---
  Lib/pathlib.py | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/Lib/pathlib.py b/Lib/pathlib.py
-index 60e2855..9fc9f38 100644
+index 7aeda14..a66e754 100644
 --- a/Lib/pathlib.py
 +++ b/Lib/pathlib.py
 @@ -123,6 +123,8 @@ class _WindowsFlavour(_Flavour):
@@ -21,5 +21,5 @@ index 60e2855..9fc9f38 100644
      pathmod = ntpath
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0090-warnings-fixes.patch b/0076-warnings-fixes.patch
index 2c4719a2612a..23a7c5286463 100644
--- a/0090-warnings-fixes.patch
+++ b/0076-warnings-fixes.patch
@@ -1,8 +1,8 @@
-From 2a8d3bf3a58d3caad9a27783240c25e9f720d137 Mon Sep 17 00:00:00 2001
+From 92b8d29b62c51db1359f987b022cae560dc5c3c3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:33 +0530
-Subject: [PATCH 090/N] warnings fixes
+Subject: [PATCH 076/N] warnings fixes
 
 ---
  Modules/_winapi.c      | 2 +-
@@ -15,7 +15,7 @@ Subject: [PATCH 090/N] warnings fixes
  7 files changed, 11 insertions(+), 7 deletions(-)
 
 diff --git a/Modules/_winapi.c b/Modules/_winapi.c
-index ba318a1..e4c7d11 100644
+index 1058184..36af7bc 100644
 --- a/Modules/_winapi.c
 +++ b/Modules/_winapi.c
 @@ -950,7 +950,7 @@ getattributelist(PyObject *obj, const char *name, AttributeList *attribute_list)
@@ -127,5 +127,5 @@ index 0ce5e94..6a6fe7e 100644
  
  /* minimum/maximum thread stack sizes supported */
 -- 
-2.32.0
+2.33.0
 
diff --git a/0091-fix-build-testinternalcapi.patch b/0077-fix-build-testinternalcapi.patch
index 1a3648a5f2e8..5bcda88bd5be 100644
--- a/0091-fix-build-testinternalcapi.patch
+++ b/0077-fix-build-testinternalcapi.patch
@@ -1,17 +1,17 @@
-From c7083b0b392333103cf09f4f33d66f07b0b5ac18 Mon Sep 17 00:00:00 2001
+From 08145aec08b12bed92d9010aedcf60cfcc23370b Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:34 +0530
-Subject: [PATCH 091/N] fix build testinternalcapi
+Subject: [PATCH 077/N] fix build testinternalcapi
 
 ---
  setup.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 14e1396..0ce4714 100644
+index 8458232..a4e6dc1 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -978,7 +978,11 @@ class PyBuildExt(build_ext):
+@@ -981,7 +981,11 @@ class PyBuildExt(build_ext):
                             depends=['testcapi_long.h']))
  
          # Python Internal C API test module
@@ -24,5 +24,5 @@ index 14e1396..0ce4714 100644
  
          # Python PEP-3118 (buffer protocol) test module
 -- 
-2.32.0
+2.33.0
 
diff --git a/0092-extend-MS_WINDOWS-flag.patch b/0078-extend-MS_WINDOWS-flag.patch
index 2430614ce75c..53acfb6b7d59 100644
--- a/0092-extend-MS_WINDOWS-flag.patch
+++ b/0078-extend-MS_WINDOWS-flag.patch
@@ -1,14 +1,14 @@
-From 1cdb69057f1fa189eaf8ef57c6a6ec946f681aaf Mon Sep 17 00:00:00 2001
+From b3cac7696a876238e11f9ea45b32d8b3ef755dc3 Mon Sep 17 00:00:00 2001
 From: Long Nguyen <nguyen.long.908132@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:34 +0530
-Subject: [PATCH 092/N] extend MS_WINDOWS flag
+Subject: [PATCH 078/N] extend MS_WINDOWS flag
 
 ---
  setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 0ce4714..a2d5656 100644
+index a4e6dc1..d161108 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -71,7 +71,7 @@ if sys.platform == "win32" and "MSYSTEM" in os.environ:
@@ -21,5 +21,5 @@ index 0ce4714..a2d5656 100644
  MACOS = (HOST_PLATFORM == 'darwin')
  AIX = (HOST_PLATFORM.startswith('aix'))
 -- 
-2.32.0
+2.33.0
 
diff --git a/0093-clang-arm64.patch b/0079-clang-arm64.patch
index 60f11671c640..ab75edefd6ba 100644
--- a/0093-clang-arm64.patch
+++ b/0079-clang-arm64.patch
@@ -1,26 +1,12 @@
-From 025cefb3dca7317d7476fa2a40938206e65eaa80 Mon Sep 17 00:00:00 2001
+From 61eb03c5793ae5c6026c7a854e1165556e3c42e7 Mon Sep 17 00:00:00 2001
 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com>
 Date: Thu, 17 Jun 2021 18:52:36 +0530
-Subject: [PATCH 093/N] clang arm64
+Subject: [PATCH 079/N] clang arm64
 
 ---
- Lib/distutils/cygwinccompiler.py |  2 +-
- Python/getcompiler.c             | 11 ++++++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
+ Python/getcompiler.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
 
-diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
-index fcba43a..0c063a8 100644
---- a/Lib/distutils/cygwinccompiler.py
-+++ b/Lib/distutils/cygwinccompiler.py
-@@ -394,7 +394,7 @@ def check_config_h():
-         return (CONFIG_H_UNCERTAIN,
-                 "couldn't read '%s': %s" % (fn, exc.strerror))
- 
--RE_VERSION = re.compile(br'[\D\s]*(\d+\.\d+(\.\d+)*)[\D\s]*$')
-+RE_VERSION = re.compile(br'[\D\s]*(\d+\.\d+(\.\d+)*)[\D\s]*')
- 
- def _find_exe_version(cmd):
-     """Find the version of an executable by running `cmd` in the shell.
 diff --git a/Python/getcompiler.c b/Python/getcompiler.c
 index adccaa7..b529e29 100644
 --- a/Python/getcompiler.c
@@ -59,5 +45,5 @@ index adccaa7..b529e29 100644
  #elif defined(__cplusplus)
  #define COMPILER "[C++]"
 -- 
-2.32.0
+2.33.0
 
diff --git a/0094-MINGW-stack-reserve.patch b/0080-configure.ac-set-MINGW-stack-reserve.patch
index b790b9a9323a..bee36b50a7c6 100644
--- a/0094-MINGW-stack-reserve.patch
+++ b/0080-configure.ac-set-MINGW-stack-reserve.patch
@@ -1,14 +1,14 @@
-From f20f69a24d26de4f570e0c3806b8e328fe54a2b5 Mon Sep 17 00:00:00 2001
+From 2a92ce2774eee311160740719a7c80e85c62ab36 Mon Sep 17 00:00:00 2001
 From: jeremyd2019 <4524874+jeremyd2019@users.noreply.github.com>
 Date: Thu, 17 Jun 2021 18:52:37 +0530
-Subject: [PATCH 094/N] MINGW stack reserve
+Subject: [PATCH 080/N] configure.ac: set MINGW stack reserve
 
 ---
  configure.ac | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index d8b1eb3..d76db66 100644
+index 588ffd4..5b41066 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -3065,6 +3065,11 @@ then
@@ -24,5 +24,5 @@ index d8b1eb3..d76db66 100644
  AC_MSG_RESULT($LINKFORSHARED)
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0097-Don-t-use-os.pathsep-to-find-EOF.patch b/0081-Don-t-use-os.pathsep-to-find-EOF.patch
index b0845a03e772..42e218e12ad0 100644
--- a/0097-Don-t-use-os.pathsep-to-find-EOF.patch
+++ b/0081-Don-t-use-os.pathsep-to-find-EOF.patch
@@ -1,7 +1,7 @@
-From d0241e1a50f2bd27876a54ee3047487d7ce66cc5 Mon Sep 17 00:00:00 2001
+From c791a766360579cd96c1a03563f674ca4e9e5698 Mon Sep 17 00:00:00 2001
 From: Naveen M K <naveen@syrusdark.website>
 Date: Fri, 18 Jun 2021 12:38:11 +0530
-Subject: [PATCH 097/N] Don't use os.pathsep to find EOF not all
+Subject: [PATCH 081/N] Don't use os.pathsep to find EOF not all
  distributions in win32 have them as \ instead check using sys.platform
 
 Signed-off-by: Naveen M K <naveen@syrusdark.website>
@@ -23,5 +23,5 @@ index b344f03..474ef89 100644
      else:
          eof = 'Ctrl-D (i.e. EOF)'
 -- 
-2.32.0
+2.33.0
 
diff --git a/0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch
index 226494752d26..95d3aefab861 100644
--- a/0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch
+++ b/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch
@@ -1,7 +1,7 @@
-From 07a8e1ed1285bf5e2708036b1c1cc72fc87dfa21 Mon Sep 17 00:00:00 2001
+From cda85af5ff314ebd772e1000b48eefaddb0914b7 Mon Sep 17 00:00:00 2001
 From: Naveen M K <naveen521kk@gmail.com>
 Date: Wed, 23 Jun 2021 18:12:12 +0530
-Subject: [PATCH 098/N] Fix extension suffix for c-extensions on mingw
+Subject: [PATCH 082/N] Fix extension suffix for c-extensions on mingw
 
 Python is compiled with various compilers which previously
 had same platform tags or extension suffix. This can be error
@@ -17,11 +17,11 @@ Signed-off-by: Naveen M K <naveen521kk@gmail.com>
 ---
  Makefile.pre.in      |  6 ++--
  Python/dynload_win.c |  6 ----
- configure.ac         | 76 +++++++++++++++++++++++++++++++++++++++-----
- 3 files changed, 71 insertions(+), 17 deletions(-)
+ configure.ac         | 77 +++++++++++++++++++++++++++++++++++++++-----
+ 3 files changed, 72 insertions(+), 17 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 3331d5c..e18239f 100644
+index 2018514..a8aecc2 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -165,6 +165,7 @@ CONFINCLUDEPY=	$(CONFINCLUDEDIR)/python$(LDVERSION)
@@ -32,7 +32,7 @@ index 3331d5c..e18239f 100644
  LDSHARED=	@LDSHARED@ $(PY_LDFLAGS)
  BLDSHARED=	@BLDSHARED@ $(PY_CORE_LDFLAGS)
  LDCXXSHARED=	@LDCXXSHARED@
-@@ -851,8 +852,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
+@@ -848,8 +849,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
  
  Python/dynload_win.o: $(srcdir)/Python/dynload_win.c Makefile
  	$(CC) -c $(PY_CORE_CFLAGS) \
@@ -42,7 +42,7 @@ index 3331d5c..e18239f 100644
  		-o $@ $(srcdir)/Python/dynload_win.c
  
  Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h
-@@ -1691,7 +1691,7 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+@@ -1688,7 +1688,7 @@ libainstall:	@DEF_MAKE_RULE@ python-config
  	done
  	@if test -d $(LIBRARY); then :; else \
  		if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
@@ -69,7 +69,7 @@ index bd34310..60fb603 100644
      PYD_UNTAGGED_SUFFIX,
      NULL
 diff --git a/configure.ac b/configure.ac
-index 7cf6519..bba2006 100644
+index 5b41066..69cb8fb 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2825,7 +2825,7 @@ if test -z "$SHLIB_SUFFIX"; then
@@ -81,7 +81,7 @@ index 7cf6519..bba2006 100644
  	esac
  fi
  AC_MSG_RESULT($SHLIB_SUFFIX)
-@@ -5114,6 +5114,67 @@ esac
+@@ -5115,6 +5115,68 @@ esac
  # check for endianness
  AC_C_BIGENDIAN
  
@@ -102,11 +102,12 @@ index 7cf6519..bba2006 100644
 +  *-*-mingw*)
 +    # check if we are linking to ucrt
 +    AC_MSG_CHECKING(whether linking to ucrt)
-+    AC_RUN_IFELSE([AC_LANG_SOURCE([[
++    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 +    #include <stdio.h>
-+    int main(){
-+      _UCRT;
-+    }
++    #ifndef _UCRT
++        #error no ucrt
++    #endif
++    int main(){ return 0; }
 +    ]])],[linking_to_ucrt=yes],[linking_to_ucrt=no])
 +    AC_MSG_RESULT($linking_to_ucrt)
 +    ;;
@@ -149,7 +150,7 @@ index 7cf6519..bba2006 100644
  # ABI version string for Python extension modules.  This appears between the
  # periods in shared library file names, e.g. foo.<SOABI>.so.  It is calculated
  # from the following attributes which affect the ABI of this Python build (in
-@@ -5146,7 +5207,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then
+@@ -5147,7 +5209,12 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then
  fi
  
  AC_SUBST(EXT_SUFFIX)
@@ -163,7 +164,7 @@ index 7cf6519..bba2006 100644
  
  AC_MSG_CHECKING(LDVERSION)
  LDVERSION='$(VERSION)$(ABIFLAGS)'
-@@ -5824,12 +5890,6 @@ case "$ac_cv_computed_gotos" in yes*)
+@@ -5819,12 +5886,6 @@ case "$ac_cv_computed_gotos" in yes*)
    AC_DEFINE(HAVE_COMPUTED_GOTOS, 1,
    [Define if the C compiler supports computed gotos.])
  esac
@@ -177,5 +178,5 @@ index 7cf6519..bba2006 100644
  case $ac_sys_system in
  AIX*)
 -- 
-2.32.0
+2.33.0
 
diff --git a/0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch b/0083-Change-the-get_platform-method-in-sysconfig.patch
index 07dd2e3f7943..d466f7d6dca3 100644
--- a/0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch
+++ b/0083-Change-the-get_platform-method-in-sysconfig.patch
@@ -1,8 +1,7 @@
-From 0e71a45f5306c61085b972fb6799dad58cc51b83 Mon Sep 17 00:00:00 2001
-From: Naveen M K <naveen521kk@gmail.com>
-Date: Mon, 28 Jun 2021 17:31:35 +0530
-Subject: [PATCH 099/N] Change the `get_platform()` method in sysconfig and
- distutils
+From ff2b019fd2d67ea53fd8431a3aa59b4508331f2c Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 21:36:58 +0200
+Subject: [PATCH 083/N] Change the `get_platform()` method in sysconfig
 
 This would possibly fix building wheels when mingw python
 is used and would be unique to each python same as EXT_SUFFIX.
@@ -12,43 +11,15 @@ in it.
 
 Signed-off-by: Naveen M K <naveen521kk@gmail.com>
 ---
- Lib/distutils/util.py | 16 ++++++++++++++--
- Lib/sysconfig.py      | 16 ++++++++++++++--
- Python/getcompiler.c  |  4 ++++
- 3 files changed, 32 insertions(+), 4 deletions(-)
+ Lib/sysconfig.py     | 16 ++++++++++++++--
+ Python/getcompiler.c |  4 ++++
+ 2 files changed, 18 insertions(+), 2 deletions(-)
 
-diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
-index 75a369d..5b51c76 100644
---- a/Lib/distutils/util.py
-+++ b/Lib/distutils/util.py
-@@ -36,8 +36,20 @@ def get_host_platform():
- 
-     """
-     if os.name == 'nt':
--        if 'GCC' in sys.version:
--            return 'mingw'
-+        if 'gcc' in sys.version.lower():
-+            if 'ucrt' in sys.version.lower():
-+                if 'amd64' in sys.version.lower():
-+                    return 'mingw_x86_64_ucrt'
-+                return 'mingw_i686_ucrt'
-+            if 'clang' in sys.version.lower():
-+                if 'amd64' in sys.version.lower():
-+                    return 'mingw_x86_64_clang'
-+                if 'arm64' in sys.version.lower():
-+                    return 'mingw_aarch64'
-+                return 'mingw_i686_clang'
-+            if 'amd64' in sys.version.lower():
-+                return 'mingw_x86_64'
-+            return 'mingw_i686'
-         if 'amd64' in sys.version.lower():
-             return 'win-amd64'
-         if '(arm)' in sys.version.lower():
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index c0695e2..854b382 100644
+index 64f7719..7a34759 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
-@@ -667,8 +667,20 @@ def get_platform():
+@@ -668,8 +668,20 @@ def get_platform():
  
      """
      if os.name == 'nt':
@@ -89,5 +60,5 @@ index b529e29..2d935fe 100644
  #elif defined(__cplusplus)
  #define COMPILER "[C++]"
 -- 
-2.32.0
+2.33.0
 
diff --git a/0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch b/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch
index b5fd650acb68..a4ce9d2d0274 100644
--- a/0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch
+++ b/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch
@@ -1,8 +1,8 @@
-From 2f233ca6cfa1122c784219e130e50ce9d0276777 Mon Sep 17 00:00:00 2001
+From 68b961fb34930195f208a85d0123e3a6d700f515 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:21 +0530
-Subject: [PATCH 012/N] MINGW compiler customize mingw cygwin compilers
+Subject: [PATCH 084/N] distutils: compiler customize mingw cygwin compilers
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -50,5 +50,5 @@ index 37feae5..bbe8e3c 100644
              if not get_config_var('CUSTOMIZED_OSX_COMPILER'):
                  import _osx_support
 -- 
-2.32.0
+2.33.0
 
diff --git a/0013-MINGW-compiler-enable-new-dtags.patch b/0085-distutils-compiler-enable-new-dtags.patch
index 5e46bbea97c9..a9427386e0f1 100644
--- a/0013-MINGW-compiler-enable-new-dtags.patch
+++ b/0085-distutils-compiler-enable-new-dtags.patch
@@ -1,8 +1,8 @@
-From d96bd363de3b94dccbe4e685796c5fd482fac63d Mon Sep 17 00:00:00 2001
+From fc9e160c083b5aa586615624a0000dcc901990df Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:22 +0530
-Subject: [PATCH 013/N] MINGW compiler enable new dtags
+Subject: [PATCH 085/N] distutils: compiler enable new dtags
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -33,5 +33,5 @@ index f0792de..60776bc 100644
                      return "-Wl,-R" + dir
              else:
 -- 
-2.32.0
+2.33.0
 
diff --git a/0024-MINGW-build-extensions-with-GCC.patch b/0086-distutils-MINGW-build-extensions-with-GCC.patch
index 6dc1bd101099..ee576d1c547e 100644
--- a/0024-MINGW-build-extensions-with-GCC.patch
+++ b/0086-distutils-MINGW-build-extensions-with-GCC.patch
@@ -1,18 +1,12 @@
-From 386008948b544e74ebe06620dc41a6a555195170 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
- <alexey.pawlow@gmail.com>
-Date: Thu, 17 Jun 2021 18:51:34 +0530
-Subject: [PATCH 024/N] MINGW build extensions with GCC
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+From bc18b4c3c94375ddff17aaf5a1bb5bd1e401997f Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 20:52:22 +0200
+Subject: [PATCH 086/N] distutils: MINGW build extensions with GCC
 
-Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 ---
  Lib/distutils/command/build_ext.py | 16 +++++++++++++++-
  Lib/distutils/util.py              |  2 ++
- Lib/sysconfig.py                   |  2 ++
- 3 files changed, 19 insertions(+), 1 deletion(-)
+ 2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
 index 1a9bd12..1c9d471 100644
@@ -61,19 +55,6 @@ index 4b002ec..7b2e1e0 100644
          if 'amd64' in sys.version.lower():
              return 'win-amd64'
          if '(arm)' in sys.version.lower():
-diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 505d538..aa49d80 100644
---- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
-@@ -656,6 +656,8 @@ def get_platform():
- 
-     """
-     if os.name == 'nt':
-+        if 'GCC' in sys.version:
-+            return 'mingw'
-         if 'amd64' in sys.version.lower():
-             return 'win-amd64'
-         if '(arm)' in sys.version.lower():
 -- 
-2.32.0
+2.33.0
 
diff --git a/0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch b/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch
index ca5bc2582283..fbd3d55ee128 100644
--- a/0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch
+++ b/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch
@@ -1,8 +1,9 @@
-From 88fba0fa0fcc87ea40fbd329f5e21ab6ebbe6f29 Mon Sep 17 00:00:00 2001
+From 40bf9e42ca67d8ac0592bc6674a9e958eabd74c3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:35 +0530
-Subject: [PATCH 025/N] MINGW use Mingw32CCompiler as default compiler for m
+Subject: [PATCH 087/N] distutils: use Mingw32CCompiler as default compiler
+ for m
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -68,5 +69,5 @@ index 66c12dd..1960ef8 100644
  # Because these compilers aren't configured in Python's pyconfig.h file by
  # default, we should at least warn the user if he is using an unmodified
 -- 
-2.32.0
+2.33.0
 
diff --git a/0026-MINGW-find-import-library.patch b/0088-distutils-find-import-library.patch
index 7987c37ba74a..6f470345abcf 100644
--- a/0026-MINGW-find-import-library.patch
+++ b/0088-distutils-find-import-library.patch
@@ -1,8 +1,8 @@
-From 193124357e5d484853f54fdc1ecc1e131bfc3794 Mon Sep 17 00:00:00 2001
+From 41d8050684eb5925e8a4c979610a3aa340139e6d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:36 +0530
-Subject: [PATCH 026/N] MINGW find import library
+Subject: [PATCH 088/N] distutils: find import library
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,5 +25,5 @@ index 1960ef8..39ad631 100644
      shared_lib_format = "%s%s"
      exe_extension = ".exe"
 -- 
-2.32.0
+2.33.0
 
diff --git a/0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch b/0089-distutils-avoid-circular-dependency-from-time-module.patch
index fb2fc5ebe831..c4862dd51607 100644
--- a/0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch
+++ b/0089-distutils-avoid-circular-dependency-from-time-module.patch
@@ -1,8 +1,9 @@
-From 4ffbd9b3c17b527f172d805010b5e20679165833 Mon Sep 17 00:00:00 2001
+From a4abb467ae7cf72e1552727b7725e40fc7412448 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:41 +0530
-Subject: [PATCH 031/N] MINGW avoid circular dependency from time module dur
+Subject: [PATCH 089/N] distutils: avoid circular dependency from time module
+ dur
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -33,5 +34,5 @@ index 39ad631..5b281e2 100644
      try:
          out_string = out.read()
 -- 
-2.32.0
+2.33.0
 
diff --git a/0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch b/0090-distutils-generalization-of-posix-build-in-distutils.patch
index 6993dfc41501..9a66e7e3483b 100644
--- a/0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch
+++ b/0090-distutils-generalization-of-posix-build-in-distutils.patch
@@ -1,8 +1,9 @@
-From 2b69618ed982a6f174a7bc666b08c90eee83c268 Mon Sep 17 00:00:00 2001
+From 24eed4bff46abb9913a9869684eef985161155a3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:41 +0530
-Subject: [PATCH 032/N] MINGW generalization of posix build in distutils sys
+Subject: [PATCH 090/N] distutils: generalization of posix build in distutils
+ sys
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -90,5 +91,5 @@ index bbe8e3c..80d3523 100644
              if (not os.path.isabs(_config_vars['srcdir']) and
                  base != os.getcwd()):
 -- 
-2.32.0
+2.33.0
 
diff --git a/0091-distutils-mingw-sysconfig-like-posix.patch b/0091-distutils-mingw-sysconfig-like-posix.patch
new file mode 100644
index 000000000000..57703912c930
--- /dev/null
+++ b/0091-distutils-mingw-sysconfig-like-posix.patch
@@ -0,0 +1,28 @@
+From a0d9baa8dc4b4afb5e7ba33980ec6d9f3d67551c Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 20:53:29 +0200
+Subject: [PATCH 091/N] distutils: mingw sysconfig like posix
+
+---
+ Lib/distutils/command/build_ext.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
+index 1c9d471..1dbdfe0 100644
+--- a/Lib/distutils/command/build_ext.py
++++ b/Lib/distutils/command/build_ext.py
+@@ -221,9 +221,10 @@ class build_ext(Command):
+         if sys.platform[:6] == 'cygwin':
+             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
+                 # building third party extensions
++                config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL'))
+                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
+                                                       "python" + get_python_version(),
+-                                                      "config"))
++                                                      config_dir_name))
+             else:
+                 # building python standard extensions
+                 self.library_dirs.append('.')
+-- 
+2.33.0
+
diff --git a/0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch b/0092-distutils-get_versions-fixes.patch
index 5f109c9cdc03..8a0f671ae802 100644
--- a/0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch
+++ b/0092-distutils-get_versions-fixes.patch
@@ -1,8 +1,7 @@
-From c4507430c95893ad2be0a1796f8dc7a7962ef789 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
- <alexey.pawlow@gmail.com>
-Date: Thu, 17 Jun 2021 18:51:51 +0530
-Subject: [PATCH 044/N] mingw _winapi_as_builtin_for_Popen_in_cygwinccompiler
+From 985a20ad50a309a528397ec6f43cf15f848c2797 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 21:14:31 +0200
+Subject: [PATCH 092/N] distutils: get_versions() fixes
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -11,12 +10,10 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
 Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
 ---
  Lib/distutils/cygwinccompiler.py | 14 ++++++++++++--
- Modules/Setup.config.in          |  1 +
- setup.py                         |  4 +++-
- 3 files changed, 16 insertions(+), 3 deletions(-)
+ 1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
-index 5b281e2..f90af3b 100644
+index 5b281e2..fba3485 100644
 --- a/Lib/distutils/cygwinccompiler.py
 +++ b/Lib/distutils/cygwinccompiler.py
 @@ -56,6 +56,7 @@ from distutils.errors import (DistutilsExecError, CCompilerError,
@@ -32,7 +29,7 @@ index 5b281e2..f90af3b 100644
                  "couldn't read '%s': %s" % (fn, exc.strerror))
  
 -RE_VERSION = re.compile(br'(\d+\.\d+(\.\d+)*)')
-+RE_VERSION = re.compile(br'[\D\s]*(\d+\.\d+(\.\d+)*)[\D\s]*$')
++RE_VERSION = re.compile(br'[\D\s]*(\d+\.\d+(\.\d+)*)[\D\s]*')
  
  def _find_exe_version(cmd):
      """Find the version of an executable by running `cmd` in the shell.
@@ -54,31 +51,6 @@ index 5b281e2..f90af3b 100644
      return tuple([_find_exe_version(cmd) for cmd in commands])
  
  def is_cygwingcc():
-diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in
-index 825ce5d..b4e7ff7 100644
---- a/Modules/Setup.config.in
-+++ b/Modules/Setup.config.in
-@@ -12,4 +12,5 @@
- # build-in modules for windows platform:
- @USE_WIN32_MODULE@winreg ../PC/winreg.c
- @USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c
-+@USE_WIN32_MODULE@_winapi _winapi.c
- 
-diff --git a/setup.py b/setup.py
-index 72f1281..36af6e9 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1607,7 +1607,9 @@ class PyBuildExt(build_ext):
-             self.add(Extension('msvcrt', [os.path.join(pc_srcdir, p)
-                                for p in ['msvcrtmodule.c']]))
- 
--            self.add(Extension('_winapi', ['_winapi.c']))
-+            # Added to Setup.config.in as now needed earlier since I
-+            # use subprocess (which uses Popen) in cygwinccompiler.py
-+            # self.add(Extension('_winapi', ['_winapi.c']))
- 
-             self.add(Extension('_msi', [os.path.join(pc_srcdir, p)
-                                for p in ['_msi.c']],
 -- 
-2.32.0
+2.33.0
 
diff --git a/0054-mingw-install-layout-as-posix.patch b/0093-distutils-install-layout-as-posix.patch
index 4e160b71bb01..bc9f61071f1e 100644
--- a/0054-mingw-install-layout-as-posix.patch
+++ b/0093-distutils-install-layout-as-posix.patch
@@ -1,8 +1,8 @@
-From d2e564612e1c443c7e8b523e8d7e9ac34e522fc4 Mon Sep 17 00:00:00 2001
+From 71cd2a0390d9e9fad42fed5c0e06d758de39edcf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:51:59 +0530
-Subject: [PATCH 054/N] mingw install layout as posix
+Subject: [PATCH 093/N] distutils: install layout as posix
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
-index eea417e..f8c42c7 100644
+index aaa300e..c611252 100644
 --- a/Lib/distutils/command/install.py
 +++ b/Lib/distutils/command/install.py
 @@ -20,10 +20,10 @@ from site import USER_SITE
@@ -43,5 +43,5 @@ index eea417e..f8c42c7 100644
          }
  
 -- 
-2.32.0
+2.33.0
 
diff --git a/0047-msys-convert_path-fix-and-root-hack.patch b/0094-distutils-msys-convert_path-fix-and-root-hack.patch
index 75425a9ed981..53b7f4e45ac6 100644
--- a/0047-msys-convert_path-fix-and-root-hack.patch
+++ b/0094-distutils-msys-convert_path-fix-and-root-hack.patch
@@ -1,23 +1,15 @@
-From c96759da7b85fe3100ea018eabcce4fb11008212 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
- <alexey.pawlow@gmail.com>
-Date: Thu, 17 Jun 2021 18:51:54 +0530
-Subject: [PATCH 047/N] msys convert_path fix and root hack
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+From 1ed69d8e50d34a111c7b42951863e13d9cef1930 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 21:18:50 +0200
+Subject: [PATCH 094/N] distutils: msys convert_path fix and root hack
 
-Co-authored-by: Алексей <alexey.pawlow@gmail.com>
-Co-authored-by: Christoph Reiter <reiter.christoph@gmail.com>
-Co-authored-by: Audrey Dutcher <audrey@rhelmot.io>
 ---
  Lib/distutils/command/install.py |  3 ++-
  Lib/distutils/util.py            | 26 ++++++++++++++++++++++++--
- Makefile.pre.in                  | 12 +++++++++---
- 3 files changed, 35 insertions(+), 6 deletions(-)
+ 2 files changed, 26 insertions(+), 3 deletions(-)
 
 diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
-index aaa300e..eea417e 100644
+index c611252..f8c42c7 100644
 --- a/Lib/distutils/command/install.py
 +++ b/Lib/distutils/command/install.py
 @@ -342,7 +342,8 @@ class install(Command):
@@ -82,36 +74,6 @@ index 7b2e1e0..75a369d 100644
  
      else:
          raise DistutilsPlatformError("nothing known about platform '%s'" % os.name)
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 5271dd8..72be72d 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1707,6 +1707,12 @@ libainstall:	@DEF_MAKE_RULE@ python-config
- 	else true; \
- 	fi
- 
-+ifeq ($(shell uname -o),Msys)
-+DESTDIRFINAL=$(DESTDIR)
-+else
-+DESTDIRFINAL=$(DESTDIR)/
-+endif
-+
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
-@@ -1714,9 +1720,9 @@ sharedinstall: sharedmods
- 	   	--prefix=$(prefix) \
- 		--install-scripts=$(BINDIR) \
- 		--install-platlib=$(DESTSHARED) \
--		--root=$(DESTDIR)/
--	-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
--	-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
-+		--root=$(DESTDIRFINAL)
-+	-rm $(DESTDIRFINAL)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
-+	-rm -r $(DESTDIRFINAL)$(DESTSHARED)/__pycache__
- 
- # Here are a couple of targets for MacOSX again, to install a full
- # framework-based Python. frameworkinstall installs everything, the
 -- 
-2.32.0
+2.33.0
 
diff --git a/0061-mingw-build-optimized-ext.patch b/0095-distutils-mingw-build-optimized-ext.patch
index 118ab56d11da..21d2284f0c91 100644
--- a/0061-mingw-build-optimized-ext.patch
+++ b/0095-distutils-mingw-build-optimized-ext.patch
@@ -1,8 +1,8 @@
-From af81cead554790e55ac7297c78c7cf0751741b40 Mon Sep 17 00:00:00 2001
+From 1da2752289e00fe51e2c8a0b25138ac83f1f0983 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:04 +0530
-Subject: [PATCH 061/N] mingw build optimized ext
+Subject: [PATCH 095/N] distutils: mingw build optimized ext
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
-index f90af3b..0bda7a3 100644
+index fba3485..bb97880 100644
 --- a/Lib/distutils/cygwinccompiler.py
 +++ b/Lib/distutils/cygwinccompiler.py
 @@ -303,9 +303,9 @@ class Mingw32CCompiler(CygwinCCompiler):
@@ -30,5 +30,5 @@ index f90af3b..0bda7a3 100644
                               linker_so='%s %s %s'
                                          % (self.linker_dll, shared_option,
 -- 
-2.32.0
+2.33.0
 
diff --git a/0096-Add-CI-to-Build-and-Test.patch b/0096-Add-CI-to-Build-and-Test.patch
deleted file mode 100644
index bd3dd00f2b23..000000000000
--- a/0096-Add-CI-to-Build-and-Test.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-From 3a33db28df3b60d7127396f76366e2081eccd386 Mon Sep 17 00:00:00 2001
-From: Naveen M K <naveen521kk@gmail.com>
-Date: Fri, 18 Jun 2021 17:51:59 +0530
-Subject: [PATCH 096/N] Add CI to Build and Test
-
----
- .github/workflows/mingw.yml     | 229 ++++++++++++++++++++++++++++++++
- .github/workflows/smoketests.py | 132 ++++++++++++++++++
- 2 files changed, 361 insertions(+)
- create mode 100644 .github/workflows/mingw.yml
- create mode 100644 .github/workflows/smoketests.py
-
-diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
-new file mode 100644
-index 0000000..fff5fa5
---- /dev/null
-+++ b/.github/workflows/mingw.yml
-@@ -0,0 +1,229 @@
-+name: Build
-+on: [push, pull_request, workflow_dispatch]
-+
-+jobs:
-+  build:
-+    runs-on: windows-latest
-+    strategy:
-+      fail-fast: false
-+      matrix:
-+        msystem: ['MINGW64','MINGW32','UCRT64','CLANG64']
-+        include:
-+          - msystem: MINGW64
-+            prefix: mingw-w64-x86_64
-+          - msystem: MINGW32
-+            prefix: mingw-w64-i686
-+          - msystem: UCRT64
-+            prefix: mingw-w64-ucrt-x86_64
-+          - msystem: CLANG64
-+            prefix: mingw-w64-clang-x86_64
-+          #- msystem: CLANG32
-+          #  prefix: mingw-w64-clang-i686
-+    steps:
-+      - name: Setup git
-+        run: |
-+          git config --global core.autocrlf false
-+          git config --global core.eol lf
-+      - uses: actions/checkout@v2
-+      - uses: msys2/setup-msys2@v2
-+        with:
-+          msystem: ${{ matrix.msystem }}
-+          release: false
-+          install: >-
-+            make
-+            binutils
-+            autoconf-archive
-+            ${{ matrix.prefix }}-toolchain
-+            ${{ matrix.prefix }}-expat
-+            ${{ matrix.prefix }}-bzip2
-+            ${{ matrix.prefix }}-libffi
-+            ${{ matrix.prefix }}-mpdecimal
-+            ${{ matrix.prefix }}-ncurses
-+            ${{ matrix.prefix }}-openssl
-+            ${{ matrix.prefix }}-sqlite3
-+            ${{ matrix.prefix }}-tcl
-+            ${{ matrix.prefix }}-tk
-+            ${{ matrix.prefix }}-zlib
-+            ${{ matrix.prefix }}-xz
-+
-+      - name: Build Python
-+        shell: msys2 {0}
-+        run: |
-+          set -ex
-+          pkgver='3.9.5'
-+          _pybasever='3.9'
-+          
-+          PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
-+          if [ ${{ matrix.msystem }} == "CLANG64" ]
-+          then
-+            export CC=clang
-+            export CXX=clang++
-+          fi
-+          autoreconf -vfi
-+          CFLAGS+=" -fwrapv -D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601"
-+          CXXFLAGS+=" -fwrapv -D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601"
-+          CPPFLAGS+=" -I${PREFIX_WIN}/include/ncurses "
-+          CFLAGS+=" -DNDEBUG "
-+          CXXFLAGS+=" -DNDEBUG "
-+          _extra_config+=("--enable-optimizations")
-+          # Fix MS_DLL_ID undeclared in PC/dl_nt.c
-+          f3f=0
-+          re='^[0-9]+$'
-+          part3=${pkgver##*.}
-+          if ! [[ $part3 =~ $re ]]; then
-+              c=
-+              while test -n "$part3"; do
-+                  b=${part3:0:1}
-+                  if ! [[ $b =~ $re ]]; then
-+                      break
-+                  fi
-+                  c+=${b}
-+                  part3=${part3:1}
-+              done
-+              f3f=$((f3f + 1000 * $((${c}))))
-+              part3Len=${#part3}
-+              if [ "$part3Len" -ge "1" ]; then
-+                  f3f=$((f3f + 10 * $((0x${part3:0:1}))))
-+                  if [ "$part3Len" -ge "2" ]; then
-+                      f3f=$((f3f + ${part3:1:1}))
-+                  fi
-+              fi
-+          else
-+              f3f=$((f3f + 1000 * ${part3}))
-+          fi
-+          CFLAGS+=" -DMS_DLL_ID=\\\"${_pybasever}\\\""
-+          CFLAGS+=" -DFIELD3=${f3f}"
-+          CFLAGS+=" -DORIGINAL_FILENAME=\\\"libpython${_pybasever}.dll\\\""
-+          rc_flags=" -DMS_DLL_ID=\\\\\\\"${_pybasever}\\\\\\\" -DFIELD3=${f3f} -DORIGINAL_FILENAME=\\\\\\\"libpython${_pybasever}.dll\\\\\\\""
-+
-+          # Workaround for conftest error on 64-bit builds
-+          export ac_cv_working_tzset=no
-+
-+          # Workaround for when dlfcn exists on Windows, which causes
-+          # some conftests to succeed when they shouldn't (we don't use dlfcn).
-+          export ac_cv_header_dlfcn_h=no
-+          export ac_cv_lib_dl_dlopen=no
-+          export ac_cv_have_decl_RTLD_GLOBAL=no
-+          export ac_cv_have_decl_RTLD_LAZY=no
-+          export ac_cv_have_decl_RTLD_LOCAL=no
-+          export ac_cv_have_decl_RTLD_NOW=no
-+          export ac_cv_have_decl_RTLD_DEEPBIND=no
-+          export ac_cv_have_decl_RTLD_MEMBER=no
-+          export ac_cv_have_decl_RTLD_NODELETE=no
-+          export ac_cv_have_decl_RTLD_NOLOAD=no
-+          
-+          export CFLAGS
-+          export CXXFLAGS
-+          export CPPFLAGS
-+          
-+          
-+          MSYSTEM=MINGW ./configure \
-+            --prefix=${MINGW_PREFIX} \
-+            --host=${MINGW_CHOST} \
-+            --build=${MINGW_CHOST} \
-+            --enable-shared \
-+            --with-nt-threads \
-+            --with-system-expat \
-+            --with-system-ffi \
-+            --with-system-libmpdec \
-+            --without-ensurepip \
-+            --without-c-locale-coercion \
-+            --enable-loadable-sqlite-extensions \
-+            "${_extra_config[@]}" \
-+            RCFLAGS="$rc_flags" \
-+            OPT=""
-+          # We patch importlib which is embedded in C headers, so regenerate them
-+          make regen-importlib
-+
-+          make -j8
-+          
-+          # Add missing venvlauncher files (issue #7014)
-+          # FIXME: build these from PC/launcher.c instead
-+          cp python.exe venvlauncher.exe
-+          cp pythonw.exe venvwlauncher.exe
-+
-+      - name: Install
-+        shell: msys2 {0}
-+        run: |
-+          set -ex
-+          
-+          pkgver='3.9.5'
-+          _pybasever='3.9'
-+          srcdir=.
-+
-+          # now install things
-+
-+          pkgdir=python_pkgdir
-+
-+          PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
-+          MSYSTEM=MINGW \
-+          MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-+          make -j1 install DESTDIR="${pkgdir}"
-+          VERABI=${_pybasever}
-+
-+          # gdb pretty printers for debugging Python itself; to use:
-+          # python
-+          # sys.path.append('C:/msys64/mingw64/share/gdb/python3')
-+          # import python_gdb
-+          # reload(python_gdb)
-+          # end
-+
-+          cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/libpython${VERABI}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${VERABI}.dll.a
-+
-+          # Need for building boost python module
-+          cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/libpython${VERABI}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a
-+
-+          for fscripts in 2to3 2to3-${_pybasever} idle3 idle${_pybasever} pydoc3 pydoc${_pybasever}; do
-+              sed -i "s|$(cygpath -w ${MINGW_PREFIX} | sed 's|\\|\\\\|g')/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" "${pkgdir}${MINGW_PREFIX}"/bin/${fscripts}
-+          done
-+
-+
-+          cp "${pkgdir}${MINGW_PREFIX}"/bin/python3.exe "${pkgdir}${MINGW_PREFIX}"/bin/python.exe
-+          cp "${pkgdir}${MINGW_PREFIX}"/bin/python3w.exe "${pkgdir}${MINGW_PREFIX}"/bin/pythonw.exe
-+          cp "${pkgdir}${MINGW_PREFIX}"/bin/python3-config "${pkgdir}${MINGW_PREFIX}"/bin/python-config
-+          cp "${pkgdir}${MINGW_PREFIX}"/bin/idle3 "${pkgdir}${MINGW_PREFIX}"/bin/idle
-+          cp "${pkgdir}${MINGW_PREFIX}"/bin/pydoc3 "${pkgdir}${MINGW_PREFIX}"/bin/pydoc
-+
-+          sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${VERABI}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/python-config.py
-+
-+          # fix permissons
-+          find ${pkgdir}${MINGW_PREFIX} -type f \( -name "*.dll" -o -name "*.exe" \) | xargs chmod 0755
-+
-+          # replace paths in sysconfig
-+          sed -i "s|${pkgdir}${MINGW_PREFIX}|${MINGW_PREFIX}|g" \
-+          "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/lib-dynload/_sysconfigdata*.py \
-+          "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/smtpd.py
-+
-+          # install venv launchers
-+          mkdir -p "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt
-+          cp venvlauncher.exe "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt/python.exe
-+          cp venvwlauncher.exe "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt/pythonw.exe
-+
-+      - name: Run Smoke Test
-+        shell: msys2 {0}
-+        run: |
-+          SMOKETESTS="$(pwd)/.github/workflows/smoketests.py"
-+          cd python_pkgdir/${MINGW_PREFIX}/bin
-+          ./python.exe "$SMOKETESTS"
-+          MSYSTEM= ./python.exe "$SMOKETESTS"
-+
-+      - name: Run tests
-+        continue-on-error: true
-+        shell: msys2 {0}
-+        run: |
-+          cd python_pkgdir/${MINGW_PREFIX}/bin
-+          ./python.exe -m test -j4
-+
-+      - name: Compress
-+        if: always()
-+        shell: msys2 {0}
-+        run: |
-+          tar -I 'zstd --ultra -20' -cf python.tar.zst python_pkgdir/
-+
-+      - name: Upload
-+        uses: actions/upload-artifact@v2
-+        if: always()
-+        with:
-+          name: build-${{ matrix.msystem }}
-+          path: python.tar.zst
-+
-diff --git a/.github/workflows/smoketests.py b/.github/workflows/smoketests.py
-new file mode 100644
-index 0000000..9277c14
---- /dev/null
-+++ b/.github/workflows/smoketests.py
-@@ -0,0 +1,132 @@
-+#!/usr/bin/env python3
-+# Copyright 2017 Christoph Reiter
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining
-+# a copy of this software and associated documentation files (the
-+# "Software"), to deal in the Software without restriction, including
-+# without limitation the rights to use, copy, modify, merge, publish,
-+# distribute, sublicense, and/or sell copies of the Software, and to
-+# permit persons to whom the Software is furnished to do so, subject to
-+# the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included
-+# in all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+"""The goal of this test suite is collect tests for update regressions
-+and to test msys2 related modifications like for path handling.
-+Feel free to extend.
-+"""
-+
-+import os
-+import unittest
-+
-+if "MSYSTEM" in os.environ:
-+    SEP = "/"
-+else:
-+    SEP = "\\"
-+
-+
-+class Tests(unittest.TestCase):
-+
-+    def test_sep(self):
-+        self.assertEqual(os.sep, SEP)
-+
-+    def test_module_file_path(self):
-+        import asyncio
-+        import zlib
-+        self.assertEqual(zlib.__file__, os.path.normpath(zlib.__file__))
-+        self.assertEqual(asyncio.__file__, os.path.normpath(asyncio.__file__))
-+
-+    def test_importlib_frozen_path_sep(self):
-+        import importlib._bootstrap_external
-+        self.assertEqual(importlib._bootstrap_external.path_sep, SEP)
-+
-+    def test_os_commonpath(self):
-+        self.assertEqual(
-+            os.path.commonpath(
-+                [os.path.join("C:", os.sep, "foo", "bar"),
-+                 os.path.join("C:", os.sep, "foo")]),
-+                 os.path.join("C:", os.sep, "foo"))
-+
-+    def test_pathlib(self):
-+        import pathlib
-+
-+        p = pathlib.Path("foo") / pathlib.Path("foo")
-+        self.assertEqual(str(p), os.path.normpath(p))
-+
-+    def test_modules_import(self):
-+        import sqlite3
-+        import ssl
-+        import ctypes
-+
-+    def test_socket_inet_ntop(self):
-+        import socket
-+        self.assertTrue(hasattr(socket, "inet_ntop"))
-+
-+    def test_socket_inet_pton(self):
-+        import socket
-+        self.assertTrue(hasattr(socket, "inet_pton"))
-+
-+    def test_multiprocessing_queue(self):
-+        from multiprocessing import Queue
-+        Queue(0)
-+
-+    #def test_socket_timout_normal_error(self):
-+    #    import urllib.request
-+    #    from urllib.error import URLError
-+
-+    #    try:
-+    #        urllib.request.urlopen(
-+    #            'http://localhost', timeout=0.0001).close()
-+    #    except URLError:
-+    #        pass
-+
-+    def test_threads(self):
-+        from concurrent.futures import ThreadPoolExecutor
-+
-+        with ThreadPoolExecutor(1) as pool:
-+            for res in pool.map(lambda *x: None, range(10000)):
-+                pass
-+
-+    def test_sysconfig(self):
-+        import sysconfig
-+        # This should be able to execute without exceptions
-+        sysconfig.get_config_vars()
-+
-+    def test_sqlite_enable_load_extension(self):
-+        # Make sure --enable-loadable-sqlite-extensions is used
-+        import sqlite3
-+        self.assertTrue(sqlite3.Connection.enable_load_extension)
-+
-+    def test_venv_creation(self):
-+        import tempfile
-+        import venv
-+        import subprocess
-+        import shutil
-+        with tempfile.TemporaryDirectory() as tmp:
-+            builder = venv.EnvBuilder()
-+            builder.create(tmp)
-+            assert os.path.exists(os.path.join(tmp, "bin", "activate"))
-+            assert os.path.exists(os.path.join(tmp, "bin", "python.exe"))
-+            assert os.path.exists(os.path.join(tmp, "bin", "python3.exe"))
-+            subprocess.check_call([shutil.which("bash.exe"), os.path.join(tmp, "bin", "activate")])
-+
-+    def test_has_mktime(self):
-+        from time import mktime, gmtime
-+        mktime(gmtime())
-+
-+
-+def suite():
-+    return unittest.TestLoader().loadTestsFromName(__name__)
-+
-+
-+if __name__ == '__main__':
-+    unittest.main(defaultTest='suite')
--- 
-2.32.0
-
diff --git a/0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch b/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch
index 14ca139a1b50..44e13720eaa1 100644
--- a/0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch
+++ b/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch
@@ -1,7 +1,8 @@
-From 01a2e7616c9e8d8cb554a125ef768eb010275dee Mon Sep 17 00:00:00 2001
+From 6d880609657632bc2f9d93964d7f9edbb2a6e430 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:05 +0530
-Subject: [PATCH 062/N] cygwinccompiler dont strip modules if pydebug
+Subject: [PATCH 096/N] distutils: cygwinccompiler dont strip modules if
+ pydebug
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +13,7 @@ Co-authored-by: Алексей <alexey.pawlow@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
-index 0bda7a3..09b6eda 100644
+index bb97880..c134525 100644
 --- a/Lib/distutils/cygwinccompiler.py
 +++ b/Lib/distutils/cygwinccompiler.py
 @@ -236,7 +236,7 @@ class CygwinCCompiler(UnixCCompiler):
@@ -25,5 +26,5 @@ index 0bda7a3..09b6eda 100644
  
          UnixCCompiler.link(self, target_desc, objects, output_filename,
 -- 
-2.32.0
+2.33.0
 
diff --git a/0097-distutils-get-compilers-from-env-vars.patch b/0097-distutils-get-compilers-from-env-vars.patch
new file mode 100644
index 000000000000..7b6ecc4267eb
--- /dev/null
+++ b/0097-distutils-get-compilers-from-env-vars.patch
@@ -0,0 +1,161 @@
+From b1f1cbeefcc5ed956ee484cd96008d5d37eb7db2 Mon Sep 17 00:00:00 2001
+From: Long Nguyen <nguyen.long.908132@gmail.com>
+Date: Tue, 17 Aug 2021 20:26:05 +0700
+Subject: [PATCH 097/N] distutils: get compilers from env vars
+
+Upstreamed at https://github.com/pypa/distutils/pull/26
+
+This would allow us to bypass all gcc workarounds when we're using clang
+---
+ Lib/distutils/cygwinccompiler.py | 91 ++++++++++++++++++--------------
+ 1 file changed, 51 insertions(+), 40 deletions(-)
+
+diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
+index c134525..75bc17b 100644
+--- a/Lib/distutils/cygwinccompiler.py
++++ b/Lib/distutils/cygwinccompiler.py
+@@ -44,6 +44,8 @@ cygwin in no-cygwin mode).
+ #   (ld supports -shared)
+ # * mingw gcc 3.2/ld 2.13 works
+ #   (ld supports -shared)
++# * llvm-mingw with Clang 11 works
++#   (lld supports -shared)
+ 
+ import os
+ import sys
+@@ -110,41 +112,46 @@ class CygwinCCompiler(UnixCCompiler):
+                 "Compiling may fail because of undefined preprocessor macros."
+                 % details)
+ 
+-        self.gcc_version, self.ld_version, self.dllwrap_version = \
+-            get_versions()
+-        self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
+-                         (self.gcc_version,
+-                          self.ld_version,
+-                          self.dllwrap_version) )
+-
+-        # ld_version >= "2.10.90" and < "2.13" should also be able to use
+-        # gcc -mdll instead of dllwrap
+-        # Older dllwraps had own version numbers, newer ones use the
+-        # same as the rest of binutils ( also ld )
+-        # dllwrap 2.10.90 is buggy
+-        if self.ld_version >= "2.10.90":
+-            self.linker_dll = "gcc"
+-        else:
+-            self.linker_dll = "dllwrap"
++        self.cc = os.environ.get('CC', 'gcc')
++        self.cxx = os.environ.get('CXX', 'g++')
++
++        if ('gcc' in self.cc): # Start gcc workaround
++            self.gcc_version, self.ld_version, self.dllwrap_version = \
++                get_versions()
++            self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
++                             (self.gcc_version,
++                              self.ld_version,
++                              self.dllwrap_version) )
++
++            # ld_version >= "2.10.90" and < "2.13" should also be able to use
++            # gcc -mdll instead of dllwrap
++            # Older dllwraps had own version numbers, newer ones use the
++            # same as the rest of binutils ( also ld )
++            # dllwrap 2.10.90 is buggy
++            if self.ld_version >= "2.10.90":
++                self.linker_dll = self.cc
++            else:
++                self.linker_dll = "dllwrap"
+ 
+-        # ld_version >= "2.13" support -shared so use it instead of
+-        # -mdll -static
+-        if self.ld_version >= "2.13":
++            # ld_version >= "2.13" support -shared so use it instead of
++            # -mdll -static
++            if self.ld_version >= "2.13":
++                shared_option = "-shared"
++            else:
++                shared_option = "-mdll -static"
++        else: # Assume linker is up to date
++            self.linker_dll = self.cc
+             shared_option = "-shared"
+-        else:
+-            shared_option = "-mdll -static"
+ 
+-        # Hard-code GCC because that's what this is all about.
+-        # XXX optimization, warnings etc. should be customizable.
+-        self.set_executables(compiler='gcc -mcygwin -O -Wall',
+-                             compiler_so='gcc -mcygwin -mdll -O -Wall',
+-                             compiler_cxx='g++ -mcygwin -O -Wall',
+-                             linker_exe='gcc -mcygwin',
++        self.set_executables(compiler='%s -mcygwin -O -Wall' % self.cc,
++                             compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc,
++                             compiler_cxx='%s -mcygwin -O -Wall' % self.cxx,
++                             linker_exe='%s -mcygwin' % self.cc,
+                              linker_so=('%s -mcygwin %s' %
+                                         (self.linker_dll, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+-        if self.gcc_version == "2.91.57":
++        if ('gcc' in self.cc and self.gcc_version == "2.91.57"):
+             # cygwin shouldn't need msvcrt, but without the dlls will crash
+             # (gcc version 2.91.57) -- perhaps something about initialization
+             self.dll_libraries=["msvcrt"]
+@@ -287,26 +294,26 @@ class Mingw32CCompiler(CygwinCCompiler):
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+-        if self.ld_version >= "2.13":
+-            shared_option = "-shared"
+-        else:
++        if ('gcc' in self.cc and self.ld_version < "2.13"):
+             shared_option = "-mdll -static"
++        else:
++            shared_option = "-shared"
+ 
+         # A real mingw32 doesn't need to specify a different entry point,
+         # but cygwin 2.91.57 in no-cygwin-mode needs it.
+-        if self.gcc_version <= "2.91.57":
++        if ('gcc' in self.cc and self.gcc_version <= "2.91.57"):
+             entry_point = '--entry _DllMain@12'
+         else:
+             entry_point = ''
+ 
+-        if is_cygwingcc():
++        if is_cygwincc(self.cc):
+             raise CCompilerError(
+                 'Cygwin gcc cannot be used with --compiler=mingw32')
+ 
+-        self.set_executables(compiler='gcc -O2 -Wall',
+-                             compiler_so='gcc -mdll -O2 -Wall',
+-                             compiler_cxx='g++ -O2 -Wall',
+-                             linker_exe='gcc',
++        self.set_executables(compiler='%s -O2 -Wall' % self.cc,
++                             compiler_so='%s -mdll -O2 -Wall' % self.cc,
++                             compiler_cxx='%s -O2 -Wall' % self.cxx,
++                             linker_exe='%s' % self.cc,
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
+                                            entry_point))
+@@ -357,6 +364,10 @@ def check_config_h():
+     if "GCC" in sys.version:
+         return CONFIG_H_OK, "sys.version mentions 'GCC'"
+ 
++    # Clang would also work
++    if "Clang" in sys.version:
++        return CONFIG_H_OK, "sys.version mentions 'Clang'"
++
+     # let's see if __GNUC__ is mentioned in python.h
+     fn = sysconfig.get_config_h_filename()
+     try:
+@@ -413,7 +424,7 @@ def get_versions():
+     commands = [gcc+' -dumpversion', ld+' -v', dllwrap+' --version']
+     return tuple([_find_exe_version(cmd) for cmd in commands])
+ 
+-def is_cygwingcc():
+-    '''Try to determine if the gcc that would be used is from cygwin.'''
+-    out_string = check_output(['gcc', '-dumpmachine'])
++def is_cygwincc(cc):
++    '''Try to determine if the compiler that would be used is from cygwin.'''
++    out_string = check_output([cc, '-dumpmachine'])
+     return out_string.strip().endswith(b'cygwin')
+-- 
+2.33.0
+
diff --git a/0086-distutils-add-windmc-to-cygwinccompiler.patch b/0098-distutils-add-windmc-to-cygwinccompiler.patch
index 07a7a0bee937..fafce741ac9c 100644
--- a/0086-distutils-add-windmc-to-cygwinccompiler.patch
+++ b/0098-distutils-add-windmc-to-cygwinccompiler.patch
@@ -1,18 +1,18 @@
-From 4f1841b7211dd4d9557a868525b5005e4d67e55e Mon Sep 17 00:00:00 2001
+From 0c751ecfc03048c60a59b090cf93f64d09255c4b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:28 +0530
-Subject: [PATCH 086/N] distutils add windmc to cygwinccompiler
+Subject: [PATCH 098/N] distutils: add windmc to cygwinccompiler
 
 ---
  Lib/distutils/cygwinccompiler.py | 26 ++++++++++++++++++++++++--
  1 file changed, 24 insertions(+), 2 deletions(-)
 
 diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
-index 09b6eda..fcba43a 100644
+index 75bc17b..6a40e80 100644
 --- a/Lib/distutils/cygwinccompiler.py
 +++ b/Lib/distutils/cygwinccompiler.py
-@@ -163,6 +163,28 @@ class CygwinCCompiler(UnixCCompiler):
+@@ -170,6 +170,28 @@ class CygwinCCompiler(UnixCCompiler):
                  self.spawn(["windres", "-i", src, "-o", obj])
              except DistutilsExecError as msg:
                  raise CompileError(msg)
@@ -41,7 +41,7 @@ index 09b6eda..fcba43a 100644
          else: # for other files use the C-compiler
              try:
                  self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-@@ -257,9 +279,9 @@ class CygwinCCompiler(UnixCCompiler):
+@@ -264,9 +286,9 @@ class CygwinCCompiler(UnixCCompiler):
              base, ext = os.path.splitext(src_name)
              # use 'normcase' only for resource suffixes
              ext_normcase = os.path.normcase(ext)
@@ -54,5 +54,5 @@ index 09b6eda..fcba43a 100644
                        (ext, src_name))
              base = os.path.splitdrive(base)[1] # Chop off the drive
 -- 
-2.32.0
+2.33.0
 
diff --git a/0082-fix-msvc9-import.patch b/0099-distutils-fix-msvc9-import.patch
index 0d73ce2b419b..f2e24600a677 100644
--- a/0082-fix-msvc9-import.patch
+++ b/0099-distutils-fix-msvc9-import.patch
@@ -1,7 +1,7 @@
-From 5db67822f24f57c96ef4424c7738aca59e0dd7aa Mon Sep 17 00:00:00 2001
+From d947ead836ca0eead2e28103a790011387720a2f Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:24 +0530
-Subject: [PATCH 082/N] fix msvc9 import
+Subject: [PATCH 099/N] distutils: fix msvc9 import
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -34,5 +34,5 @@ index 6934e96..dddb2fd 100644
          self.__root = r"Software\Microsoft\VisualStudio"
          # self.__macros = MACROS
 -- 
-2.32.0
+2.33.0
 
diff --git a/0100-Add-a-test-to-build-C-Ext.patch b/0100-Add-a-test-to-build-C-Ext.patch
deleted file mode 100644
index 067b44628949..000000000000
--- a/0100-Add-a-test-to-build-C-Ext.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 30080e89858fc1ae343eea6ba2d2bf152257a458 Mon Sep 17 00:00:00 2001
-From: Naveen M K <naveen521kk@gmail.com>
-Date: Tue, 29 Jun 2021 18:24:37 +0530
-Subject: [PATCH 100/N] Add a test to build C-Ext
-
----
- .github/workflows/smoketests.py | 85 +++++++++++++++++++++++++++++++++
- 1 file changed, 85 insertions(+)
-
-diff --git a/.github/workflows/smoketests.py b/.github/workflows/smoketests.py
-index 9277c14..1761724 100644
---- a/.github/workflows/smoketests.py
-+++ b/.github/workflows/smoketests.py
-@@ -123,6 +123,91 @@ class Tests(unittest.TestCase):
-         from time import mktime, gmtime
-         mktime(gmtime())
- 
-+    def test_c_ext_build(self):
-+        import tempfile
-+        import sys
-+        import subprocess
-+        import textwrap
-+        from pathlib import Path
-+
-+        with tempfile.TemporaryDirectory() as tmppro:
-+            subprocess.check_call([sys.executable, "-m", "ensurepip", "--user"])
-+            with Path(tmppro, "setup.py").open("w") as f:
-+                f.write(
-+                    textwrap.dedent(
-+                        """\
-+                                    from setuptools import setup, Extension
-+
-+                                    setup(
-+                                        name='cwrapper',
-+                                        version='1.0',
-+                                        ext_modules=[
-+                                            Extension(
-+                                                'cwrapper',
-+                                                sources=['cwrapper.c']),
-+                                        ],
-+                                    )
-+                                """
-+                    )
-+                )
-+            with Path(tmppro, "cwrapper.c").open("w") as f:
-+                f.write(
-+                    textwrap.dedent(
-+                        """\
-+                                    #include <Python.h>
-+                                    static PyObject *
-+                                    helloworld(PyObject *self, PyObject *args)
-+                                    {
-+                                        printf("Hello World\\n");
-+                                        return Py_None;
-+                                    }
-+                                    static PyMethodDef
-+                                    myMethods[] = {
-+                                        { "helloworld", helloworld, METH_NOARGS, "Prints Hello World" },
-+                                        { NULL, NULL, 0, NULL }
-+                                    };
-+                                    static struct PyModuleDef cwrapper = {
-+                                        PyModuleDef_HEAD_INIT,
-+                                        "cwrapper",
-+                                        "Test Module",
-+                                        -1,
-+                                        myMethods
-+                                    };
-+
-+                                    PyMODINIT_FUNC
-+                                    PyInit_cwrapper(void)
-+                                    {
-+                                        return PyModule_Create(&cwrapper);
-+                                    }
-+                                """
-+                    )
-+                )
-+            subprocess.check_call(
-+                [sys.executable, "-c", "import struct"],
-+            )
-+            subprocess.check_call(
-+                [
-+                    sys.executable,
-+                    "-m",
-+                    "pip",
-+                    "install",
-+                    "wheel",
-+                ],
-+            )
-+            subprocess.check_call(
-+                [
-+                    sys.executable,
-+                    "-m",
-+                    "pip",
-+                    "install",
-+                    tmppro,
-+                ],
-+            )
-+            subprocess.check_call(
-+                [sys.executable, "-c", "import cwrapper"],
-+            )
-+
-+
- 
- def suite():
-     return unittest.TestLoader().loadTestsFromName(__name__)
--- 
-2.32.0
-
diff --git a/0064-mingw-add-LIBPL-to-library-dirs.patch b/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch
index 70c10f774fc3..66c39dfbc8d4 100644
--- a/0064-mingw-add-LIBPL-to-library-dirs.patch
+++ b/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch
@@ -1,8 +1,8 @@
-From 01ffe9fb03e551372f0b54912d938f3256e4c5cd Mon Sep 17 00:00:00 2001
+From 609d9e23ff0403233ae2e8a81eaa55eda54d175f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
  <alexey.pawlow@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:06 +0530
-Subject: [PATCH 064/N] mingw add LIBPL to library dirs
+Subject: [PATCH 100/N] distutils: mingw add LIBPL to library dirs
 
 ---
  Lib/distutils/command/build_ext.py | 2 +-
@@ -22,5 +22,5 @@ index 1dbdfe0..1598735 100644
                  # building third party extensions
                  config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL'))
 -- 
-2.32.0
+2.33.0
 
diff --git a/0101-Add-some-platform-related-tests.patch b/0101-Add-some-platform-related-tests.patch
deleted file mode 100644
index 50622c926737..000000000000
--- a/0101-Add-some-platform-related-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 23659e23d12299a564b12e527ab144d425a2d572 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Thu, 1 Jul 2021 09:16:20 +0200
-Subject: [PATCH 101/N] Add some platform related tests
-
-So we notice when things change/break
----
- .github/workflows/smoketests.py | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/.github/workflows/smoketests.py b/.github/workflows/smoketests.py
-index 1761724..d8f76e6 100644
---- a/.github/workflows/smoketests.py
-+++ b/.github/workflows/smoketests.py
-@@ -123,6 +123,27 @@ class Tests(unittest.TestCase):
-         from time import mktime, gmtime
-         mktime(gmtime())
- 
-+    def test_platform_things(self):
-+        import sys
-+        import sysconfig
-+        import platform
-+        import importlib.machinery
-+        self.assertEqual(sys.implementation.name, "cpython")
-+        self.assertEqual(sys.platform, "win32")
-+        self.assertTrue(sysconfig.get_platform().startswith("mingw"))
-+        self.assertTrue(sysconfig.get_config_var('SOABI').startswith("cpython-"))
-+        ext_suffix = sysconfig.get_config_var('EXT_SUFFIX')
-+        self.assertTrue(ext_suffix.endswith(".pyd"))
-+        self.assertTrue("mingw" in ext_suffix)
-+        self.assertEqual(sysconfig.get_config_var('SHLIB_SUFFIX'), ".pyd")
-+        ext_suffixes = importlib.machinery.EXTENSION_SUFFIXES
-+        self.assertTrue(ext_suffix in ext_suffixes)
-+        self.assertTrue(".pyd" in ext_suffixes)
-+        self.assertEqual(sys.winver, ".".join(map(str, sys.version_info[:2])))
-+        self.assertEqual(platform.python_implementation(), "CPython")
-+        self.assertEqual(platform.system(), "Windows")
-+        self.assertTrue(isinstance(sys.api_version, int) and sys.api_version > 0)
-+
-     def test_c_ext_build(self):
-         import tempfile
-         import sys
--- 
-2.32.0
-
diff --git a/0101-distutils-Change-the-get_platform-method-in-distutil.patch b/0101-distutils-Change-the-get_platform-method-in-distutil.patch
new file mode 100644
index 000000000000..afe88bb7f7fb
--- /dev/null
+++ b/0101-distutils-Change-the-get_platform-method-in-distutil.patch
@@ -0,0 +1,44 @@
+From 5a61407b52dc9d8f2949af82bff034cac2d99c2d Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Tue, 21 Sep 2021 21:37:23 +0200
+Subject: [PATCH 101/N] distutils: Change the `get_platform()` method in
+ distutils to match sysconfig
+
+This would possibly fix building wheels when mingw python
+is used and would be unique to each python same as EXT_SUFFIX.
+
+Signed-off-by: Naveen M K <naveen521kk@gmail.com>
+---
+ Lib/distutils/util.py | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
+index 75a369d..5b51c76 100644
+--- a/Lib/distutils/util.py
++++ b/Lib/distutils/util.py
+@@ -36,8 +36,20 @@ def get_host_platform():
+ 
+     """
+     if os.name == 'nt':
+-        if 'GCC' in sys.version:
+-            return 'mingw'
++        if 'gcc' in sys.version.lower():
++            if 'ucrt' in sys.version.lower():
++                if 'amd64' in sys.version.lower():
++                    return 'mingw_x86_64_ucrt'
++                return 'mingw_i686_ucrt'
++            if 'clang' in sys.version.lower():
++                if 'amd64' in sys.version.lower():
++                    return 'mingw_x86_64_clang'
++                if 'arm64' in sys.version.lower():
++                    return 'mingw_aarch64'
++                return 'mingw_i686_clang'
++            if 'amd64' in sys.version.lower():
++                return 'mingw_x86_64'
++            return 'mingw_i686'
+         if 'amd64' in sys.version.lower():
+             return 'win-amd64'
+         if '(arm)' in sys.version.lower():
+-- 
+2.33.0
+
diff --git a/0108-build-Cleanup-ncursesw-include-lookup-code.patch b/0102-build-Fix-ncursesw-include-lookup.patch
index a37be8ae9b67..e25e92f126d2 100644
--- a/0108-build-Cleanup-ncursesw-include-lookup-code.patch
+++ b/0102-build-Fix-ncursesw-include-lookup.patch
@@ -1,20 +1,19 @@
-From 092108ff97a30264657e3f998de754e691cc58f4 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 23 Jul 2021 08:50:39 +0200
-Subject: [PATCH 108/N] build: Cleanup ncursesw include lookup code
+From 7f0e7c96729a306b58ab87ecb4e051b460bec6ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
+ <alexey.pawlow@gmail.com>
+Date: Thu, 17 Jun 2021 18:52:09 +0530
+Subject: [PATCH 102/N] build: Fix ncursesw include lookup
 
-Mirror what si already done for libffi; Look it up via
+Mirror what is already done for libffi; Look it up via
 pkg-config and use the exported path via sysconfig in setup.py
-
-This should be merged into "dont include system ncurses path"
 ---
- Makefile.pre.in |  1 +
- configure.ac    | 19 ++++++++++---------
- setup.py        |  2 +-
- 3 files changed, 12 insertions(+), 10 deletions(-)
+ Makefile.pre.in | 1 +
+ configure.ac    | 9 ++++++++-
+ setup.py        | 2 +-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 01cc055..fe25d9e 100644
+index a8aecc2..3aca037 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -313,6 +313,7 @@ IO_OBJS=	\
@@ -26,10 +25,10 @@ index 01cc055..fe25d9e 100644
  ##########################################################################
  # Parser
 diff --git a/configure.ac b/configure.ac
-index 14e4c8c..bab62ad 100644
+index 69cb8fb..6b21b79 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5556,17 +5556,18 @@ then
+@@ -5557,10 +5557,17 @@ then
    [Define if you have struct stat.st_mtimensec])
  fi
  
@@ -42,26 +41,17 @@ index 14e4c8c..bab62ad 100644
 +
  # first curses header check
  ac_save_cppflags="$CPPFLAGS"
--case $host_os in
--    mingw*)
--    ;;
--    *)
--      if test "$cross_compiling" = no; then
--        CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
--      fi
--    ;;
--esac
-+if test "$cross_compiling" = no; then
+ if test "$cross_compiling" = no; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
 +  CPPFLAGS="$CPPFLAGS -I$NCURSESW_INCLUDEDIR"
-+fi
+ fi
  
  AC_CHECK_HEADERS(curses.h ncurses.h)
- 
 diff --git a/setup.py b/setup.py
-index a2d5656..4e7a284 100644
+index d161108..46de8be 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1098,7 +1098,7 @@ class PyBuildExt(build_ext):
+@@ -1104,7 +1104,7 @@ class PyBuildExt(build_ext):
          if curses_library == 'ncursesw':
              curses_defines.append(('HAVE_NCURSESW', '1'))
              if not CROSS_COMPILING:
@@ -71,5 +61,5 @@ index a2d5656..4e7a284 100644
              # _curses_panel.so must link with panelw.
              panel_library = 'panelw'
 -- 
-2.32.0
+2.33.0
 
diff --git a/0102-squash-CI-use-O2.patch b/0102-squash-CI-use-O2.patch
deleted file mode 100644
index 0814327e35d7..000000000000
--- a/0102-squash-CI-use-O2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 16dd9f42f911def97236f58be72d6d6aa023373e Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 2 Jul 2021 15:01:54 +0200
-Subject: [PATCH 102/N] [squash] CI: use -O2
-
-Without optimizations the stack size increases and tests start to fail
-with stack overflow (this is a known problem upstream https://bugs.python.org/issue43271)
-
-Either we enforce -O2 or we increase the stack size.
-
-Needs to be merged into the CI setup
----
- .github/workflows/mingw.yml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
-index fff5fa5..8486bb4 100644
---- a/.github/workflows/mingw.yml
-+++ b/.github/workflows/mingw.yml
-@@ -52,6 +52,7 @@ jobs:
-           set -ex
-           pkgver='3.9.5'
-           _pybasever='3.9'
-+          CFLAGS="-O2"
-           
-           PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
-           if [ ${{ matrix.msystem }} == "CLANG64" ]
--- 
-2.32.0
-
diff --git a/0103-squash-Fixup-.rc-handling.patch b/0103-squash-Fixup-.rc-handling.patch
deleted file mode 100644
index abbbc180ec9f..000000000000
--- a/0103-squash-Fixup-.rc-handling.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 2d66cfe1ae9f08b51abfd8f1aaeeb9ce87ee06b9 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 2 Jul 2021 19:04:05 +0200
-Subject: [PATCH 103/N] [squash] Fixup .rc handling
-
-Define everything needed in the build system
-
-This needs to be merged into "link win resource files and build pythonw"
----
- Makefile.pre.in | 11 ++++-------
- configure.ac    | 16 +++++++++++++++-
- 2 files changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index e18239f..01cc055 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -600,17 +600,14 @@ coverage-report: regen-grammar regen-token regen-importlib
- clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
- 	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
- 
--pythonnt_rc.h:
--	@echo '#define PYTHON_DLL_NAME "$(DLLLIBRARY)"' >> $@
--
--python_exe.o: pythonnt_rc.h $(srcdir)/PC/python_exe.rc
-+python_exe.o: $(srcdir)/PC/python_exe.rc
- 	$(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_exe.rc $@
- 
--pythonw_exe.o: pythonnt_rc.h $(srcdir)/PC/pythonw_exe.rc
-+pythonw_exe.o: $(srcdir)/PC/pythonw_exe.rc
- 	$(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pythonw_exe.rc $@
- 
--python_nt.o: pythonnt_rc.h $(srcdir)/PC/python_nt.rc
--	$(WINDRES) $(RCFLAGS) -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@
-+python_nt.o: $(srcdir)/PC/python_nt.rc
-+	$(WINDRES) $(RCFLAGS) -DORIGINAL_FILENAME=\\\"$(DLLLIBRARY)\\\" -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@
- 
- $(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw_exe.o
- 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -mwindows -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) pythonw_exe.o
-diff --git a/configure.ac b/configure.ac
-index bba2006..78057de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5942,7 +5942,21 @@ AC_MSG_RESULT(done)
- case $host in
-   *-*-mingw*)
-     LIBS="$LIBS -lversion -lshlwapi"
--    RCFLAGS="$RCFLAGS -O COFF"
-+
-+    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+      #include <stdio.h>
-+      #include "Include/patchlevel.h"
-+      int main() {
-+        fprintf (
-+          fopen ("conftest.out","w"),
-+          "%d",
-+          PY_MICRO_VERSION * 1000 + PY_RELEASE_LEVEL * 10 + PY_RELEASE_SERIAL);
-+        return 0;
-+      }
-+    ]])], [FIELD3=`cat conftest.out`])
-+
-+    RCFLAGS="$RCFLAGS -DFIELD3=$FIELD3 -O COFF"
-+
-     case $host in
-       i686*)  RCFLAGS="$RCFLAGS --target=pe-i386" ;;
-       x86_64*)  RCFLAGS="$RCFLAGS --target=pe-x86-64" ;;
--- 
-2.32.0
-
diff --git a/0109-tests-fix-test_bytes.patch b/0103-tests-fix-test_bytes.patch
index eb466629b02c..8f5db54627cb 100644
--- a/0109-tests-fix-test_bytes.patch
+++ b/0103-tests-fix-test_bytes.patch
@@ -1,7 +1,7 @@
-From c303ac774c185b775e109d857cfd91223825de96 Mon Sep 17 00:00:00 2001
+From dee249e62d0d3f610538286927b24ea6f9f5b332 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Fri, 23 Jul 2021 08:51:32 +0200
-Subject: [PATCH 109/N] tests: fix test_bytes
+Subject: [PATCH 103/N] tests: fix test_bytes
 
 %p has different casing with mingw-w64, but it's implementation defined.
 Change the test to the mingw-w64 variant.
@@ -23,5 +23,5 @@ index 227e6d7..193ce10 100644
                  return (ptr_format % ptr)
          else:
 -- 
-2.32.0
+2.33.0
 
diff --git a/0104-squash-Set-MS_DLL_ID.patch b/0104-squash-Set-MS_DLL_ID.patch
deleted file mode 100644
index 72b4758ffc4b..000000000000
--- a/0104-squash-Set-MS_DLL_ID.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a12eab686c41516a51449bcc61883703393870b2 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 2 Jul 2021 19:04:56 +0200
-Subject: [PATCH 104/N] [squash] Set MS_DLL_ID
-
-This needs to be merged into "MINGW dynamic loading support"
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 78057de..bf21222 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3958,6 +3958,7 @@ then
- 	*-*-mingw*)
- 	DYNLOADFILE="dynload_win.o"
- 	extra_machdep_objs="$extra_machdep_objs PC/dl_nt.o"
-+	CFLAGS_NODIST="$CFLAGS_NODIST -DMS_DLL_ID='\"$VERSION\"'"
- 	;;
- 	esac
- fi
--- 
-2.32.0
-
diff --git a/0110-time-fix-strftime-not-raising-for-invalid-year-value.patch b/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch
index 32bb8332f301..df3091983801 100644
--- a/0110-time-fix-strftime-not-raising-for-invalid-year-value.patch
+++ b/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch
@@ -1,7 +1,7 @@
-From 57bb29b796eca27031584a75e6b44182e4c6b2e5 Mon Sep 17 00:00:00 2001
+From 72e058ef4fdb8aa7a5d5a1a8b45a16d9c0ef975f Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Fri, 23 Jul 2021 08:52:50 +0200
-Subject: [PATCH 110/N] time: fix strftime not raising for invalid year
+Subject: [PATCH 104/N] time: fix strftime not raising for invalid year
  values
 
 It's crt specific and not compiler specific.
@@ -24,5 +24,5 @@ index 80eab30..f0cdcfa 100644
          PyErr_SetString(PyExc_ValueError,
                          "strftime() requires year in [1; 9999]");
 -- 
-2.32.0
+2.33.0
 
diff --git a/0113-ctypes-find_library-c-should-return-None-with-ucrt.patch b/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch
index 9a253d9baadf..1352c0210ada 100644
--- a/0113-ctypes-find_library-c-should-return-None-with-ucrt.patch
+++ b/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch
@@ -1,7 +1,7 @@
-From a3aa28ae29edfe8ffd0d428742f1e1bee4db971b Mon Sep 17 00:00:00 2001
+From bf97e2d2da502effd0116a00d4a02a69b7a9c2a9 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Fri, 23 Jul 2021 18:23:58 +0200
-Subject: [PATCH 113/N] ctypes: find_library('c') should return None with
+Subject: [PATCH 105/N] ctypes: find_library('c') should return None with
  ucrt
 
 Just like with MSVC. This fixes a test in test_ctypes.
@@ -37,5 +37,5 @@ index 0c2510e..48ddb3b 100644
          # See MSDN for the REAL search order.
          for directory in os.environ['PATH'].split(os.pathsep):
 -- 
-2.32.0
+2.33.0
 
diff --git a/0105-squash-CI-Clean-up.patch b/0105-squash-CI-Clean-up.patch
deleted file mode 100644
index 1d2f9c9fd55e..000000000000
--- a/0105-squash-CI-Clean-up.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 0a6d945f0dc1b1941aa4265ce68718582f5bea32 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 2 Jul 2021 19:11:46 +0200
-Subject: [PATCH 105/N] [squash] CI: Clean up
-
-this is all no longer needed now
-
-Needs to be merged into the CI setup
----
- .github/workflows/mingw.yml | 45 +++++--------------------------------
- 1 file changed, 6 insertions(+), 39 deletions(-)
-
-diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
-index 8486bb4..d45a9c2 100644
---- a/.github/workflows/mingw.yml
-+++ b/.github/workflows/mingw.yml
-@@ -50,8 +50,7 @@ jobs:
-         shell: msys2 {0}
-         run: |
-           set -ex
--          pkgver='3.9.5'
--          _pybasever='3.9'
-+
-           CFLAGS="-O2"
-           
-           PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
-@@ -67,35 +66,6 @@ jobs:
-           CFLAGS+=" -DNDEBUG "
-           CXXFLAGS+=" -DNDEBUG "
-           _extra_config+=("--enable-optimizations")
--          # Fix MS_DLL_ID undeclared in PC/dl_nt.c
--          f3f=0
--          re='^[0-9]+$'
--          part3=${pkgver##*.}
--          if ! [[ $part3 =~ $re ]]; then
--              c=
--              while test -n "$part3"; do
--                  b=${part3:0:1}
--                  if ! [[ $b =~ $re ]]; then
--                      break
--                  fi
--                  c+=${b}
--                  part3=${part3:1}
--              done
--              f3f=$((f3f + 1000 * $((${c}))))
--              part3Len=${#part3}
--              if [ "$part3Len" -ge "1" ]; then
--                  f3f=$((f3f + 10 * $((0x${part3:0:1}))))
--                  if [ "$part3Len" -ge "2" ]; then
--                      f3f=$((f3f + ${part3:1:1}))
--                  fi
--              fi
--          else
--              f3f=$((f3f + 1000 * ${part3}))
--          fi
--          CFLAGS+=" -DMS_DLL_ID=\\\"${_pybasever}\\\""
--          CFLAGS+=" -DFIELD3=${f3f}"
--          CFLAGS+=" -DORIGINAL_FILENAME=\\\"libpython${_pybasever}.dll\\\""
--          rc_flags=" -DMS_DLL_ID=\\\\\\\"${_pybasever}\\\\\\\" -DFIELD3=${f3f} -DORIGINAL_FILENAME=\\\\\\\"libpython${_pybasever}.dll\\\\\\\""
- 
-           # Workaround for conftest error on 64-bit builds
-           export ac_cv_working_tzset=no
-@@ -131,7 +101,6 @@ jobs:
-             --without-c-locale-coercion \
-             --enable-loadable-sqlite-extensions \
-             "${_extra_config[@]}" \
--            RCFLAGS="$rc_flags" \
-             OPT=""
-           # We patch importlib which is embedded in C headers, so regenerate them
-           make regen-importlib
-@@ -147,9 +116,8 @@ jobs:
-         shell: msys2 {0}
-         run: |
-           set -ex
--          
--          pkgver='3.9.5'
--          _pybasever='3.9'
-+
-+          _pybasever=$(./python.exe -c "import sys; print(sys.winver);")
-           srcdir=.
- 
-           # now install things
-@@ -160,7 +128,6 @@ jobs:
-           MSYSTEM=MINGW \
-           MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-           make -j1 install DESTDIR="${pkgdir}"
--          VERABI=${_pybasever}
- 
-           # gdb pretty printers for debugging Python itself; to use:
-           # python
-@@ -169,10 +136,10 @@ jobs:
-           # reload(python_gdb)
-           # end
- 
--          cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/libpython${VERABI}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${VERABI}.dll.a
-+          cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/libpython${_pybasever}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a
- 
-           # Need for building boost python module
--          cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/libpython${VERABI}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a
-+          cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/libpython${_pybasever}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a
- 
-           for fscripts in 2to3 2to3-${_pybasever} idle3 idle${_pybasever} pydoc3 pydoc${_pybasever}; do
-               sed -i "s|$(cygpath -w ${MINGW_PREFIX} | sed 's|\\|\\\\|g')/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" "${pkgdir}${MINGW_PREFIX}"/bin/${fscripts}
-@@ -185,7 +152,7 @@ jobs:
-           cp "${pkgdir}${MINGW_PREFIX}"/bin/idle3 "${pkgdir}${MINGW_PREFIX}"/bin/idle
-           cp "${pkgdir}${MINGW_PREFIX}"/bin/pydoc3 "${pkgdir}${MINGW_PREFIX}"/bin/pydoc
- 
--          sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${VERABI}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${VERABI}/python-config.py
-+          sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/python-config.py
- 
-           # fix permissons
-           find ${pkgdir}${MINGW_PREFIX} -type f \( -name "*.dll" -o -name "*.exe" \) | xargs chmod 0755
--- 
-2.32.0
-
diff --git a/0114-build-Disable-checks-for-dlopen-dlfcn.patch b/0106-build-Disable-checks-for-dlopen-dlfcn.patch
index 232c85aec8a3..605441a8ae48 100644
--- a/0114-build-Disable-checks-for-dlopen-dlfcn.patch
+++ b/0106-build-Disable-checks-for-dlopen-dlfcn.patch
@@ -1,7 +1,7 @@
-From 22537ffc1a86b3f483bd6ff0af9bd89880160f0c Mon Sep 17 00:00:00 2001
+From 33575171384e6e85efaf11ed9210463a870a7258 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 25 Jul 2021 13:54:12 +0200
-Subject: [PATCH 114/N] build: Disable checks for dlopen/dlfcn
+Subject: [PATCH 106/N] build: Disable checks for dlopen/dlfcn
 
 While it is (potentially) available with mingw we don't want to use it, so skip any
 checks for it.
@@ -10,7 +10,7 @@ checks for it.
  1 file changed, 17 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index bab62ad..d1b8acb 100644
+index 6b21b79..12373f7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2423,7 +2423,7 @@ dnl AC_MSG_RESULT($cpp_type)
@@ -62,5 +62,5 @@ index bab62ad..d1b8acb 100644
  # determine what size digit to use for Python's longs
  AC_MSG_CHECKING([digit size for Python's longs])
 -- 
-2.32.0
+2.33.0
 
diff --git a/0106-squash-CI-use-srcdir-builddir.patch b/0106-squash-CI-use-srcdir-builddir.patch
deleted file mode 100644
index f23054c98a97..000000000000
--- a/0106-squash-CI-use-srcdir-builddir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 29bca6042fe8e66965c3c7207699fff107403296 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 3 Jul 2021 09:22:14 +0200
-Subject: [PATCH 106/N] [squash] CI: use srcdir!=builddir
-
-To catch me breaking it
----
- .github/workflows/mingw.yml | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
-index d45a9c2..b2f0d6a 100644
---- a/.github/workflows/mingw.yml
-+++ b/.github/workflows/mingw.yml
-@@ -87,8 +87,9 @@ jobs:
-           export CXXFLAGS
-           export CPPFLAGS
-           
-+          rm -Rf _build && mkdir _build && cd _build
-           
--          MSYSTEM=MINGW ./configure \
-+          MSYSTEM=MINGW ../configure \
-             --prefix=${MINGW_PREFIX} \
-             --host=${MINGW_CHOST} \
-             --build=${MINGW_CHOST} \
-@@ -117,8 +118,8 @@ jobs:
-         run: |
-           set -ex
- 
-+          cd _build
-           _pybasever=$(./python.exe -c "import sys; print(sys.winver);")
--          srcdir=.
- 
-           # now install things
- 
-@@ -171,6 +172,7 @@ jobs:
-         shell: msys2 {0}
-         run: |
-           SMOKETESTS="$(pwd)/.github/workflows/smoketests.py"
-+          cd _build
-           cd python_pkgdir/${MINGW_PREFIX}/bin
-           ./python.exe "$SMOKETESTS"
-           MSYSTEM= ./python.exe "$SMOKETESTS"
-@@ -179,6 +181,7 @@ jobs:
-         continue-on-error: true
-         shell: msys2 {0}
-         run: |
-+          cd _build
-           cd python_pkgdir/${MINGW_PREFIX}/bin
-           ./python.exe -m test -j4
- 
-@@ -186,6 +189,7 @@ jobs:
-         if: always()
-         shell: msys2 {0}
-         run: |
-+          cd _build
-           tar -I 'zstd --ultra -20' -cf python.tar.zst python_pkgdir/
- 
-       - name: Upload
-@@ -193,5 +197,5 @@ jobs:
-         if: always()
-         with:
-           name: build-${{ matrix.msystem }}
--          path: python.tar.zst
-+          path: _build/python.tar.zst
- 
--- 
-2.32.0
-
diff --git a/0115-Fix-install-location-of-the-import-library.patch b/0107-Fix-install-location-of-the-import-library.patch
index 7bee5322b8d6..c538b4eb8e62 100644
--- a/0115-Fix-install-location-of-the-import-library.patch
+++ b/0107-Fix-install-location-of-the-import-library.patch
@@ -1,14 +1,14 @@
-From 88d43ecb5443eaa93965e7f799deed119486fd0a Mon Sep 17 00:00:00 2001
+From 212191d85f1af9b7fb395c07db30ff4a9e3cd8da Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 25 Jul 2021 15:46:01 +0200
-Subject: [PATCH 115/N] Fix install location of the import library
+Subject: [PATCH 107/N] Fix install location of the import library
 
 ---
  Makefile.pre.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index fe25d9e..2dfc47f 100644
+index 3aca037..2154bdf 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -1690,7 +1690,7 @@ libainstall:	@DEF_MAKE_RULE@ python-config
@@ -21,5 +21,5 @@ index fe25d9e..2dfc47f 100644
  				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
  			fi; \
 -- 
-2.32.0
+2.33.0
 
diff --git a/0107-squash-fix-srcdir-builddir.patch b/0107-squash-fix-srcdir-builddir.patch
deleted file mode 100644
index 5494f6db5502..000000000000
--- a/0107-squash-fix-srcdir-builddir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b38e504287a07e713de6facb001b2b9e069e5f74 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 3 Jul 2021 09:34:29 +0200
-Subject: [PATCH 107/N] [squash] fix srcdir!=builddir
-
-merge into "Fixup .rc handling"
----
- configure.ac | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index bf21222..14e4c8c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5944,9 +5944,12 @@ case $host in
-   *-*-mingw*)
-     LIBS="$LIBS -lversion -lshlwapi"
- 
-+    AC_MSG_CHECKING([FIELD3])
-+    SAVE_CFLAGS=$CFLAGS
-+    CFLAGS="-I $srcdir/Include"
-     AC_RUN_IFELSE([AC_LANG_SOURCE([[
-       #include <stdio.h>
--      #include "Include/patchlevel.h"
-+      #include "patchlevel.h"
-       int main() {
-         fprintf (
-           fopen ("conftest.out","w"),
-@@ -5955,7 +5958,8 @@ case $host in
-         return 0;
-       }
-     ]])], [FIELD3=`cat conftest.out`])
--
-+    CFLAGS=$SAVE_CFLAGS
-+    AC_MSG_RESULT([${FIELD3}])
-     RCFLAGS="$RCFLAGS -DFIELD3=$FIELD3 -O COFF"
- 
-     case $host in
--- 
-2.32.0
-
diff --git a/0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch
index 1078e6b617a4..928ad0a161be 100644
--- a/0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch
+++ b/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch
@@ -1,7 +1,7 @@
-From aa693f38199fb21c4b1e7520c4de3a515243aa34 Mon Sep 17 00:00:00 2001
+From be91fcc4aa3d4b31521a4eda1256470f5ea43760 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 25 Jul 2021 15:46:54 +0200
-Subject: [PATCH 116/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module
+Subject: [PATCH 108/N] Set MSYS2_ARG_CONV_EXCL for the shared Python module
  install
 
 Otherwise one has to set it when calling "make install".
@@ -10,7 +10,7 @@ Otherwise one has to set it when calling "make install".
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 2dfc47f..a17dcdf 100644
+index 2154bdf..7b8317a 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -1736,6 +1736,7 @@ endif
@@ -22,5 +22,5 @@ index 2dfc47f..a17dcdf 100644
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
 -- 
-2.32.0
+2.33.0
 
diff --git a/0117-build-Integrate-venvlauncher-build-installation-into.patch b/0109-build-Integrate-venvlauncher-build-installation-into.patch
index 576b5db5e4fc..33c151e75c45 100644
--- a/0117-build-Integrate-venvlauncher-build-installation-into.patch
+++ b/0109-build-Integrate-venvlauncher-build-installation-into.patch
@@ -1,7 +1,7 @@
-From 4dc2cda4b0eaffbb79f67174db060452dc43e3ea Mon Sep 17 00:00:00 2001
+From f86fcd93f6748af7964e2875a890e3957ce3a2c4 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 25 Jul 2021 16:53:35 +0200
-Subject: [PATCH 117/N] build: Integrate venvlauncher build/installation into
+Subject: [PATCH 109/N] build: Integrate venvlauncher build/installation into
  the Makefile
 
 This is required for venv creation on Windows.
@@ -12,7 +12,7 @@ but a copy of main binary seems to work as well for now.
  1 file changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index a17dcdf..ab90e65 100644
+index 7b8317a..6012869 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -161,6 +161,7 @@ BINLIBDEST=	@BINLIBDEST@
@@ -75,5 +75,5 @@ index a17dcdf..ab90e65 100644
  		$(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
  	fi
 -- 
-2.32.0
+2.33.0
 
diff --git a/0126-Set-_WIN32_WINNT-version-in-configure.ac.patch b/0110-configure.ac-set-_WIN32_WINNT-version.patch
index 73829c70edf3..31fa06115725 100644
--- a/0126-Set-_WIN32_WINNT-version-in-configure.ac.patch
+++ b/0110-configure.ac-set-_WIN32_WINNT-version.patch
@@ -1,17 +1,17 @@
-From 32c54c2c248fe463a4b0078cb945f1845178780a Mon Sep 17 00:00:00 2001
+From 3724005ffa45a6115f94f8361d0f08cb95af568b Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 1 Aug 2021 15:18:50 +0200
-Subject: [PATCH 126/N] Set _WIN32_WINNT version in configure.ac
+Subject: [PATCH 110/N] configure.ac: set _WIN32_WINNT version
 
 ---
  configure.ac | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 736e1b9..82bea12 100644
+index 12373f7..2455a05 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3470,6 +3470,11 @@ else
+@@ -3477,6 +3477,11 @@ else
  fi])
  AC_MSG_RESULT($with_dbmliborder)
  
@@ -24,5 +24,5 @@ index 736e1b9..82bea12 100644
  AC_SUBST(USE_WIN32_MODULE)
  USE_WIN32_MODULE='#'
 -- 
-2.32.0
+2.33.0
 
diff --git a/0131-configure.ac-don-t-check-for-clock_-functions.patch b/0111-configure.ac-don-t-check-for-clock_-functions.patch
index e77f120f29a2..3af3c2dce883 100644
--- a/0131-configure.ac-don-t-check-for-clock_-functions.patch
+++ b/0111-configure.ac-don-t-check-for-clock_-functions.patch
@@ -1,7 +1,7 @@
-From 839f384b8d3f1b77bef639609246f67e979d8159 Mon Sep 17 00:00:00 2001
+From 80640c7c44d34d8cebfa0768575750e7753bcb8e Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 1 Aug 2021 18:35:17 +0200
-Subject: [PATCH 131/N] configure.ac: don't check for clock_ functions
+Subject: [PATCH 111/N] configure.ac: don't check for clock_ functions
 
 They shouldn't be exposed on Windows and lead to winpthread being linked in
 ---
@@ -9,7 +9,7 @@ They shouldn't be exposed on Windows and lead to winpthread being linked in
  1 file changed, 5 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 0497199..23dd59b 100644
+index 2455a05..dd6969d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -4369,6 +4369,9 @@ char *r = crypt_r("", "", &d);
@@ -32,5 +32,5 @@ index 0497199..23dd59b 100644
  AC_MSG_CHECKING(for major, minor, and makedev)
  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 -- 
-2.32.0
+2.33.0
 
diff --git a/0111-winconsoleio-build-_testconsole-which-is-required-fo.patch b/0111-winconsoleio-build-_testconsole-which-is-required-fo.patch
deleted file mode 100644
index fd6674c53399..000000000000
--- a/0111-winconsoleio-build-_testconsole-which-is-required-fo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bf8eeb610de434dc3adbdf0f4e8da39c70171cca Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 23 Jul 2021 08:55:03 +0200
-Subject: [PATCH 111/N] winconsoleio: build _testconsole which is required
- for the tests
-
-This fixes test_winconsoleio
-
-Should be merged into "build winconsoleio"
----
- setup.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 4e7a284..63f486c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -999,6 +999,9 @@ class PyBuildExt(build_ext):
-                            ['_xxtestfuzz/_xxtestfuzz.c',
-                             '_xxtestfuzz/fuzzer.c']))
- 
-+        if MS_WINDOWS:
-+            self.add(Extension('_testconsole', ['../PC/_testconsole.c']))
-+
-     def detect_readline_curses(self):
-         # readline
-         if not MS_WINDOWS:
--- 
-2.32.0
-
diff --git a/0112-Adjust-Py_WINVER-for-our-Win-7-target.patch b/0112-Adjust-Py_WINVER-for-our-Win-7-target.patch
deleted file mode 100644
index 945c86d7c51a..000000000000
--- a/0112-Adjust-Py_WINVER-for-our-Win-7-target.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 44f87e70a74f9acde6536373a37e0623020a07a5 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 23 Jul 2021 08:55:42 +0200
-Subject: [PATCH 112/N] Adjust Py_WINVER for our Win 7 target
-
-We support win7 still, so adjust accordingly.
-
-Should be merged into the win7 patch
----
- PC/pyconfig.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/PC/pyconfig.h b/PC/pyconfig.h
-index d7d3cf0..6e9c090 100644
---- a/PC/pyconfig.h
-+++ b/PC/pyconfig.h
-@@ -136,8 +136,8 @@ WIN32 is still required for the locale module.
- 
- /* set the version macros for the windows headers */
- /* Python 3.9+ requires Windows 8 or greater */
--#define Py_WINVER 0x0602 /* _WIN32_WINNT_WIN8 */
--#define Py_NTDDI NTDDI_WIN8
-+#define Py_WINVER 0x0601 /* _WIN32_WINNT_WIN7 */
-+#define Py_NTDDI NTDDI_WIN7
- 
- /* We only set these values when building Python - we don't want to force
-    these values on extensions, as that will affect the prototypes and
--- 
-2.32.0
-
diff --git a/0134-expanduser-normpath-paths-coming-from-env-vars.patch b/0112-expanduser-normpath-paths-coming-from-env-vars.patch
index 9b7fb03aa16a..894fc90c8d11 100644
--- a/0134-expanduser-normpath-paths-coming-from-env-vars.patch
+++ b/0112-expanduser-normpath-paths-coming-from-env-vars.patch
@@ -1,7 +1,7 @@
-From 6f3a083adc2e679029614ecb2ce4aa2f066324b1 Mon Sep 17 00:00:00 2001
+From 2748eca808bc4a0d9f79a86803217147fa4c69ec Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 8 Aug 2021 10:17:35 +0200
-Subject: [PATCH 134/N] expanduser: normpath paths coming from env vars
+Subject: [PATCH 112/N] expanduser: normpath paths coming from env vars
 
 This makes sure we get the same paths as with related functions in pathlib.
 ---
@@ -31,5 +31,5 @@ index 77f5614..5d1c6b9 100644
  
  # Expand paths containing shell variable substitutions.
 -- 
-2.32.0
+2.33.0
 
diff --git a/0095-Add-support-for-Windows-7-Python-3.9.patch b/0113-Add-support-for-Windows-7-Python-3.9.patch
index 44c514d30b3b..311bad70f0ef 100644
--- a/0095-Add-support-for-Windows-7-Python-3.9.patch
+++ b/0113-Add-support-for-Windows-7-Python-3.9.patch
@@ -1,7 +1,7 @@
-From 71fba9ef0080a54dcd80fa5ff6c85c567101206d Mon Sep 17 00:00:00 2001
+From 0f459a423fa1754bae5817940d62348b5197fda5 Mon Sep 17 00:00:00 2001
 From: Naveen M K <naveen521kk@gmail.com>
 Date: Thu, 17 Jun 2021 18:52:39 +0530
-Subject: [PATCH 095/N] Add support for Windows 7 Python 3.9
+Subject: [PATCH 113/N] Add support for Windows 7 Python 3.9
 
 ---
  Modules/posixmodule.c | 22 +++++++++++------
@@ -159,18 +159,18 @@ index 53da3a6..40b0db3 100644
      return _PyStatus_OK();
  }
 diff --git a/configure.ac b/configure.ac
-index d76db66..7cf6519 100644
+index dd6969d..23dd59b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -5881,7 +5881,7 @@ AC_MSG_RESULT(done)
+@@ -5968,7 +5968,7 @@ AC_MSG_RESULT(done)
  # For mingw build need additional library for linking
  case $host in
    *-*-mingw*)
 -    LIBS="$LIBS -lversion -lshlwapi -lpathcch"
 +    LIBS="$LIBS -lversion -lshlwapi"
-     RCFLAGS="$RCFLAGS -O COFF"
-     case $host in
-       i686*)  RCFLAGS="$RCFLAGS --target=pe-i386" ;;
+     AC_PROG_AWK
+     if test "$AWK" = "gawk"; then
+       awk_extra_flag="--non-decimal-data"
 -- 
-2.32.0
+2.33.0
 
diff --git a/0128-Commit-regenerated-importlib.patch b/0114-Commit-regenerated-importlib.patch
index c42bc2a50f4c..f8b830b00821 100644
--- a/0128-Commit-regenerated-importlib.patch
+++ b/0114-Commit-regenerated-importlib.patch
@@ -1,7 +1,7 @@
-From 73ef914a5fa580212ee63d4336484f788618972e Mon Sep 17 00:00:00 2001
+From 4ad86b7afa525e568e3c57b795df33b6a5369a3c Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Sun, 1 Aug 2021 16:09:12 +0200
-Subject: [PATCH 128/N] Commit regenerated importlib
+Subject: [PATCH 114/N] Commit regenerated importlib
 
 It needs a native Python when building which isn't available when cross compiling
 
@@ -2390,5 +2390,5 @@ index 6d40249..17f549b 100644
 +    0,20,14,127,0,27,10,23,8,11,8,61,
  };
 -- 
-2.32.0
+2.33.0
 
diff --git a/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch
new file mode 100644
index 000000000000..f463717a0dc9
--- /dev/null
+++ b/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch
@@ -0,0 +1,589 @@
+From dace5a0283f861847979063d2ceb14bbf3cbc0f2 Mon Sep 17 00:00:00 2001
+From: Naveen M K <naveen521kk@gmail.com>
+Date: Fri, 18 Jun 2021 17:51:59 +0530
+Subject: [PATCH 115/N] CI: test the build and add some mingw specific tests
+
+---
+ .github/workflows/mingw.yml | 209 ++++++++++++++++++++++++
+ mingw_ignorefile.txt        |  34 ++++
+ mingw_smoketests.py         | 310 ++++++++++++++++++++++++++++++++++++
+ 3 files changed, 553 insertions(+)
+ create mode 100644 .github/workflows/mingw.yml
+ create mode 100644 mingw_ignorefile.txt
+ create mode 100644 mingw_smoketests.py
+
+diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
+new file mode 100644
+index 0000000..eb27adc
+--- /dev/null
++++ b/.github/workflows/mingw.yml
+@@ -0,0 +1,209 @@
++name: Build
++on: [push, pull_request, workflow_dispatch]
++
++jobs:
++  build:
++    runs-on: windows-2022
++    strategy:
++      fail-fast: false
++      matrix:
++        msystem: ['MINGW64','MINGW32','UCRT64','CLANG64']
++        include:
++          - msystem: MINGW64
++            prefix: mingw-w64-x86_64
++          - msystem: MINGW32
++            prefix: mingw-w64-i686
++          - msystem: UCRT64
++            prefix: mingw-w64-ucrt-x86_64
++          - msystem: CLANG64
++            prefix: mingw-w64-clang-x86_64
++          #- msystem: CLANG32
++          #  prefix: mingw-w64-clang-i686
++    steps:
++      - name: Setup git
++        run: |
++          git config --global core.autocrlf false
++          git config --global core.eol lf
++      - uses: actions/checkout@v2
++      - uses: msys2/setup-msys2@v2
++        with:
++          msystem: ${{ matrix.msystem }}
++          release: false
++          update: true
++          install: >-
++            make
++            binutils
++            autoconf
++            autoconf-archive
++            automake-wrapper
++            tar
++            gzip
++            ${{ matrix.prefix }}-toolchain
++            ${{ matrix.prefix }}-expat
++            ${{ matrix.prefix }}-bzip2
++            ${{ matrix.prefix }}-libffi
++            ${{ matrix.prefix }}-mpdecimal
++            ${{ matrix.prefix }}-ncurses
++            ${{ matrix.prefix }}-openssl
++            ${{ matrix.prefix }}-sqlite3
++            ${{ matrix.prefix }}-tcl
++            ${{ matrix.prefix }}-tk
++            ${{ matrix.prefix }}-zlib
++            ${{ matrix.prefix }}-xz
++            ${{ matrix.prefix }}-tzdata
++
++      - name: Build Python
++        shell: msys2 {0}
++        run: |
++          set -ex
++
++          if [ ${{ matrix.msystem }} == "CLANG64" ]
++          then
++            export CC=clang
++            export CXX=clang++
++          fi
++          autoreconf -vfi
++
++          rm -Rf _build && mkdir _build && cd _build
++
++          ../configure \
++            --prefix=${MINGW_PREFIX} \
++            --host=${MINGW_CHOST} \
++            --build=${MINGW_CHOST} \
++            --enable-shared \
++            --with-system-expat \
++            --with-system-ffi \
++            --with-system-libmpdec \
++            --without-ensurepip \
++            --without-c-locale-coercion \
++            --enable-loadable-sqlite-extensions \
++            --with-tzpath=${MINGW_PREFIX}/share/zoneinfo \
++            --enable-optimizations
++
++          make -j8
++
++      - name: Run Smoke Test (build)
++        shell: msys2 {0}
++        run: |
++          SMOKETESTS="$(pwd)/mingw_smoketests.py"
++          cd _build
++          ./python.exe "$SMOKETESTS"
++          MSYSTEM= ./python.exe "$SMOKETESTS"
++
++      - name: Run tests
++        shell: msys2 {0}
++        run: |
++          IGNOREFILE="$(pwd)/mingw_ignorefile.txt"
++          cd _build
++          MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" -W
++
++      - name: Run broken tests
++        continue-on-error: true
++        shell: msys2 {0}
++        run: |
++          IGNOREFILE="$(pwd)/mingw_ignorefile.txt"
++          cd _build
++          MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" -W
++
++      - name: Install
++        shell: msys2 {0}
++        run: |
++          set -ex
++          cd _build
++
++          pkgdir=python_pkgdir
++
++          make -j1 install DESTDIR="${pkgdir}"
++
++          # Fix shebangs
++          _pybasever=$(./python.exe -c "import sys; print(sys.winver);")
++          for fscripts in 2to3 2to3-${_pybasever} idle3 idle${_pybasever} pydoc3 pydoc${_pybasever}; do
++              sed -i "s|$(cygpath -w ${MINGW_PREFIX} | sed 's|\\|\\\\|g')/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" "${pkgdir}${MINGW_PREFIX}"/bin/${fscripts}
++          done
++          sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/python-config.py
++
++          # Create version-less aliases
++          cp "${pkgdir}${MINGW_PREFIX}"/bin/python3.exe "${pkgdir}${MINGW_PREFIX}"/bin/python.exe
++          cp "${pkgdir}${MINGW_PREFIX}"/bin/python3w.exe "${pkgdir}${MINGW_PREFIX}"/bin/pythonw.exe
++          cp "${pkgdir}${MINGW_PREFIX}"/bin/python3-config "${pkgdir}${MINGW_PREFIX}"/bin/python-config
++          cp "${pkgdir}${MINGW_PREFIX}"/bin/idle3 "${pkgdir}${MINGW_PREFIX}"/bin/idle
++          cp "${pkgdir}${MINGW_PREFIX}"/bin/pydoc3 "${pkgdir}${MINGW_PREFIX}"/bin/pydoc
++
++      - name: Run Smoke Test (installed)
++        shell: msys2 {0}
++        run: |
++          export PYTHONTZPATH="${MINGW_PREFIX}/share/zoneinfo"
++          SMOKETESTS="$(pwd)/mingw_smoketests.py"
++          cd _build
++          cd python_pkgdir/${MINGW_PREFIX}/bin
++          ./python.exe "$SMOKETESTS"
++          MSYSTEM= ./python.exe "$SMOKETESTS"
++
++      - name: Compress
++        if: always()
++        shell: msys2 {0}
++        run: |
++          cd _build
++          tar -zcf python.tar.gz python_pkgdir/
++
++      - name: Upload
++        uses: actions/upload-artifact@v2
++        if: always()
++        with:
++          name: build-${{ matrix.msystem }}
++          path: _build/python.tar.gz
++
++  cross:
++    runs-on: ubuntu-latest
++    container:
++      image: archlinux:base-devel
++    steps:
++      - uses: actions/checkout@v2
++      - name: Install deps
++        run: |
++          pacman --noconfirm -Suuy
++          pacman --needed --noconfirm -S mingw-w64-gcc autoconf-archive autoconf automake python zip
++
++      - name: Build
++        run: |
++          autoreconf -vfi
++
++          mkdir _build && cd _build
++
++          ../configure \
++            --host=x86_64-w64-mingw32 \
++            --build=x86_64-pc-linux-gnu \
++            --enable-shared \
++            --with-system-expat \
++            --with-system-ffi \
++            --with-system-libmpdec \
++            --without-ensurepip \
++            --without-c-locale-coercion \
++            --enable-loadable-sqlite-extensions
++
++          make -j8
++
++          make install DESTDIR="$(pwd)/install"
++
++      - name: 'Zip files'
++        run: |
++          zip -r install.zip _build/install
++
++      - name: Upload
++        uses: actions/upload-artifact@v2
++        with:
++          name: build-cross
++          path: install.zip
++
++  cross-test:
++    needs: [cross]
++    runs-on: windows-latest
++    steps:
++      - uses: actions/download-artifact@v2
++        with:
++          name: build-cross
++
++      - name: 'Run tests'
++        run: |
++          7z x install.zip
++          ./_build/install/usr/local/bin/python3.exe -c "import sysconfig, pprint; pprint.pprint(sysconfig.get_config_vars())"
+diff --git a/mingw_ignorefile.txt b/mingw_ignorefile.txt
+new file mode 100644
+index 0000000..dc3802e
+--- /dev/null
++++ b/mingw_ignorefile.txt
+@@ -0,0 +1,34 @@
++ctypes.test.test_loading.LoaderTest.test_load_dll_with_flags
++distutils.tests.test_bdist_dumb.BuildDumbTestCase.test_simple_built
++distutils.tests.test_cygwinccompiler.CygwinCCompilerTestCase.test_get_versions
++distutils.tests.test_util.UtilTestCase.test_change_root
++test.datetimetester.TestLocalTimeDisambiguation_Fast.*
++test.datetimetester.TestLocalTimeDisambiguation_Pure.*
++test.test_cmath.CMathTests.test_specific_values
++test.test_cmd_line_script.CmdLineTest.test_consistent_sys_path_for_direct_execution
++test.test_compileall.CommandLineTestsNoSourceEpoch.*
++test.test_compileall.CommandLineTestsWithSourceEpoch.*
++test.test_compileall.CompileallTestsWithoutSourceEpoch.*
++test.test_compileall.CompileallTestsWithSourceEpoch.*
++test.test_import.ImportTests.test_dll_dependency_import
++test.test_math.MathTests.*
++test.test_ntpath.NtCommonTest.test_import
++test.test_os.StatAttributeTests.test_stat_block_device
++test.test_os.TestScandir.test_attributes
++test.test_os.UtimeTests.test_large_time
++test.test_platform.PlatformTest.test_architecture_via_symlink
++test.test_regrtest.ProgramsTestCase.test_pcbuild_rt
++test.test_regrtest.ProgramsTestCase.test_tools_buildbot_test
++test.test_site._pthFileTests.*
++test.test_site.HelperFunctionsTests.*
++test.test_site.StartupImportTests.*
++test.test_ssl.*
++test.test_strptime.CalculationTests.*
++test.test_strptime.StrptimeTests.test_weekday
++test.test_strptime.TimeRETests.test_compile
++test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date
++test.test_venv.BasicTest.*
++test.test_venv.EnsurePipTest.*
++# flaky
++test.test__xxsubinterpreters.*
++test.test_asyncio.test_subprocess.SubprocessProactorTests.test_stdin_broken_pipe
+\ No newline at end of file
+diff --git a/mingw_smoketests.py b/mingw_smoketests.py
+new file mode 100644
+index 0000000..70acbd1
+--- /dev/null
++++ b/mingw_smoketests.py
+@@ -0,0 +1,310 @@
++#!/usr/bin/env python3
++# Copyright 2017 Christoph Reiter
++#
++# Permission is hereby granted, free of charge, to any person obtaining
++# a copy of this software and associated documentation files (the
++# "Software"), to deal in the Software without restriction, including
++# without limitation the rights to use, copy, modify, merge, publish,
++# distribute, sublicense, and/or sell copies of the Software, and to
++# permit persons to whom the Software is furnished to do so, subject to
++# the following conditions:
++#
++# The above copyright notice and this permission notice shall be included
++# in all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
++# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
++# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
++# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++"""The goal of this test suite is collect tests for update regressions
++and to test msys2 related modifications like for path handling.
++Feel free to extend.
++"""
++
++import os
++import unittest
++import sysconfig
++
++if "MSYSTEM" in os.environ:
++    SEP = "/"
++else:
++    SEP = "\\"
++
++_UCRT = "clang" in sysconfig.get_platform() or "ucrt" in sysconfig.get_platform()
++
++
++class Tests(unittest.TestCase):
++
++    def test_zoneinfo(self):
++        # https://github.com/msys2-contrib/cpython-mingw/issues/32
++        import zoneinfo
++        self.assertTrue(any(os.path.exists(p) for p in zoneinfo.TZPATH))
++        zoneinfo.ZoneInfo("America/Sao_Paulo")
++
++    def test_userdir_path_sep(self):
++        # Make sure os.path and pathlib use the same path separators
++        from unittest import mock
++        from os.path import expanduser
++        from pathlib import Path
++
++        profiles = ["C:\\foo", "C:/foo"]
++        for profile in profiles:
++            with mock.patch.dict(os.environ, {"USERPROFILE": profile}):
++                self.assertEqual(expanduser("~"), os.path.normpath(expanduser("~")))
++                self.assertEqual(str(Path("~").expanduser()), expanduser("~"))
++                self.assertEqual(str(Path.home()), expanduser("~"))
++
++    def test_sysconfig_schemes(self):
++        # https://github.com/msys2/MINGW-packages/issues/9319
++        import sysconfig
++        from distutils.dist import Distribution
++        from distutils.command.install import install
++
++        names = ['scripts', 'purelib', 'platlib', 'data', 'include']
++        for scheme in ["nt", "nt_user"]:
++            for name in names:
++                c = install(Distribution({"name": "foobar"}))
++                c.user = (scheme == "nt_user")
++                c.finalize_options()
++                if name == "include":
++                    dist_path = os.path.dirname(getattr(c, "install_" + "headers"))
++                else:
++                    dist_path = getattr(c, "install_" + name)
++                sys_path = sysconfig.get_path(name, scheme)
++                self.assertEqual(dist_path, sys_path, (scheme, name))
++
++    def test_ctypes_find_library(self):
++        from ctypes.util import find_library
++        from ctypes import cdll
++        self.assertTrue(cdll.msvcrt)
++        if _UCRT:
++            self.assertIsNone(find_library('c'))
++        else:
++            self.assertEqual(find_library('c'), 'msvcrt.dll')
++
++    def test_ctypes_dlopen(self):
++        import ctypes
++        import sys
++        self.assertEqual(ctypes.RTLD_GLOBAL, 0)
++        self.assertEqual(ctypes.RTLD_GLOBAL,  ctypes.RTLD_LOCAL)
++        self.assertFalse(hasattr(sys, 'setdlopenflags'))
++        self.assertFalse(hasattr(sys, 'getdlopenflags'))
++        self.assertFalse([n for n in dir(os) if n.startswith("RTLD_")])
++
++    def test_time_no_unix_stuff(self):
++        import time
++        self.assertFalse([n for n in dir(time) if n.startswith("clock_")])
++        self.assertFalse([n for n in dir(time) if n.startswith("CLOCK_")])
++        self.assertFalse([n for n in dir(time) if n.startswith("pthread_")])
++        self.assertFalse(hasattr(time, 'tzset'))
++
++    def test_strftime(self):
++        import time
++        with self.assertRaises(ValueError):
++            time.strftime('%Y', (12345,) + (0,) * 8)
++
++    def test_sep(self):
++        self.assertEqual(os.sep, SEP)
++
++    def test_module_file_path(self):
++        import asyncio
++        import zlib
++        self.assertEqual(zlib.__file__, os.path.normpath(zlib.__file__))
++        self.assertEqual(asyncio.__file__, os.path.normpath(asyncio.__file__))
++
++    def test_importlib_frozen_path_sep(self):
++        import importlib._bootstrap_external
++        self.assertEqual(importlib._bootstrap_external.path_sep, SEP)
++
++    def test_os_commonpath(self):
++        self.assertEqual(
++            os.path.commonpath(
++                [os.path.join("C:", os.sep, "foo", "bar"),
++                 os.path.join("C:", os.sep, "foo")]),
++                 os.path.join("C:", os.sep, "foo"))
++
++    def test_pathlib(self):
++        import pathlib
++
++        p = pathlib.Path("foo") / pathlib.Path("foo")
++        self.assertEqual(str(p), os.path.normpath(p))
++
++    def test_modules_import(self):
++        import sqlite3
++        import ssl
++        import ctypes
++        import curses
++
++    def test_socket_inet_ntop(self):
++        import socket
++        self.assertTrue(hasattr(socket, "inet_ntop"))
++
++    def test_socket_inet_pton(self):
++        import socket
++        self.assertTrue(hasattr(socket, "inet_pton"))
++
++    def test_multiprocessing_queue(self):
++        from multiprocessing import Queue
++        Queue(0)
++
++    #def test_socket_timout_normal_error(self):
++    #    import urllib.request
++    #    from urllib.error import URLError
++
++    #    try:
++    #        urllib.request.urlopen(
++    #            'http://localhost', timeout=0.0001).close()
++    #    except URLError:
++    #        pass
++
++    def test_threads(self):
++        from concurrent.futures import ThreadPoolExecutor
++
++        with ThreadPoolExecutor(1) as pool:
++            for res in pool.map(lambda *x: None, range(10000)):
++                pass
++
++    def test_sysconfig(self):
++        import sysconfig
++        # This should be able to execute without exceptions
++        sysconfig.get_config_vars()
++
++    def test_sqlite_enable_load_extension(self):
++        # Make sure --enable-loadable-sqlite-extensions is used
++        import sqlite3
++        self.assertTrue(sqlite3.Connection.enable_load_extension)
++
++    def test_venv_creation(self):
++        import tempfile
++        import venv
++        import subprocess
++        import shutil
++        with tempfile.TemporaryDirectory() as tmp:
++            builder = venv.EnvBuilder()
++            builder.create(tmp)
++            assert os.path.exists(os.path.join(tmp, "bin", "activate"))
++            assert os.path.exists(os.path.join(tmp, "bin", "python.exe"))
++            assert os.path.exists(os.path.join(tmp, "bin", "python3.exe"))
++            subprocess.check_call([shutil.which("bash.exe"), os.path.join(tmp, "bin", "activate")])
++
++    def test_has_mktime(self):
++        from time import mktime, gmtime
++        mktime(gmtime())
++
++    def test_platform_things(self):
++        import sys
++        import sysconfig
++        import platform
++        import importlib.machinery
++        self.assertEqual(sys.implementation.name, "cpython")
++        self.assertEqual(sys.platform, "win32")
++        self.assertTrue(sysconfig.get_platform().startswith("mingw"))
++        self.assertTrue(sysconfig.get_config_var('SOABI').startswith("cpython-"))
++        ext_suffix = sysconfig.get_config_var('EXT_SUFFIX')
++        self.assertTrue(ext_suffix.endswith(".pyd"))
++        self.assertTrue("mingw" in ext_suffix)
++        self.assertEqual(sysconfig.get_config_var('SHLIB_SUFFIX'), ".pyd")
++        ext_suffixes = importlib.machinery.EXTENSION_SUFFIXES
++        self.assertTrue(ext_suffix in ext_suffixes)
++        self.assertTrue(".pyd" in ext_suffixes)
++        self.assertEqual(sys.winver, ".".join(map(str, sys.version_info[:2])))
++        self.assertEqual(platform.python_implementation(), "CPython")
++        self.assertEqual(platform.system(), "Windows")
++        self.assertTrue(isinstance(sys.api_version, int) and sys.api_version > 0)
++
++    def test_c_ext_build(self):
++        import tempfile
++        import sys
++        import subprocess
++        import textwrap
++        from pathlib import Path
++
++        with tempfile.TemporaryDirectory() as tmppro:
++            subprocess.check_call([sys.executable, "-m", "ensurepip", "--user"])
++            with Path(tmppro, "setup.py").open("w") as f:
++                f.write(
++                    textwrap.dedent(
++                        """\
++                                    from setuptools import setup, Extension
++
++                                    setup(
++                                        name='cwrapper',
++                                        version='1.0',
++                                        ext_modules=[
++                                            Extension(
++                                                'cwrapper',
++                                                sources=['cwrapper.c']),
++                                        ],
++                                    )
++                                """
++                    )
++                )
++            with Path(tmppro, "cwrapper.c").open("w") as f:
++                f.write(
++                    textwrap.dedent(
++                        """\
++                                    #include <Python.h>
++                                    static PyObject *
++                                    helloworld(PyObject *self, PyObject *args)
++                                    {
++                                        printf("Hello World\\n");
++                                        return Py_None;
++                                    }
++                                    static PyMethodDef
++                                    myMethods[] = {
++                                        { "helloworld", helloworld, METH_NOARGS, "Prints Hello World" },
++                                        { NULL, NULL, 0, NULL }
++                                    };
++                                    static struct PyModuleDef cwrapper = {
++                                        PyModuleDef_HEAD_INIT,
++                                        "cwrapper",
++                                        "Test Module",
++                                        -1,
++                                        myMethods
++                                    };
++
++                                    PyMODINIT_FUNC
++                                    PyInit_cwrapper(void)
++                                    {
++                                        return PyModule_Create(&cwrapper);
++                                    }
++                                """
++                    )
++                )
++            subprocess.check_call(
++                [sys.executable, "-c", "import struct"],
++            )
++            subprocess.check_call(
++                [
++                    sys.executable,
++                    "-m",
++                    "pip",
++                    "install",
++                    "wheel",
++                ],
++            )
++            subprocess.check_call(
++                [
++                    sys.executable,
++                    "-m",
++                    "pip",
++                    "install",
++                    tmppro,
++                ],
++            )
++            subprocess.check_call(
++                [sys.executable, "-c", "import cwrapper"],
++            )
++
++
++
++def suite():
++    return unittest.TestLoader().loadTestsFromName(__name__)
++
++
++if __name__ == '__main__':
++    unittest.main(defaultTest='suite')
+-- 
+2.33.0
+
diff --git a/0116-decimal-backport-build-fixes.patch b/0116-decimal-backport-build-fixes.patch
new file mode 100644
index 000000000000..4cfeb6286718
--- /dev/null
+++ b/0116-decimal-backport-build-fixes.patch
@@ -0,0 +1,35 @@
+From f9d77130f2c14f49081ba243f346e0c458f45d5e Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Thu, 23 Sep 2021 09:55:32 +0200
+Subject: [PATCH 116/N] decimal: backport build fixes
+
+part of https://github.com/python/cpython/pull/24962
+---
+ Modules/_decimal/_decimal.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
+index d80d791..28fd209 100644
+--- a/Modules/_decimal/_decimal.c
++++ b/Modules/_decimal/_decimal.c
+@@ -3279,7 +3279,7 @@ dec_format(PyObject *dec, PyObject *args)
+     }
+     else {
+         size_t n = strlen(spec.dot);
+-        if (n > 1 || (n == 1 && !isascii((uchar)spec.dot[0]))) {
++        if (n > 1 || (n == 1 && !isascii((unsigned char)spec.dot[0]))) {
+             /* fix locale dependent non-ascii characters */
+             dot = dotsep_as_utf8(spec.dot);
+             if (dot == NULL) {
+@@ -3288,7 +3288,7 @@ dec_format(PyObject *dec, PyObject *args)
+             spec.dot = PyBytes_AS_STRING(dot);
+         }
+         n = strlen(spec.sep);
+-        if (n > 1 || (n == 1 && !isascii((uchar)spec.sep[0]))) {
++        if (n > 1 || (n == 1 && !isascii((unsigned char)spec.sep[0]))) {
+             /* fix locale dependent non-ascii characters */
+             sep = dotsep_as_utf8(spec.sep);
+             if (sep == NULL) {
+-- 
+2.33.0
+
diff --git a/0117-smoketests-test-that-_decimal-exists.patch b/0117-smoketests-test-that-_decimal-exists.patch
new file mode 100644
index 000000000000..d5fab8e948fd
--- /dev/null
+++ b/0117-smoketests-test-that-_decimal-exists.patch
@@ -0,0 +1,26 @@
+From b7d2e9e27140b56c131e1705bd20dcc7dac63eb2 Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Thu, 23 Sep 2021 09:57:56 +0200
+Subject: [PATCH 117/N] smoketests: test that _decimal exists
+
+---
+ mingw_smoketests.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mingw_smoketests.py b/mingw_smoketests.py
+index 70acbd1..527aafb 100644
+--- a/mingw_smoketests.py
++++ b/mingw_smoketests.py
+@@ -139,6 +139,9 @@ class Tests(unittest.TestCase):
+         import ctypes
+         import curses
+ 
++    def test_c_modules_import(self):
++        import _decimal
++
+     def test_socket_inet_ntop(self):
+         import socket
+         self.assertTrue(hasattr(socket, "inet_ntop"))
+-- 
+2.33.0
+
diff --git a/0118-Update-smoketests.patch b/0118-Update-smoketests.patch
deleted file mode 100644
index c27b70706158..000000000000
--- a/0118-Update-smoketests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 6cc4ce00eeed7ab066c848637b4d06381d161a11 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 23 Jul 2021 08:56:15 +0200
-Subject: [PATCH 118/N] Update smoketests
-
----
- .../smoketests.py => mingw_smoketests.py      | 27 +++++++++++++++++++
- 1 file changed, 27 insertions(+)
- rename .github/workflows/smoketests.py => mingw_smoketests.py (90%)
-
-diff --git a/.github/workflows/smoketests.py b/mingw_smoketests.py
-similarity index 90%
-rename from .github/workflows/smoketests.py
-rename to mingw_smoketests.py
-index d8f76e6..3f41855 100644
---- a/.github/workflows/smoketests.py
-+++ b/mingw_smoketests.py
-@@ -27,15 +27,41 @@ Feel free to extend.
- 
- import os
- import unittest
-+import sysconfig
- 
- if "MSYSTEM" in os.environ:
-     SEP = "/"
- else:
-     SEP = "\\"
- 
-+_UCRT = "clang" in sysconfig.get_platform() or "ucrt" in sysconfig.get_platform()
-+
- 
- class Tests(unittest.TestCase):
- 
-+    def test_ctypes_find_library(self):
-+        from ctypes.util import find_library
-+        from ctypes import cdll
-+        self.assertTrue(cdll.msvcrt)
-+        if _UCRT:
-+            self.assertIsNone(find_library('c'))
-+        else:
-+            self.assertEqual(find_library('c'), 'msvcrt.dll')
-+
-+    def test_ctypes_dlopen(self):
-+        import ctypes
-+        import sys
-+        self.assertEqual(ctypes.RTLD_GLOBAL, 0)
-+        self.assertEqual(ctypes.RTLD_GLOBAL,  ctypes.RTLD_LOCAL)
-+        self.assertFalse(hasattr(sys, 'setdlopenflags'))
-+        self.assertFalse(hasattr(sys, 'getdlopenflags'))
-+        self.assertFalse([n for n in dir(os) if n.startswith("RTLD_")])
-+
-+    def test_strftime(self):
-+        import time
-+        with self.assertRaises(ValueError):
-+            time.strftime('%Y', (12345,) + (0,) * 8)
-+
-     def test_sep(self):
-         self.assertEqual(os.sep, SEP)
- 
-@@ -66,6 +92,7 @@ class Tests(unittest.TestCase):
-         import sqlite3
-         import ssl
-         import ctypes
-+        import curses
- 
-     def test_socket_inet_ntop(self):
-         import socket
--- 
-2.32.0
-
diff --git a/0119-CI-clean-up-the-build-enforce-some-tests.patch b/0119-CI-clean-up-the-build-enforce-some-tests.patch
deleted file mode 100644
index eb4a531d2674..000000000000
--- a/0119-CI-clean-up-the-build-enforce-some-tests.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From 02aeab593ce0e2e5fe99717d286a8e1776de5b9d Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Fri, 23 Jul 2021 09:03:21 +0200
-Subject: [PATCH 119/N] CI: clean up the build; enforce some tests
-
-This now enforces success of a subset of tests (see mingw_ignorefile.txt)
-and runs smoketests on the build as well as after installation.
-
-Remove everything that is no longer needed after the previous patches:
-
-* the build uses -O3 by default
-* it sets fwrapv by default
-* __USE_MINGW_ANSI_STDIO is not needed anymore with c99
-* it sets_WIN32_WINNT anyway
-* ncurses is fixed by patching the build
-* debug is handled by autotools
-* all ac_cv_* overrides are now handled in configure.ac
-* venvlauncher is handled by the main makefile
-* setting MSYS2_ARG_CONV_EXCL is now handled by the makefile
-* the import library is now installed by the makefile
-* _sysconfig_data overrides are handled at runtime anyway
-* we don't care about permissions.. (I think?)
----
- .github/workflows/mingw.yml | 118 +++++++++++-------------------------
- mingw_ignorefile.txt        |  34 +++++++++++
- 2 files changed, 68 insertions(+), 84 deletions(-)
- create mode 100644 mingw_ignorefile.txt
-
-diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
-index b2f0d6a..16a96b5 100644
---- a/.github/workflows/mingw.yml
-+++ b/.github/workflows/mingw.yml
-@@ -51,45 +51,16 @@ jobs:
-         run: |
-           set -ex
- 
--          CFLAGS="-O2"
--          
--          PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
-           if [ ${{ matrix.msystem }} == "CLANG64" ]
-           then
-             export CC=clang
-             export CXX=clang++
-           fi
-           autoreconf -vfi
--          CFLAGS+=" -fwrapv -D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601"
--          CXXFLAGS+=" -fwrapv -D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601"
--          CPPFLAGS+=" -I${PREFIX_WIN}/include/ncurses "
--          CFLAGS+=" -DNDEBUG "
--          CXXFLAGS+=" -DNDEBUG "
--          _extra_config+=("--enable-optimizations")
--
--          # Workaround for conftest error on 64-bit builds
--          export ac_cv_working_tzset=no
--
--          # Workaround for when dlfcn exists on Windows, which causes
--          # some conftests to succeed when they shouldn't (we don't use dlfcn).
--          export ac_cv_header_dlfcn_h=no
--          export ac_cv_lib_dl_dlopen=no
--          export ac_cv_have_decl_RTLD_GLOBAL=no
--          export ac_cv_have_decl_RTLD_LAZY=no
--          export ac_cv_have_decl_RTLD_LOCAL=no
--          export ac_cv_have_decl_RTLD_NOW=no
--          export ac_cv_have_decl_RTLD_DEEPBIND=no
--          export ac_cv_have_decl_RTLD_MEMBER=no
--          export ac_cv_have_decl_RTLD_NODELETE=no
--          export ac_cv_have_decl_RTLD_NOLOAD=no
--          
--          export CFLAGS
--          export CXXFLAGS
--          export CPPFLAGS
--          
-+
-           rm -Rf _build && mkdir _build && cd _build
--          
--          MSYSTEM=MINGW ../configure \
-+
-+          ../configure \
-             --prefix=${MINGW_PREFIX} \
-             --host=${MINGW_CHOST} \
-             --build=${MINGW_CHOST} \
-@@ -101,90 +72,69 @@ jobs:
-             --without-ensurepip \
-             --without-c-locale-coercion \
-             --enable-loadable-sqlite-extensions \
--            "${_extra_config[@]}" \
--            OPT=""
-+            --enable-optimizations
-+
-           # We patch importlib which is embedded in C headers, so regenerate them
-           make regen-importlib
- 
-           make -j8
--          
--          # Add missing venvlauncher files (issue #7014)
--          # FIXME: build these from PC/launcher.c instead
--          cp python.exe venvlauncher.exe
--          cp pythonw.exe venvwlauncher.exe
- 
--      - name: Install
-+      - name: Run Smoke Test (build)
-         shell: msys2 {0}
-         run: |
--          set -ex
-+          SMOKETESTS="$(pwd)/mingw_smoketests.py"
-+          cd _build
-+          ./python.exe "$SMOKETESTS"
-+          MSYSTEM= ./python.exe "$SMOKETESTS"
-+
-+      - name: Run tests
-+        shell: msys2 {0}
-+        run: |
-+          IGNOREFILE="$(pwd)/mingw_ignorefile.txt"
-+          cd _build
-+          MSYSTEM= ./python.exe -m test -j8 --ignorefile "$IGNOREFILE" -W
- 
-+      - name: Run broken tests
-+        continue-on-error: true
-+        shell: msys2 {0}
-+        run: |
-+          IGNOREFILE="$(pwd)/mingw_ignorefile.txt"
-           cd _build
--          _pybasever=$(./python.exe -c "import sys; print(sys.winver);")
-+          MSYSTEM= ./python.exe -m test -j8 --matchfile "$IGNOREFILE" -W
- 
--          # now install things
-+      - name: Install
-+        shell: msys2 {0}
-+        run: |
-+          set -ex
-+          cd _build
- 
-           pkgdir=python_pkgdir
- 
--          PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
--          MSYSTEM=MINGW \
--          MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-           make -j1 install DESTDIR="${pkgdir}"
- 
--          # gdb pretty printers for debugging Python itself; to use:
--          # python
--          # sys.path.append('C:/msys64/mingw64/share/gdb/python3')
--          # import python_gdb
--          # reload(python_gdb)
--          # end
--
--          cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/libpython${_pybasever}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a
--
--          # Need for building boost python module
--          cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/libpython${_pybasever}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a
--
-+          # Fix shebangs
-+          _pybasever=$(./python.exe -c "import sys; print(sys.winver);")
-           for fscripts in 2to3 2to3-${_pybasever} idle3 idle${_pybasever} pydoc3 pydoc${_pybasever}; do
-               sed -i "s|$(cygpath -w ${MINGW_PREFIX} | sed 's|\\|\\\\|g')/bin/python${_pybasever}.exe|/usr/bin/env python${_pybasever}.exe|g" "${pkgdir}${MINGW_PREFIX}"/bin/${fscripts}
-           done
-+          sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/python-config.py
- 
--
-+          # Create version-less aliases
-           cp "${pkgdir}${MINGW_PREFIX}"/bin/python3.exe "${pkgdir}${MINGW_PREFIX}"/bin/python.exe
-           cp "${pkgdir}${MINGW_PREFIX}"/bin/python3w.exe "${pkgdir}${MINGW_PREFIX}"/bin/pythonw.exe
-           cp "${pkgdir}${MINGW_PREFIX}"/bin/python3-config "${pkgdir}${MINGW_PREFIX}"/bin/python-config
-           cp "${pkgdir}${MINGW_PREFIX}"/bin/idle3 "${pkgdir}${MINGW_PREFIX}"/bin/idle
-           cp "${pkgdir}${MINGW_PREFIX}"/bin/pydoc3 "${pkgdir}${MINGW_PREFIX}"/bin/pydoc
- 
--          sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!/usr/bin/env python${_pybasever}.exe|" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config-${_pybasever}/python-config.py
--
--          # fix permissons
--          find ${pkgdir}${MINGW_PREFIX} -type f \( -name "*.dll" -o -name "*.exe" \) | xargs chmod 0755
--
--          # replace paths in sysconfig
--          sed -i "s|${pkgdir}${MINGW_PREFIX}|${MINGW_PREFIX}|g" \
--          "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/lib-dynload/_sysconfigdata*.py \
--          "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/smtpd.py
--
--          # install venv launchers
--          mkdir -p "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt
--          cp venvlauncher.exe "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt/python.exe
--          cp venvwlauncher.exe "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/venv/scripts/nt/pythonw.exe
--
--      - name: Run Smoke Test
-+      - name: Run Smoke Test (installed)
-         shell: msys2 {0}
-         run: |
--          SMOKETESTS="$(pwd)/.github/workflows/smoketests.py"
-+          SMOKETESTS="$(pwd)/mingw_smoketests.py"
-           cd _build
-           cd python_pkgdir/${MINGW_PREFIX}/bin
-           ./python.exe "$SMOKETESTS"
-           MSYSTEM= ./python.exe "$SMOKETESTS"
- 
--      - name: Run tests
--        continue-on-error: true
--        shell: msys2 {0}
--        run: |
--          cd _build
--          cd python_pkgdir/${MINGW_PREFIX}/bin
--          ./python.exe -m test -j4
--
-       - name: Compress
-         if: always()
-         shell: msys2 {0}
-diff --git a/mingw_ignorefile.txt b/mingw_ignorefile.txt
-new file mode 100644
-index 0000000..dc3802e
---- /dev/null
-+++ b/mingw_ignorefile.txt
-@@ -0,0 +1,34 @@
-+ctypes.test.test_loading.LoaderTest.test_load_dll_with_flags
-+distutils.tests.test_bdist_dumb.BuildDumbTestCase.test_simple_built
-+distutils.tests.test_cygwinccompiler.CygwinCCompilerTestCase.test_get_versions
-+distutils.tests.test_util.UtilTestCase.test_change_root
-+test.datetimetester.TestLocalTimeDisambiguation_Fast.*
-+test.datetimetester.TestLocalTimeDisambiguation_Pure.*
-+test.test_cmath.CMathTests.test_specific_values
-+test.test_cmd_line_script.CmdLineTest.test_consistent_sys_path_for_direct_execution
-+test.test_compileall.CommandLineTestsNoSourceEpoch.*
-+test.test_compileall.CommandLineTestsWithSourceEpoch.*
-+test.test_compileall.CompileallTestsWithoutSourceEpoch.*
-+test.test_compileall.CompileallTestsWithSourceEpoch.*
-+test.test_import.ImportTests.test_dll_dependency_import
-+test.test_math.MathTests.*
-+test.test_ntpath.NtCommonTest.test_import
-+test.test_os.StatAttributeTests.test_stat_block_device
-+test.test_os.TestScandir.test_attributes
-+test.test_os.UtimeTests.test_large_time
-+test.test_platform.PlatformTest.test_architecture_via_symlink
-+test.test_regrtest.ProgramsTestCase.test_pcbuild_rt
-+test.test_regrtest.ProgramsTestCase.test_tools_buildbot_test
-+test.test_site._pthFileTests.*
-+test.test_site.HelperFunctionsTests.*
-+test.test_site.StartupImportTests.*
-+test.test_ssl.*
-+test.test_strptime.CalculationTests.*
-+test.test_strptime.StrptimeTests.test_weekday
-+test.test_strptime.TimeRETests.test_compile
-+test.test_tools.test_i18n.Test_pygettext.test_POT_Creation_Date
-+test.test_venv.BasicTest.*
-+test.test_venv.EnsurePipTest.*
-+# flaky
-+test.test__xxsubinterpreters.*
-+test.test_asyncio.test_subprocess.SubprocessProactorTests.test_stdin_broken_pipe
-\ No newline at end of file
--- 
-2.32.0
-
diff --git a/0120-1-2-AC_RUN_IFELSE-replace.patch b/0120-1-2-AC_RUN_IFELSE-replace.patch
deleted file mode 100644
index 9f5d846e3bf0..000000000000
--- a/0120-1-2-AC_RUN_IFELSE-replace.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 92b9a55e916277392c5e308a4193179637e04eae Mon Sep 17 00:00:00 2001
-From: Long Nguyen <nguyen.long.908132@gmail.com>
-Date: Thu, 29 Jul 2021 22:19:32 +0700
-Subject: [PATCH 120/N] [1/2] AC_RUN_IFELSE replace
-
----
- configure.ac | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d1b8acb..ae9b1d8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5146,11 +5146,12 @@ case $host in
-   *-*-mingw*)
-     # check if we are linking to ucrt
-     AC_MSG_CHECKING(whether linking to ucrt)
--    AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-     #include <stdio.h>
--    int main(){
--      _UCRT;
--    }
-+    #ifndef _UCRT
-+        #error no ucrt
-+    #endif
-+    int main(){}
-     ]])],[linking_to_ucrt=yes],[linking_to_ucrt=no])
-     AC_MSG_RESULT($linking_to_ucrt)
-     ;;
--- 
-2.32.0
-
diff --git a/0121-Add-return-0-to-the-test-code.patch b/0121-Add-return-0-to-the-test-code.patch
deleted file mode 100644
index 662a846d461c..000000000000
--- a/0121-Add-return-0-to-the-test-code.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b63a2139c30c268fdc763abae966f527b9a7d798 Mon Sep 17 00:00:00 2001
-From: Long Nguyen <nguyen.long.908132@gmail.com>
-Date: Fri, 30 Jul 2021 10:31:55 +0700
-Subject: [PATCH 121/N] Add return 0 to the test code
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ae9b1d8..14eb4b6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5151,7 +5151,7 @@ case $host in
-     #ifndef _UCRT
-         #error no ucrt
-     #endif
--    int main(){}
-+    int main(){ return 0; }
-     ]])],[linking_to_ucrt=yes],[linking_to_ucrt=no])
-     AC_MSG_RESULT($linking_to_ucrt)
-     ;;
--- 
-2.32.0
-
diff --git a/0122-2-2-AC_RUN_IFELSE-replace.patch b/0122-2-2-AC_RUN_IFELSE-replace.patch
deleted file mode 100644
index e806c69d8085..000000000000
--- a/0122-2-2-AC_RUN_IFELSE-replace.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 91ea75c8a7e2c91fd1ba454f3522ac8f27989805 Mon Sep 17 00:00:00 2001
-From: Long Nguyen <nguyen.long.908132@gmail.com>
-Date: Fri, 30 Jul 2021 16:34:41 +0700
-Subject: [PATCH 122/N] [2/2] AC_RUN_IFELSE replace
-
-Replace strtonum() with --non-decimal-data
----
- configure.ac | 28 +++++++++++++---------------
- 1 file changed, 13 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 14eb4b6..215dc75 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5959,22 +5959,20 @@ AC_MSG_RESULT(done)
- case $host in
-   *-*-mingw*)
-     LIBS="$LIBS -lversion -lshlwapi"
--
-+    AC_PROG_AWK
-+    if test "$AWK" = "gawk"; then
-+      awk_extra_flag="--non-decimal-data"
-+    fi
-     AC_MSG_CHECKING([FIELD3])
--    SAVE_CFLAGS=$CFLAGS
--    CFLAGS="-I $srcdir/Include"
--    AC_RUN_IFELSE([AC_LANG_SOURCE([[
--      #include <stdio.h>
--      #include "patchlevel.h"
--      int main() {
--        fprintf (
--          fopen ("conftest.out","w"),
--          "%d",
--          PY_MICRO_VERSION * 1000 + PY_RELEASE_LEVEL * 10 + PY_RELEASE_SERIAL);
--        return 0;
--      }
--    ]])], [FIELD3=`cat conftest.out`])
--    CFLAGS=$SAVE_CFLAGS
-+    FIELD3=$($AWK $awk_extra_flag '\
-+      /^#define PY_RELEASE_LEVEL_/             {levels[$2]=$3}    \
-+      /^#define PY_MICRO_VERSION[[:space:]]+/  {micro=$3}         \
-+      /^#define PY_RELEASE_LEVEL[[:space:]]+/  {level=levels[$3]} \
-+      /^#define PY_RELEASE_SERIAL[[:space:]]+/ {serial=$3}        \
-+      END {print micro * 1000 + level * 10 + serial}' \
-+      $srcdir/Include/patchlevel.h
-+    )
-+    
-     AC_MSG_RESULT([${FIELD3}])
-     RCFLAGS="$RCFLAGS -DFIELD3=$FIELD3 -O COFF"
- 
--- 
-2.32.0
-
diff --git a/0123-Make-sure-MACHDEP-matches-sys.platform.patch b/0123-Make-sure-MACHDEP-matches-sys.platform.patch
deleted file mode 100644
index b3bd2f27b7af..000000000000
--- a/0123-Make-sure-MACHDEP-matches-sys.platform.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From aacd49b757cccfef161f2107248b8a80ab62f3d5 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 31 Jul 2021 15:55:00 +0200
-Subject: [PATCH 123/N] Make sure MACHDEP matches sys.platform
-
-MACHDEP=win32
-
-This simplifies things a bit and also makes sure that
-_PYTHON_SYSCONFIGDATA_NAME is set correctly when cross compiling
----
- Python/getplatform.c |  6 ------
- configure.ac         | 17 +++++------------
- 2 files changed, 5 insertions(+), 18 deletions(-)
-
-diff --git a/Python/getplatform.c b/Python/getplatform.c
-index 636b0a8..81a0f7a 100644
---- a/Python/getplatform.c
-+++ b/Python/getplatform.c
-@@ -1,12 +1,6 @@
- 
- #include "Python.h"
- 
--#ifdef __MINGW32__
--#  undef PLATFORM
--/* see PC/pyconfig.h */
--#  define PLATFORM "win32"
--#endif
--
- #ifndef PLATFORM
- #define PLATFORM "unknown"
- #endif
-diff --git a/configure.ac b/configure.ac
-index 215dc75..736e1b9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,17 +383,6 @@ AC_DEFINE_UNQUOTED(_PYTHONFRAMEWORK, "${PYTHONFRAMEWORK}", [framework name])
- # Set name for machine-dependent library files
- AC_ARG_VAR([MACHDEP], [name for machine-dependent library files])
- AC_MSG_CHECKING(MACHDEP)
--case $host in
--  *-*-mingw*)
--    # On those hosts MACHDEP is 'win', as platform specific files
--    # go in plat-$(MACHDEP), but runtime platform is 'win32'
--    test -z "$MACHDEP" && MACHDEP=win
--
--    dnl Configuration will be based only on "host triplet" as build
--    dnl must not depend from posix compatible environement.
--    ac_sys_system=ignore
--    ;;
--esac
- if test -z "$MACHDEP"
- then
-     # avoid using uname for cross builds
-@@ -412,6 +401,9 @@ then
- 	*-*-cygwin*)
- 		ac_sys_system=Cygwin
- 		;;
-+	*-*-mingw*)
-+		ac_sys_system=MINGW
-+		;;
- 	*-*-darwin*)
- 		ac_sys_system=Darwin
- 		ac_sys_release=$(echo $host | sed -n 's/.*-[^0-9]\+\([0-9]\+\)/\1/p')
-@@ -461,6 +453,7 @@ then
- 	linux*) MACHDEP="linux";;
- 	cygwin*) MACHDEP="cygwin";;
- 	darwin*) MACHDEP="darwin";;
-+	mingw*) MACHDEP="win32";;
- 	'')	MACHDEP="unknown";;
-     esac
- fi
-@@ -5236,7 +5229,7 @@ AC_MSG_RESULT($LDVERSION)
- 
- # On Android and Cygwin the shared libraries must be linked with libpython.
- AC_SUBST(LIBPYTHON)
--if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin" -o "$MACHDEP" = "win"; then
-+if test -n "$ANDROID_API_LEVEL" -o "$MACHDEP" = "cygwin" -o "$MACHDEP" = "win32"; then
-   LIBPYTHON="-lpython${VERSION}${ABIFLAGS}"
- else
-   LIBPYTHON=''
--- 
-2.32.0
-
diff --git a/0124-CI-add-a-cross-build-job.patch b/0124-CI-add-a-cross-build-job.patch
deleted file mode 100644
index 38b4452d8fd6..000000000000
--- a/0124-CI-add-a-cross-build-job.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 3ea2b7adc6859e939b75c02260d9512de758eb5c Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sat, 31 Jul 2021 18:04:05 +0200
-Subject: [PATCH 124/N] CI: add a cross build job
-
----
- .github/workflows/mingw.yml | 57 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 57 insertions(+)
-
-diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
-index 16a96b5..af2f57c 100644
---- a/.github/workflows/mingw.yml
-+++ b/.github/workflows/mingw.yml
-@@ -149,3 +149,60 @@ jobs:
-           name: build-${{ matrix.msystem }}
-           path: _build/python.tar.zst
- 
-+  cross:
-+    runs-on: ubuntu-latest
-+    container:
-+      image: archlinux:base-devel
-+    steps:
-+      - uses: actions/checkout@v2
-+      - name: Install deps
-+        run: |
-+          pacman --noconfirm -Suuy
-+          pacman --needed --noconfirm -S mingw-w64-gcc autoconf-archive autoconf automake python zip
-+
-+      - name: Build
-+        run: |
-+          autoreconf -vfi
-+
-+          mkdir _build && cd _build
-+
-+          CFLAGS="-O2 -D_WIN32_WINNT=0x0601" \
-+          ../configure \
-+            --host=x86_64-w64-mingw32 \
-+            --build=x86_64-pc-linux-gnu \
-+            --enable-shared \
-+            --with-nt-threads \
-+            --with-system-expat \
-+            --with-system-ffi \
-+            --with-system-libmpdec \
-+            --without-ensurepip \
-+            --without-c-locale-coercion \
-+            --enable-loadable-sqlite-extensions
-+
-+          make -j8
-+
-+          make install DESTDIR="$(pwd)/install"
-+          cp /usr/x86_64-w64-mingw32/bin/libwinpthread-1.dll install/usr/local/bin
-+
-+      - name: 'Zip files'
-+        run: |
-+          zip -r install.zip _build/install
-+
-+      - name: Upload
-+        uses: actions/upload-artifact@v2
-+        with:
-+          name: build-cross
-+          path: install.zip
-+
-+  cross-test:
-+    needs: [cross]
-+    runs-on: windows-latest
-+    steps:
-+      - uses: actions/download-artifact@v2
-+        with:
-+          name: build-cross
-+
-+      - name: 'Run tests'
-+        run: |
-+          7z x install.zip
-+          ./_build/install/usr/local/bin/python3.exe -c "import sysconfig, pprint; pprint.pprint(sysconfig.get_config_vars())"
--- 
-2.32.0
-
diff --git a/0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch b/0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch
deleted file mode 100644
index 69638967d9c7..000000000000
--- a/0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9f09ab8856a9b220e700345ad3a8378f51a372e6 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 1 Aug 2021 15:18:28 +0200
-Subject: [PATCH 125/N] Revert "Adjust Py_WINVER for our Win 7 target"
-
-This reverts commit 44f87e70a74f9acde6536373a37e0623020a07a5.
----
- PC/pyconfig.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/PC/pyconfig.h b/PC/pyconfig.h
-index 6e9c090..d7d3cf0 100644
---- a/PC/pyconfig.h
-+++ b/PC/pyconfig.h
-@@ -136,8 +136,8 @@ WIN32 is still required for the locale module.
- 
- /* set the version macros for the windows headers */
- /* Python 3.9+ requires Windows 8 or greater */
--#define Py_WINVER 0x0601 /* _WIN32_WINNT_WIN7 */
--#define Py_NTDDI NTDDI_WIN7
-+#define Py_WINVER 0x0602 /* _WIN32_WINNT_WIN8 */
-+#define Py_NTDDI NTDDI_WIN8
- 
- /* We only set these values when building Python - we don't want to force
-    these values on extensions, as that will affect the prototypes and
--- 
-2.32.0
-
diff --git a/0127-CI-cleanup.patch b/0127-CI-cleanup.patch
deleted file mode 100644
index 74a466db1a63..000000000000
--- a/0127-CI-cleanup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ea45b9740011bbd6d09c6f66e43f71f21e354c00 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 1 Aug 2021 15:19:48 +0200
-Subject: [PATCH 127/N] CI: cleanup
-
----
- .github/workflows/mingw.yml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
-index af2f57c..17aab89 100644
---- a/.github/workflows/mingw.yml
-+++ b/.github/workflows/mingw.yml
-@@ -166,7 +166,6 @@ jobs:
- 
-           mkdir _build && cd _build
- 
--          CFLAGS="-O2 -D_WIN32_WINNT=0x0601" \
-           ../configure \
-             --host=x86_64-w64-mingw32 \
-             --build=x86_64-pc-linux-gnu \
--- 
-2.32.0
-
diff --git a/0129-CI-clean-up.patch b/0129-CI-clean-up.patch
deleted file mode 100644
index ae315b925a1c..000000000000
--- a/0129-CI-clean-up.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1f588119d6fade355756f06124a246456e7a5c0e Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 1 Aug 2021 16:14:20 +0200
-Subject: [PATCH 129/N] CI: clean up
-
----
- .github/workflows/mingw.yml | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
-index 17aab89..0662196 100644
---- a/.github/workflows/mingw.yml
-+++ b/.github/workflows/mingw.yml
-@@ -74,9 +74,6 @@ jobs:
-             --enable-loadable-sqlite-extensions \
-             --enable-optimizations
- 
--          # We patch importlib which is embedded in C headers, so regenerate them
--          make regen-importlib
--
-           make -j8
- 
-       - name: Run Smoke Test (build)
--- 
-2.32.0
-
diff --git a/0130-configure.ac-default-to-with-nt-threads-with-mingw.patch b/0130-configure.ac-default-to-with-nt-threads-with-mingw.patch
deleted file mode 100644
index a9192b00e44b..000000000000
--- a/0130-configure.ac-default-to-with-nt-threads-with-mingw.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0973babb46f37ae7a2c7cf4f6884ea700802d9a9 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 1 Aug 2021 18:33:52 +0200
-Subject: [PATCH 130/N] configure.ac: default to --with-nt-threads with mingw
-
-Everything else is untested, so make the default system dependent
----
- configure.ac | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 82bea12..0497199 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2215,24 +2215,31 @@ dnl impact build process. When a new functionality is added, developers
- dnl are responsible to update configure script to avoid thread models
- dnl to be mixed.
- 
--AC_MSG_CHECKING([for NT threads])
-+AC_MSG_CHECKING([for --with-nt-threads])
- AC_ARG_WITH(nt-threads,
--            AS_HELP_STRING([--with-nt-threads], [build with windows threads]),
-+            AS_HELP_STRING([--with-nt-threads], [build with windows threads (default is system-dependent)]),
- [
- 	case $withval in
- 	no)	with_nt_threads=no;;
- 	yes)	with_nt_threads=yes;;
- 	*)	with_nt_threads=yes;;
--	esac], [
--	with_nt_threads=no])
-+	esac
-+], [
-+	case $host in
-+		*-*-mingw*) with_nt_threads=yes;;
-+		*) with_nt_threads=no;;
-+	esac
-+])
-+AC_MSG_RESULT([$with_nt_threads])
-+
- if test $with_nt_threads = yes ; then
-+AC_MSG_CHECKING([whether linking with nt-threads work])
- AC_LINK_IFELSE([
-     AC_LANG_PROGRAM([[]],[[_beginthread(0, 0, 0);]])
-   ],
--  [with_nt_threads=yes],
--  [with_nt_threads=no])
-+  [AC_MSG_RESULT([yes])],
-+  [AC_MSG_ERROR([failed to link with nt-threads])])
- fi
--AC_MSG_RESULT([$with_nt_threads])
- 
- if test $with_nt_threads = yes ; then
-   dnl temporary default flag to avoid additional pthread checks
--- 
-2.32.0
-
diff --git a/0132-CI-clean-up.patch b/0132-CI-clean-up.patch
deleted file mode 100644
index 5375a359a233..000000000000
--- a/0132-CI-clean-up.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e8a5966d9e80ed05b7792c910111db145be24475 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 1 Aug 2021 18:48:31 +0200
-Subject: [PATCH 132/N] CI: clean up
-
----
- .github/workflows/mingw.yml | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
-index 0662196..f860493 100644
---- a/.github/workflows/mingw.yml
-+++ b/.github/workflows/mingw.yml
-@@ -65,7 +65,6 @@ jobs:
-             --host=${MINGW_CHOST} \
-             --build=${MINGW_CHOST} \
-             --enable-shared \
--            --with-nt-threads \
-             --with-system-expat \
-             --with-system-ffi \
-             --with-system-libmpdec \
-@@ -167,7 +166,6 @@ jobs:
-             --host=x86_64-w64-mingw32 \
-             --build=x86_64-pc-linux-gnu \
-             --enable-shared \
--            --with-nt-threads \
-             --with-system-expat \
-             --with-system-ffi \
-             --with-system-libmpdec \
-@@ -178,7 +176,6 @@ jobs:
-           make -j8
- 
-           make install DESTDIR="$(pwd)/install"
--          cp /usr/x86_64-w64-mingw32/bin/libwinpthread-1.dll install/usr/local/bin
- 
-       - name: 'Zip files'
-         run: |
--- 
-2.32.0
-
diff --git a/0133-smoketests-update.patch b/0133-smoketests-update.patch
deleted file mode 100644
index 0178d817dfe3..000000000000
--- a/0133-smoketests-update.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 61c5a4a14932539b31878de0b60bc98bcba791b9 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 1 Aug 2021 18:48:43 +0200
-Subject: [PATCH 133/N] smoketests: update
-
----
- mingw_smoketests.py | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/mingw_smoketests.py b/mingw_smoketests.py
-index 3f41855..0b99c88 100644
---- a/mingw_smoketests.py
-+++ b/mingw_smoketests.py
-@@ -57,6 +57,13 @@ class Tests(unittest.TestCase):
-         self.assertFalse(hasattr(sys, 'getdlopenflags'))
-         self.assertFalse([n for n in dir(os) if n.startswith("RTLD_")])
- 
-+    def test_time_no_unix_stuff(self):
-+        import time
-+        self.assertFalse([n for n in dir(time) if n.startswith("clock_")])
-+        self.assertFalse([n for n in dir(time) if n.startswith("CLOCK_")])
-+        self.assertFalse([n for n in dir(time) if n.startswith("pthread_")])
-+        self.assertFalse(hasattr(time, 'tzset'))
-+
-     def test_strftime(self):
-         import time
-         with self.assertRaises(ValueError):
--- 
-2.32.0
-
diff --git a/0135-sysconfig-fix-platlib-purelib-paths.patch b/0135-sysconfig-fix-platlib-purelib-paths.patch
deleted file mode 100644
index 50d1a65e1c80..000000000000
--- a/0135-sysconfig-fix-platlib-purelib-paths.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 86ec35c1c09f3ef98cab669915a9aec7a7ddb275 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 8 Aug 2021 10:19:01 +0200
-Subject: [PATCH 135/N] sysconfig: fix platlib/purelib paths
-
-make them match what we use in distutils. pip is moving from distutils
-to sysconfig and this is breaking things.
----
- Lib/sysconfig.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 854b382..0729dc9 100644
---- a/Lib/sysconfig.py
-+++ b/Lib/sysconfig.py
-@@ -50,8 +50,8 @@ _INSTALL_SCHEMES = {
-     'nt': {
-         'stdlib': '{installed_base}/lib/python{py_version_short}',
-         'platstdlib': '{base}/lib/python{py_version_short}',
--        'purelib': '{base}/lib/python{py_version_short}',
--        'platlib': '{base}/lib/python{py_version_short}',
-+        'purelib': '{base}/lib/python{py_version_short}/site-packages',
-+        'platlib': '{base}/lib/python{py_version_short}/site-packages',
-         'include': '{installed_base}/include/python{py_version_short}',
-         'platinclude': '{installed_base}/include/python{py_version_short}',
-         'scripts': '{base}/bin',
--- 
-2.32.0
-
diff --git a/0136-smoketests-update.patch b/0136-smoketests-update.patch
deleted file mode 100644
index 8874db793f4f..000000000000
--- a/0136-smoketests-update.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 05def4bb6e292c3967ef3b219cc720ae28446272 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 8 Aug 2021 10:19:57 +0200
-Subject: [PATCH 136/N] smoketests: update
-
----
- mingw_smoketests.py | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/mingw_smoketests.py b/mingw_smoketests.py
-index 0b99c88..dc26169 100644
---- a/mingw_smoketests.py
-+++ b/mingw_smoketests.py
-@@ -39,6 +39,38 @@ _UCRT = "clang" in sysconfig.get_platform() or "ucrt" in sysconfig.get_platform(
- 
- class Tests(unittest.TestCase):
- 
-+    def test_userdir_path_sep(self):
-+        # Make sure os.path and pathlib use the same path separators
-+        from unittest import mock
-+        from os.path import expanduser
-+        from pathlib import Path
-+
-+        profiles = ["C:\\foo", "C:/foo"]
-+        for profile in profiles:
-+            with mock.patch.dict(os.environ, {"USERPROFILE": profile}):
-+                self.assertEqual(expanduser("~"), os.path.normpath(expanduser("~")))
-+                self.assertEqual(str(Path("~").expanduser()), expanduser("~"))
-+                self.assertEqual(str(Path.home()), expanduser("~"))
-+
-+    def test_sysconfig_schemes(self):
-+        # https://github.com/msys2/MINGW-packages/issues/9319
-+        import sysconfig
-+        from distutils.dist import Distribution
-+        from distutils.command.install import install
-+
-+        names = ['scripts', 'purelib', 'platlib', 'data', 'include']
-+        for scheme in ["nt", "nt_user"]:
-+            for name in names:
-+                c = install(Distribution({"name": "foobar"}))
-+                c.user = (scheme == "nt_user")
-+                c.finalize_options()
-+                if name == "include":
-+                    dist_path = os.path.dirname(getattr(c, "install_" + "headers"))
-+                else:
-+                    dist_path = getattr(c, "install_" + name)
-+                sys_path = sysconfig.get_path(name, scheme)
-+                self.assertEqual(dist_path, sys_path, (scheme, name))
-+
-     def test_ctypes_find_library(self):
-         from ctypes.util import find_library
-         from ctypes import cdll
--- 
-2.32.0
-
diff --git a/PKGBUILD b/PKGBUILD
index b011027ac54f..248a13fac61d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Dr-Shadow <kerdiles.robin@gmail.com>
 
 pkgname=mingw-w64-python
-pkgver=3.9.6
+pkgver=3.9.7
 _pybasever=3.9
 pkgrel=1
 pkgdesc="Next generation of the python high-level scripting language (mingw-w64)"
@@ -23,15 +23,16 @@ depends=('mingw-w64-crt'
          'mingw-w64-zlib'
          'mingw-w64-xz'
          'mingw-w64-mpdecimal'
-         'mingw-w64-sqlite')
+         'mingw-w64-sqlite'
+		 'mingw-w64-tzdata')
 
 makedepends=('mingw-w64-configure' 'mingw-w64-wine' 'python' 'autoconf-archive')
 optdepends=('mingw-w64-wine: runtime support')
 options=('staticlibs' '!buildflags' '!strip')
 source=("https://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.xz"
-		0001-make-_sysconfigdata.py-relocatable.patch
+        0001-sysconfig-make-_sysconfigdata.py-relocatable.patch
         0002-restore-setup-config.patch
-        0003-MINGW-BASE-use-NT-thread-model.patch
+        0003-build-add-with-nt-threads-and-make-it-default-on-min.patch
         0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch
         0005-MINGW-configure-MACHDEP-and-platform-for-build.patch
         0006-MINGW-preset-configure-defaults.patch
@@ -40,269 +41,231 @@ source=("https://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.xz"
         0009-MINGW-init-system-calls.patch
         0010-MINGW-build-in-windows-modules-winreg.patch
         0011-MINGW-determine-if-pwdmodule-should-be-used.patch
-        0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch
-        0013-MINGW-compiler-enable-new-dtags.patch
-        0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
-        0015-MINGW-configure-for-shared-build.patch
-        0016-MINGW-dynamic-loading-support.patch
-        0017-MINGW-ignore-main-program-for-frozen-scripts.patch
-        0018-MINGW-setup-_multiprocessing-module.patch
-        0019-MINGW-setup-select-module.patch
-        0020-MINGW-setup-_ctypes-module-with-system-libffi.patch
-        0021-MINGW-defect-winsock2-and-setup-_socket-module.patch
-        0022-MINGW-exclude-unix-only-modules.patch
-        0023-MINGW-setup-msvcrt-and-_winapi-modules.patch
-        0024-MINGW-build-extensions-with-GCC.patch
-        0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch
-        0026-MINGW-find-import-library.patch
-        0027-MINGW-setup-_ssl-module.patch
-        0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
-        0029-MINGW-support-stdcall-without-underscore.patch
-        0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch
-        0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch
-        0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch
-        0033-MINGW-customize-site.patch
-        0034-add-python-config-sh.patch
-        0035-cross-darwin-feature.patch
-        0036-py3k-mingw-ntthreads-vs-pthreads.patch
-        0037-mingw-system-libffi.patch
-        0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
-        0039-mingw-use-posix-getpath.patch
-        0040-mingw-add-ModuleFileName-dir-to-PATH.patch
-        0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
-        0042-msys-cygwin-semi-native-build-sysconfig.patch
-        0043-mingw-sysconfig-like-posix.patch
-        0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch
-        0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch
-        0046-mingw-use-backslashes-in-compileall-py.patch
-        0047-msys-convert_path-fix-and-root-hack.patch
-        0048-allow-static-tcltk.patch
-        0049-mingw-pdcurses_ISPAD.patch
-        0050-grammar-fixes.patch
-        0051-builddir-fixes.patch
-        0052-msys-monkeypatch-os-system-via-sh-exe.patch
-        0053-msys-replace-slashes-used-in-io-redirection.patch
-        0054-mingw-install-layout-as-posix.patch
-        0055-remove_path_max.default.patch
-        0056-dont-link-with-gettext.patch
-        0057-ctypes-python-dll.patch
-        0058-gdbm-module-includes.patch
-        0059-use-gnu_printf-in-format.patch
-        0060-mingw-fix-ssl-dont-use-enum_certificates.patch
-        0061-mingw-build-optimized-ext.patch
-        0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch
-        0063-fix-using-dllhandle-and-winver-mingw.patch
-        0064-mingw-add-LIBPL-to-library-dirs.patch
-        0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
-        0066-MINGW-link-with-additional-library.patch
-        0067-install-msilib.patch
-        0068-dont-include-system-ncurses-path.patch
-        0069-fix-signal-module-build.patch
-        0070-build-winconsoleio.patch
-        0071-expose-sem_unlink.patch
-        0072-cygpty-isatty.patch
-        0073-disable-broken-gdbm-module.patch
-        0074-link-win-resource-files-and-build-pythonw.patch
-        0075-3.7-mpdec-mingw.patch
-        0076-disable-readline.patch
-        0077-fix-isselectable.patch
-        0078-use-_wcsnicmp-instead-wcsncasecmp.patch
-        0079-_xxsubinterpretersmodule.patch
-        0080-sqlite3-module-defines.patch
-        0081-configure-have-inet-pton.patch
-        0082-fix-msvc9-import.patch
-        0083-set-venv-activate-path-unix.patch
-        0084-venv-creation-fixes.patch
-        0085-pass-gen-profile-ldflags.patch
-        0086-distutils-add-windmc-to-cygwinccompiler.patch
-        0087-pkg-config-windows-must-link-ext-with-python-lib.patch
-        0088-importlib-bootstrap-path-sep.patch
-        0089-pathlib-path-sep.patch
-        0090-warnings-fixes.patch
-        0091-fix-build-testinternalcapi.patch
-        0092-extend-MS_WINDOWS-flag.patch
-        0093-clang-arm64.patch
-        0094-MINGW-stack-reserve.patch
-        0095-Add-support-for-Windows-7-Python-3.9.patch
-        0096-Add-CI-to-Build-and-Test.patch
-        0097-Don-t-use-os.pathsep-to-find-EOF.patch
-        0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch
-        0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch
-        0100-Add-a-test-to-build-C-Ext.patch
-        0101-Add-some-platform-related-tests.patch
-        0102-squash-CI-use-O2.patch
-        0103-squash-Fixup-.rc-handling.patch
-        0104-squash-Set-MS_DLL_ID.patch
-        0105-squash-CI-Clean-up.patch
-        0106-squash-CI-use-srcdir-builddir.patch
-        0107-squash-fix-srcdir-builddir.patch
-        0108-build-Cleanup-ncursesw-include-lookup-code.patch
-        0109-tests-fix-test_bytes.patch
-        0110-time-fix-strftime-not-raising-for-invalid-year-value.patch
-        0111-winconsoleio-build-_testconsole-which-is-required-fo.patch
-        0112-Adjust-Py_WINVER-for-our-Win-7-target.patch
-        0113-ctypes-find_library-c-should-return-None-with-ucrt.patch
-        0114-build-Disable-checks-for-dlopen-dlfcn.patch
-        0115-Fix-install-location-of-the-import-library.patch
-        0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch
-        0117-build-Integrate-venvlauncher-build-installation-into.patch
-        0118-Update-smoketests.patch
-        0119-CI-clean-up-the-build-enforce-some-tests.patch
-        0120-1-2-AC_RUN_IFELSE-replace.patch
-        0121-Add-return-0-to-the-test-code.patch
-        0122-2-2-AC_RUN_IFELSE-replace.patch
-        0123-Make-sure-MACHDEP-matches-sys.platform.patch
-        0124-CI-add-a-cross-build-job.patch
-        0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch
-        0126-Set-_WIN32_WINNT-version-in-configure.ac.patch
-        0127-CI-cleanup.patch
-        0128-Commit-regenerated-importlib.patch
-        0129-CI-clean-up.patch
-        0130-configure.ac-default-to-with-nt-threads-with-mingw.patch
-        0131-configure.ac-don-t-check-for-clock_-functions.patch
-        0132-CI-clean-up.patch
-        0133-smoketests-update.patch
-        0134-expanduser-normpath-paths-coming-from-env-vars.patch
-        0135-sysconfig-fix-platlib-purelib-paths.patch
-        0136-smoketests-update.patch
+        0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch
+        0013-MINGW-configure-for-shared-build.patch
+        0014-MINGW-dynamic-loading-support.patch
+        0015-MINGW-ignore-main-program-for-frozen-scripts.patch
+        0016-MINGW-setup-_multiprocessing-module.patch
+        0017-MINGW-setup-select-module.patch
+        0018-MINGW-setup-_ctypes-module-with-system-libffi.patch
+        0019-MINGW-defect-winsock2-and-setup-_socket-module.patch
+        0020-MINGW-exclude-unix-only-modules.patch
+        0021-MINGW-setup-msvcrt-and-_winapi-modules.patch
+        0022-sysconfig-MINGW-build-extensions-with-GCC.patch
+        0023-MINGW-setup-_ssl-module.patch
+        0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch
+        0025-MINGW-support-stdcall-without-underscore.patch
+        0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch
+        0027-MINGW-customize-site.patch
+        0028-add-python-config-sh.patch
+        0029-cross-darwin-feature.patch
+        0030-mingw-system-libffi.patch
+        0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch
+        0032-mingw-use-posix-getpath.patch
+        0033-mingw-add-ModuleFileName-dir-to-PATH.patch
+        0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch
+        0035-msys-cygwin-semi-native-build-sysconfig.patch
+        0036-sysconfig-mingw-sysconfig-like-posix.patch
+        0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch
+        0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch
+        0039-mingw-use-backslashes-in-compileall-py.patch
+        0040-msys-convert_path-fix-and-root-hack.patch
+        0041-allow-static-tcltk.patch
+        0042-mingw-pdcurses_ISPAD.patch
+        0043-grammar-fixes.patch
+        0044-builddir-fixes.patch
+        0045-msys-monkeypatch-os-system-via-sh-exe.patch
+        0046-msys-replace-slashes-used-in-io-redirection.patch
+        0047-remove_path_max.default.patch
+        0048-dont-link-with-gettext.patch
+        0049-ctypes-python-dll.patch
+        0050-gdbm-module-includes.patch
+        0051-use-gnu_printf-in-format.patch
+        0052-mingw-fix-ssl-dont-use-enum_certificates.patch
+        0053-fix-using-dllhandle-and-winver-mingw.patch
+        0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch
+        0055-MINGW-link-with-additional-library.patch
+        0056-install-msilib.patch
+        0057-fix-signal-module-build.patch
+        0058-build-build-winconsoleio-and-_testconsole.patch
+        0059-expose-sem_unlink.patch
+        0060-cygpty-isatty.patch
+        0061-disable-broken-gdbm-module.patch
+        0062-build-link-win-resource-files-and-build-pythonw.patch
+        0063-3.7-mpdec-mingw.patch
+        0064-disable-readline.patch
+        0065-fix-isselectable.patch
+        0066-use-_wcsnicmp-instead-wcsncasecmp.patch
+        0067-_xxsubinterpretersmodule.patch
+        0068-sqlite3-module-defines.patch
+        0069-configure.ac-fix-inet_pton-check.patch
+        0070-set-venv-activate-path-unix.patch
+        0071-venv-creation-fixes.patch
+        0072-pass-gen-profile-ldflags.patch
+        0073-pkg-config-windows-must-link-ext-with-python-lib.patch
+        0074-importlib-bootstrap-path-sep.patch
+        0075-pathlib-path-sep.patch
+        0076-warnings-fixes.patch
+        0077-fix-build-testinternalcapi.patch
+        0078-extend-MS_WINDOWS-flag.patch
+        0079-clang-arm64.patch
+        0080-configure.ac-set-MINGW-stack-reserve.patch
+        0081-Don-t-use-os.pathsep-to-find-EOF.patch
+        0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch
+        0083-Change-the-get_platform-method-in-sysconfig.patch
+        0084-distutils-compiler-customize-mingw-cygwin-compilers.patch
+        0085-distutils-compiler-enable-new-dtags.patch
+        0086-distutils-MINGW-build-extensions-with-GCC.patch
+        0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch
+        0088-distutils-find-import-library.patch
+        0089-distutils-avoid-circular-dependency-from-time-module.patch
+        0090-distutils-generalization-of-posix-build-in-distutils.patch
+        0091-distutils-mingw-sysconfig-like-posix.patch
+        0092-distutils-get_versions-fixes.patch
+        0093-distutils-install-layout-as-posix.patch
+        0094-distutils-msys-convert_path-fix-and-root-hack.patch
+        0095-distutils-mingw-build-optimized-ext.patch
+        0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch
+        0097-distutils-get-compilers-from-env-vars.patch
+        0098-distutils-add-windmc-to-cygwinccompiler.patch
+        0099-distutils-fix-msvc9-import.patch
+        0100-distutils-mingw-add-LIBPL-to-library-dirs.patch
+        0101-distutils-Change-the-get_platform-method-in-distutil.patch
+        0102-build-Fix-ncursesw-include-lookup.patch
+        0103-tests-fix-test_bytes.patch
+        0104-time-fix-strftime-not-raising-for-invalid-year-value.patch
+        0105-ctypes-find_library-c-should-return-None-with-ucrt.patch
+        0106-build-Disable-checks-for-dlopen-dlfcn.patch
+        0107-Fix-install-location-of-the-import-library.patch
+        0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch
+        0109-build-Integrate-venvlauncher-build-installation-into.patch
+        0110-configure.ac-set-_WIN32_WINNT-version.patch
+        0111-configure.ac-don-t-check-for-clock_-functions.patch
+        0112-expanduser-normpath-paths-coming-from-env-vars.patch
+        0113-Add-support-for-Windows-7-Python-3.9.patch
+        0114-Commit-regenerated-importlib.patch
+        0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch
+        0116-decimal-backport-build-fixes.patch
+        0117-smoketests-test-that-_decimal-exists.patch
         "wine-python.sh")
-sha512sums=('01c529e3207738d8771caeb5ed6217e10745c21aa39832fe3185e1c87fdb6aedead97ce38dbb11e02d873654028bd8071c3f345c18452769520723284efe9dc1'
-			'2f1e91391db0f50e7de5562b9166a83b326c9a6f875011d1c503080f43498a0368c50dab07a655fedcd452ba3f769ee695e3253d2fe541cb29884efdaa4993c2'
-			'f459f75f47ca756cb8bbe411762c733c5d02382d74d68e57b3a54d8eddf405cfa1e55c2ec45773788aba829e9a9548567557c0d2d306b941f2a530964a07e5a5'
-			'b06ede9530d27583a8d3538b042ed94fe6f29c16d2f1990d1b6763d7ba448ef721accce086529f84b6b5086ddc6aea1c7393b8e1aaa3a42942cd67619846739c'
-			'1b2049a24a539ce4b7ae9d066c5624f42f05067b3a78753f583dd98f02e0455cc5f68d76e09ba3a9616719138533c08fbde598e7c83a93923d67dd018a45b763'
-			'80bdd16b5142a244ab2ceaffb50ae3a1b7b93977def05b6dd244e101a1701f2cc01357e1e756c8c548192141247c20ef198789e6923ce5751062eda2ed44da62'
-			'181ee229d2b64a6305ff00263b574f1331ba02613ab6a9ed502659a960c7beaee161cea003adef65dcacab4cbbb600668756ea1b87fff06401996f455f950573'
-			'0b5e951bd433998a0ceac079aa40a67a0d0ba1679fae2663999eef1024fab5daad5ad67b8e091172aecf0761568b97ac804e51067d83db57b9ab6445562c0737'
-			'bed18d78b11615ada2063b6246fa501e63dfec5009dd5ee316a39ca6a927fc095762399ecac5c7fb043af4c9a008b145b61ffd7f02b41dbd58a1a9342d1bb202'
-			'2981458b0e6448305f3da4e2b328e666f93495216fe72fe21572af1fb945d2da68318789b7c0d5888e7f255c10c041e98758fe17db58a50b269b81fa00e7591e'
-			'78f54dc07100bc0cd7ecebb7b7976f17dc959a8c894e32e48a04419eddc04b290e7fc25ec3db2c6da730046d5e571bdf2e64c63dbb8569a7a14d36543d13515e'
-			'18244172a9adf349710b8851eae7667926defacb21534ec085b280648effb402e997ca496a52377f8bc10124aa2f8e611f23399cabb719d7493033547b6ad671'
-			'0d7354a0846c2c5e3975f7c757b4c3d30392bef511036416c09c43290ca4f34c506d50bb9e59bdbe0ab29b1757b62767b3cf095c5e5d5cf2eae15583674dcc55'
-			'444cc70ed2a0ac37f82763ecdcf2024d480e6631583b64fbb34976a5b9fff814b61816f681ed4baf24094ddeb81dbffdc68b0342978a5b5f4eb0d37bb3f0d7f4'
-			'16a290ba51c53e902f71b85e8b4bb4f65129b0dc61a571e71c8cf9352307700ddbd6ca9d891c74224ff56eff795face7d228fdf60db3015f3ff61c2e6ce80673'
-			'8b99b6332e12d2f84c3f21d90b7ab946a03fba80cf0cee068bc1958a03514db431971ec7db158f5db37f676e6159e50d60fad07f7d6b303c2852922d4241163b'
-			'014c379e92eecfe2e22888f039bcb5f26d9c23e33ce29e3905e6d3cec2792de71919a1f6517d528820c7babac163b94bffd684a0404673943335e7f9e61132b2'
-			'f4a97bd111607c7dda2b0b62dd93c137de89e49c1e2c782efca02a1c0536bdc20b9537c1f0464e383e0e1b29d76ad87470b8bb55ad93725d9075bee36dcadb1d'
-			'78db3161f0810c823732302046338a341ee50601b3b6eb9a1eb72f13dc2789eb84c5d8e4c2d9812921b1b7c480c070e1dff5e1bb7236cd278689f200663a82c3'
-			'f1c5021498addfc076837d94f5ae240cf62a17c9a04f7ec8c9929a25a02fedc0f975f56155be3aa79aa111fb6c01e96b9cfb2a75a81add576884d13fb2b220e6'
-			'e90da0b8787fdeb9b0c9dc75134e18d23ddbcf0da667402ba80cd43956ee3dc5cc2ffb62a0ff980fe50bb8e7a617a018bc6ba93adffe8d70759a0020ff65749a'
-			'32f8b63d344b9438df8794bd76a4d7e95ce25762c2eb1ca9e2b1eab084386936b09b6ad001d8affdac4d6600143ecb043870ec65c20251f05385e3ebcfd2fc67'
-			'53ed9e2b211f025986e69da484c2583848822ada0dbfcde01f16202a15a5dde133a4df74d7f900642ad7893d79ece91ab75cb7ec921889dc0391fcbb336d6715'
-			'8a7f0c3e7659210618d10d942ba5efab3aa403accc9d360458ad333d7f10656260145e9d0b2588f2cc26f1b2806960a688c565ecf4a9118fd4f071834fa33150'
-			'ac82ec4597561650f711bef98c94146da8caec5c8c0794d82f7707f6ce89d82dff2b55a91db2c1b778cde11de5cd7350ea57ef4ede2836fad1212ed190affea9'
-			'081b954260767bcb49bc3f8f1f35af15d5b261f69cca6697d95ab57bb191622990ba672de54e09fc692777beb31682d49446e387cdd80b4cd280a6869caa53f2'
-			'9cd710d2b4a2a029bb89473bfe8212cbf16368c795e45be7acfbb4efbd8a45fc01c90387c6e97a8490d4f04a0cfd34ee16aad094463d159b3aee18bc4da1da6b'
-			'7dfd4a36f0ab554edfa6d1be2b1c5892bee41c368cc5e21e0d6126bdca040918068b63fcde07cefcf361d3afee79708ff6631c3f886d85e3b5b60b508a0e67ba'
-			'a8eede1f4a2844a98be1ff5c7e8eb74b36c8912af9c2381c80e8ec2c19136aed541f3dd4e22de7dd8270b1b11323d6b769b876aaf777f8095aaf431948fd3e73'
-			'166ef0748798b284fbc1aee53fe31af8115ad5de47c47ba288deda43d8e578c3e72b14a4a80df17d13b8af8a59787e84e932910840977e60a80afee21fbddb67'
-			'99f93ac8e1f1c36e09a4bf3aa556c9fa1dc6c4019ba255aded5552950ff769776c7218d1d65b58f09cee8ed56495f841f013f2c693edb079769a62336274605f'
-			'c12a277de36c04f80f40c9dbecdb4bf1fa55dcbc393d073083039bd0994e53f57dc3fdb8ee52e80a234ed5b6be25e8a02c06675f0d56cedc201d6b6d02fe67b8'
-			'3b5c73ef484f69ad4280078e6e017a5331b9a7f7eb76e52d0883809b5927d63b59fc70233df1bb1253c597693646959dda87112240927840015a91a3c0e53e15'
-			'064e14df2333bce7994711ec9631c3a7a5c1dde8b6a188ac7dbe446cc17789433dafbdd7ae6a1ac9f8475bcc7ba643e76c34218c4c53508ea0b070c6abb5b3d7'
-			'6f61ccbda6d277a7efa787a2271e98404dd1c0e70f5ba92ca36c3a5d85d1be7d278a24f5e7ec911950218d90e2e93337453f474431e76759a02dea0a95433948'
-			'bcb1d53e89548b0d146f95fd9ec82680dd3ad0b8aba1db7f6c4b576de63c45a764e142370eaae45d798e198e459ef4fe771494701c944754c3729aca4b08a59b'
-			'6eda961b04e1ea775cfeb9fd7451cb1e6521bade46b7671f7c035ac71b9aed6388db627a8b5a4d8945261a772fb0e4b852b5c9dee75f1508509cb1d71cb23145'
-			'd16762af58a1582d66773e47426f953189415d801af8d47a6968a8e4a87a219bee763292f4ef9bf302186d149fc763841c8f6f17f462ddcde28547cb9a6150d3'
-			'c2fbfb69a4344f764318ffcb096ad13efb6c00a5f75ee226e88cd2bb90fb0017d5bfdb3fa880f6db1fa522446f64c97c2157fd886f81886904eb233286fb5a71'
-			'cf28075e8e10ecd9867b7997f6707997c3180151d228809875b6432b44e610784d8647ff3f403196261e993de9184b5f71621e9504d4f54a8c5d52bacce4ceda'
-			'a8b43befb0ef4b700c1bb22808e4f7b142e2ad0c1ddb3786f7881395b3d34e38dd7d35136c22af5e2f4051fe0d79d97ec0418748ad61eabe97175047d742f39f'
-			'f0d72cbfc2e6d1b0c93528389b7576221b8a33feeecddfc0653df21b6887ea7ba4dc549044353243e90d0628537e4af6ef890703684aed69d32075889ebd0044'
-			'77e8a08cbc638aa6353f564be5e4fb78ee97a4c2d51c741bcb89bcd95b9d029d97a9bfa251a11b9c84f9f75c41c8327890b8c7a041dd12453094d9a41f0fd1d9'
-			'b98f8dc0b71bd57be7dcd56b28c9534f4175f0407b0eab178e7642149422045a3242ea1257c4aa949e54dcee163529b50b997774507f09fe2ec17b5401d3f8ae'
-			'ce40ba66738c5bd1494b06c6b09dd3209afed003c097c5ed3be86cd11e3325364a866fd136679ffa9c84ffc69536f3481b88d05774e06460d56543c116735c79'
-			'578f1c76f928a1f7a1946830f04b9ebe725b8df3d47d542d48fa1c53fd6a3b862208d481215a750113ae11f0c6762b0bbe382820e620187620410d7e8624f9da'
-			'746e8a58e2f6552713334ef4550cb023dab177f5b53bc24cb51255e9a3d655c7734b9441e7396ec004a55d1bc2ce55c352ac394c58213964980334f4d85ad81a'
-			'a8c13e66d90fe8c75ce146890b38435de0e85984c64dce1e4f118c5fca63efaaafd23911dba1a3f0c8f5a826603573c29ad5ecdadfed2beb436afe67b5ad7272'
-			'c9ecce52a554955bc62f6baa5d9f2317bf7ffd486182f287eaac401b7216ed6ba00e1a28f7d47991c77abeb43b5fca3f7d33b2b95c4a41b4218bb2d84be275ef'
-			'd7c5cab9f259d68e75852b58a64c05249c152531a7f89170a22245d22e4b8aa10790f41dfb9aa3e3ca8e0d93bfb310c52d74eed33bc0e6abac6977d2b2565361'
-			'43cd5f37bafa14a4b84d4941fced1d8b6ce93197b33bd674abd0a0ea846eb5c1bd0eda1807b1b4c5de392bfe592769eac7dbcd67fc1f453f72e6bbc2724c2ac0'
-			'b04d2bc12d36dd0a6846f1394e0f2fe5c33cd4fe1edb0fc946ea3dc3ea2654678a7e01de7c10b28f0fb91350b5a9369caf9d86b2f3bea7d6ff26345374106249'
-			'c421e9a8feba81910d99c8d9a65615d267ca7e4ba0e15a9c0fb8fbf989e923d56fddc2e2e81febf0f21eaa095d4d74ba7022bcfb8b7bba724b190ea4f14fd14c'
-			'3b238801ee5c3262dc00dc78339ef3d1f8d0526265d2a1c772416cd0fdbbd75161996a7c8959c36a6711a5f88a4cdc215c374d2a5fa7380c0874e15acfb1d356'
-			'eda88a2aad8f7cbb47d936ce305c03313355a7e4f17ee3d4f476825d96793f3b362a58b4ec3867e6196097dfea02b577e169e1acd2cbdba241642602ec96233e'
-			'19ccbc8ee9e7cfea54df995327e76b4a5777e061f12ebc01b8ce6383b615fd8a656c524ddfbfc0ed03b3b6eefec2c2783a9cb319471f0f59fb17dcc4a6a7d457'
-			'5b8ba80290c1f0abf5185be70887bc919f4fd4b304af88de22603a001986054aba91467310532e9997b20887698a16c4939c5af6237f93603999bc8f29d7ae21'
-			'7170a09d2e4f5393750f0b3aad92816c2b28fb79036b7fb97b90cd907ba63373e5c745cd246ff357e55274de633f2382242ae285ea3a4d4c6cf589e7dda1d849'
-			'72a6c7978044534cdafc8a2ab0000ebc740426943728911084f216255925fcb045c1596190c391b23be23385bc821590314d48db73eeff019219e5b48c66068b'
-			'5166bcc2954aed6ff6097e087fcaf6704d4e24237e80c7ae78f6d3c19fe1a74c64d4282797dd93f2b9656a7e6f01b515fe5e50c7382a2ba70d1f2c0f25de60b1'
-			'2e3d828e7aa06596a9248ea39e7f2dd75f0fe438474fbacbc6515bf529197e2bab55846cb0023a8184c01329c4fb22a0a3cc76c9618281699efc40e6d58c93de'
-			'91ea233217eb507dac62f5a23a33b89b8e042116bb83c4a5b23bcb88a6a80d6390a1bd5e8cc9c3d6432bfc8d9f8f60bf8876863b6e4b0941ad7e42c279a8e7fa'
-			'b4dd7bbff60416cf94b8d7341841ca9a5c330345c71202eedf2ea7a1d9500d232d678d334d00375d55041454de286c746b21a9181ad06c8991d4d59b503b437d'
-			'eac1bbc8d254d9e25265601e3604d66800d18c73669f8f0babc8fde516a1268ebea9b57c6daffff54d51c5133c82158347798437e032bed6823f47a3b669fcc0'
-			'61a615eefb2202d194fb2295193f8794f8c5087a6156f5dc0ba6b2dc8bbe9d1a330b9ea760eb5981daf20553a5976365fa598ed38b25e5bbce83dc0827e22611'
-			'b87952f51881854f841191e58199813f93c5464239af42b284e28ad1701491f580720f70e82e4e6bd373446461850c36033c04466708244f34397c73924af929'
-			'f7a60f1bdcac0dd6933cf6a08ef049c058d782043fde3d5ce0437955d73e3468ffb2b1a6b7a4da1e4f7fe5354a0c8d96e757848bde234e9b9decde53dba4cd33'
-			'48facfcdbcd8ad369c709f72fd6b61120112ea5de400eefc4aa8a2bfbbca2181828a4ea54773758b82bea46a349edbba8085065590ea3661f3266e387996cb25'
-			'ee04223922c59ceb235da46ab5b4b043d41df67f55151eafb177d412ed5b810366b76c755c1d1e9beb312e42e559e218af071f0b8f1d5fcdb8299047ee7ff9b0'
-			'c121a0873f1adf03e5ba80c23400f82cf9d9ff88e5925e3eca6e9749b56dc3ade2c042db5fe9a91d31995fe7d1a1ba0b89c0a71e11eaf603d8a5fc1fea525a68'
-			'de2020961d20072cfd05ff04ad05217002d65ff4e1a24e88379d1c9fdb73da968556b7d76920acb93ef752e9077b5798f90172ce7dfb56514b0f5aef09029d6e'
-			'6d16c467992bbb320f1ba6c7866dfa6bc5030aece1c5e09e3c088636e0e9460da3b144017c09dc06d8aa82a37237e3cc5b918d861d267780a8e0e92a54c22b53'
-			'63202ee776cade95088a53781022ee049e3ca983d1d2462ffc8170376b6170ad783f51de3936695b319ffb24d439085461f94b354b3616948b748e2f3c039c3e'
-			'5c2990028fce9093b4c938606e765827b4b516bb585537043bafd5278a406e4bca2f94964fad0811137f8d63a853c5456ac69823cef49c2cee8062e82557c4d9'
-			'75e4fbd7d35c7d4382c0f92ffcdc766d11821e429039cee3976a844ea4cb9b0dba7e18db987aa6c16cf12e2c4aec9752167b6d0ca29145f56fa685ecbae519d3'
-			'2e8f8ad0c7abd63c1954d568e10816b47bb4c7a51c8238a247749f823e140447d859e2cc3c937cb1a5c29399a40a7a9f595e5a963c3b8b75e40ea905eb72ac9e'
-			'a621483763be5cdcb7541b92028563f63ae1e0094a69e04b06723eefdd5758b2e3fc4641418b33944abfa4d194115e1302573b2f6fd54582d3a017fa05281c2b'
-			'4f061b1efe7b6beafec882893bfb2d39b3d84cee8a9fce8d1c0d57e7d9792c6f8ae121ed2e05f6f8156a36b3c6f4b4bc44453476b510a5b6a14119f40e0a05ba'
-			'7f0e20f2faeffb95f4b4d2c6e8863a210bc5daffed8cd78ba1622b4b4ba390d7532b89dec5ad42514072541374905891c7b6d16ace61f2576947c167c582deaa'
-			'35e1a070c7361b99e08cc7440098d0cebac085a4542fa20ee811294cbdb8542269ef78841e86e44daeb6fe35580e637b8dc3caac7fb7c114e73727fb27e7d633'
-			'e7f831c99ff8384bacd10a649e5fa6ee7926f06eeefb6fc6ee016187808cf246948dff17b005f52fd295035a79d0d50604b7c22992447917c39e724de5ed7208'
-			'7af4894b4fe448c2ff58df17f6bebee3c058e99618bc678a9270d20e6b93b8b8d6f8e58c1478e52f77a0b6ebb5d4829e3cc1e9f6becf3cbcc48734cb53096329'
-			'5ee924adca6ebc77562cf9353a7c810d4cb8f9c4e1a22eac7d4cf25975e9372d7e71b8a7bdba82692a66b7d17307ff5be7d10965310113737a5dde535446f667'
-			'0676b2c4c8e5e076f44feb3cc62eee656376903cc18062dd8adaeaa33c5c5bbc678384796740286b3049aa1d2e543c445f1718fd30e9b7f49e6071d2532d9110'
-			'3149f70d0a8b0d1992b057c6416e915fa387d9880ac7df46ee0613d9e02610ac07ab52d64a2548a259a2dcebd327b801e0362a5b27e3f7770a3ca6e508a8c106'
-			'9d80879db19f8613d04e0ff15d2ea572c59eaf3c9a999350943b7db34afb985da2e7129468c56584f307ce291ebe7b86d2311bc0d786127f2e227f7c78287426'
-			'25419951979253ab0d78711146285f7e5c85683d7bcafd474c752530fc3d380e920d22f2faf0571059388a011a890c2214d91fe0bcb31ae6f0ce131e1bcdab50'
-			'f9109a1973a99082c19a55b061cf08a483890db92bb2232d90f9b08ef56c9dc5afa084088b31a04ca30e85c32c9793e21c9757106d822f81b62574c3c9f0a8d6'
-			'b02d032b27d85b820bb2cb11f409f4e57d15e8f32603ed10f0691c6fe71d496b18cea96456e2595e0b0a41e45c798504b079842745082b392bc6e23313ac0738'
-			'6f4f7aff59113cb17f07f4af062d9388af490f6bb1fb4ddbbfebc58ff390113b575b08ff6a7267092345bb5a335749fb2f763b0979d8cee5e3a0c905f06f433e'
-			'f66dfe7cc661d46509003af8aadf0357272554cc5d0a6f102fd59cf1f3888ea38e5d37a40acb5345677120a6393ed054bdaa97fdc27fa6a5b3b683bf462d2791'
-			'4dd44f7136f9b7dd4ff32853ab6780a0f7fc99731f8c67ba67bcefc01d17473d59f0f1760fe71832ffe0307b4b2eeb3493b4edb507fc1ed419c47dcd08f65b56'
-			'a7a41122ea5af5148bba296b6fa20e59443ede8a18cf6218a31c1d3ebf09859d10172f3dd95b4080458d0de1dd3a1cd1b1564cb54527e388818a9c7d4c3f3b2a'
-			'e8c9ad4bf41530f6015113e42f0fedb05b746f6920ffb73c26620b6db298fb4bb7bf64baff52e2d054b2ea4d1efb39a164c3973b0aaf82a7abb23a5df09a9a75'
-			'55b695b99f837449338884cdd64185a68bc8e80c8315548c7aff35ee81dac858cece895cecc1a206edd9eb50b003052dcaf84b1e6b49b7f44669d09e365f58d8'
-			'06bbce5be2330ef8e1a3723b227c84edceca7cb421e80484b66053022ac0ac2b7ef3be634bb037bca4f969866c0c910253bfa347b93bc652e3655df6a6b84945'
-			'05e6eefb297cfdc8562388305a8bd8ac095a2566fe26bd47b92e43d2c65ceea48ce36cd5bc091a7a2748d3e8a71010bb7f8d9598fa76a15e3a940eca82f2bab2'
-			'826b307d3f51b4c9fad52dc51475ec283523a58f5e4ed599d1ff2db7ad2fed6bd7601dfaee6a84939fc40bdea2918c7a0375d5557b4d31cd2af78c750df203e8'
-			'ac201bfd778e8206446cd2084e9971bae3133b8a86fad8b1ec0391e4435f54d464300e8d693153ab3f490e053725d00edf8f24848ede0511f28a041a166f8694'
-			'c8f086c3ddaa8761ff84b165bda8f72796580b79064e74c53c133273c5f8e4eb0ce426174a3395bf402e6a0bb4f481e3ced82ed07fd8de1c30f06890fad1b85b'
-			'4e8bf98ec7ee79766aca2ddb65973fe48916a84943b6531683dc0e8964c7fe93afbe022b5188e11e22645482d91ce64250e183ba82ccf23f68e5776b5ace01ad'
-			'6d174ea91cde2d45078a639e99921056e88f9bd5bc5ec0e037b62655cb4cc798fa55c392b789e6c8ef5ffe914eecdc0b3a1d2878d619ba430b5781a634b305fc'
-			'fc6583dabdf7558879e5c9a2c2da86d91bcfa39583aeb9dc3de9fe70f69f2945ab9b149f13f024b2103bf9b3da7ac87e679167d3deabe87213da839760b73e31'
-			'09413a07437cbe8e5929a23b0317f315e1807750abeba0c809e50ff14953db445d69a88b263efcde267a16db79add7870632e5f70411c98c22af97255678238f'
-			'e8902aa546ead9a05cba7b5725351af6336f97588b8c73b00cc7bcbd79d5b0358e9d731a8e2b1164d289569cd093bd198f21fe923c51cdd66e15f7341d3e2c43'
-			'bc3b8bcb596335205b925af5df58625095b896b74504c203c1efdc5fa7ce7e2b0f48241064758f10625a8d340328f34ac0aa6efd4f062afba76897e3449955d7'
-			'd30dcaa9a11cdd0b3908d209432409e6d46ecd9f8c83d10ba2c016b5fbd8cc74b14d97b20e236149ef6cc8b7c449ff573f65f63e33a72f13c23593a2773d39d8'
-			'953f26172c0e0b5dc63fe3e1f4938cdf1f753be8e0b907e3f8934e76ab09dd705c28297da7b049ab01b2b0a939ab522d465408f8fea6b0bfa997972259a2c113'
-			'e14329c3f63edb2547a92063e4fcfe6622431ac1e0bbcdab68a4523f5faa30d817574e786085b08791f0d2ebcd5198f7d29f4f8c5748f0a87b8798e7dd5bb974'
-			'f5a1f28ea40fcb422fdeed18d284ecaab69a45569eda1415d976433e6f50fc0f6e1dfb8b0ae4f074cdd6ccf53d6b0999798190e0a953a13d0d93a5c65a3ebfa8'
-			'5246234f40c23cd3bf3d132692b6ebd25e5a2af1aafa59c34c99c8b93baa61c3dcfef3ab2dfc53c52c2d6962bb10616dea42514d88e341c5c48be0cd9b66aad4'
-			'5020931d834735c3c998ff12f9b4fb876cf175b2405b6a8198ac237960fb68f81a7008bd1862721cffc72e06dd91f76636e68792946bc0a3e7f0cb7e4303a8c9'
-			'd8bd4a4499805d967d334e80732c1c674f7b7d4420a821b5bdbbf096c9160c081d843e7c7349a64233d3da5bb27fdb3e2fdda11570f2c1c4e08e6e773325516d'
-			'4fd4e90a56ea415f6dbd17b1833e2fc3bf4679d9e158109d9695382b0548fce8de37346c411de074c4075f49752ce36cbad9abf0f17c5a282f7ea1b07f2af6c5'
-			'96c0b3e4ef20ef29dba1d099e7b5152c3593c746aa05d2bc11b2694f63627d810602fdb90d6e4f769dc847606d565cf9317f3cb36ff74ff1fd1de71316127c01'
-			'02df218e0232fb31cbb41ad0da855e8b09b142bfeeb6a6fa73d36b14d4024483b173f39d027e84db8597ec1d647a348902c54e98a80873dd49b0c0319fd3b181'
-			'c453f43af49a3ada8017ff9c295dbaa3c7360c508fa792d9f110f7913c5642cb0adb5b6d82c04ac4faa31dd93ff43e7d9ec5015adf4008a158626b07cb4e502b'
-			'4f262b536d0751b643e879808121aaa95d1300ea47c6e7e6c0727d392902704eb943242307845030434fdde2b868c29f3728acb76222d3d98ccfdd0ad509766c'
-			'e123b44352e247cd4c82a01c36c8a356fb2a395c98a853ac4d5451e2018468092cba969db76bb2f7832397365c75a6cdb6dbb4f0e2b39c273ffb3b39874a657f'
-			'649b42db20470c194b15b03c56e73b6170b8d2d30624135e2949fc9c0fcb96dc8b55dc676559514ca9badd662e900558c274d1c8c6382833ec53ac1cb7a486df'
-			'ccd84813417ef7d9230a794a4e0eb778a236f6d465a999143429d25b0ad65546faf983f2b52cc192204453c25bcfff7fe33816b1cca0e0b81f52892e6038aa5e'
-			'8fe2a5536d144e70b3858561dc19407eb1672aa905eea724f0f8140097659e7c016928b500810c0e5f0eda2d7a1286bb5ffe4501eb9734e26438c6225655b5e7'
-			'1ee6f2c2e3d17876fdd28d4a4e311eba9d45f145a1b36b0a84ebf1a1f1ce90807bb76b7449cbe8de21aa045b43c0b4e4f8968f160d74dd74963f7930b47f9c81'
-			'e49bca267236c7b543c0839d9ac751c23e82947f9df6de9d758c1727d48e9ff8843c2a2f4f94101fb19e33acc6457f72fa9a59f3f4e39e5ec10feb6093732409'
-			'6fbc925a94e7343688f38ed2d226e17cbfac82b9cd604d15272e51adc6f1133b9804b53f24921315696031fe9fcd34264242d7808955b714c0ae9025999dd338'
-			'a9a9422062e42b4ae14d0f7edc641d6014e1c574e537c804f52a61efd7843ef1214a2a462ec1da14f9ed2c03c12607d416d62a4b4873310005f6589a48568527'
-			'd5b5d32201bafdab4aa82ef5920c9e514b3e52f2d7d05385ebbb0101ebbce382ce8c55522a687d4c896cc4665437b4634da9ed0180661a797c644850d47b019c'
-			'ec8bbff8278e0eff0f708dfaf6fcfc303dcd99dab7fd343312f593d2e8d8794901578e5a13150a21cef02841db76b486c48c01a126b8717e812d77b094e62d43'
-			'6d0be15d5feea6a8e46e892b9b5db2af47d0970c829a6895486c49a0a1aee88adebad54c2ac84dbdb78a80ab05270b7f2744064260c3b96fcab8d7629f0c55f9'
-			'f6cbed91352c29d618f529cb5ab79ff0acfd236e755641aaece309695e7dac05f4c6beb49b6e54921fc6eb21b22495459cd6e8a84e344e5a7ec1b6314bf1251a'
-			'7cada3319b02a338c5f32eabe99be0f9ea35412759614f31ac77d310d6848a6b938143744d40d07721241d438d01781b456bda1781bfb37d4839a540b600458c'
-			'64d9a43b1ff38813d567f1c2a5ac48ed72907e1438e76188bdfc22bc463eff887f34f5d1ad524aab77d61e358e5b87ed6f05bd9e9e46d66c03cb7e3c0c980ca4'
-			'40852c5f7a2e0cff440ac61cc8d1dd53d3c4641abcf12ba8c87d5a804161c00c7820cdfdf4d3853a145915e0bd2a428a8c868d58bff2377f38c979bd8eb99a55'
-			'79cd9bfb6984ae69560c71dc886adc272688871d95a9bb01da2b154671240b1fcd5e837396796d75a9487803d88cf7af484f932f3fb56402f5a2c7dc3d8e463e'
-			'b4e6018ac6b546bfbc1b788e20192615eb2f184b209b85e2209cf5976f74cd15c9a63c727455d1ca0e6e1cadc36a908b3e4a1a7efb5b0e453e1f562b4bb9a5e4'
-			'aecf9e0a168e58db338c0ca12830c42d279b77962735b69c1b2f7cd056e7d2cfafff565e3bd5fd3dca26fd30b3d4f83760a6f191155f7c2a8592934b882a6ec0'
-			'a2d924fb4c87da54b79549a2d77116c2f29fde7b5ecab059dacc83e0deeaf2e78325cf7d7d97047c85bc66afc672c95da2b83504bc12b0aa1500678af460852b'
+sha512sums=('55139776ab58a40f9e1e70613d7071d559ef9e51e32a77791422aac134322c21a49f0348c42813214b69789c589367eae43e16d4ae838a73daf37617e966b735'
+			'f0cfb67ba0127995074990c71ff9dd8a722fcb89c8f6ec700f35fd5de749dfaea2c4794613fb5b2e0c13b8cd4a82bc26f067b577a3e5a74a60914b14b4c872a7'
+			'26e51df2c56e3cb221841dfbe97e0110bd4aef17dc223992271a6217e4a716e0b67ff88f8bb8757c2a0e197cae5725dafbb87dd474d46882507d6e9c23a6ead4'
+			'41c6f727660051ea03866d6afa4e799c611a6cce3f1d4765de28e6066c13d0ea1ed7f1d579d80b641df2819cf7c53b736a13be6e5bb5f5c52607422eeb8201e3'
+			'6c56e0b11105d642c2b34b29f64a636471d74d4cfa319cf057e7149bb89068519c9941b4fb9a979480f250fae720b18b849c62cbce9671d690f207c1d4e52aa4'
+			'8e7b12a59ddd91b73c88e8f4936d382faeac90b9ce915e1f32efafe48ffe217c5abbb834966779e601ae74a1116832a7ca8b383337a76e2c525cbf406e7e601f'
+			'03a6449306e2332b439b2b8b8fa8176f0754351c1d773ae54ad940c975b8d8033f77b6cede17230f9a80d31715540fe0ca22a01dc517dc6fcfc18f937df11284'
+			'5ac61ffaacf9d31c1c24691b3b7cf5b89df176a2e4e7ad303c9df4a06998a264cdb6ece7374a56abb914558513a553f63980ac6a34bde11919718d57695a4358'
+			'b2d3616cb006995f3ace570ac8fbd203ce73aa91a7c25507eb5af887256500bf0a1d792e24d562db5995ef968d9c624b2bbbd6222d848f20b342e2437ba2c2a0'
+			'c97011cdf741b22953493e7f5bd7cccbebaea2d77b0696c6fd54027d5b3670922da14015674d5a9c92c92e7df9f635ca5cc9ffed5da3329eb1886727d7970e30'
+			'23c24a2f277d57e330659c26ce3e0e76aea619a6dcc726228c7d6592a5b1c5aa61dc4c7f55c6d289f0cbbfdc75f8b1a143fcd6aa8d197e9d9c7c5bab126a8a42'
+			'19231e5e5f19bc3eb921ba7272c4f6e867ad19f94259e16a884ab755bdae8da6ef35274f360552c72e8b41bff14e75a89efe6908567b1d8f32832caed5888864'
+			'1b80d9b88ed5f80587e0e182b19d3581ed6a4671e5b6ce78df2c9a2c7eb48e329bcc60b1fe6f29297b5cc537867fdd54c0444c1ee53986d400de4d2f7daa573a'
+			'63eb5f4e3e48919be6630d8732a40349577c7924b4ddaf669931ddea89f5c88f56523ad24f16df03669325dc538a1b2b6f271f0858fb5b3b2e6c0d07262c1e52'
+			'b6d15b8d3c9f2e6b45b0f41657e30ed8b4454a65c1b4395c178d56c1050ccb7c853ecbaca8ba0db24990e5c3264fbfe91529e5daf69b725b9a19ff891413c514'
+			'cf864b7292a0e34622f532e536eba88358f9be290b3924396730d617c84d440b8f82557766cde336f9ef24f4bee47fea198fc8f6dd06ed8d0eba66b261ab87a3'
+			'8196a95a830360c10d8c92ce905a12872fde802de83d1a1182cce91da3c8fa6792b99e26b57cfb6fd8687cfec6c5f71733363a6a14a1e223211b7355a5b30e20'
+			'8351e50886702b7798ed153e2b90349ecfc62e32d5f223b10d95574fd0bdf3e2ce283f7b765005cd689f6a488f9cd26adf7c815508159f447b1cad7d6d1cebed'
+			'd321ddc7e003c9a21185283a36eb719ce54973faaf822b43e88f33a9dc64382d57b98d5068d0ef2fec5c2fbde825ab5c1d006eef5610a9b5fdfb2355a605d013'
+			'6ab2fb94b45d9931f3ee7e1323526760f21882432f546fb9d3e04216ddf99434da6596d8cdbdfdf46d07ea7a6e2a03691e1122c49f9462bb9bbc62b10a634043'
+			'3d54eec19d4d875d792ddc100d5d90c070b485d5b46365411b618db891d7eb979d7edf23809d25559bfd46a1a989ebbd3e811d5f33f72547cc7892711440138f'
+			'5f6edb6019a1632e36310aa03f8ba5884909a464130eea4fc3fb2b51cd1272eb6fb5d32d72abee22cb1193a8d01d0e9b4e5f831ace4eee3843aa47ac3520dc2b'
+			'cb0a8d61e4e6c89dd6f0577e62acb0c886eaf0f1a13903fb846ae8e6953a6317ac3f443fae8bd43ce0f742dab51935a614f4a6ef316b47d02a1d3adadb420098'
+			'10c6d3f0f5dd1e5ef50404540c9fa51f7db331421f924a53d10987e7fb943c0d8e1b1502c8cc6d82090811fe50af6282d422eb5dbd719b442502898b7fa37cbf'
+			'006a4ded4d8c06449f524a14ac2a8e7bdfefc171e7e630e06c380c56898799b63bfecfbb5536118b1648f883ffa1b29d452fcef733cd9c33b40fc64eeadd7cb8'
+			'bab6fac212cb334c176b5a5066e20fe42043ec0034cd73411643bcc1f2451661d35645199eba16ccd06c6a9684855f0ba20136b45adc1ec34a03a486d4b310ad'
+			'2f5e542d145976d18478323ea64c4755de17271030e7674295634cef3c2a3b1c89c205530ee869875e5ce462f07c10d6976013046351e261e2d6e717cef28d67'
+			'f7d386022831d80974983dd670251a42e1d649b14a0581458ae8f6c472b69c33536ffc5d09d700cfb89b24b517a8e0981d91fc356712414995240f36ca84155a'
+			'6ca5485f5a6fb9bc3aa0d6fa4fb96598c6a642dd6ad3f4566d1f3183c584d3983c14d763fee6aa01429e4e204999da7cf8b684292eb7fa528374915a3117e1ab'
+			'aa43fe53bff733b7acbebaea24fc74df1968c51577dbc8176b363efc5087b1a4d302e30d2b1a606a4db5863894cc73ef7293df6f1dcc61eb94ebfb67b5630a6f'
+			'09b0d97269cd9d9d63408cdc34d7600a743150cafdde8ae09c0d0569988c466d6a481d4c1caf57b1e8a9034a01afc3580621ad1bdb8bb0b113c930045ed737e4'
+			'62f1f7e1eb49ff8bedbd3e54c33fb3468c63de909b3d9754d1b2e46b7b14e2eaec483f03e8a45eaf3599af3b304054862735d38e22659437cbafe39d510d553d'
+			'd3cec955e9a2ec8358df5110d38254fc09fd2b67c9c4363691f69c9cfd3f435d3eff861cafee1c27cfb22182f53dde22b27cb41d679292555e91ee2201b24176'
+			'0e0ff5f38bf184db1a5553dc95b6455a3564d1273d21f41c672d80f3e98b3fa7477994624864d23c363ddba3a29c418a1025c32942d7d2e40ea38e930679cb09'
+			'd3a059155610009ec18a92b260e616d57550557c871f0d1d1b73e00ce8cf9883bb968e957cfd40d494cd3a93c32b8bf3494c0e1b49229738d57d4674443c14fe'
+			'17bd36cd016441e70601fabb3b08a7ed56d8a38f42b42bf43913b0a4913a47a4beed45ebf89e33ee17b833f13fe26b5abce2effa6343d21b3d14283c682c18c1'
+			'3db56ee71963bae7eb187a1b9c7c0e6e346227601b1624e0e83308da5c3e4c4cf78ce2d7453f58c66bcb35aa0810dca9d561bf7f63ebddbc52063da0301c1839'
+			'f5e2239ed4de3157647b742d518acbbb06b041e7504174b7dd730d269a69cf97a03a4d13e86afd570fffe0546fda83084c7ad8faa7d2878fc7a632cc20ba6f6e'
+			'82c9eb8ab7238ca1ee8e884445aab8d6bf20e4a6fed96278874e23494b138b51c8bda65ca6b7d14f309f011d182c33ce7a10c75c931cd170e03960193e374378'
+			'5a3cfe5541c72fe0c6642930ca9854ee84bea11cffe8ce84027a71ac9eabb1da11eca49bb0cfb43dd9a80923e8fce43aa96e2390a7910aaa7f56f8f9662f7094'
+			'8fdca783601af8fb606513947beaa41292d2282c3273c82ca80efe8f203b37ae3213f2a44ed660fb55aaca44c9322e8c6f1c8713f8d2dbbef5859ce66daf0848'
+			'f5d451b2cb865447dd4720d99c0bb84054e4043601ed43343309c7f4e3a13fd58e158549100d3ad6c9061b0cb016ee09993eaa832c527eff40d70bbb0a80c858'
+			'9bc05b7abddcee927eefc7a5e03507006eba5103d370474f04a27556a2d4bd2ab9e1abdf223b274794c855d4ea15af9e7bb53dbf6ddc3500bceaa43772aa4317'
+			'0e7c6eef21a78a4acf7916bde9dd4916837a7946560f0507630585144dedbb58394def311bb8541ecc2d790bd99438865ea4ea3877c0dc4c07321894c7e1c41c'
+			'3bc90cefe1e373a29e26513276a3523663d4478b26c6c44db21a2d0800aff3e8604f202a1c21a3223b10c3fb819f2a5291081211a760021f74622cd3db6cdd20'
+			'758be0f6cd6d1783eaeb80fe68776972915a0b86a507d060b317fe03be635e28540503f75809c25e759ec9f8ec197febbd3557b6dbf918b53f128a9b836663f6'
+			'09a979c05a8203dad129456f1cb639e2aac3a1fdcdfbdd96c60821724a0989ba9f934b0c86fe0149a002cd4e40e87588741b2e742e7c2480341efeeded008359'
+			'af2cbcf9bb1a73ab4548b6a769bb6d85ffa1ac76509c0d28647fe98708bec302c82aa0ca5c8c4729073ea89e8974b4f7fae90224c3dfbddca55a72d2a53f6ea9'
+			'9ec71c28cdb3cd4b71582e851035657f2d69f8d7da7b8b4ecf7fe3691c7f268b363b86ba6dbb3d972de454f4134ba809afd0c9969bc9db028c0e3611be72771b'
+			'99b43630f06126d7780d80876c85ce566e10e8c4b01a208fa9095de4910d012dd2d73b415f2b1d9585640f8b6ec456050d92723e03893b7ecd0e7ca723c32f2a'
+			'1d68d6adac2aa3480d804e5468043ca9f225c0d3ebf8d58349072ba4636aa7663d15bb4c72834326f73e146dac9cb57074c758b2d2252e1db2c2a886f47f31bb'
+			'ae2665aa94448fca188fcd02260b76f9a151935d49e60bb6618bb8104efcc7913b2c9baa563540d9ae9af48c55b7fafe8b07c59eab86f558af957527185d9214'
+			'eaa428695422df02bfbfd5dcec30375dd1bbd0f38b05f08b376788d22944f02af3b1cd205e96731cb78a32b7a262286380a568ab81ab385acf358d8e3f1595d1'
+			'b10268ab74c988da9ac6dfe36e639a4103e32bfd6aa317595fb08137ad34f3e200c61c00ce6f796a4dc3f6aa72032347f14cd70e01ff36638c544dd7f78cd849'
+			'bd091940af14a616c2d3d159a1fd4caa7b938eb2ef4b947652eec8cdb2ccc7e81c02d0c70bfc0062c9d8e6e5e86a305e90cc9bbfe1b4ab0aa108a4037a5a1812'
+			'542116ce563e2e4228d3a1dc7a8ff985e43966f668ed008249f313cb93e4f2bbb4297395337dcef660775c419db2443ada0dae9b2d73f1d2e0d5c235ad57b2ef'
+			'64a45f0e0c144e80a2de9250fbed4e5e8870e6a80d29c2190c6ffdb997bcdf8ad1f06fa0c5ebb264ddf2dbe68de9a015c9606582302de102434bf1cd8a57d188'
+			'bd4cb8ab81cc92b32aaa49679551b212b5965c11a6bac92cf127b481e0d0999d8023068f7c2d4fbc30ef91ff024319dc73b61c20e2cba94efcdcc83a684fc7fb'
+			'ded210698a47892484e12eb016b493578f0f2932b372475fd86eea6d1ebffd411855961b04387f8e3e2a6dc40eba9aa8c7820aa0e76ee11b1436a0b9560ac959'
+			'69766fc79023a261f958dca1c370e3f097cf2fdf6a8ef1ea3ca572f78170d3e71bad739d0d469122b2955992b3b7177cea34865eefd0235907e8a4cf936f119b'
+			'f85708ea96b06fd2acf57a712e868228f8d80e7dd0fe72c5916cfd91f383ec091dbc7da714559c37848f4fc1d00b9c45700aa15e8ca53899c1a156bb307691a4'
+			'bc312860f88f120c1ca28d9982c37131e92210f09e097cc21ad245b5168df46714886a3dc13969f619bf205413d6224ecdb4fb0c894b6b12920ef983ce24006d'
+			'a591c1c937bc8d6cdb744636bd2e347cfbceba1bfd4ee23e450373fcb37c4827230814b739dcab6dd1e199520020e823db36d25f2576e6cde4d1a0bec66b878b'
+			'34c2577f535b79f3ad44fd986de8ef89e66b0a43091d5e171e21ef3e3ae32883a7d8ea0de0e23c50480b814ad3bfc15be30a8cc38c26da234a8df1c1d059a9b8'
+			'705d984f9bd265ed497a6e6b2a3baa0f247d5310a909ee86e60802de5d3c6df36464f5b2cc0ff8946a9e90d4ec8f98151352a79cabe487384ad00f81c89fd9d3'
+			'224b87b4a5b64a490f17cb8df750d4a5a71dbf0edfcb0be69f9cf3c305c968bfabdef185dc32b0658686a8b57129abb5fac5bc48a1fc7cb0634b14b83a8ccc13'
+			'477a884ea80ec894dbbb4dd69f0ae981c0b7537268938aeba6fb103ebb7fbfcb0bd3099227b81583f65417441e8218ce12d4d109af5b99c164502a67cc902144'
+			'1c2e5d196076cec19a409b655fa298406230f02631bf75445eaebc2605ea0c28fb4572a436b7be82e8e7f2f606135760230518381dc5c983ed2c294e6b02aa1f'
+			'36af8b7e51a1d0d9e03d64ccf49caff8d3afefac1d2fb75712f09e1544549d36cda903d9029a5552189a4474b517fe8c7d988b6047758b9ae39a9a7b1a0f3ebc'
+			'63649fa9edfb4c717020f6b425800c5fa300ecceea8509706143b9fdcf3032711e6ae018e2ceeb2adf409942a992561e840eb094f09e359507910b742179291c'
+			'ed181186baf02cb4f176cd5c90a83d05011a373b3cd3d977aa2e23b8177eb0712a86630ab881c609cc17d59803776c535a83c6ff8c45fb274dcfbd4eb2a6e402'
+			'b4ae314acdd382e5a96839a711fd66985cceb0bd74a6b0aef159d50b86e03701029681a94811de8be36012d2fcdaadafbbf3275e89e065fd96c87f52c76e05a6'
+			'9e506d09e8f1a2901f8333f60888f711d83f8f454caf0ecf842396fa7a918db68ab2908b9b396003b2d554503a956c236b979c0fb535c7eea4ec65e7ad50c717'
+			'aad88f476a8e025ca021567a0bc06228c36594677f3994d61aa9fa95de77f2fcd4df2f5a47315fde8c3cd08012684f1e7ddaa29531951d831b7e98eada096d01'
+			'5e740bdc4bf657319e8ef9b13aef2e3f1f2999ddd86c53d16b40b6135b9102efe0236338b3e67ceaecaa884c490e464028bead43bc0bc76a5326098853c66e0b'
+			'a942ef01e9784017756ef239332ac763f74d14f546aa7706813543d76c735564b23e1b2156b50cefa78774095d04dc7a7ab201b5a635ad495d60db543225c9f9'
+			'10bf51d31afb2f5780b7d97501f7931c4bd7844c852a750f95db4c0314f139d9cb703833106214d13f3301677357b5ed9b23d7d0d549a598e7af58caee72cdc1'
+			'83e16a9f40d96e88cc6ca0cfecef46386a0fad42c1a283b1a391e5be50825448c0d711c36af9fdf5d9d0c17c9ea5d6618a75fa0a69bced702911c705bbe9be0a'
+			'be9fab09e27c3d0e0df4686933a133897e7eef7141095e27b3c7991deac2a948859f582334523438d4a65376086b89a6a4ff34582a20b0d46fe01677610eebc4'
+			'bbc2b8cd47c0dd902ddf75a64e469fb1eece28c71eaecd100e0777e288b48603a496b3608fc0f52ce78c51cf4fe7554e7bf7bcdda9b1a89fa7f5ccaec94873fa'
+			'66229c6f3bf9a7f99595b7bf2e254f8ce4519c50c7dd3245b7c61c721dbd3cbcc8a3279c289f9b00f6c4f603379de91fe99425a537ff3176eadf55b9cfc8946f'
+			'e50eb2ff2a54217e20bfa030784766fabfb19cdc020b817631eefdd81e6b46a31b42dae4ff828152ead8620e4af3a77a3e73e32729691ad98ad906f35ed26f15'
+			'8b5385f434300eda9dead082bf15fbff59f985b1b43ad2c2a14a4d292f2767a7a5e0a17a474e6f5c3bf8d7afe4d0fd7ccfbc6e86fc325f231747d441eb726e02'
+			'4c2d8ed24f0a60f63f6b2d6de06c00f6ff6341f0eeafdbadbff6420d155004d9056cc1ed85bd56bd53c41b3cfea54c9dd798307b6cd32d492f7d5abc911b255a'
+			'e6e439a611cdb5389a255503a6f54cdc9d67fe0ecd410f2a009e16386abdcceb04e8b260b131a094de82ae1dbfc222a0a215570d9bb50156a6ae2f7840d39cab'
+			'3d601e605747a8c8f4be163f5c74db1800b0247eacc1794dc1241c70feb309dc5a35c30408f508a8c3200ff5f0ad7781564876063c09d16d3d50c8992a1bf957'
+			'cdc167038762a7d12dbb42912eb8def746ac682881af60b43f4ded9fc4ce1aff0c06a761a1ffe6994029dbde6689b999f8809c0396b40b64d8505ce4ed9ef032'
+			'c053dbfa6bd50a7b734e9d4365273a10986b655508c8c01f00c513e20c1a2b859b8d0a05c56d64000eb44470058db1243ca66f09064524e6a4d4f57b64580762'
+			'cd6df02ddf052ae0f4ee22fc2343311b90f1af49ef92eed9cc7e0d251d310fc64c6e78cc552840c6e99aa86b5cb9bda92b038235ced3203f6752507bf818ff38'
+			'e9bce0c1f3b9c65ef486dd084b380a260b3b004a8f9f9b861147c9da7be822c78083bf89790bc39f791be67e6d23a32775e061c0a4c531ae010bece1888b0f47'
+			'54903be20d3ee706bea2ea814ea9dab8026f5f81367ce3bb04bbf04e60bb83abac70a0b31d99c36c05709acce94ef8f08da402027374b0b648fe474cd94e8048'
+			'6cba19596a67d77cd3cbd2374bca4cace0ad3062289832c62fddf37366c2f32d67b13ccb1f49efb2e24749effcea4ad446d46dad2a7279196a3692538367ab24'
+			'926431b225a737763761558bdc0e20c59085ac3d7a719ace7ac24c5cd20700fbfa2b57a1291879c6087ee5956409adbe61ea477a0aa7ac6d5bef57aaf5d139a3'
+			'64fb10774ff20a0bb064f6d2a2f4beb8ec83e78cd184661c154778c9ce0d701fd83596ad94cafa82c3c9d7799b3c8756418951206a9d3a010738be96fa655023'
+			'e93285bad68022a6aa74d3b42550b7799b9b5b65a0a40bc001c14bd88f471ca2d78a39d852c2331cffe0d05d5d8bc18e1d1779f29052001389b88cadd76de031'
+			'29b16193f9e01e2b7e5cbfa8894d7b44cea6dbdcce11b0be764aeefd83d0a66a20a5ec7f7e7368351b4c9ea8c759a504c392df98e3771f8dbe719797b406cd25'
+			'a8802bfc661db74da05d996d1967328e10d4cd787aa576451a2a7f6c5b2a2edc72aeb3ed986ae0364056aa1f11670a48abe0ceae7bb073fe39d0ee4704540ef5'
+			'1b444ffe1ccb79e7b794032367ceb998f31cf7c3d302636b774681147a0db8b8d53ca5755094177e08f4886a5436e753ab3a632e3bbf97d780e05f19d017767a'
+			'0953789fba110e76b09c1a40b05e22ddf1c723379bd7d93979180c0f83e9b6553a3a3d87a1a6a5834d46f33c93b408271cf5bbf47c6e6e28cc29a35c6b03479a'
+			'b6ca7628cc26c8115462accdac8c033ff9eaf4188e9350b18de21c126c9774ad41adfd4fd0660c0f89b0bb160481174b22274a87c48fb98156081cca76c30ca8'
+			'784fc12065cd2eec1f5990bcbe90ead94cb7d51a15c32cfa7e16e9e18751ab67d026fa56414be8f992a00e80b333e28d77108e7c563ebd657ddbc54e1d47654f'
+			'712ba4c9690535e0b3c93c9fa12689d84dc5b508074fc5aeb074072a96514826b41e8d269d5d38e5f2c25e10000b072fe2e9f675d899d63f5131f2e13684d7c9'
+			'35f7f7b697156fd18e0ab80c9e8b1f23763732f14b278f7395377add69646a1a7abe2ab760684dd3d8ef5dd37fa0f3c78b19f7d3fe5c7be120c3406b7382f70b'
+			'cc578d556bc82247d28742eb2b8d8ddafac3e02af7a4effcd65528fd63b512cede85972102aef21b323095687c59da70904c5946922d3b6012ce9b9ce3c4e54c'
+			'26c8ec091b32da935f1f8e56ccb33081beb7e30f27963107388c8490dfd321516908fe1f4d43b216591276cf484797d16ac15d16599e04e05e5545e4fd1979c0'
+			'41b92e526c4aa9c90b3a9129133f6f5c264ec41806178d35e864a2c93c0c5d7200a2443c82ef0c02af453074f86463589eaa809b695996eb14b4b99aaf18f64f'
+			'233f271511cc1475fa019b0cc0ebbf8a40209a65be9bb1b1245aaf237a5e44f9acb073b066d4bf35f25655db7a73fd21f7d08cd1e6219d2931053f770e64ae4c'
+			'5f1d743bb9aab98eea8ced0e1c179ca18046a99394da34b7529b5ba41b197b657d71aa7993a8bda8604c1b6ae20c4e95881307dce9a9805ca78ffbf537c6131a'
+			'305a8cbf21b63d230ab7e7bad5c796192f9056477ecd944e9f529afcc13d4cdf5f36285f819220e880633d759ee3399bcc48fc08fe5ad31de538c1f991c64c04'
+			'942d6d7bbab6684d60c63ec77bfc380da8c0cd9f7be8ddba176b5285af770a518be073abcde92e0bb12ace96082643010c45c213b1dd2e8033a73aa2bc886ad1'
+			'8799bb502dd2eda984b71ca3b8b873528863b698c615c217adf5ca5491b2223775721aa292d4d6e1b22b30a44554972bbd062df9f07f879d041dff9020dc9166'
+			'df578a48589968bf5c8e1afa3b4d9fca3674ea19d9cd2b4b42ab745cffe0dde611ecdd2517a85a2ee26cfb5639423a1efa4b57746688952f48014af02c5d3d49'
+			'c986f5ccbf19a26758f49c87e11ba45c803d7b01b54927e9b0c18a16bcad0c2886d910480577cd5470e5e7a63f232300658ae2826b07e9bc38988c63d4e7bd5a'
+			'4e9e9e2a4d08accd6641b6266caa47f12bd657bb1a7291a20b360c1b9d6c83d320be3fe475bb6b62bc172a14fe684b3ecb6ad7a8dbb0b391660bc3c30bd66347'
+			'552d1bde7a7e93b8ee35218d51bcd30d8e8e3e23287d02b157b17a7f4f5b6eeabcdefd412f08f25e8028dc7c0f66a938ae6a855675277e787aa1f3a35abf4e58'
+			'c0b00680c41b4f9cd9e5fac6b33eada3565c4ed45caf16a2d0abd7b02ddf70b30c0b425919abf2eb6fa22a46416b69073ad71c6368fb699228f4a3f21f2c36f6'
+			'6f689a54ac0dfc09dbaba5693d484d265dae7ef92887ec5330bd3fdca90c2af4b42a6d2c79074f09510bc643dd22048400b5f65918b4ce880fe01da36f5ecc9e'
+			'e48cd4f4de571784ad172f592c710ef1fdc5f72c426951252f32b4c7fd33c7dffcca0208a188903e48c0fae568d5c4d1de47d32492aa7511261e20f1e4d8558c'
             'd0fb7f0e1a3d98a170ebea301226ad8caa7ffab9fc0bee224abc31c22875c892b43d3468dffbdd15eb71ca1b5260e039d0fceb21ecc92341b9bb6949d7e9be6a')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -329,9 +292,9 @@ del_file_exists() {
 prepare() {
   cd "${srcdir}/Python-${pkgver}"
 
-  apply_patch_with_msg 0001-make-_sysconfigdata.py-relocatable.patch \
+ apply_patch_with_msg 0001-sysconfig-make-_sysconfigdata.py-relocatable.patch \
   0002-restore-setup-config.patch \
-  0003-MINGW-BASE-use-NT-thread-model.patch \
+  0003-build-add-with-nt-threads-and-make-it-default-on-min.patch \
   0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch \
   0005-MINGW-configure-MACHDEP-and-platform-for-build.patch \
   0006-MINGW-preset-configure-defaults.patch \
@@ -340,131 +303,112 @@ prepare() {
   0009-MINGW-init-system-calls.patch \
   0010-MINGW-build-in-windows-modules-winreg.patch \
   0011-MINGW-determine-if-pwdmodule-should-be-used.patch \
-  0012-MINGW-compiler-customize-mingw-cygwin-compilers.patch \
-  0013-MINGW-compiler-enable-new-dtags.patch \
-  0014-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch \
-  0015-MINGW-configure-for-shared-build.patch \
-  0016-MINGW-dynamic-loading-support.patch \
-  0017-MINGW-ignore-main-program-for-frozen-scripts.patch \
-  0018-MINGW-setup-_multiprocessing-module.patch \
-  0019-MINGW-setup-select-module.patch \
-  0020-MINGW-setup-_ctypes-module-with-system-libffi.patch \
-  0021-MINGW-defect-winsock2-and-setup-_socket-module.patch \
-  0022-MINGW-exclude-unix-only-modules.patch \
-  0023-MINGW-setup-msvcrt-and-_winapi-modules.patch \
-  0024-MINGW-build-extensions-with-GCC.patch \
-  0025-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch \
-  0026-MINGW-find-import-library.patch \
-  0027-MINGW-setup-_ssl-module.patch \
-  0028-MINGW-generalization-of-posix-build-in-sysconfig.py.patch \
-  0029-MINGW-support-stdcall-without-underscore.patch \
-  0030-use-replace-instead-rename-to-avoid-failure-on-windo.patch \
-  0031-MINGW-avoid-circular-dependency-from-time-module-dur.patch \
-  0032-MINGW-generalization-of-posix-build-in-distutils-sys.patch \
-  0033-MINGW-customize-site.patch \
-  0034-add-python-config-sh.patch \
-  0035-cross-darwin-feature.patch \
-  0036-py3k-mingw-ntthreads-vs-pthreads.patch \
-  0037-mingw-system-libffi.patch \
-  0038-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch \
-  0039-mingw-use-posix-getpath.patch \
-  0040-mingw-add-ModuleFileName-dir-to-PATH.patch \
-  0041-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch \
-  0042-msys-cygwin-semi-native-build-sysconfig.patch \
-  0043-mingw-sysconfig-like-posix.patch \
-  0044-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompile.patch \
-  0045-cross-dont-add-multiarch-paths-if-cross-compiling.patch \
-  0046-mingw-use-backslashes-in-compileall-py.patch \
-  0047-msys-convert_path-fix-and-root-hack.patch \
-  0048-allow-static-tcltk.patch \
-  0049-mingw-pdcurses_ISPAD.patch \
-  0050-grammar-fixes.patch \
-  0051-builddir-fixes.patch \
-  0052-msys-monkeypatch-os-system-via-sh-exe.patch \
-  0053-msys-replace-slashes-used-in-io-redirection.patch \
-  0054-mingw-install-layout-as-posix.patch \
-  0055-remove_path_max.default.patch \
-  0056-dont-link-with-gettext.patch \
-  0057-ctypes-python-dll.patch \
-  0058-gdbm-module-includes.patch \
-  0059-use-gnu_printf-in-format.patch \
-  0060-mingw-fix-ssl-dont-use-enum_certificates.patch \
-  0061-mingw-build-optimized-ext.patch \
-  0062-cygwinccompiler-dont-strip-modules-if-pydebug.patch \
-  0063-fix-using-dllhandle-and-winver-mingw.patch \
-  0064-mingw-add-LIBPL-to-library-dirs.patch \
-  0065-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch \
-  0066-MINGW-link-with-additional-library.patch \
-  0067-install-msilib.patch \
-  0068-dont-include-system-ncurses-path.patch \
-  0069-fix-signal-module-build.patch \
-  0070-build-winconsoleio.patch \
-  0071-expose-sem_unlink.patch \
-  0072-cygpty-isatty.patch \
-  0073-disable-broken-gdbm-module.patch \
-  0074-link-win-resource-files-and-build-pythonw.patch \
-  0075-3.7-mpdec-mingw.patch \
-  0076-disable-readline.patch \
-  0077-fix-isselectable.patch \
-  0078-use-_wcsnicmp-instead-wcsncasecmp.patch \
-  0079-_xxsubinterpretersmodule.patch \
-  0080-sqlite3-module-defines.patch \
-  0081-configure-have-inet-pton.patch \
-  0082-fix-msvc9-import.patch \
-  0083-set-venv-activate-path-unix.patch \
-  0084-venv-creation-fixes.patch \
-  0085-pass-gen-profile-ldflags.patch \
-  0086-distutils-add-windmc-to-cygwinccompiler.patch \
-  0087-pkg-config-windows-must-link-ext-with-python-lib.patch \
-  0088-importlib-bootstrap-path-sep.patch \
-  0089-pathlib-path-sep.patch \
-  0090-warnings-fixes.patch \
-  0091-fix-build-testinternalcapi.patch \
-  0092-extend-MS_WINDOWS-flag.patch \
-  0093-clang-arm64.patch \
-  0094-MINGW-stack-reserve.patch \
-  0095-Add-support-for-Windows-7-Python-3.9.patch \
-  0096-Add-CI-to-Build-and-Test.patch \
-  0097-Don-t-use-os.pathsep-to-find-EOF.patch \
-  0098-Fix-extension-suffix-for-c-extensions-on-mingw.patch \
-  0099-Change-the-get_platform-method-in-sysconfig-and-dist.patch \
-  0100-Add-a-test-to-build-C-Ext.patch \
-  0101-Add-some-platform-related-tests.patch \
-  0102-squash-CI-use-O2.patch \
-  0103-squash-Fixup-.rc-handling.patch \
-  0104-squash-Set-MS_DLL_ID.patch \
-  0105-squash-CI-Clean-up.patch \
-  0106-squash-CI-use-srcdir-builddir.patch \
-  0107-squash-fix-srcdir-builddir.patch \
-  0108-build-Cleanup-ncursesw-include-lookup-code.patch \
-  0109-tests-fix-test_bytes.patch \
-  0110-time-fix-strftime-not-raising-for-invalid-year-value.patch \
-  0111-winconsoleio-build-_testconsole-which-is-required-fo.patch \
-  0112-Adjust-Py_WINVER-for-our-Win-7-target.patch \
-  0113-ctypes-find_library-c-should-return-None-with-ucrt.patch \
-  0114-build-Disable-checks-for-dlopen-dlfcn.patch \
-  0115-Fix-install-location-of-the-import-library.patch \
-  0116-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch \
-  0117-build-Integrate-venvlauncher-build-installation-into.patch \
-  0118-Update-smoketests.patch \
-  0119-CI-clean-up-the-build-enforce-some-tests.patch \
-  0120-1-2-AC_RUN_IFELSE-replace.patch \
-  0121-Add-return-0-to-the-test-code.patch \
-  0122-2-2-AC_RUN_IFELSE-replace.patch \
-  0123-Make-sure-MACHDEP-matches-sys.platform.patch \
-  0124-CI-add-a-cross-build-job.patch \
-  0125-Revert-Adjust-Py_WINVER-for-our-Win-7-target.patch \
-  0126-Set-_WIN32_WINNT-version-in-configure.ac.patch \
-  0127-CI-cleanup.patch \
-  0128-Commit-regenerated-importlib.patch \
-  0129-CI-clean-up.patch \
-  0130-configure.ac-default-to-with-nt-threads-with-mingw.patch \
-  0131-configure.ac-don-t-check-for-clock_-functions.patch \
-  0132-CI-clean-up.patch \
-  0133-smoketests-update.patch \
-  0134-expanduser-normpath-paths-coming-from-env-vars.patch \
-  0135-sysconfig-fix-platlib-purelib-paths.patch \
-  0136-smoketests-update.patch
+  0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch \
+  0013-MINGW-configure-for-shared-build.patch \
+  0014-MINGW-dynamic-loading-support.patch \
+  0015-MINGW-ignore-main-program-for-frozen-scripts.patch \
+  0016-MINGW-setup-_multiprocessing-module.patch \
+  0017-MINGW-setup-select-module.patch \
+  0018-MINGW-setup-_ctypes-module-with-system-libffi.patch \
+  0019-MINGW-defect-winsock2-and-setup-_socket-module.patch \
+  0020-MINGW-exclude-unix-only-modules.patch \
+  0021-MINGW-setup-msvcrt-and-_winapi-modules.patch \
+  0022-sysconfig-MINGW-build-extensions-with-GCC.patch \
+  0023-MINGW-setup-_ssl-module.patch \
+  0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch \
+  0025-MINGW-support-stdcall-without-underscore.patch \
+  0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch \
+  0027-MINGW-customize-site.patch \
+  0028-add-python-config-sh.patch \
+  0029-cross-darwin-feature.patch \
+  0030-mingw-system-libffi.patch \
+  0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch \
+  0032-mingw-use-posix-getpath.patch \
+  0033-mingw-add-ModuleFileName-dir-to-PATH.patch \
+  0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch \
+  0035-msys-cygwin-semi-native-build-sysconfig.patch \
+  0036-sysconfig-mingw-sysconfig-like-posix.patch \
+  0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch \
+  0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch \
+  0039-mingw-use-backslashes-in-compileall-py.patch \
+  0040-msys-convert_path-fix-and-root-hack.patch \
+  0041-allow-static-tcltk.patch \
+  0042-mingw-pdcurses_ISPAD.patch \
+  0043-grammar-fixes.patch \
+  0044-builddir-fixes.patch \
+  0045-msys-monkeypatch-os-system-via-sh-exe.patch \
+  0046-msys-replace-slashes-used-in-io-redirection.patch \
+  0047-remove_path_max.default.patch \
+  0048-dont-link-with-gettext.patch \
+  0049-ctypes-python-dll.patch \
+  0050-gdbm-module-includes.patch \
+  0051-use-gnu_printf-in-format.patch \
+  0052-mingw-fix-ssl-dont-use-enum_certificates.patch \
+  0053-fix-using-dllhandle-and-winver-mingw.patch \
+  0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch \
+  0055-MINGW-link-with-additional-library.patch \
+  0056-install-msilib.patch \
+  0057-fix-signal-module-build.patch \
+  0058-build-build-winconsoleio-and-_testconsole.patch \
+  0059-expose-sem_unlink.patch \
+  0060-cygpty-isatty.patch \
+  0061-disable-broken-gdbm-module.patch \
+  0062-build-link-win-resource-files-and-build-pythonw.patch \
+  0063-3.7-mpdec-mingw.patch \
+  0064-disable-readline.patch \
+  0065-fix-isselectable.patch \
+  0066-use-_wcsnicmp-instead-wcsncasecmp.patch \
+  0067-_xxsubinterpretersmodule.patch \
+  0068-sqlite3-module-defines.patch \
+  0069-configure.ac-fix-inet_pton-check.patch \
+  0070-set-venv-activate-path-unix.patch \
+  0071-venv-creation-fixes.patch \
+  0072-pass-gen-profile-ldflags.patch \
+  0073-pkg-config-windows-must-link-ext-with-python-lib.patch \
+  0074-importlib-bootstrap-path-sep.patch \
+  0075-pathlib-path-sep.patch \
+  0076-warnings-fixes.patch \
+  0077-fix-build-testinternalcapi.patch \
+  0078-extend-MS_WINDOWS-flag.patch \
+  0079-clang-arm64.patch \
+  0080-configure.ac-set-MINGW-stack-reserve.patch \
+  0081-Don-t-use-os.pathsep-to-find-EOF.patch \
+  0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch \
+  0083-Change-the-get_platform-method-in-sysconfig.patch \
+  0084-distutils-compiler-customize-mingw-cygwin-compilers.patch \
+  0085-distutils-compiler-enable-new-dtags.patch \
+  0086-distutils-MINGW-build-extensions-with-GCC.patch \
+  0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch \
+  0088-distutils-find-import-library.patch \
+  0089-distutils-avoid-circular-dependency-from-time-module.patch \
+  0090-distutils-generalization-of-posix-build-in-distutils.patch \
+  0091-distutils-mingw-sysconfig-like-posix.patch \
+  0092-distutils-get_versions-fixes.patch \
+  0093-distutils-install-layout-as-posix.patch \
+  0094-distutils-msys-convert_path-fix-and-root-hack.patch \
+  0095-distutils-mingw-build-optimized-ext.patch \
+  0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch \
+  0097-distutils-get-compilers-from-env-vars.patch \
+  0098-distutils-add-windmc-to-cygwinccompiler.patch \
+  0099-distutils-fix-msvc9-import.patch \
+  0100-distutils-mingw-add-LIBPL-to-library-dirs.patch \
+  0101-distutils-Change-the-get_platform-method-in-distutil.patch \
+  0102-build-Fix-ncursesw-include-lookup.patch \
+  0103-tests-fix-test_bytes.patch \
+  0104-time-fix-strftime-not-raising-for-invalid-year-value.patch \
+  0105-ctypes-find_library-c-should-return-None-with-ucrt.patch \
+  0106-build-Disable-checks-for-dlopen-dlfcn.patch \
+  0107-Fix-install-location-of-the-import-library.patch \
+  0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch \
+  0109-build-Integrate-venvlauncher-build-installation-into.patch \
+  0110-configure.ac-set-_WIN32_WINNT-version.patch \
+  0111-configure.ac-don-t-check-for-clock_-functions.patch \
+  0112-expanduser-normpath-paths-coming-from-env-vars.patch \
+  0113-Add-support-for-Windows-7-Python-3.9.patch \
+  0114-Commit-regenerated-importlib.patch \
+  0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch \
+  0116-decimal-backport-build-fixes.patch \
+  0117-smoketests-test-that-_decimal-exists.patch
 
   autoreconf -vfi
 }
@@ -509,6 +453,7 @@ build() {
       --without-ensurepip \
       --without-c-locale-coercion \
       --enable-loadable-sqlite-extensions \
+	  --with-tzpath=/usr/${_arch}/share/zoneinfo \
       "${_extra_config[@]}" \
       OPT=""