Update 7 packages

libgc (8.2.6-1 -> 8.2.8-1) mingw-w64-i686-python (3.11.9-1 -> 3.11.10-1) mingw-w64-x86_64-python (3.11.9-1 -> 3.11.10-1) msys2-launcher (1.5-1 -> 1.5-2) nano (8.1-1 -> 8.2-1) python (3.12.5-1 -> 3.12.6-1) winpty (0.4.3-2 -> 0.4.3-3) Signed-off-by: Git for Windows Build Agent <[email protected]>
git-for-windows · Sep 11, 2024 · 0567384 · 0567384
1 parent 850f9c4
commit 0567384
Show file tree

Hide file tree

Showing 455 changed files with 5,333 additions and 998 deletions.
diff --git a/clang32.exe b/clang32.exe
diff --git a/clang64.exe b/clang64.exe
diff --git a/clangarm64.exe b/clangarm64.exe
diff --git a/etc/nanorc b/etc/nanorc
@@ -249,12 +249,12 @@ set functioncolor green
 ## For all details, see 'man nanorc', section SYNTAX HIGHLIGHTING.
 
 ## To include most of the existing syntax definitions, you can do:
-include "/usr/share/nano/*.nanorc"
+# include /usr/share/nano/*.nanorc
 
 ## Or you can select just the ones you need.  For example:
-include "/usr/share/nano/html.nanorc"
-include "/usr/share/nano/python.nanorc"
-include "/usr/share/nano/sh.nanorc"
+# include /usr/share/nano/html.nanorc
+# include /usr/share/nano/python.nanorc
+# include /usr/share/nano/sh.nanorc
 
 ## In /usr/share/nano/extra/ you can find some syntaxes that are
 ## specific for certain distros or for some less common languages.

diff --git a/etc/pacman.conf b/etc/pacman.conf
@@ -70,6 +70,9 @@ LocalFileSigLevel = Optional
 # Server = https://repo.msys2.org/staging/
 # SigLevel = Never
 
+[git-for-windows-aarch64]
+Server = https://wingit.blob.core.windows.net/aarch64
+
 [clangarm64]
 Include = /etc/pacman.d/mirrorlist.mingw
 

diff --git a/mingw32.exe b/mingw32.exe
diff --git a/mingw32/bin/libpython3.11.dll b/mingw32/bin/libpython3.11.dll
diff --git a/mingw32/bin/libpython3.dll b/mingw32/bin/libpython3.dll
diff --git a/mingw32/bin/python-config b/mingw32/bin/python-config
@@ -47,7 +47,7 @@ exec_prefix="${prefix}"
 exec_prefix_real=${prefix_real}
 includedir=$(echo "${prefix}/include" | sed "s#$prefix#$prefix_real#")
 libdir=$(echo "${exec_prefix}/lib" | sed "s#$prefix#$prefix_real#")
-CFLAGS=$(echo "-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3" | sed "s#$prefix#$prefix_real#")
+CFLAGS=$(echo "-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1 -O3" | sed "s#$prefix#$prefix_real#")
 VERSION="3.11"
 LIBM="-lm"
 LIBC=""

diff --git a/mingw32/bin/python.exe b/mingw32/bin/python.exe
diff --git a/mingw32/bin/python3-config b/mingw32/bin/python3-config
@@ -47,7 +47,7 @@ exec_prefix="${prefix}"
 exec_prefix_real=${prefix_real}
 includedir=$(echo "${prefix}/include" | sed "s#$prefix#$prefix_real#")
 libdir=$(echo "${exec_prefix}/lib" | sed "s#$prefix#$prefix_real#")
-CFLAGS=$(echo "-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3" | sed "s#$prefix#$prefix_real#")
+CFLAGS=$(echo "-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1 -O3" | sed "s#$prefix#$prefix_real#")
 VERSION="3.11"
 LIBM="-lm"
 LIBC=""

diff --git a/mingw32/bin/python3.11-config b/mingw32/bin/python3.11-config
@@ -47,7 +47,7 @@ exec_prefix="${prefix}"
 exec_prefix_real=${prefix_real}
 includedir=$(echo "${prefix}/include" | sed "s#$prefix#$prefix_real#")
 libdir=$(echo "${exec_prefix}/lib" | sed "s#$prefix#$prefix_real#")
