From 9ea6de58aa946e5e2aedb44a067d6b99f902db9b Mon Sep 17 00:00:00 2001 From: Naveen M K Date: Mon, 14 Mar 2022 22:06:41 +0530 Subject: [PATCH] python: update Add patch from https://github.com/msys2-contrib/cpython-mingw/pull/88 --- ...g-make-_sysconfigdata.py-relocatable.patch | 2 +- .../0002-restore-setup-config.patch | 2 +- ...t-threads-and-make-it-default-on-min.patch | 2 +- ...gcc-internal-defines-to-python-platf.patch | 2 +- ...igure-MACHDEP-and-platform-for-build.patch | 2 +- ...0006-MINGW-preset-configure-defaults.patch | 2 +- ...largefile-support-for-windows-builds.patch | 2 +- ...0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch | 2 +- .../0009-MINGW-init-system-calls.patch | 2 +- ...INGW-build-in-windows-modules-winreg.patch | 2 +- ...etermine-if-pwdmodule-should-be-used.patch | 2 +- ...-Mingw-recognition-to-pyport.h-to-al.patch | 2 +- ...013-MINGW-configure-for-shared-build.patch | 2 +- .../0014-MINGW-dynamic-loading-support.patch | 2 +- ...nore-main-program-for-frozen-scripts.patch | 2 +- ...-MINGW-setup-_multiprocessing-module.patch | 2 +- .../0017-MINGW-setup-select-module.patch | 2 +- ...up-_ctypes-module-with-system-libffi.patch | 2 +- ...ct-winsock2-and-setup-_socket-module.patch | 2 +- ...0020-MINGW-exclude-unix-only-modules.patch | 2 +- ...NGW-setup-msvcrt-and-_winapi-modules.patch | 2 +- ...nfig-MINGW-build-extensions-with-GCC.patch | 2 +- .../0023-MINGW-setup-_ssl-module.patch | 2 +- ...ation-of-posix-build-in-sysconfig.py.patch | 2 +- ...W-support-stdcall-without-underscore.patch | 2 +- ...ead-rename-to-avoid-failure-on-windo.patch | 2 +- .../0027-MINGW-customize-site.patch | 2 +- .../0028-add-python-config-sh.patch | 2 +- .../0029-cross-darwin-feature.patch | 2 +- .../0030-mingw-system-libffi.patch | 2 +- ...sys-mingw-prefer-unix-sep-if-MSYSTEM.patch | 2 +- .../0032-mingw-use-posix-getpath.patch | 2 +- ...mingw-add-ModuleFileName-dir-to-PATH.patch | 2 +- ...dd-BUILDIN_WIN32_MODULEs-time-msvcrt.patch | 2 +- ...s-cygwin-semi-native-build-sysconfig.patch | 2 +- ...sysconfig-mingw-sysconfig-like-posix.patch | 2 +- ...rlier-so-we-can-use-it-in-distutils-.patch | 2 +- ...d-multiarch-paths-if-cross-compiling.patch | 2 +- ...ngw-use-backslashes-in-compileall-py.patch | 2 +- ...-msys-convert_path-fix-and-root-hack.patch | 2 +- .../0041-allow-static-tcltk.patch | 2 +- .../0042-mingw-pdcurses_ISPAD.patch | 2 +- mingw-w64-python/0043-grammar-fixes.patch | 2 +- mingw-w64-python/0044-builddir-fixes.patch | 2 +- ...sys-monkeypatch-os-system-via-sh-exe.patch | 2 +- ...place-slashes-used-in-io-redirection.patch | 2 +- .../0047-remove_path_max.default.patch | 2 +- .../0048-dont-link-with-gettext.patch | 2 +- mingw-w64-python/0049-ctypes-python-dll.patch | 2 +- .../0050-gdbm-module-includes.patch | 2 +- .../0051-use-gnu_printf-in-format.patch | 2 +- ...w-fix-ssl-dont-use-enum_certificates.patch | 2 +- ...fix-using-dllhandle-and-winver-mingw.patch | 2 +- ...-config-so-msvccompiler-get_build_ve.patch | 2 +- ...5-MINGW-link-with-additional-library.patch | 2 +- mingw-w64-python/0056-install-msilib.patch | 2 +- .../0057-fix-signal-module-build.patch | 2 +- ...-build-winconsoleio-and-_testconsole.patch | 2 +- mingw-w64-python/0059-expose-sem_unlink.patch | 2 +- mingw-w64-python/0060-cygpty-isatty.patch | 2 +- .../0061-disable-broken-gdbm-module.patch | 2 +- ...win-resource-files-and-build-pythonw.patch | 2 +- mingw-w64-python/0063-3.7-mpdec-mingw.patch | 2 +- mingw-w64-python/0064-disable-readline.patch | 2 +- mingw-w64-python/0065-fix-isselectable.patch | 2 +- ...66-use-_wcsnicmp-instead-wcsncasecmp.patch | 2 +- .../0067-_xxsubinterpretersmodule.patch | 2 +- .../0068-sqlite3-module-defines.patch | 2 +- ...069-configure.ac-fix-inet_pton-check.patch | 2 +- .../0070-set-venv-activate-path-unix.patch | 2 +- .../0071-venv-creation-fixes.patch | 2 +- .../0072-pass-gen-profile-ldflags.patch | 2 +- ...indows-must-link-ext-with-python-lib.patch | 2 +- .../0074-importlib-bootstrap-path-sep.patch | 2 +- mingw-w64-python/0075-pathlib-path-sep.patch | 2 +- mingw-w64-python/0076-warnings-fixes.patch | 2 +- .../0077-fix-build-testinternalcapi.patch | 2 +- .../0078-extend-MS_WINDOWS-flag.patch | 2 +- mingw-w64-python/0079-clang-arm64.patch | 2 +- ...configure.ac-set-MINGW-stack-reserve.patch | 2 +- ...081-Don-t-use-os.pathsep-to-find-EOF.patch | 2 +- ...ion-suffix-for-c-extensions-on-mingw.patch | 2 +- ...the-get_platform-method-in-sysconfig.patch | 2 +- ...ler-customize-mingw-cygwin-compilers.patch | 2 +- ...-distutils-compiler-enable-new-dtags.patch | 2 +- ...tils-MINGW-build-extensions-with-GCC.patch | 2 +- ...ngw32CCompiler-as-default-compiler-f.patch | 2 +- .../0088-distutils-find-import-library.patch | 2 +- ...circular-dependency-from-time-module.patch | 2 +- ...lization-of-posix-build-in-distutils.patch | 2 +- ...distutils-mingw-sysconfig-like-posix.patch | 2 +- .../0092-distutils-get_versions-fixes.patch | 2 +- ...93-distutils-install-layout-as-posix.patch | 2 +- ...-msys-convert_path-fix-and-root-hack.patch | 2 +- ...-distutils-mingw-build-optimized-ext.patch | 2 +- ...ccompiler-dont-strip-modules-if-pyde.patch | 2 +- ...istutils-get-compilers-from-env-vars.patch | 2 +- ...tutils-add-windmc-to-cygwinccompiler.patch | 2 +- .../0099-distutils-fix-msvc9-import.patch | 2 +- ...tils-mingw-add-LIBPL-to-library-dirs.patch | 2 +- ...-the-get_platform-method-in-distutil.patch | 2 +- ...02-build-Fix-ncursesw-include-lookup.patch | 2 +- .../0103-tests-fix-test_bytes.patch | 2 +- ...e-not-raising-for-invalid-year-value.patch | 2 +- ...brary-c-should-return-None-with-ucrt.patch | 2 +- ...uild-Disable-checks-for-dlopen-dlfcn.patch | 2 +- ...stall-location-of-the-import-library.patch | 2 +- ...NV_EXCL-for-the-shared-Python-module.patch | 2 +- ...venvlauncher-build-installation-into.patch | 2 +- ...onfigure.ac-set-_WIN32_WINNT-version.patch | 2 +- ....ac-don-t-check-for-clock_-functions.patch | 2 +- ...-normpath-paths-coming-from-env-vars.patch | 2 +- ...Add-support-for-Windows-7-Python-3.9.patch | 2 +- .../0114-Commit-regenerated-importlib.patch | 2 +- ...ld-and-add-some-mingw-specific-tests.patch | 2 +- .../0116-decimal-backport-build-fixes.patch | 2 +- ...smoketests-test-that-_decimal-exists.patch | 2 +- .../0118-Prefer-sysconfig.python_build.patch | 2 +- ...move-checks-for-ancient-gcc-binutils.patch | 2 +- ...CC-env-var-before-passing-to-subproc.patch | 2 +- ...1-_testconsole.c-Fix-casing-path-sep.patch | 2 +- ...t-architecture-markers-for-python-on.patch | 2 +- .../0123-distutils-add-back-gcc_version.patch | 2 +- ...ix-mingw-cross-compiling-in-setup.py.patch | 2 +- ...p-python-for-setting-up-correct-vers.patch | 2 +- ...26-Fix-buffer-overflow-in-Py_GetSepW.patch | 2 +- ...ecessary-strlen-in-Py_NormalizeSepsW.patch | 2 +- ...sesw-pkg-config-when-cross-compiling.patch | 2 +- .../0129-Use-CC-instead-of-cc.patch | 25 ++ ...est-suite-support-Expat-2.4.5-GH-314.patch | 106 +++++++ ...131-Avoid-using-sysconfig-in-site.py.patch | 62 ++++ mingw-w64-python/PKGBUILD | 271 +++++++++--------- 132 files changed, 461 insertions(+), 259 deletions(-) create mode 100644 mingw-w64-python/0129-Use-CC-instead-of-cc.patch create mode 100644 mingw-w64-python/0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch create mode 100644 mingw-w64-python/0131-Avoid-using-sysconfig-in-site.py.patch diff --git a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch index 368d79fd17..9036723090 100644 --- a/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch +++ b/mingw-w64-python/0001-sysconfig-make-_sysconfigdata.py-relocatable.patch @@ -56,5 +56,5 @@ index e3f79bf..45eab2a 100644 # Create file used for sys.path fixup -- see Modules/getpath.c with open('pybuilddir.txt', 'w', encoding='utf8') as f: -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0002-restore-setup-config.patch b/mingw-w64-python/0002-restore-setup-config.patch index a3c19981f3..2e1ed98d02 100644 --- a/mingw-w64-python/0002-restore-setup-config.patch +++ b/mingw-w64-python/0002-restore-setup-config.patch @@ -78,5 +78,5 @@ index 431d661..471860c 100644 mv config.c Modules -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch index 2c4f3e13fe..c354e00748 100644 --- a/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch +++ b/mingw-w64-python/0003-build-add-with-nt-threads-and-make-it-default-on-min.patch @@ -285,5 +285,5 @@ index 188faee..1df9659 100644 #undef PACKAGE_BUGREPORT -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch index 0eb87c1eb8..9c7ee81a55 100644 --- a/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch +++ b/mingw-w64-python/0004-MINGW-translate-gcc-internal-defines-to-python-platf.patch @@ -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.34.1 +2.35.1 diff --git a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch index 5c238f7f5e..2ffd1a9bb1 100644 --- a/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch +++ b/mingw-w64-python/0005-MINGW-configure-MACHDEP-and-platform-for-build.patch @@ -59,5 +59,5 @@ index 6a375e3..eb285cc 100644 # Some systems cannot stand _XOPEN_SOURCE being defined at all; they -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch index 8fa05777f9..17ec0817c8 100644 --- a/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch +++ b/mingw-w64-python/0006-MINGW-preset-configure-defaults.patch @@ -86,5 +86,5 @@ index eb285cc..bbea587 100644 save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -Wl,--no-as-needed" -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch index 1fe66bab3c..f249ab7088 100644 --- a/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch +++ b/mingw-w64-python/0007-MINGW-configure-largefile-support-for-windows-builds.patch @@ -39,5 +39,5 @@ index bbea587..ea7d551 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.34.1 +2.35.1 diff --git a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch index d544722600..572bc9320d 100644 --- a/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch +++ b/mingw-w64-python/0008-MINGW-add-srcdir-PC-to-CPPFLAGS.patch @@ -39,5 +39,5 @@ index ea7d551..bb80ed8 100644 for dir in $SRCDIRS; do if test ! -d $dir; then -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0009-MINGW-init-system-calls.patch b/mingw-w64-python/0009-MINGW-init-system-calls.patch index 80877742a2..707b5816f1 100644 --- a/mingw-w64-python/0009-MINGW-init-system-calls.patch +++ b/mingw-w64-python/0009-MINGW-init-system-calls.patch @@ -120,5 +120,5 @@ index bb80ed8..d3ee3fe 100644 # it may influence the way we can build extensions, so distutils # needs to check it -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch index 93026ca85f..45d8cae823 100644 --- a/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch +++ b/mingw-w64-python/0010-MINGW-build-in-windows-modules-winreg.patch @@ -75,5 +75,5 @@ index d3ee3fe..fcbb02c 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch index 807ad50e98..7bfd817c36 100644 --- a/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch +++ b/mingw-w64-python/0011-MINGW-determine-if-pwdmodule-should-be-used.patch @@ -61,5 +61,5 @@ index fcbb02c..b797c58 100644 # For a single AC_DEFINE, no template is needed. AH_TEMPLATE(_REENTRANT, -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch index d01c68f924..6ed227d0ac 100644 --- a/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch +++ b/mingw-w64-python/0012-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch @@ -78,5 +78,5 @@ index c6023e1..86f877b 100644 self.detect_modules() -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch index bfe25a7ecd..7626e1d976 100644 --- a/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch +++ b/mingw-w64-python/0013-MINGW-configure-for-shared-build.patch @@ -65,5 +65,5 @@ index b797c58..b457a4b 100644 esac -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch index ad4294d731..5731633a5b 100644 --- a/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch +++ b/mingw-w64-python/0014-MINGW-dynamic-loading-support.patch @@ -100,5 +100,5 @@ index b457a4b..6ba6dc7 100644 case $ac_sys_system in AIX*) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch index b20b4a0a84..a95d86f050 100644 --- a/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch +++ b/mingw-w64-python/0015-MINGW-ignore-main-program-for-frozen-scripts.patch @@ -48,5 +48,5 @@ index 6ba6dc7..ac5061f 100644 SRCDIRS="Parser Parser/pegen Objects Python Modules Modules/_io Programs" case $host in -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch index 37b91c9684..642f3443ff 100644 --- a/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch +++ b/mingw-w64-python/0016-MINGW-setup-_multiprocessing-module.patch @@ -30,5 +30,5 @@ index 86f877b..f00612a 100644 def detect_uuid(self): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0017-MINGW-setup-select-module.patch b/mingw-w64-python/0017-MINGW-setup-select-module.patch index dbeb756478..dfb3f7c717 100644 --- a/mingw-w64-python/0017-MINGW-setup-select-module.patch +++ b/mingw-w64-python/0017-MINGW-setup-select-module.patch @@ -56,5 +56,5 @@ index f00612a..d74f25e 100644 # Fred Drake's interface to the Python parser self.add(Extension('parser', ['parsermodule.c'])) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch index 66daf0eed0..59bf94f3a5 100644 --- a/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch +++ b/mingw-w64-python/0018-MINGW-setup-_ctypes-module-with-system-libffi.patch @@ -41,5 +41,5 @@ index d74f25e..2c3e29e 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch index 75623d74c2..81eb6758f2 100644 --- a/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch +++ b/mingw-w64-python/0019-MINGW-defect-winsock2-and-setup-_socket-module.patch @@ -163,5 +163,5 @@ index 2c3e29e..2beb525 100644 self.add(Extension('_socket', ['socketmodule.c'], **kwargs)) elif self.compiler.find_library_file(self.lib_dirs, 'net'): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch index fe51fec4ff..2cefa194d3 100644 --- a/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch +++ b/mingw-w64-python/0020-MINGW-exclude-unix-only-modules.patch @@ -90,5 +90,5 @@ index 2beb525..a35f493 100644 def detect_socket(self): # socket(2) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch index 527105bdc0..b899e6e003 100644 --- a/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch +++ b/mingw-w64-python/0021-MINGW-setup-msvcrt-and-_winapi-modules.patch @@ -89,5 +89,5 @@ index a35f493..a802e51 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.34.1 +2.35.1 diff --git a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch index 91286ee5f2..76d7fdd5a1 100644 --- a/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0022-sysconfig-MINGW-build-extensions-with-GCC.patch @@ -21,5 +21,5 @@ index 45eab2a..42de9b3 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch index 349bcba8bf..3df24899c6 100644 --- a/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch +++ b/mingw-w64-python/0023-MINGW-setup-_ssl-module.patch @@ -26,5 +26,5 @@ index a802e51..2e2578c 100644 # libssl and libcrypto not found self.missing.extend(['_ssl', '_hashlib']) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch index 82e3e6fa39..8a36203212 100644 --- a/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch +++ b/mingw-w64-python/0024-MINGW-generalization-of-posix-build-in-sysconfig.py.patch @@ -76,5 +76,5 @@ index 42de9b3..65cb345 100644 # If srcdir is a relative path (typically '.' or '..') # then it should be interpreted relative to the directory -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch index 6e4e534831..1f8a02404f 100644 --- a/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch +++ b/mingw-w64-python/0025-MINGW-support-stdcall-without-underscore.patch @@ -50,5 +50,5 @@ index ceae67e..b9cf96b 100644 return NULL; #endif -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch index ce403abc65..68f8ebd0da 100644 --- a/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch +++ b/mingw-w64-python/0026-use-replace-instead-rename-to-avoid-failure-on-windo.patch @@ -27,5 +27,5 @@ index 2e2578c..0d2740b 100644 if filename in updated_files: newupdated_files.append(newfilename) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0027-MINGW-customize-site.patch b/mingw-w64-python/0027-MINGW-customize-site.patch index 97c48d588a..e56a8cd338 100644 --- a/mingw-w64-python/0027-MINGW-customize-site.patch +++ b/mingw-w64-python/0027-MINGW-customize-site.patch @@ -55,5 +55,5 @@ index 9e617af..b344f03 100644 path = os.path.join(prefix, libdir, "python%d.%d" % sys.version_info[:2], -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0028-add-python-config-sh.patch b/mingw-w64-python/0028-add-python-config-sh.patch index 4f9e12e27b..4b1a75eae7 100644 --- a/mingw-w64-python/0028-add-python-config-sh.patch +++ b/mingw-w64-python/0028-add-python-config-sh.patch @@ -158,5 +158,5 @@ index 2602fe2..e0e048a 100644 esac done -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0029-cross-darwin-feature.patch b/mingw-w64-python/0029-cross-darwin-feature.patch index 37e899294d..69d403f666 100644 --- a/mingw-w64-python/0029-cross-darwin-feature.patch +++ b/mingw-w64-python/0029-cross-darwin-feature.patch @@ -134,5 +134,5 @@ index 495cf68..7f2bb28 100644 MACOSX_DEFAULT_ARCH="x86_64" ;; -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0030-mingw-system-libffi.patch b/mingw-w64-python/0030-mingw-system-libffi.patch index f24fe2f32e..8f5eb9a13c 100644 --- a/mingw-w64-python/0030-mingw-system-libffi.patch +++ b/mingw-w64-python/0030-mingw-system-libffi.patch @@ -26,5 +26,5 @@ index 0d2740b..d6b0856 100644 if sysconfig.get_config_var('HAVE_LIBDL'): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch index a85cbddbf3..0279a49447 100644 --- a/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch +++ b/mingw-w64-python/0031-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch @@ -393,5 +393,5 @@ index 23d0e38..37a7670 100644 tail = filepath; else -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0032-mingw-use-posix-getpath.patch b/mingw-w64-python/0032-mingw-use-posix-getpath.patch index 08f40ba9ef..73ebe8c4bf 100644 --- a/mingw-w64-python/0032-mingw-use-posix-getpath.patch +++ b/mingw-w64-python/0032-mingw-use-posix-getpath.patch @@ -501,5 +501,5 @@ index 26e97df..75ee355 100644 /* Get an absolute path. -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch index 677b6cdbb4..cfa6a854ce 100644 --- a/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch +++ b/mingw-w64-python/0033-mingw-add-ModuleFileName-dir-to-PATH.patch @@ -54,5 +54,5 @@ index bede134..c782e0f 100644 && calculate->warnings) { -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch index 245b5a887a..04b6ea1143 100644 --- a/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch +++ b/mingw-w64-python/0034-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch @@ -23,5 +23,5 @@ index d071a74..825ce5d 100644 +@USE_WIN32_MODULE@msvcrt -DPy_BUILD_CORE ../PC/msvcrtmodule.c -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch index e8b16b7240..b47a670b22 100644 --- a/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch +++ b/mingw-w64-python/0035-msys-cygwin-semi-native-build-sysconfig.patch @@ -122,5 +122,5 @@ index 7f2bb28..a7d664c 100644 AC_SUBST(INITSYS) case $host in -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch index 56e151a019..26915f2c59 100644 --- a/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0036-sysconfig-mingw-sysconfig-like-posix.patch @@ -58,5 +58,5 @@ index f69d0db..64f7719 100644 # -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch index e17e0208ed..0d4fb76f42 100644 --- a/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch +++ b/mingw-w64-python/0037-build-_winapi-earlier-so-we-can-use-it-in-distutils-.patch @@ -35,5 +35,5 @@ index d6b0856..27f7bb2 100644 self.add(Extension('_msi', [os.path.join(pc_srcdir, p) for p in ['_msi.c']], -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch index 2f8ecac498..4eeedb359d 100644 --- a/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch +++ b/mingw-w64-python/0038-cross-dont-add-multiarch-paths-if-cross-compiling.patch @@ -29,5 +29,5 @@ index 27f7bb2..5164bf7 100644 def init_inc_lib_dirs(self): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch index 5989ff5e2e..fccca3b785 100644 --- a/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch +++ b/mingw-w64-python/0039-mingw-use-backslashes-in-compileall-py.patch @@ -26,5 +26,5 @@ index 25ad83c..f57879e 100644 yield fullname elif (maxlevels > 0 and name != os.curdir and name != os.pardir and -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch index 1f7943cc2a..ef9ba78d95 100644 --- a/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0040-msys-convert_path-fix-and-root-hack.patch @@ -38,5 +38,5 @@ index 3d42756..d00acbd 100644 # Here are a couple of targets for MacOSX again, to install a full # framework-based Python. frameworkinstall installs everything, the -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0041-allow-static-tcltk.patch b/mingw-w64-python/0041-allow-static-tcltk.patch index 12f26715e6..c61100107c 100644 --- a/mingw-w64-python/0041-allow-static-tcltk.patch +++ b/mingw-w64-python/0041-allow-static-tcltk.patch @@ -83,5 +83,5 @@ index 5164bf7..f761245 100644 # XXX handle these, but how to detect? # *** Uncomment and edit for PIL (TkImaging) extension only: -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch index c30851144b..40aaec3604 100644 --- a/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch +++ b/mingw-w64-python/0042-mingw-pdcurses_ISPAD.patch @@ -31,5 +31,5 @@ index b70252d..0d5cee2 100644 /* configure was checking , but we will use , which has some or all these features. */ -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0043-grammar-fixes.patch b/mingw-w64-python/0043-grammar-fixes.patch index 398e290fb7..59c3152c24 100644 --- a/mingw-w64-python/0043-grammar-fixes.patch +++ b/mingw-w64-python/0043-grammar-fixes.patch @@ -41,5 +41,5 @@ index b7aa528..4a1ee9a 100644 {2, 1}, {3, 2}, -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0044-builddir-fixes.patch b/mingw-w64-python/0044-builddir-fixes.patch index b7c65cbb9c..b733884e4a 100644 --- a/mingw-w64-python/0044-builddir-fixes.patch +++ b/mingw-w64-python/0044-builddir-fixes.patch @@ -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.34.1 +2.35.1 diff --git a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch index d1f394093e..e8cfb6685e 100644 --- a/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch +++ b/mingw-w64-python/0045-msys-monkeypatch-os-system-via-sh-exe.patch @@ -35,5 +35,5 @@ index f761245..8454b28 100644 HOST_PLATFORM = get_platform() MS_WINDOWS = (HOST_PLATFORM == 'win32') -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch index 8dd35fbea7..ec1bb278e0 100644 --- a/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch +++ b/mingw-w64-python/0046-msys-replace-slashes-used-in-io-redirection.patch @@ -69,5 +69,5 @@ index 8454b28..d4778b0 100644 with open(tmpfile) as fp: detected_archs = [] -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0047-remove_path_max.default.patch b/mingw-w64-python/0047-remove_path_max.default.patch index 38ddaeaf99..68da6c1d17 100644 --- a/mingw-w64-python/0047-remove_path_max.default.patch +++ b/mingw-w64-python/0047-remove_path_max.default.patch @@ -25,5 +25,5 @@ index 3243944..99d4977 100644 #endif -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0048-dont-link-with-gettext.patch b/mingw-w64-python/0048-dont-link-with-gettext.patch index 74d37cd44e..5d5005aaa1 100644 --- a/mingw-w64-python/0048-dont-link-with-gettext.patch +++ b/mingw-w64-python/0048-dont-link-with-gettext.patch @@ -56,5 +56,5 @@ index a7d664c..7589b6a 100644 # checks for system dependent C++ extensions support case "$ac_sys_system" in -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0049-ctypes-python-dll.patch b/mingw-w64-python/0049-ctypes-python-dll.patch index 62bf061fce..0df73c7d1a 100644 --- a/mingw-w64-python/0049-ctypes-python-dll.patch +++ b/mingw-w64-python/0049-ctypes-python-dll.patch @@ -29,5 +29,5 @@ index 4afa4eb..2fe2eec 100644 elif _sys.platform == "cygwin": pythonapi = PyDLL("libpython%d.%d.dll" % _sys.version_info[:2]) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0050-gdbm-module-includes.patch b/mingw-w64-python/0050-gdbm-module-includes.patch index fb902479e6..9c12c8caa4 100644 --- a/mingw-w64-python/0050-gdbm-module-includes.patch +++ b/mingw-w64-python/0050-gdbm-module-includes.patch @@ -26,5 +26,5 @@ index 16b0f79..46b28b2 100644 extern const char * gdbm_strerror(gdbm_error); #endif -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0051-use-gnu_printf-in-format.patch b/mingw-w64-python/0051-use-gnu_printf-in-format.patch index a4ee1d044c..2caf9d3ea5 100644 --- a/mingw-w64-python/0051-use-gnu_printf-in-format.patch +++ b/mingw-w64-python/0051-use-gnu_printf-in-format.patch @@ -81,5 +81,5 @@ index 670e5d2..d582963 100644 PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...); -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch index af4ebd41e0..e0b1a20304 100644 --- a/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch +++ b/mingw-w64-python/0052-mingw-fix-ssl-dont-use-enum_certificates.patch @@ -35,5 +35,5 @@ index 30f4e59..dda3ae1 100644 self._load_windows_store_certs(storename, purpose) self.set_default_verify_paths() -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch index a9a1d2cf54..f4f910f5ff 100644 --- a/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch +++ b/mingw-w64-python/0053-fix-using-dllhandle-and-winver-mingw.patch @@ -35,5 +35,5 @@ index a52b299..e890979 100644 PyLong_FromVoidPtr(PyWin_DLLhModule)); SET_SYS_FROM_STRING("winver", -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch index 42179e9368..b2779f9851 100644 --- a/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch +++ b/mingw-w64-python/0054-Add-AMD64-to-sys-config-so-msvccompiler-get_build_ve.patch @@ -38,5 +38,5 @@ index 59c0dbf..adccaa7 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch index af5f858096..7349b854b1 100644 --- a/mingw-w64-python/0055-MINGW-link-with-additional-library.patch +++ b/mingw-w64-python/0055-MINGW-link-with-additional-library.patch @@ -29,5 +29,5 @@ index 7589b6a..d97844f 100644 AC_MSG_CHECKING(for -O2) saved_cflags="$CFLAGS" -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0056-install-msilib.patch b/mingw-w64-python/0056-install-msilib.patch index 711ce0a4a7..c7da7bb914 100644 --- a/mingw-w64-python/0056-install-msilib.patch +++ b/mingw-w64-python/0056-install-msilib.patch @@ -26,5 +26,5 @@ index 1895e74..1d2e16e 100644 unittest unittest/test unittest/test/testmock \ venv venv/scripts venv/scripts/common venv/scripts/posix \ -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0057-fix-signal-module-build.patch b/mingw-w64-python/0057-fix-signal-module-build.patch index d872caa3b0..5c8a665fd0 100644 --- a/mingw-w64-python/0057-fix-signal-module-build.patch +++ b/mingw-w64-python/0057-fix-signal-module-build.patch @@ -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.34.1 +2.35.1 diff --git a/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch index 879a632d72..0f488390de 100644 --- a/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch +++ b/mingw-w64-python/0058-build-build-winconsoleio-and-_testconsole.patch @@ -40,5 +40,5 @@ index d4778b0..6f4730d 100644 # readline do_readline = self.compiler.find_library_file(self.lib_dirs, 'readline') -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0059-expose-sem_unlink.patch b/mingw-w64-python/0059-expose-sem_unlink.patch index c452b2bae4..2cdaac87b0 100644 --- a/mingw-w64-python/0059-expose-sem_unlink.patch +++ b/mingw-w64-python/0059-expose-sem_unlink.patch @@ -25,5 +25,5 @@ index 806e638..d7954d1 100644 #endif {NULL} -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0060-cygpty-isatty.patch b/mingw-w64-python/0060-cygpty-isatty.patch index db0a4a3f05..633db9641a 100644 --- a/mingw-w64-python/0060-cygpty-isatty.patch +++ b/mingw-w64-python/0060-cygpty-isatty.patch @@ -457,5 +457,5 @@ index 60f091c..734084c 100644 if (!Py_InteractiveFlag) return 0; -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0061-disable-broken-gdbm-module.patch b/mingw-w64-python/0061-disable-broken-gdbm-module.patch index f179acdcac..d1bbf51688 100644 --- a/mingw-w64-python/0061-disable-broken-gdbm-module.patch +++ b/mingw-w64-python/0061-disable-broken-gdbm-module.patch @@ -25,5 +25,5 @@ index 6f4730d..4d8dc48 100644 for cand in dbm_order: if cand == "ndbm": -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch index e1cb567ad5..0597099722 100644 --- a/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch +++ b/mingw-w64-python/0062-build-link-win-resource-files-and-build-pythonw.patch @@ -143,5 +143,5 @@ index d97844f..9eed603 100644 # Availability of -O2: AC_MSG_CHECKING(for -O2) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0063-3.7-mpdec-mingw.patch b/mingw-w64-python/0063-3.7-mpdec-mingw.patch index 41c275ab1b..69e94e8e99 100644 --- a/mingw-w64-python/0063-3.7-mpdec-mingw.patch +++ b/mingw-w64-python/0063-3.7-mpdec-mingw.patch @@ -22,5 +22,5 @@ index 4d8dc48..d376299 100644 depends = ['_decimal/docstrings.h'] else: -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0064-disable-readline.patch b/mingw-w64-python/0064-disable-readline.patch index ea021eb7b5..c664008bb1 100644 --- a/mingw-w64-python/0064-disable-readline.patch +++ b/mingw-w64-python/0064-disable-readline.patch @@ -28,5 +28,5 @@ index d376299..1e4f9e5 100644 curses_library = "" # Cannot use os.popen here in py3k. -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0065-fix-isselectable.patch b/mingw-w64-python/0065-fix-isselectable.patch index 6f216b4115..b9fb64d39f 100644 --- a/mingw-w64-python/0065-fix-isselectable.patch +++ b/mingw-w64-python/0065-fix-isselectable.patch @@ -25,5 +25,5 @@ index 6ec2994..a80f195 100644 #define _PyIsSelectable_fd(FD) (1) #else -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch index e98f5858db..a7814fc886 100644 --- a/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch +++ b/mingw-w64-python/0066-use-_wcsnicmp-instead-wcsncasecmp.patch @@ -22,5 +22,5 @@ index c782e0f..83422d3 100644 } -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch index e6565a1d8f..4f90df2582 100644 --- a/mingw-w64-python/0067-_xxsubinterpretersmodule.patch +++ b/mingw-w64-python/0067-_xxsubinterpretersmodule.patch @@ -22,5 +22,5 @@ index 314059d..f26e662 100644 sizeof(channelid), /* tp_basicsize */ 0, /* tp_itemsize */ -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0068-sqlite3-module-defines.patch b/mingw-w64-python/0068-sqlite3-module-defines.patch index 34774e1456..ff96c8a37c 100644 --- a/mingw-w64-python/0068-sqlite3-module-defines.patch +++ b/mingw-w64-python/0068-sqlite3-module-defines.patch @@ -24,5 +24,5 @@ index 1e4f9e5..4433082 100644 # Enable support for loadable extensions in the sqlite3 module # if --enable-loadable-sqlite-extensions configure option is used. -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch index d879d15ad4..a03aa8ded5 100644 --- a/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch +++ b/mingw-w64-python/0069-configure.ac-fix-inet_pton-check.patch @@ -31,5 +31,5 @@ index 9eed603..d4bd1d1 100644 [AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.) AC_MSG_RESULT(yes)], -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0070-set-venv-activate-path-unix.patch b/mingw-w64-python/0070-set-venv-activate-path-unix.patch index 9b10d01599..83bfc6a190 100644 --- a/mingw-w64-python/0070-set-venv-activate-path-unix.patch +++ b/mingw-w64-python/0070-set-venv-activate-path-unix.patch @@ -25,5 +25,5 @@ index 45af353..877b5d3 100644 _OLD_VIRTUAL_PATH="$PATH" -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0071-venv-creation-fixes.patch b/mingw-w64-python/0071-venv-creation-fixes.patch index 3ac1e5811c..6475358d3b 100644 --- a/mingw-w64-python/0071-venv-creation-fixes.patch +++ b/mingw-w64-python/0071-venv-creation-fixes.patch @@ -66,5 +66,5 @@ index 6f1af29..83ba0bc 100644 def setup_scripts(self, context): """ -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0072-pass-gen-profile-ldflags.patch b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch index 53f792893b..7f1c393a8e 100644 --- a/mingw-w64-python/0072-pass-gen-profile-ldflags.patch +++ b/mingw-w64-python/0072-pass-gen-profile-ldflags.patch @@ -25,5 +25,5 @@ index fd3d142..8df163c 100644 fi -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch index 8297a300fe..f4af7a3055 100644 --- a/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch +++ b/mingw-w64-python/0073-pkg-config-windows-must-link-ext-with-python-lib.patch @@ -34,5 +34,5 @@ index d4bd1d1..da43ea0 100644 else LIBPYTHON='' -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch index ad02d6b0b1..a1dfba1c58 100644 --- a/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch +++ b/mingw-w64-python/0074-importlib-bootstrap-path-sep.patch @@ -27,5 +27,5 @@ index fe31f43..229d9aa 100644 setattr(self_module, 'path_sep', path_sep) setattr(self_module, 'path_separators', ''.join(path_separators)) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0075-pathlib-path-sep.patch b/mingw-w64-python/0075-pathlib-path-sep.patch index d40338ed5b..5ceed19080 100644 --- a/mingw-w64-python/0075-pathlib-path-sep.patch +++ b/mingw-w64-python/0075-pathlib-path-sep.patch @@ -21,5 +21,5 @@ index 7aeda14..a66e754 100644 pathmod = ntpath -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0076-warnings-fixes.patch b/mingw-w64-python/0076-warnings-fixes.patch index bea6879298..bdc146ded7 100644 --- a/mingw-w64-python/0076-warnings-fixes.patch +++ b/mingw-w64-python/0076-warnings-fixes.patch @@ -127,5 +127,5 @@ index 0ce5e94..6a6fe7e 100644 /* minimum/maximum thread stack sizes supported */ -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0077-fix-build-testinternalcapi.patch b/mingw-w64-python/0077-fix-build-testinternalcapi.patch index f88e61877c..c6703692a1 100644 --- a/mingw-w64-python/0077-fix-build-testinternalcapi.patch +++ b/mingw-w64-python/0077-fix-build-testinternalcapi.patch @@ -24,5 +24,5 @@ index 4433082..e52eacd 100644 # Python PEP-3118 (buffer protocol) test module -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch index cab5dfaf03..9d09c4b0a7 100644 --- a/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch +++ b/mingw-w64-python/0078-extend-MS_WINDOWS-flag.patch @@ -21,5 +21,5 @@ index e52eacd..71e6ea5 100644 MACOS = (HOST_PLATFORM == 'darwin') AIX = (HOST_PLATFORM.startswith('aix')) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0079-clang-arm64.patch b/mingw-w64-python/0079-clang-arm64.patch index 0578ec32ee..a7e02e047c 100644 --- a/mingw-w64-python/0079-clang-arm64.patch +++ b/mingw-w64-python/0079-clang-arm64.patch @@ -45,5 +45,5 @@ index adccaa7..b529e29 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch index 78f98299a4..bd3dc9030f 100644 --- a/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch +++ b/mingw-w64-python/0080-configure.ac-set-MINGW-stack-reserve.patch @@ -24,5 +24,5 @@ index da43ea0..2ca299a 100644 AC_MSG_RESULT($LINKFORSHARED) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch index e9413452d8..182766a40f 100644 --- a/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch +++ b/mingw-w64-python/0081-Don-t-use-os.pathsep-to-find-EOF.patch @@ -23,5 +23,5 @@ index b344f03..474ef89 100644 else: eof = 'Ctrl-D (i.e. EOF)' -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch index 11274d1f5c..9b0cd57d76 100644 --- a/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch +++ b/mingw-w64-python/0082-Fix-extension-suffix-for-c-extensions-on-mingw.patch @@ -178,5 +178,5 @@ index 2ca299a..11872dc 100644 case $ac_sys_system in AIX*) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch index 9bdfe13a73..ae930bbc2f 100644 --- a/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch +++ b/mingw-w64-python/0083-Change-the-get_platform-method-in-sysconfig.patch @@ -60,5 +60,5 @@ index b529e29..2d935fe 100644 #elif defined(__cplusplus) #define COMPILER "[C++]" -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch index e636e3aac7..ba011d91db 100644 --- a/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch +++ b/mingw-w64-python/0084-distutils-compiler-customize-mingw-cygwin-compilers.patch @@ -50,5 +50,5 @@ index 37feae5..bbe8e3c 100644 if not get_config_var('CUSTOMIZED_OSX_COMPILER'): import _osx_support -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch index 57283706a6..a7ebeee02f 100644 --- a/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch +++ b/mingw-w64-python/0085-distutils-compiler-enable-new-dtags.patch @@ -33,5 +33,5 @@ index d00c489..76a7d82 100644 return "-Wl,-R" + dir else: -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch index 319b672c90..ed6a0650f4 100644 --- a/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch +++ b/mingw-w64-python/0086-distutils-MINGW-build-extensions-with-GCC.patch @@ -56,5 +56,5 @@ index 4b002ec..7b2e1e0 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch index b3115edced..0ec187df6f 100644 --- a/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch +++ b/mingw-w64-python/0087-distutils-use-Mingw32CCompiler-as-default-compiler-f.patch @@ -69,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.34.1 +2.35.1 diff --git a/mingw-w64-python/0088-distutils-find-import-library.patch b/mingw-w64-python/0088-distutils-find-import-library.patch index b10bc84a33..ab906df1bb 100644 --- a/mingw-w64-python/0088-distutils-find-import-library.patch +++ b/mingw-w64-python/0088-distutils-find-import-library.patch @@ -25,5 +25,5 @@ index 1960ef8..39ad631 100644 shared_lib_format = "%s%s" exe_extension = ".exe" -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch index dedc2a922b..adcba21b97 100644 --- a/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch +++ b/mingw-w64-python/0089-distutils-avoid-circular-dependency-from-time-module.patch @@ -34,5 +34,5 @@ index 39ad631..5b281e2 100644 try: out_string = out.read() -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch index 74e525b7ad..9ec9220aab 100644 --- a/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch +++ b/mingw-w64-python/0090-distutils-generalization-of-posix-build-in-distutils.patch @@ -91,5 +91,5 @@ index bbe8e3c..80d3523 100644 if (not os.path.isabs(_config_vars['srcdir']) and base != os.getcwd()): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch index 34d0ec29eb..585a9bd750 100644 --- a/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch +++ b/mingw-w64-python/0091-distutils-mingw-sysconfig-like-posix.patch @@ -24,5 +24,5 @@ index 1c9d471..1dbdfe0 100644 # building python standard extensions self.library_dirs.append('.') -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0092-distutils-get_versions-fixes.patch b/mingw-w64-python/0092-distutils-get_versions-fixes.patch index 9caf681604..cae1c8a0f1 100644 --- a/mingw-w64-python/0092-distutils-get_versions-fixes.patch +++ b/mingw-w64-python/0092-distutils-get_versions-fixes.patch @@ -52,5 +52,5 @@ index 5b281e2..fba3485 100644 def is_cygwingcc(): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0093-distutils-install-layout-as-posix.patch b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch index 3b59e29c0e..fd0743453e 100644 --- a/mingw-w64-python/0093-distutils-install-layout-as-posix.patch +++ b/mingw-w64-python/0093-distutils-install-layout-as-posix.patch @@ -43,5 +43,5 @@ index aaa300e..c611252 100644 } -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch index 4017cc4d58..5b72d1a1c3 100644 --- a/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch +++ b/mingw-w64-python/0094-distutils-msys-convert_path-fix-and-root-hack.patch @@ -75,5 +75,5 @@ index 7b2e1e0..75a369d 100644 else: raise DistutilsPlatformError("nothing known about platform '%s'" % os.name) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch index 7614768fbb..6caf1d3a02 100644 --- a/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch +++ b/mingw-w64-python/0095-distutils-mingw-build-optimized-ext.patch @@ -30,5 +30,5 @@ index fba3485..bb97880 100644 linker_so='%s %s %s' % (self.linker_dll, shared_option, -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch index c48b100ec4..b8bc1fa804 100644 --- a/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch +++ b/mingw-w64-python/0096-distutils-cygwinccompiler-dont-strip-modules-if-pyde.patch @@ -26,5 +26,5 @@ index bb97880..c134525 100644 UnixCCompiler.link(self, target_desc, objects, output_filename, -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch index 0de5977b0f..5900a11f40 100644 --- a/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch +++ b/mingw-w64-python/0097-distutils-get-compilers-from-env-vars.patch @@ -157,5 +157,5 @@ index c134525..75bc17b 100644 + out_string = check_output([cc, '-dumpmachine']) return out_string.strip().endswith(b'cygwin') -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch index ad88994ceb..ff0b35aa97 100644 --- a/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch +++ b/mingw-w64-python/0098-distutils-add-windmc-to-cygwinccompiler.patch @@ -54,5 +54,5 @@ index 75bc17b..6a40e80 100644 (ext, src_name)) base = os.path.splitdrive(base)[1] # Chop off the drive -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0099-distutils-fix-msvc9-import.patch b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch index 4471e29f92..c94fb5b06c 100644 --- a/mingw-w64-python/0099-distutils-fix-msvc9-import.patch +++ b/mingw-w64-python/0099-distutils-fix-msvc9-import.patch @@ -34,5 +34,5 @@ index a7976fb..c341679 100644 self.__root = r"Software\Microsoft\VisualStudio" # self.__macros = MACROS -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch index 3c1e96b433..ce9e4cff95 100644 --- a/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch +++ b/mingw-w64-python/0100-distutils-mingw-add-LIBPL-to-library-dirs.patch @@ -22,5 +22,5 @@ index 1dbdfe0..1598735 100644 # building third party extensions config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch index 27c82b5fcb..6afcb8dae3 100644 --- a/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch +++ b/mingw-w64-python/0101-distutils-Change-the-get_platform-method-in-distutil.patch @@ -40,5 +40,5 @@ index 75a369d..5b51c76 100644 return 'win-amd64' if '(arm)' in sys.version.lower(): -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch index 3fb86977a0..2818a264c1 100644 --- a/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch +++ b/mingw-w64-python/0102-build-Fix-ncursesw-include-lookup.patch @@ -61,5 +61,5 @@ index 71e6ea5..badb119 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0103-tests-fix-test_bytes.patch b/mingw-w64-python/0103-tests-fix-test_bytes.patch index 21f99362cd..ab645dab06 100644 --- a/mingw-w64-python/0103-tests-fix-test_bytes.patch +++ b/mingw-w64-python/0103-tests-fix-test_bytes.patch @@ -23,5 +23,5 @@ index 227e6d7..193ce10 100644 return (ptr_format % ptr) else: -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch index 5aa4632cc3..864887ef3d 100644 --- a/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch +++ b/mingw-w64-python/0104-time-fix-strftime-not-raising-for-invalid-year-value.patch @@ -24,5 +24,5 @@ index df59f2a..ded8165 100644 PyErr_SetString(PyExc_ValueError, "strftime() requires year in [1; 9999]"); -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch index 0dac44e687..ec468c7d46 100644 --- a/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch +++ b/mingw-w64-python/0105-ctypes-find_library-c-should-return-None-with-ucrt.patch @@ -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.34.1 +2.35.1 diff --git a/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch index 489c1b42c8..a14ef32098 100644 --- a/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch +++ b/mingw-w64-python/0106-build-Disable-checks-for-dlopen-dlfcn.patch @@ -62,5 +62,5 @@ index fb90929..bfa18be 100644 # determine what size digit to use for Python's longs AC_MSG_CHECKING([digit size for Python's longs]) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch index 740acce830..f1ebc7e128 100644 --- a/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch +++ b/mingw-w64-python/0107-Fix-install-location-of-the-import-library.patch @@ -21,5 +21,5 @@ index 99bed41..14bd6e3 100644 $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch index 0dec35566b..484c60f53b 100644 --- a/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch +++ b/mingw-w64-python/0108-Set-MSYS2_ARG_CONV_EXCL-for-the-shared-Python-module.patch @@ -22,5 +22,5 @@ index 14bd6e3..35055fb 100644 --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch index 03dd7cfb99..be7f9ad3fa 100644 --- a/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch +++ b/mingw-w64-python/0109-build-Integrate-venvlauncher-build-installation-into.patch @@ -75,5 +75,5 @@ index 35055fb..498186f 100644 $(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \ fi -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch index b7e958aeee..bb240967e8 100644 --- a/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch +++ b/mingw-w64-python/0110-configure.ac-set-_WIN32_WINNT-version.patch @@ -24,5 +24,5 @@ index bfa18be..77982d0 100644 AC_SUBST(USE_WIN32_MODULE) USE_WIN32_MODULE='#' -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch index 9aa1de34c5..d973be1262 100644 --- a/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch +++ b/mingw-w64-python/0111-configure.ac-don-t-check-for-clock_-functions.patch @@ -32,5 +32,5 @@ index 77982d0..f986188 100644 AC_MSG_CHECKING(for major, minor, and makedev) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch index 5458f0415c..905e4d7c04 100644 --- a/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch +++ b/mingw-w64-python/0112-expanduser-normpath-paths-coming-from-env-vars.patch @@ -31,5 +31,5 @@ index 77f5614..5d1c6b9 100644 # Expand paths containing shell variable substitutions. -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch index f5283ac950..f9d7645c6b 100644 --- a/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch +++ b/mingw-w64-python/0113-Add-support-for-Windows-7-Python-3.9.patch @@ -173,5 +173,5 @@ index f986188..f5be44c 100644 if test "$AWK" = "gawk"; then awk_extra_flag="--non-decimal-data" -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0114-Commit-regenerated-importlib.patch b/mingw-w64-python/0114-Commit-regenerated-importlib.patch index 4e30f7e39a..27b16e89f0 100644 --- a/mingw-w64-python/0114-Commit-regenerated-importlib.patch +++ b/mingw-w64-python/0114-Commit-regenerated-importlib.patch @@ -2390,5 +2390,5 @@ index 6d40249..17f549b 100644 + 0,20,14,127,0,27,10,23,8,11,8,61, }; -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch b/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch index 387b3ee690..b729fc63e2 100644 --- a/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch +++ b/mingw-w64-python/0115-CI-test-the-build-and-add-some-mingw-specific-tests.patch @@ -585,5 +585,5 @@ index 0000000..70acbd1 +if __name__ == '__main__': + unittest.main(defaultTest='suite') -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0116-decimal-backport-build-fixes.patch b/mingw-w64-python/0116-decimal-backport-build-fixes.patch index b2b80683ef..ce37618528 100644 --- a/mingw-w64-python/0116-decimal-backport-build-fixes.patch +++ b/mingw-w64-python/0116-decimal-backport-build-fixes.patch @@ -31,5 +31,5 @@ index d80d791..28fd209 100644 sep = dotsep_as_utf8(spec.sep); if (sep == NULL) { -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch b/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch index c582e09bfa..6e5d0eace8 100644 --- a/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch +++ b/mingw-w64-python/0117-smoketests-test-that-_decimal-exists.patch @@ -22,5 +22,5 @@ index 70acbd1..527aafb 100644 import socket self.assertTrue(hasattr(socket, "inet_ntop")) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch b/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch index 65446951da..c4e048bda7 100644 --- a/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch +++ b/mingw-w64-python/0118-Prefer-sysconfig.python_build.patch @@ -21,5 +21,5 @@ index 1598735..82a21d2 100644 config_dir_name = os.path.basename(sysconfig.get_config_var('LIBPL')) self.library_dirs.append(os.path.join(sys.prefix, "lib", -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch b/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch index 15f15baa60..ffed3c27d9 100644 --- a/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch +++ b/mingw-w64-python/0119-distutils-remove-checks-for-ancient-gcc-binutils.patch @@ -256,5 +256,5 @@ index 9dc869d..f525ab4 100644 # none -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch b/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch index 3f31dbe044..e0e056e9ff 100644 --- a/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch +++ b/mingw-w64-python/0120-distutils-split-CC-env-var-before-passing-to-subproc.patch @@ -32,5 +32,5 @@ index 2804f69..6e22555 100644 + out_string = check_output(shlex.split(cc) + ['-dumpmachine']) return out_string.strip().endswith(b'cygwin') -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch b/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch index 80b9669158..0fe3859823 100644 --- a/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch +++ b/mingw-w64-python/0121-_testconsole.c-Fix-casing-path-sep.patch @@ -30,5 +30,5 @@ index b62f21c..c8b9593 100644 PyMethodDef testconsole_methods[] = { _TESTCONSOLE_WRITE_INPUT_METHODDEF -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch b/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch index 77fbb0694d..d9cfcddf57 100644 --- a/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch +++ b/mingw-w64-python/0122-Return-consistent-architecture-markers-for-python-on.patch @@ -65,5 +65,5 @@ index f5be44c..81e94c3 100644 AC_MSG_RESULT($PYD_PLATFORM_TAG) esac -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0123-distutils-add-back-gcc_version.patch b/mingw-w64-python/0123-distutils-add-back-gcc_version.patch index a6ead317b5..3703f98e2a 100644 --- a/mingw-w64-python/0123-distutils-add-back-gcc_version.patch +++ b/mingw-w64-python/0123-distutils-add-back-gcc_version.patch @@ -34,5 +34,5 @@ index 6e22555..d8c8428 100644 shared_option = "-shared" -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch b/mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch index bd820ddb5c..9e8b1a5b1c 100644 --- a/mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch +++ b/mingw-w64-python/0124-fix-mingw-cross-compiling-in-setup.py.patch @@ -43,5 +43,5 @@ index badb119..2d07ea3 100644 os.unlink(tmpfile) -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch b/mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch index 0b687910f5..ba708ae4b7 100644 --- a/mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch +++ b/mingw-w64-python/0125-Use-actions-setup-python-for-setting-up-correct-vers.patch @@ -32,5 +32,5 @@ index eb27adc..ffd6ecb 100644 - name: Build run: | -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch b/mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch index b780e10db2..2cfaffc4bd 100644 --- a/mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch +++ b/mingw-w64-python/0126-Fix-buffer-overflow-in-Py_GetSepW.patch @@ -61,5 +61,5 @@ index 222850b..7d75216 100644 return L'\\'; } -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch b/mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch index 0414138715..a8a7e5ff87 100644 --- a/mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch +++ b/mingw-w64-python/0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch @@ -38,5 +38,5 @@ index 7d75216..d47cb6f 100644 } seps = wcschr(name, altsep); -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch b/mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch index 32b7e929e1..dd7ebad5e9 100644 --- a/mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch +++ b/mingw-w64-python/0128-handle-ncursesw-pkg-config-when-cross-compiling.patch @@ -59,5 +59,5 @@ index 2d07ea3..7ef50e9 100644 # _curses_panel.so must link with panelw. panel_library = 'panelw' -- -2.34.1 +2.35.1 diff --git a/mingw-w64-python/0129-Use-CC-instead-of-cc.patch b/mingw-w64-python/0129-Use-CC-instead-of-cc.patch new file mode 100644 index 0000000000..2b54d509a0 --- /dev/null +++ b/mingw-w64-python/0129-Use-CC-instead-of-cc.patch @@ -0,0 +1,25 @@ +From b9d24754cbc8c3c5587164e98554103c1ffc3b3f Mon Sep 17 00:00:00 2001 +From: Long Nguyen +Date: Mon, 28 Feb 2022 00:06:06 +0700 +Subject: [PATCH 129/N] Use CC instead of cc + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7ef50e9..36ecc3b 100644 +--- a/setup.py ++++ b/setup.py +@@ -722,7 +722,7 @@ class PyBuildExt(build_ext): + add_dir_to_list(self.compiler.include_dirs, + line.strip()) + if is_clang: +- ret = run_command('%s -print-search-dirs >%s' % (cc, tmpfile)) ++ ret = run_command('%s -print-search-dirs >%s' % (CC, tmpfile)) + if ret == 0: + with open(tmpfile) as fp: + for line in fp.readlines(): +-- +2.35.1 + diff --git a/mingw-w64-python/0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch b/mingw-w64-python/0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch new file mode 100644 index 0000000000..9ce5237c9c --- /dev/null +++ b/mingw-w64-python/0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch @@ -0,0 +1,106 @@ +From 5574284f68f8014dee419b9bba1dc5a18362562e Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Mon, 21 Feb 2022 08:16:23 -0800 +Subject: [PATCH 130/N] bpo-46811: Make test suite support Expat >=2.4.5 + (GH-31453) (GH-31469) + +Curly brackets were never allowed in namespace URIs +according to RFC 3986, and so-called namespace-validating +XML parsers have the right to reject them a invalid URIs. + +libexpat >=2.4.5 has become strcter in that regard due to +related security issues; with ET.XML instantiating a +namespace-aware parser under the hood, this test has no +future in CPython. + +References: +- https://datatracker.ietf.org/doc/html/rfc3968 +- https://www.w3.org/TR/xml-names/ + +Also, test_minidom.py: Support Expat >=2.4.5 +(cherry picked from commit 2cae93832f46b245847bdc252456ddf7742ef45e) + +Co-authored-by: Sebastian Pipping + +Co-authored-by: Sebastian Pipping +--- + Lib/test/test_minidom.py | 17 +++++++++++++++-- + Lib/test/test_xml_etree.py | 6 ------ + .../2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst | 1 + + 3 files changed, 16 insertions(+), 8 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst + +diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py +index 1663b1f..9762025 100644 +--- a/Lib/test/test_minidom.py ++++ b/Lib/test/test_minidom.py +@@ -6,10 +6,12 @@ import io + from test import support + import unittest + ++import pyexpat + import xml.dom.minidom + + from xml.dom.minidom import parse, Node, Document, parseString + from xml.dom.minidom import getDOMImplementation ++from xml.parsers.expat import ExpatError + + + tstfile = support.findfile("test.xml", subdir="xmltestdata") +@@ -1147,7 +1149,13 @@ class MinidomTest(unittest.TestCase): + + # Verify that character decoding errors raise exceptions instead + # of crashing +- self.assertRaises(UnicodeDecodeError, parseString, ++ if pyexpat.version_info >= (2, 4, 5): ++ self.assertRaises(ExpatError, parseString, ++ b'') ++ self.assertRaises(ExpatError, parseString, ++ b'Comment \xe7a va ? Tr\xe8s bien ?') ++ else: ++ self.assertRaises(UnicodeDecodeError, parseString, + b'Comment \xe7a va ? Tr\xe8s bien ?') + + doc.unlink() +@@ -1609,7 +1617,12 @@ class MinidomTest(unittest.TestCase): + self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE) + + def testExceptionOnSpacesInXMLNSValue(self): +- with self.assertRaisesRegex(ValueError, 'Unsupported syntax'): ++ if pyexpat.version_info >= (2, 4, 5): ++ context = self.assertRaisesRegex(ExpatError, 'syntax error') ++ else: ++ context = self.assertRaisesRegex(ValueError, 'Unsupported syntax') ++ ++ with context: + parseString('') + + def testDocRemoveChild(self): +diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py +index 23c4cd5..142ce2c 100644 +--- a/Lib/test/test_xml_etree.py ++++ b/Lib/test/test_xml_etree.py +@@ -2159,12 +2159,6 @@ class BugsTest(unittest.TestCase): + b"\n" + b'tãg') + +- def test_issue3151(self): +- e = ET.XML('') +- self.assertEqual(e.tag, '{${stuff}}localname') +- t = ET.ElementTree(e) +- self.assertEqual(ET.tostring(e), b'') +- + def test_issue6565(self): + elem = ET.XML("") + self.assertEqual(summarize_list(elem), ['tag']) +diff --git a/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst +new file mode 100644 +index 0000000..6969bd1 +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst +@@ -0,0 +1 @@ ++Make test suite support Expat >=2.4.5 +-- +2.35.1 + diff --git a/mingw-w64-python/0131-Avoid-using-sysconfig-in-site.py.patch b/mingw-w64-python/0131-Avoid-using-sysconfig-in-site.py.patch new file mode 100644 index 0000000000..995692e529 --- /dev/null +++ b/mingw-w64-python/0131-Avoid-using-sysconfig-in-site.py.patch @@ -0,0 +1,62 @@ +From 6407bc7c4a164ecb35003748179a8d69c6ca65ef Mon Sep 17 00:00:00 2001 +From: Naveen M K +Date: Mon, 14 Mar 2022 19:28:06 +0530 +Subject: [PATCH 131/N] Avoid using sysconfig in site.py + +This would significantly decrease the startup time. +The importime can be calculated using + + python -X importtime -c "" + +Just like other things, _POSIX_BUILD is also copied from +sysconfig to site.py. + +Fixes https://github.com/msys2-contrib/cpython-mingw/issues/81 + +Signed-off-by: Naveen M K +--- + Lib/site.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Lib/site.py b/Lib/site.py +index 474ef89..548f9d7 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -242,6 +242,10 @@ def check_enableusersite(): + # + # See https://bugs.python.org/issue29585 + ++# Copy of sysconfig._POSIX_BUILD ++_POSIX_BUILD = os.name == 'posix' or \ ++ (os.name == "nt" and 'GCC' in sys.version) ++ + # Copy of sysconfig._getuserbase() + def _getuserbase(): + env_base = os.environ.get("PYTHONUSERBASE", None) +@@ -251,7 +255,6 @@ def _getuserbase(): + def joinuser(*args): + return os.path.expanduser(os.path.join(*args)) + +- from sysconfig import _POSIX_BUILD + if os.name == "nt" and not _POSIX_BUILD: + base = os.environ.get("APPDATA") or "~" + return joinuser(base, "Python") +@@ -267,7 +270,6 @@ def _getuserbase(): + def _get_path(userbase): + version = sys.version_info + +- from sysconfig import _POSIX_BUILD + if sys.platform == 'win32' and not _POSIX_BUILD: + return f'{userbase}\\Python{version[0]}{version[1]}\\site-packages' + +@@ -331,7 +333,6 @@ def getsitepackages(prefixes=None): + if prefixes is None: + prefixes = PREFIXES + +- from sysconfig import _POSIX_BUILD + for prefix in prefixes: + if not prefix or prefix in seen: + continue +-- +2.35.1 + diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index 62bcfe3fa2..73a0b6ca12 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -22,7 +22,7 @@ else pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi pkgver=${_pybasever}.10 -pkgrel=2 +pkgrel=3 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -175,7 +175,10 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0125-Use-actions-setup-python-for-setting-up-correct-vers.patch 0126-Fix-buffer-overflow-in-Py_GetSepW.patch 0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch - 0128-handle-ncursesw-pkg-config-when-cross-compiling.patch) + 0128-handle-ncursesw-pkg-config-when-cross-compiling.patch + 0129-Use-CC-instead-of-cc.patch + 0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch + 0131-Avoid-using-sysconfig-in-site.py.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -316,7 +319,10 @@ prepare() { 0125-Use-actions-setup-python-for-setting-up-correct-vers.patch \ 0126-Fix-buffer-overflow-in-Py_GetSepW.patch \ 0127-Remove-unnecessary-strlen-in-Py_NormalizeSepsW.patch \ - 0128-handle-ncursesw-pkg-config-when-cross-compiling.patch + 0128-handle-ncursesw-pkg-config-when-cross-compiling.patch \ + 0129-Use-CC-instead-of-cc.patch \ + 0130-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch \ + 0131-Avoid-using-sysconfig-in-site.py.patch autoreconf -vfi } @@ -413,131 +419,134 @@ package() { } sha256sums=('0a8fbfb5287ebc3a13e9baf3d54e08fa06778ffeccf6311aef821bb3a6586cc8' - '60650cee2336a38745531e0c471399ecfc368700f4d28793797c302c3a50a566' - '168a439e7aff58ed3dc8f373516ec98eb30913fc1d2f221179c203089b0edcf5' - '38224674f5c5ffb0091823c383fe01a984df8a1ad04600d2ca8626bc56686b30' - '09840437dd5ef3a7f95c8b82f0b848bf3b6013a75935bd7e860514a0d4816776' - 'a08b996f85450f6d0034e051319f2f251378cbad731758fe41b95a8a63d8c114' - '936f53654f5bb61ba17b1865890c19f265985355396ac6cf44f868809156178e' - '86c7b3a2900c8c865caf3822cb6f386e364c621df762778087238cd1dfeae5f2' - 'b7fbbfe4ee8427a1557e03ef8a882063c9c4442ad2704a5b1405bc0887a63bc7' - 'f9d8304547f4e78293c96ed19038a7204520797a337a97ff8adc3e46deb1c772' - '5fc51578040d4d2b6ba30437a882b62a850bdfb6cab5a02e2ab073d47c5a2727' - '3451df1a841470d5441644acaec1e3fa2a68c505c93419251ddeb673141f8297' - 'fee31a78904b3728e548a64af7172100f97b4f61db26b02b31f7ae3f4ee0d17d' - '86867a92b3d230bb6167c04fbb0fcd479cd85823ecda49cc59490c6afae9c900' - '3cd374775817ff1c345bb04654df07d3e363a3e3513dce19969b4710343da048' - '5c3b83875f9bb96dfc46db2876fd11f52ff11b7ee419ab3117643527b2f7e752' - 'e1f4bf7ee19a132682088bd0afebf4e38fcfe6f61f7a068a2bd8384036f986ad' - 'e6a813338ff07bcdeab6a9a2cfd448a6abe85f9407e6f294ea938b53ece9f916' - '8fc1ca5cc349f0101bcb6411c6727b4510f432ac449fff35941f34d6f3b30846' - 'bbe154f44ffac46b365c9100d1fba385d9fe727ee9698ce47684c82cc2c2fc0a' - 'd07b44e0461147d4b1fac4cfe7d49f95ecfe19f7e872e93c02653620b378c1ae' - '111d535b6938515b2fe66bd0870e09f7e6110bfbd53b2b896f435de93672ba9b' - '49f98bd4b4cb2bf26d40fe53918ef4b8ea5f366e077e24cfce265004d9e5e813' - '727968284fa21a92dad810e444091350fac9b34aca29f772e67f6ac47e74284d' - 'a5bbaafc5eed72346f618e2d3642109f31f1e62d8025fa5ccd2a73853fb81f64' - '95883f9bdb8b1ba84ca02e803c1aac662bb63fe3c35c18f70a1ffee07db2e760' - '7fd66c363e37673a90189efc832647834bc2b4021169b0a4c2c3f553e2aee252' - '418cdcca9196bb396b2c2cbfaecc54ac4858c5aaf040d97f00cd2e8fbc2101bb' - 'b467817f1b44c14ee218156a1d39007d96bbf924e8d784a97ee6247c09ca7790' - '88c22e47524d5ee5669d0fe470863a9e602d6f033225575e07d0e40069b96021' - '95cc396fcb39ab9cd8b0ab0118a2aab680ffd780e4223738ae6096b45637c103' - 'c4e5ca79353e3138cfca40d8e837436e0391b8a899ef4fbb12b7f8cfae70685a' - 'bf9bb6ec92e57f7ac8b8036dce564937319efe9bec789e90c9e5f535cf199a2d' - '7642ef2113842a1d5b82d4e2975c3101d0e8a7cfcebb21618f42b99b7346710a' - '04837a3b9a35f5ab49ad5f96a292565aaa27d3b377e6c46c41764373156235c4' - 'c1918a148aeb2c55139cd08c27974ba6edd0ef0248474a739c27ddb0e7fdba27' - '493ebda56669d48c756cd499b6eda43b975a71a3a04aef50949e8afdb31ebb64' - '927cf53ad8053cf04c670925dbc7ba70c98de33a1d7830c4e3f6242bba627e72' - '7aa0e088de3f7d5ed56de08e854b0ccf7447587c031b291cb70385314ab23049' - '782d5705129ce4432df35377cd8143a83111e03c2244ed7cc4bdc44d6ff07856' - 'e2e46ce6a0ee1dc7b88875a01be16ac8d142c8b588c5e434bfe6663c90ddf2df' - 'e3be03dc47acd14dd2f2a730c6dc5518f814d5841d62abea6a0b48efa06a4228' - '8e5a3171da2c2b3c771b1855b7918b7326c872de7fa0d14bcb65608837cbeea2' - 'd7798e45c09f0fd38c123e7ca5224ea2554e758a6d870347c5fef6edc50b6c6d' - 'b35baeb182ce5193613029602c3975f8df62ff2914329baf2c09d3b615620b2a' - '4fcb2f83b721e0529ce89fea66728b416f703caa49e2c169f9e23c9a60e34592' - 'a9b1a3956f208db9fff439a98535c287385a7f5e2631a4181582b8ae72a9c589' - '92a9af8ff4295279cf647c01d84081696087d9f5af33f06079c5f5594a71b983' - '7f89f54f228e93e7214a4c63fef63fe6114afae7e0645e2b89c1ab4b18c36403' - '09793e3629c2e173a034e0bdd182d2d71e26675434951356839a241d0094f3cf' - '6192d280c42f769e9ed78dcedf853e3c8f0bc8d3cc55238f0650f3699dc5c71b' - '8811fc1885cab84ec168b75af75a1aa80a889831d750403a78701ba953171369' - 'a275aef09e2d1de2f3a86146dac64fc43c67a4316c2d357e373da9fed6da58a1' - 'ca05645a9a11218dd5af61dd29189d4987ac73835df2fd2fe2584c50b11e3a53' - 'e98878ba09845b99b1126b62fff9bff287a971a5af7a4a40d725652144e9a929' - '4b0a7a3af45c5c3de5dfc2d4f8e22753f74dccd683ad11aabaa9efa4f71124c0' - '5066a8e32ede96a77b012295169620bfe5e91b6976fd6688a8d014dc007c6f07' - '2ab1246d675e3befd23c666eff2d691986526f8a07ec8932876b762ce877a668' - '941cd99a3ce9b345af8bdcd2b260a49fa161575ee365e56e8d5074b399b33798' - '76e840d422804f01bac1b51e936b1626b87eb867f624245aa58864706186aa81' - '8723dbd000deff073a02c6823236dd207d524e7951fdeebe961e5c2f5e29ba21' - '7a80ff908bf9a5e82c5664550a2fd259b037ca21cdb56aa081ff73ac0b15edf2' - 'd6c23fe6707926d2e0184b3f680766fcb669e2397157a9366405e9350addd030' - 'aa562c7b20d64175fe191cd6c00eb4550aa5d48e00031d45be67f9bea69279c0' - 'b5631dd8f2f4fafdef0c3d0becb33d63021f334fd2451c9ff4b527e6780736df' - '36c7ca7815354e5765c0cf4b16d9a3a83b55261d0a731962c7fdde5f6912a14f' - '271aada30e4887a290c3532bdc4820d58b2424f7866ad8374840d26e338765c2' - '64eb809b66e4ee7bfd8aba878e6fa4ad037eeb79c8d1c1efc7a0c6a39c61d0a0' - '586cb55731714973d904e071be3a161d21d3e99a8a18f4f266068a511e739ef8' - 'b453a6e53f3c1f0d1fa1b30e1114303123ba6a2399eafd5e0d80da1eea859042' - '1948e440008606c888957a85511b53d88ea8f7a13860bf6bb8429f8362634730' - '8dd42da695f2e43be5c39a68ac9d2ef7af93604e23c9aaaf55514db546a57708' - 'acfdc04626e7abc18f0b1894a80dc0761c1a62d37652dcc848c6efe952126d50' - '0391bb4743bf857b0cfeeac44e3fd8aa4a776e5478ea7d770101857c2bc5c498' - 'ec9091d2e7bd09a6ca5697a5f443bbb1635d63b43711e08e1a9e3f76cd66df2d' - '96ec270e675c1b0bce7d34fe86b92cedbc55d646a83f09935753f9c9a7622f00' - '6231ae6c6b94609a03c8c1eed0ed447693f3fa97e9550cd5ac397ad4ced82c09' - '10a186d35345e5873de3f3d5e731f4947028fda015d074069873788d4bd8ecd1' - '64fa589875de2196724977007e3bff8f1c9d0511d1ec3f4b56b02c5deb5072ba' - '80d92890d9439b47e776025e6431f192d6f87957ff90e418317946d72ad35d6c' - 'be9c9a3f04d690547c9590263b946d2be1365beeb9d913b6c7c3394f996bbf1c' - '671d2bc567f0db768d9637df3500100274e82357469f955285ad0e0165142d92' - 'cb33fae278f56414e0f4596982fc587e3588c53c8ea63e9bfe31f0ede848f8f5' - 'f1c09484198dbea759f597308d7c546c3b282441f9e53e9bc69b15030c80694f' - 'fa3f0bbaeed5ad5a9a55cea1e18c68364588156f8181afe7eed4278adb87416a' - 'dc319c34eab5dcb0aaa226439fa9c9958c791aed2228d8711af71c9559654c95' - '40a306f53d80f2086652eb6f89675587fb91f807824a2a830f28dbd744081b68' - '5edf62f1a5058b116804d1d9a794d2773573c918d9f0bf5d8697554378c39979' - '273df9944f409f39d64401f4f69360a434d09e382bf4d86892861e2fa86b2fb6' - 'aa818920ce83da07cd1108815172984b883af39486e017be5fc3b7d08f5dd155' - '190056e7b1258e6ad8e04ebfcda863d6dc9e52449a874fa86629d0b3650d09c6' - 'ead7b75338b7ca9fbe76f00d861bfb6a7eed0269b6d514565564e82873cf29ef' - '40891b0fb8e73d197a5be3483009dae171f4014c6fff0b6d38260ec749868430' - '077e86394f2297498d0bb0e31ca182378eaaf6ec4699fe0825825714a169e486' - '16537dc7c2541e6630d3940fb1621a2fddac23c635432c100417b9cc017c1744' - '9ab5e7b9779c37d97d3fb8721d075ca7218e91d7f33614e2a6fc543cb2fccebe' - '8fffbcae11339fed8bc5db8461bf33d1a21731472307095d86ce89bb70efae39' - 'fb20135c52b2d31099413e4093aa0176eac5bb8f4aadae44da9953abf99f4808' - '60203aad4248ebca91082b2ab026255adfb91b3e97ae91517c987038463ab5b5' - '27667a57d9d92c9845d75336e7edb181b3259da5c35503ef4b318e6933662568' - '7c85cbde9d63d48f30411f8586f13e7193445fb7e23cd2a4e526a00f4036153d' - '6fcb445cfb69bf303cbf218540090cb5bfcb3912ed34c9da379e2c8ddd62d02a' - '67adb386399de2a6e1ba037b43bccc03525c34af0d2a108e062f33ee834d592b' - '4be9c3edd0c4ede5e987e7a0ecd9c0c5d9268f9e0a0218c48246c1c7b14bc92e' - '9bd54319dee4744f96dcd2af76293772a4c70c28fed217c704209f69d070647a' - 'c6bf66856da49ea29d8e3a6abb8a998a4281ecbf012e205f6d950dc50b417507' - '3db41a2f58ea08abfa56269c3385c4c88c28e7f5f3d8705cea1e23f2882ec84e' - 'd6146f24a1318b7a110d3670b425c44288cfb70ea9289eed991ca887afef8bd3' - '70ea4ad3da593ffe72365fdfeada65e93d1d4abb738513ecebd463a79ee5ddf7' - '83d522bd0cfd1b428f77d3ba9e3e96372c41c30ee6355630697cb97e17016cd5' - '026719b4a09d296a4fc6bfb46137674f10915cb331c38a2914344d549fdc9277' - '1e29a61bd6af94ede2f02aa9cd30f827b5323b13d47350d3d799b9af9acc49c5' - 'b5a9ed1d214ab2e60c7e8db29dedcf8a19a9aad3f333016478368fd8edd34f29' - '8006557662ded0093128676c00d79e77a91d383634a88d3fefeadaf9442001d2' - 'f0e2052e660c25997c096e4364d1c6f257d7f2dbd2631f18505d0a009535e92b' - '8ede2976cabf1f5bb0892b5682db4992c0551f44adc547261a4553b53169ed2c' - 'c1544e7891eade882aeeaa4086255b31a9026891d87868705f3713755c084eba' - 'ec48b3816cc73080859c2252f1ce6a6a9f15890b15e133d07a69191f7d68da33' - 'a300004ba6b22874997c93cbf6e1f9e8eb1b6b286c464bfac4d02f4974d1a5dd' - '7cd30e9a8877c03ddcbc306c444e3080b6f6fc1b4f8e037c0d9f61a322b77264' - '8a4b437f2d077a184743c2c628d92ac2d87cae3b16aaae73c0a5ca1aa5ecdaff' - 'c81ce6b1924df5cee69d02694abbf198e8050d803e5d009df16d557cb3607414' - '9bd3388aacac702ff3f73fb6d076ac91e5a4775e9317ac4d683100f38b9db62e' - '04318674b0493d8f844bd1792209615e661ad702f3aacb10f2210458c99e1cfd' - 'e77aab9e9bf6c070c9c51b85d20d2ab35e227fd9d214a928c70ea1bbc3a5c1d9' - 'b89e281b8ed5e036ed76b8fe1dc4cca27bc53181c1acb844a546fe33a862d782' - 'df7751b5e4d4973f6610dcf4b069395e0cc91c5f23842c54deb9ae31cf1220c9' - 'c190aad285352d3084052b1dee2dfc5637b4d3c2b9826cea0be59f92a23eda05' - 'ee691f942441376b359abe8ee42cf5c915a51c69b8b73a0a504dd978bdbb519e') + 'd015c8f1b7782dd042d88790ac634c1ebb4283cf7110b17bbc883656d6059c09' + '18fabe1a590cb237c69adf7d40c5059c194bcf6ee7e6e46c9e395de1b42862d6' + '28cfc9c6f8568431a6e4362871d291c834154346e13100a09f7a834ac02ac934' + '18da18072809c9f2f4d40cb0f383a4ce03e5ee9e18271c3fb1fb59930d0dd68e' + 'd3fe7b376f947da94e2f483804a7237aa5d23f88af031bb0afe564e889e772c7' + '247be25ac1da1aa12a5ebed2a2bf84d069d07b1cd6bc19c9439e6e14beec23e5' + '13bb9c614812f41b9565479d0d4181b542edaf2ca0133e1fe47c964287978cce' + 'e289681d83688509f58f5584f676dd60480168b4ab28fe06b30dd678f5251c5a' + 'da18893625bf9505cc9ffec1fee8388acf53837aa029ffedd021e757e8f6ebdb' + 'b0065b6a77f99c465173e61da4dbb7c2d2204c7c8ea95feb7afbe7452a386b93' + 'eb35ba3f9f6427ae76d9235287244c6b66be0e4c2f47d678efd775f3987d27bc' + '1c95e8b11e8e9f5052300ae7a92cfcc5b76ef8f72bab5a207c331c90184bd8b7' + 'af5afb67ce5c01510b961d96a8990df533d6c7a04cd83e87c4f2e2abb3bb276f' + '227f4e10d65bf2bd6603d2552e741ed69ba15f54a7e95013c327d22033bac600' + '9a104481f1409088364912226e6d88d0c13f7f21315fd1831ea025ae1747c774' + '64fbca98ca973f0af1762080beb6d8be0bc54075edab4548694129522f9560aa' + 'a9a051a9186a1ce45ca48970dcc7fe09b518834acfad9a6edee6cc16b362d299' + 'a795304cef268c8c399a77d524b95cfb117e416832601348a34cb6ca7274a87b' + '5e8ab863e347f63d647427506192bb257547a16df9d9e30e31053a47800ea4c9' + '13f266905720b1d7ea4dbb7cf5f27d66ac6b98b7abff321394fca6f29a7fc24d' + '2f101a5b4187aca54ce7dce6b0e85ecde876391bf947b27afb33fe0cedc0185f' + '17c0841488e4d738ada5e9d41a90e136ebb5dc8a7f371af5efb3b81f149ce2e1' + '172f91ecafa543bf8658addf597b5cb09bc2cc14533f40eb44d474f3c48b6e1f' + '4e997d24b9316c92a88cfc12b9f2026699885d37ccc088b2b6c10d02e022ff0d' + '27ecb2622ba7c3f657fe2caa7608026d4c8f63e03d5ea25cfba593991add8aae' + '204068dadcd59c505c484930011615012294d4a09af23dc8b9825873aa0eb20c' + '5a162b6c1480edea61ec210ee6b5ac925de3c1c2c439f20aea7350f98f0d799a' + '150d4e66e96aafd8bae63892f29b0dec50ad49c5240b0a9bdbee1885b4aeb9e0' + '4684c16a7d1c801fb8af78a4876f81240477c2505881576e70f63a6f59126913' + '5451749a486473c61af78e50992d27d02d4daf24298102361cb81856f6350da9' + 'f88a5bf3aeb7b8c735b8b3aa5fb175595dbdba41b45a86de81f86348383b632a' + '70fda94e79237055b16f0bb92e0f3db7c3c270e1fd856f038f76751b8dd0badc' + 'e35941104c255b0eba67b56cfbbe820597a734c6f95e1e47dedd8ebd069d6a00' + 'd129bb499c2e85c88230031eec1bf49991886476f60f3fafaee64da74062a942' + '0055aef37cd6bede3dc1c4e3e813a1472388fff613363df29828788ee4d0e6e2' + 'd46807159a2ccca90d52b6017895f64ec87828889014bfd17a800635b757bfd2' + 'ee447eda2bd569ca251cbd6db8eb1e51a6033559b7d3776a616f414251b394fe' + '1e7ebe7c0b19560adcc74e874bcae51f1a36603226e2be4deed2d480bbd08394' + 'fc6a82de484864eed4d6665d2da8e67c8f00cb2099596ea728cfa3a6301a5b33' + '074fa533ee2fb39d37643d06f63d47edb686103b69c3b723c2517097f96229de' + '6941394f6a642a14c748e3b9f10845c84809536025c4f63d8ec0bf0990b72dbb' + 'b7dbcc7df5afe00fcac50297454821ecd11b989eca0346fe38163a7e234bb615' + 'd2b34e89e9d8ef866f2d72f96d70c166d2b2bd7b4cf2a7184f365bca2d5b555c' + 'bd3ac027feb83f48cfe79d8a733c81087d6b5bc1715b0a2aecfba5e87f14ee8d' + 'e3aa3f83dc29066f93728556a2300a6532e8c22f3b0181b26f23ffd7c5e1c0b8' + 'aa5069a15af381781ebf6d3cdd6cbdceeb73c68e0e93d8e6b8215603939770cb' + 'c5cc32739a04da625f6004130b8895e336c296adb0aae4df84dba43052cfbfc1' + '778cbde3c974788e28b052d760e6a0f2fa4bfb5278052249f6e0b50cc038f341' + 'a5740ca0866d5cea2f0c41243c993cd56992eaec7bef4814e855e41edc77b85e' + '81dcea28ea7caaa28eab6912e4b205986b39e05509dd06854bd0b51d1a5d414d' + 'ccb716bfa8d4f02acc47f0079a8ac1040011ffaa1463c222339434ff51f649d5' + '89151bdda848d1123530a4fb10d270edd8b84375e7bc601c0297661fe91ae6c2' + 'bebd4c117d73cbdceb75fdf1b4c79c21b441246bddfc13e3180b4a87f8142ca8' + '97fc7b8a06262743f823ad7d93374d2f0f37b0ca656ba519af9603857a789b5d' + '6572177ebe5dc25ce7e44b5ba0ee70a88c97ddb317a0798f01527b536f7ecf57' + '7f1b6b28204a68ba1f94090d0d99916b50513e622de3d57ec28d1d6db948722a' + '7e5bb71cd10a6811d879b476739a5cafeceb9462415bef589f3f472d8b10ca3e' + '7af77954afb59a30e6f7db996777c960e194296230507c2471b9f9f220e3bab9' + '2b6f55dc7ea548107dea1ee2a76348de0848cf7325ed992025fed1cb5c86c6f3' + 'd500c647342b9058cc1baefedbfea8734f57d9d6263c664ef27075463feb731d' + '40398e60afa57c9e6f8c1dd3057c92312b5acc922df138180a6b6c8a3f68eedf' + 'ab25090c8600b1c404db7127c44b7bb1d352586ecb3d7100785a93622cb31688' + 'd02d12eef13e81d0187ee7e59ea397045b27f5fe592ebe06af13c8c2a1160530' + '909a403767568b3738ef7ee1526b3795ae9a2a1f170d9642e2a05fe370dc1e46' + 'd9da3f41dafae6cfaa3fe7384b11d6eaf428efe5c00d0a2b71350b3beb713c73' + 'e4ab3b7242cfbe389c9258ab1fd4b9d7ad7644567a3320b87df01766e0212750' + 'd749504f525266e861cf99603d4e41e7fc3d61c58cb033604bbf3c7775b4cde7' + '4fc35baef4e9a6dbd39a2db5fb502ccfdb9cc831c5b2ba7971a0785531a03564' + '404c1f5f8c511bfe9140ae36785243bf1ef8d0d25ae8633d050d70ac15bc5d58' + '293c0b89ef7ab6cd2b33c560ee5a6f6640c3781b43edde76eca6be6da4143bec' + '09203c49c7265b9fc966c05094614064f2b93a8ccc3d036aa97b5e4a196b68b9' + '0ec32686b1e3be25dbdf38982efd5118d61c96fb13933b93d117fc2a2a1f04c7' + '42ee4135a2c499a43dcc3a04f4dde9cfc091b1e5947a10c19d8a70d0debef458' + 'fb03d7482d09e9dec1fce65e3355989a8d25b279da1b2637d354055fb8748eca' + 'f746e1af86e1ec4d81f05c5b0753c7d14d6bdd8ca3c5613bfa78b5c2f448c65c' + '71f7f195df7bacaccf9ab00edb84c70fa93b9cbb9895fe2fe5709bdc7645329e' + '8adba3232ac86417740f2b43c1d2e6558a5dfa43e148600d2b6c927d4de66e66' + '847b0a6fd389d2e1a43b13aae1f4dbc8d76997e19842f96201bb71ac2dff1f33' + '07b190fdc678695869892fb15129b47c1b82a39f57f4cab46c5e2a578e98b561' + 'babbe72530caad3a64c7a6db0417cadc1e77bc4b61882a5befcabe3f756200f7' + '7a508e44574faf505d2fb3379572537fdb2eb8c01e334a6cb1c9a9fd5edc5849' + '079c2ba1248ddcdad93f939d0286d281281526d7fc0b3fa33781fb4bdcb39541' + '97dcaff965fa7d1415e0dcf8c0f4859d4a0d9e8552bd931f24eb592f33b1335b' + 'ed5ff1d030841dcf6d08d354f40bbb83972c0a5925ec9d5aebea31f990981978' + 'fb548e8afa05537427d46c4bca7eeb10770b94864c9c2f4b111a5a189f33b834' + '403cf8f69605f2a8c13b91ca56c8ab77916c423a3d3ad8d2173891598785f6aa' + '9d96d38184caa6cf3c23ddc405d5d6c7341bfb49ecf6a52d75befb5d899635b3' + '4f0e1ca9f7d05fd0457414c455d0b3e5faefc4188069a62d93bb2b26ca127bac' + '0e3aa1aeb3aebd7c0df381688a86ec6b016a9f7b957bf2df0f96f80c3f713fa8' + '82cbfbaddb6b3650d0a0a02f9685053fc40471d9608d4a2d5aa92f396e007e76' + '088a59f677e868605777bc9d02fff43fccd1db046cee323b1f0ad03f12897c81' + 'f66c246ab93fc087f11197945261ffc052550bbefe555fb3c506999b2012257a' + 'c5b1e918d0c222afc3b36c2762e31fc51a4ff00932e42c92d006348b1f031e13' + '9040cbd793b537374041caafab4c1a0562644c25ff7b6403f74e00dfd9bcbe10' + '0cb11a19987c595f8476219bfc6bccc1a814ac1d8139422af48757d1f1aca975' + 'd3ddcf2fade8bdff6e3a1ad3197db3f9a10daa117529d3a88c9ca8da42fa67d0' + '0cef75f93fe668163b8952f98ca7296bfbb3477930308616810d564bb3f1cb97' + 'ac5bdfb8c32964e266556797a3745451647d7e71e2a3bb6c877cca0853b98d41' + '7133976e873a9f7e2f25a34a53330c724386c17dc8b9984261ff677d7bd212dc' + 'a8999b6526ffb8914122448c13430c75579815bc785270f04499e90dad72a779' + '6ed6b0129808a7af10ea457b31a8c09f6579ed9db9787e1ecf401e47185623bb' + '577648aa8d73488d772553527f6310040918ab72b7ee30583af0d597ed642bfa' + 'cac5ebf672a1c8597f11d5012a755460103aeb864cf57a2f183c33c2f0bef84f' + '0a477628e81a2d47e647a5b9acc3ef160081047fc059bb365f4f86090405135b' + '6a282238deae9ef72daf26a3b2f1731244c0f4649995ce9fee15769221eb4712' + 'ae350d25de5e4bb4c4a06d3d7e55d076f289abce832d7f788c320723f9f814ed' + '63f745a9f77cf3d36cff674da404d4a56858415ef507b7a5e62178957e52f243' + '8053e36b46b1422d5f0cbdecca22712424c1ca7392feb6fab825326196e437cf' + '8256a90d0da4722ce8003a8468478c7719d252feae23e24c03d996fdd5812925' + '58db4796361fb9fc77e9159d2fdb498e66e3240154bc88039a7aa9657c00addd' + '1ed043a52a04f6700ffcdc2552f8704ba8b6b2c70fe478f165d04ef2a36e0ad0' + '6d2874bdf6f95c4e11c8ffb195ad54181ab77a1d504c651905f8271e57eb7d6d' + '4ebe45ed2e86e11384919fbc4831d5518f4f6a44b68356a1e51f4d2fe6231916' + '3ea57370519ada05aaf15c8783a9774b91cf6612d7f1fc72979c91a96bc1e5c2' + '9e5b9263b10fc422b150e44f6f7136f567a9c56c07fd4b0c2f0423495e860566' + '3a5dd25c5ab4e9f0a4ca4b9008f80c7ae593a55e43661d04190bed329f57f0ef' + 'f0ba86d821a7abd4127a31249dced279428e01cec0a23fb6592a586ec1348f54' + '23fa4f0f7921bc42918e33f4ec7b976b7b4e99535c26face3d013513ff303a19' + '54a3f50ad08c40064eeb398e22abd013f3b66e3f78f5d5188e009a60d9eac420' + '41cf8644969b3a2b33882d4f881269442520ebf9e3e7a86ebbe771236394245b' + '141d3cd941c7a149f56f58eeae2ea78e745437d69dfdf967f277efa6fb32f532' + 'c90ac74aa7947902c10a1d89814b8c705ba3a2a63894540808fa92c431c16ec6' + 'd77435479ff22de154aed102584f775d19d19217b1476de311623b5de118c07a' + '92e0d5286a9194be9aab23dba1fce0864ae34951a40b8ebcabb80b06fbd8f0ed' + '0c671d5393c63c7ec764e463d458d0943dbe4e4d3fd0aac50cd6f5034e84c4df' + '104102255022be041a574bc4bd21f9775d3ad114d9c538de18d55722a721b164' + '7e13fadf84c25dcc83dd761f286fbed3b54b2d11b213667251b659d33e8c05f8' + 'e7205b266c68e581556b473f19f66e986adc946da8de98dd72adcaea936abed2' + 'd6420e7c9d3b0a70d961b42272ff5a13282f23426f9e52b865a806891a4691c4' + '30ee3b46a98ea4cde3e75409c28d398ece71b2c03628d90eb7fbe1ac7ad8106e' + '318bb96672c25459716d89481dd6dab9baa0f20cbf6df3e06faa63d1d9663815')