-CFLAGS=$(echo "-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3" | sed "s#$prefix#$prefix_real#")
+CFLAGS=$(echo "-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1 -O3" | sed "s#$prefix#$prefix_real#")
 VERSION="3.11"
 LIBM="-lm"
 LIBC=""

diff --git a/mingw32/bin/python3.11.exe b/mingw32/bin/python3.11.exe
diff --git a/mingw32/bin/python3.exe b/mingw32/bin/python3.exe
diff --git a/mingw32/bin/python3w.exe b/mingw32/bin/python3w.exe
diff --git a/mingw32/bin/pythonw.exe b/mingw32/bin/pythonw.exe
diff --git a/mingw32/include/python3.11/patchlevel.h b/mingw32/include/python3.11/patchlevel.h
@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION        3
 #define PY_MINOR_VERSION        11
-#define PY_MICRO_VERSION        9
+#define PY_MICRO_VERSION        10
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_FINAL
 #define PY_RELEASE_SERIAL       0
 
 /* Version as a string */
-#define PY_VERSION              "3.11.9"
+#define PY_VERSION              "3.11.10"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

diff --git a/mingw32/include/python3.11/pyconfig.h b/mingw32/include/python3.11/pyconfig.h
@@ -120,7 +120,7 @@
 /* #undef HAVE_BROKEN_SEM_GETVALUE */
 
 /* Define if 'unsetenv' does not return an int. */
-/* #undef HAVE_BROKEN_UNSETENV */
+#define HAVE_BROKEN_UNSETENV 1
 
 /* Has builtin __atomic_load_n() and __atomic_store_n() functions */
 #define HAVE_BUILTIN_ATOMIC 1

diff --git a/mingw32/lib/libpython3.11.dll.a b/mingw32/lib/libpython3.11.dll.a
diff --git a/mingw32/lib/libpython3.dll.a b/mingw32/lib/libpython3.dll.a
diff --git a/mingw32/lib/python3.11/_sysconfigdata__win32_.py b/mingw32/lib/python3.11/_sysconfigdata__win32_.py
diff --git a/mingw32/lib/python3.11/asyncio/__main__.py b/mingw32/lib/python3.11/asyncio/__main__.py
@@ -90,6 +90,8 @@ def run(self):
 
 
 if __name__ == '__main__':
+    sys.audit("cpython.run_stdin")
+
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
 

diff --git a/mingw32/lib/python3.11/config-3.11/Makefile b/mingw32/lib/python3.11/config-3.11/Makefile
@@ -29,9 +29,9 @@ MODLIBS=           $(LOCALMODLIBS) $(BASEMODLIBS)
 
 # === Variables set by configure
 VERSION=	3.11
-srcdir=		../Python-3.11.9
-VPATH=		../Python-3.11.9
-abs_srcdir=	/c/M/B/src/build-MINGW32/../Python-3.11.9
+srcdir=		../Python-3.11.10
+VPATH=		../Python-3.11.10
+abs_srcdir=	/c/M/B/src/build-MINGW32/../Python-3.11.10
 abs_builddir=	/c/M/B/src/build-MINGW32
 
 
@@ -83,19 +83,19 @@ MAKESETUP=      $(srcdir)/Modules/makesetup
 OPT=		-DNDEBUG -g -fwrapv -O3 -Wall
 BASECFLAGS=	
 BASECPPFLAGS=	-IObjects -IInclude -IPython
-CONFIGURE_CFLAGS=	-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3
+CONFIGURE_CFLAGS=	-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1 -O3
 # CFLAGS_NODIST is used for building the interpreter and stdlib C extensions.
 # Use it when a compiler flag should _not_ be part of the distutils CFLAGS
 # once Python is installed (Issue #21121).
-CONFIGURE_CFLAGS_NODIST= -fno-semantic-interposition -std=c11 -Werror=implicit-function-declaration -fvisibility=hidden -D_WIN32_WINNT=0x0602 -DPY3_DLLNAME='L"libpython$(LDVERSION).dll"' -DMS_DLL_ID='"3.11-32"'
+CONFIGURE_CFLAGS_NODIST= -fno-semantic-interposition -std=c11 -Wno-error=incompatible-pointer-types -Werror=implicit-function-declaration -fvisibility=hidden -D_WIN32_WINNT=0x0602 -DPY3_DLLNAME='L"libpython$(LDVERSION).dll"' -DMS_DLL_ID='"3.11-32"'
 # LDFLAGS_NODIST is used in the same manner as CFLAGS_NODIST.
 # Use it when a linker flag should _not_ be part of the distutils LDFLAGS
 # once Python is installed (bpo-35257)
 CONFIGURE_LDFLAGS_NODIST= -fno-semantic-interposition
 # LDFLAGS_NOLTO is an extra flag to disable lto. It is used to speed up building
 # of _bootstrap_python and _freeze_module tools, which don't need LTO.
 CONFIGURE_LDFLAGS_NOLTO=
-CONFIGURE_CPPFLAGS=	-I$(srcdir)/PC -D__USE_MINGW_ANSI_STDIO=1 -I.
+CONFIGURE_CPPFLAGS=	-I$(srcdir)/PC  -I.
 CONFIGURE_LDFLAGS=	-Wl,--no-seh -Wl,--large-address-aware -Wl,--large-address-aware
 # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
 # command line to append to these values without stomping the pre-set
@@ -125,7 +125,7 @@ PY_CORE_CFLAGS=	$(PY_STDMODULE_CFLAGS) -DPy_BUILD_CORE
 PY_CORE_LDFLAGS=$(PY_LDFLAGS) $(PY_LDFLAGS_NODIST)
 # Strict or non-strict aliasing flags used to compile dtoa.c, see above
 CFLAGS_ALIASING=
-RCFLAGS= -DFIELD3=9150 -O COFF --target=pe-i386
+RCFLAGS= -DFIELD3=10150 -O COFF --target=pe-i386
 
 
 # Machine-dependent subdirectories
@@ -145,8 +145,8 @@ exec_prefix=	${prefix}
 datarootdir=    ${prefix}/share
 
 # Locations needed for semi-native fixup of sysconfig.
-srcdir_b2h=		C:/M/B/src/Python-3.11.9
-abs_srcdir_b2h=		C:/M/B/src/Python-3.11.9
+srcdir_b2h=		C:/M/B/src/Python-3.11.10
+abs_srcdir_b2h=		C:/M/B/src/Python-3.11.10
 abs_builddir_b2h=	C:/M/B/src/build-MINGW32
 prefix_b2h=		D:/a/msys64/mingw32
 
@@ -367,7 +367,7 @@ EXEMODE=	755
 FILEMODE=	644
 
 # configure script arguments
-CONFIG_ARGS=	 '--prefix=/mingw32' '--host=i686-w64-mingw32' '--build=i686-w64-mingw32' '--enable-shared' '--with-system-expat' '--with-system-ffi' '--with-system-libmpdec' '--without-ensurepip' '--enable-loadable-sqlite-extensions' '--with-tzpath=/mingw32/share/zoneinfo' '--enable-optimizations' 'build_alias=i686-w64-mingw32' 'host_alias=i686-w64-mingw32' 'PKG_CONFIG_PATH=/mingw32/lib/pkgconfig:/mingw32/share/pkgconfig' 'CC=gcc' 'CFLAGS=-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3' 'LDFLAGS=-Wl,--no-seh -Wl,--large-address-aware -Wl,--large-address-aware' 'CPPFLAGS=-D__USE_MINGW_ANSI_STDIO=1'
+CONFIG_ARGS=	 '--prefix=/mingw32' '--host=i686-w64-mingw32' '--build=i686-w64-mingw32' '--enable-shared' '--with-system-expat' '--with-system-ffi' '--with-system-libmpdec' '--without-ensurepip' '--enable-loadable-sqlite-extensions' '--with-tzpath=/mingw32/share/zoneinfo' '--enable-optimizations' 'build_alias=i686-w64-mingw32' 'host_alias=i686-w64-mingw32' 'PKG_CONFIG_PATH=/mingw32/lib/pkgconfig:/mingw32/share/pkgconfig' 'CC=gcc' 'CFLAGS=-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wp,-D__USE_MINGW_ANSI_STDIO=1 -O3' 'LDFLAGS=-Wl,--no-seh -Wl,--large-address-aware -Wl,--large-address-aware' 'CPPFLAGS='
 
 
 # Subdirectories with code
@@ -879,10 +879,10 @@ $(BUILDPYTHON):	Programs/python.o $(LINK_PYTHON_DEPS) python_exe.o
 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -municode -o $@ Programs/python.o $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS) python_exe.o
 
 $(BUILDVENVLAUNCHER): $(BUILDPYTHON) venvlauncher.o  $(srcdir)/PC/launcher.c
-	$(LINKCC) -D_CONSOLE -DVENV_REDIRECT -DPYTHON_EXECUTABLE_WITH_VERSION="L\"python$(LDVERSION)$(EXE)\"" -municode -static -static-libgcc -static-libstdc++ venvlauncher.o $(srcdir)/PC/launcher.c -o $@ -lversion
+	$(LINKCC) -D_CONSOLE -DVENV_REDIRECT -DPYTHON_EXECUTABLE_WITH_VERSION="L\"python$(LDVERSION)$(EXE)\"" $(PY_STDMODULE_CFLAGS) -municode -static -static-libgcc -static-libstdc++ venvlauncher.o $(srcdir)/PC/launcher.c -o $@ -lversion
 
 $(BUILDVENVWLAUNCHER): $(BUILDPYTHONW) venvwlauncher.o  $(srcdir)/PC/launcher.c
-	$(LINKCC) -D_WINDOWS -DVENV_REDIRECT -DPYTHON_EXECUTABLE_WITH_VERSION="L\"pythonw$(LDVERSION)$(EXE)\"" -mwindows -municode -static -static-libgcc -static-libstdc++ venvwlauncher.o $(srcdir)/PC/launcher.c -o $@ -lversion
+	$(LINKCC) -D_WINDOWS -DVENV_REDIRECT -DPYTHON_EXECUTABLE_WITH_VERSION="L\"pythonw$(LDVERSION)$(EXE)\"" $(PY_STDMODULE_CFLAGS) -mwindows -municode -static -static-libgcc -static-libstdc++ venvwlauncher.o $(srcdir)/PC/launcher.c -o $@ -lversion
 
 platform: $(PYTHON_FOR_BUILD_DEPS) 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

diff --git a/mingw32/lib/python3.11/config-3.11/config.c b/mingw32/lib/python3.11/config-3.11/config.c
@@ -1,4 +1,4 @@
-/* Generated automatically from ../Python-3.11.9/Modules/config.c.in by makesetup. */
+/* Generated automatically from ../Python-3.11.10/Modules/config.c.in by makesetup. */
 /* -*- C -*- ***********************************************
 Copyright (c) 2000, BeOpen.com.
 Copyright (c) 1995-2000, Corporation for National Research Initiatives.

diff --git a/mingw32/lib/python3.11/config-3.11/python.o b/mingw32/lib/python3.11/config-3.11/python.o
diff --git a/mingw32/lib/python3.11/email/_header_value_parser.py b/mingw32/lib/python3.11/email/_header_value_parser.py
@@ -92,6 +92,8 @@
 ASPECIALS = TSPECIALS | set("*'%")
 ATTRIBUTE_ENDS = ASPECIALS | WSP
 EXTENDED_ATTRIBUTE_ENDS = ATTRIBUTE_ENDS - set('%')
+NLSET = {'\n', '\r'}
+SPECIALSNL = SPECIALS | NLSET
 
 def quote_string(value):
     return '"'+str(value).replace('\\', '\\\\').replace('"', r'\"')+'"'
@@ -950,6 +952,7 @@ class _InvalidEwError(errors.HeaderParseError):
 DOT = ValueTerminal('.', 'dot')
 ListSeparator = ValueTerminal(',', 'list-separator')
 ListSeparator.as_ew_allowed = False
+ListSeparator.syntactic_break = False
 RouteComponentMarker = ValueTerminal('@', 'route-component-marker')
 
 #
@@ -2780,9 +2783,13 @@ def _refold_parse_tree(parse_tree, *, policy):
             wrap_as_ew_blocked -= 1
             continue
         tstr = str(part)
-        if part.token_type == 'ptext' and set(tstr) & SPECIALS:
-            # Encode if tstr contains special characters.
-            want_encoding = True
+        if not want_encoding:
+            if part.token_type == 'ptext':
+                # Encode if tstr contains special characters.
+                want_encoding = not SPECIALSNL.isdisjoint(tstr)
+            else:
+                # Encode if tstr contains newlines.
+                want_encoding = not NLSET.isdisjoint(tstr)
         try:
             tstr.encode(encoding)
             charset = encoding
@@ -2821,7 +2828,9 @@ def _refold_parse_tree(parse_tree, *, policy):
             if not hasattr(part, 'encode'):
                 # It's not a Terminal, do each piece individually.
                 parts = list(part) + parts
-            else:
+                want_encoding = False
+                continue
+            elif part.as_ew_allowed:
                 # It's a terminal, wrap it as an encoded word, possibly
                 # combining it with previously encoded words if allowed.
                 if (last_ew is not None and
@@ -2832,8 +2841,15 @@ def _refold_parse_tree(parse_tree, *, policy):
                 last_ew = _fold_as_ew(tstr, lines, maxlen, last_ew,
                                       part.ew_combine_allowed, charset)
                 last_charset = charset
-            want_encoding = False
-            continue
+                want_encoding = False
+                continue
+            else:
+                # It's a terminal which should be kept non-encoded
+                # (e.g. a ListSeparator).
+                last_ew = None
+                want_encoding = False
+                # fall through
+
         if len(tstr) <= maxlen - len(lines[-1]):
             lines[-1] += tstr
             continue

diff --git a/mingw32/lib/python3.11/email/_policybase.py b/mingw32/lib/python3.11/email/_policybase.py
@@ -157,6 +157,13 @@ class Policy(_PolicyBase, metaclass=abc.ABCMeta):
     message_factory     -- the class to use to create new message objects.
                            If the value is None, the default is Message.
 
+    verify_generated_headers
+                        -- if true, the generator verifies that each header
+                           they are properly folded, so that a parser won't
+                           treat it as multiple headers, start-of-body, or
+                           part of another header.
+                           This is a check against custom Header & fold()
+                           implementations.
     """
 
     raise_on_defect = False
@@ -165,6 +172,7 @@ class Policy(_PolicyBase, metaclass=abc.ABCMeta):
     max_line_length = 78
     mangle_from_ = False
     message_factory = None
+    verify_generated_headers = True
 
     def handle_defect(self, obj, defect):
         """Based on policy, either raise defect or call register_defect.

diff --git a/mingw32/lib/python3.11/email/errors.py b/mingw32/lib/python3.11/email/errors.py
@@ -29,6 +29,10 @@ class CharsetError(MessageError):
     """An illegal charset was given."""
 
 
+class HeaderWriteError(MessageError):
+    """Error while writing headers."""
+
+
 # These are parsing defects which the parser was able to work around.
 class MessageDefect(ValueError):
     """Base class for a message defect."""

diff --git a/mingw32/lib/python3.11/email/generator.py b/mingw32/lib/python3.11/email/generator.py
@@ -14,12 +14,14 @@
 from copy import deepcopy
 from io import StringIO, BytesIO
 from email.utils import _has_surrogates
+from email.errors import HeaderWriteError
 
 UNDERSCORE = '_'
 NL = '\n'  # XXX: no longer used by the code below.
 
 NLCRE = re.compile(r'\r\n|\r|\n')
 fcre = re.compile(r'^From ', re.MULTILINE)
+NEWLINE_WITHOUT_FWSP = re.compile(r'\r\n[^ \t]|\r[^ \n\t]|\n[^ \t]')
 
 
 class Generator:
@@ -222,7 +224,16 @@ def _dispatch(self, msg):
 
     def _write_headers(self, msg):
         for h, v in msg.raw_items():
-            self.write(self.policy.fold(h, v))
+            folded = self.policy.fold(h, v)
+            if self.policy.verify_generated_headers:
+                linesep = self.policy.linesep
+                if not folded.endswith(self.policy.linesep):
+                    raise HeaderWriteError(
+                        f'folded header does not end with {linesep!r}: {folded!r}')
+                if NEWLINE_WITHOUT_FWSP.search(folded.removesuffix(linesep)):
+                    raise HeaderWriteError(
+                        f'folded header contains newline: {folded!r}')
+            self.write(folded)
         # A blank line always separates headers from body
         self.write(self._NL)