Update 3 packages

bash (5.2.002-1 -> 5.2.009-1)
git-extra (1.1.600.cbd5e15-1 -> 1.1.609.6752ff0-1)
mingw-w64-i686-python (3.10.8-1 -> 3.10.8-2)

Signed-off-by: Git for Windows Build Agent <[email protected]>

Author: Git for Windows Build Agent

mingw32/bin/WhoUses.exe

@@ -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 -O3" | 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#")
 VERSION="3.10"
 LIBM="-lm"
 LIBC=""

mingw32/bin/blocked-file-util.exe

@@ -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 -O3" | 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#")
 VERSION="3.10"
 LIBM="-lm"
 LIBC=""

mingw32/bin/create-shortcut.exe

@@ -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 -O3" | 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#")
 VERSION="3.10"
 LIBM="-lm"
 LIBC=""

mingw32/bin/git-askpass.exe

@@ -17,7 +17,8 @@
  'BINLIBDEST': '/mingw32/lib/python3.10',
  'BLDLIBRARY': '-L. -lpython3.10',
  'BLDSHARED': 'gcc -shared -Wl,--enable-auto-image-base -pipe -Wl,--no-seh '
-              '-pipe -Wl,--no-seh',
+              '-Wl,--large-address-aware -pipe -Wl,--no-seh '
+              '-Wl,--large-address-aware',
  'BUILDEXE': '.exe',
  'BUILDPYTHON': 'python.exe',
  'BUILDPYTHONW': 'pythonw.exe',
@@ -28,13 +29,15 @@
  'CC': 'gcc',
  'CCSHARED': '',
  'CFLAGS': '-Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall '
-           '-march=pentium4 -mtune=generic -O2 -pipe -O3 -march=pentium4 '
-           '-mtune=generic -O2 -pipe -O3',
+           '-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 '
+           '-fstack-protector-strong -O3 -march=pentium4 -mtune=generic -O2 '
+           '-pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3',
  'CFLAGSFORSHARED': '',
  'CFLAGS_ALIASING': '',
  'CONFIGFILES': 'configure configure.ac acconfig.h pyconfig.h.in '
                 'Makefile.pre.in',
- 'CONFIGURE_CFLAGS': '-march=pentium4 -mtune=generic -O2 -pipe -O3',
+ 'CONFIGURE_CFLAGS': '-march=pentium4 -mtune=generic -O2 -pipe '
+                     '-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3',
  'CONFIGURE_CFLAGS_NODIST': '-fno-semantic-interposition -std=c99 -Wextra '
                             '-Wno-unused-result -Wno-unused-parameter '
                             '-Wno-missing-field-initializers '
@@ -44,7 +47,7 @@
                             '-DPY3_DLLNAME=\'L"libpython3.10.dll"\' '
                             '-DMS_DLL_ID=\'"3.10-32"\'',
  'CONFIGURE_CPPFLAGS': '-I../Python-3.10.8/PC -D__USE_MINGW_ANSI_STDIO=1 -I.',
- 'CONFIGURE_LDFLAGS': '-pipe -Wl,--no-seh',
+ 'CONFIGURE_LDFLAGS': '-pipe -Wl,--no-seh -Wl,--large-address-aware',
  'CONFIGURE_LDFLAGS_NODIST': '-fno-semantic-interposition',
  'CONFIG_ARGS': "'--prefix=/mingw32' '--host=i686-w64-mingw32' "
                 "'--build=i686-w64-mingw32' '--enable-shared' "
@@ -54,8 +57,9 @@
                 "'--with-tzpath=/mingw32/share/zoneinfo' "
                 "'--enable-optimizations' 'build_alias=i686-w64-mingw32' "
                 "'host_alias=i686-w64-mingw32' 'CC=gcc' "
-                "'CFLAGS=-march=pentium4 -mtune=generic -O2 -pipe -O3' "
-                "'LDFLAGS=-pipe -Wl,--no-seh' "
+                "'CFLAGS=-march=pentium4 -mtune=generic -O2 -pipe "
+                "-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3' "
+                "'LDFLAGS=-pipe -Wl,--no-seh -Wl,--large-address-aware' "
                 "'CPPFLAGS=-D__USE_MINGW_ANSI_STDIO=1' "
                 "'PKG_CONFIG_PATH=/mingw32/lib/pkgconfig:/mingw32/share/pkgconfig'",
  'CONFINCLUDEDIR': '/mingw32/include',
@@ -559,16 +563,18 @@
  'IO_H': 'Modules/_io/_iomodule.h',
  'IO_OBJS': '\\',
  'LDCXXSHARED': 'g++ -shared -Wl,--enable-auto-image-base',
- 'LDFLAGS': '-pipe -Wl,--no-seh -pipe -Wl,--no-seh',
+ 'LDFLAGS': '-pipe -Wl,--no-seh -Wl,--large-address-aware -pipe -Wl,--no-seh '
+            '-Wl,--large-address-aware',
  'LDLIBRARY': 'libpython3.10.dll.a',
  'LDLIBRARYDIR': '',
  'LDSHARED': 'gcc -shared -Wl,--enable-auto-image-base -pipe -Wl,--no-seh '
-             '-pipe -Wl,--no-seh',
+             '-Wl,--large-address-aware -pipe -Wl,--no-seh '
+             '-Wl,--large-address-aware',
  'LDVERSION': '3.10',
  'LIBC': '',
  'LIBDEST': '/mingw32/lib/python3.10',
  'LIBDIR': '/mingw32/lib',
- 'LIBFFI_INCLUDEDIR': 'D:/a/msys64/mingw32/include',
+ 'LIBFFI_INCLUDEDIR': '',
  'LIBM': '-lm',
  'LIBOBJDIR': 'Python/',
  'LIBOBJS': '',
@@ -627,8 +633,8 @@
  'NO_AS_NEEDED': '-Wl,--no-as-needed',
  'NT_THREADS': 1,
  'OBJECT_OBJS': '\\',
- 'OPENSSL_INCLUDES': '-ID:/a/msys64/mingw32/include',
- 'OPENSSL_LDFLAGS': '-LD:/a/msys64/mingw32/lib',
+ 'OPENSSL_INCLUDES': '',
+ 'OPENSSL_LDFLAGS': '',
  'OPENSSL_LIBS': '-lssl -lcrypto',
  'OPENSSL_RPATH': '',
  'OPT': '-DNDEBUG -g -fwrapv -O3 -Wall',
@@ -668,9 +674,12 @@
  'PY_BUILTIN_HASHLIB_HASHES': '"md5,sha1,sha256,sha512,sha3,blake2"',
  'PY_BUILTIN_MODULE_CFLAGS': '-Wno-unused-result -Wsign-compare -DNDEBUG -g '
                              '-fwrapv -O3 -Wall -march=pentium4 -mtune=generic '
-                             '-O2 -pipe -O3 -march=pentium4 -mtune=generic -O2 '
-                             '-pipe -O3 -fno-semantic-interposition -std=c99 '
-                             '-Wextra -Wno-unused-result -Wno-unused-parameter '
+                             '-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 '
+                             '-fstack-protector-strong -O3 -march=pentium4 '
+                             '-mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 '
+                             '-fstack-protector-strong -O3 '
+                             '-fno-semantic-interposition -std=c99 -Wextra '
+                             '-Wno-unused-result -Wno-unused-parameter '
                              '-Wno-missing-field-initializers '
                              '-Wstrict-prototypes '
                              '-Werror=implicit-function-declaration '
@@ -685,8 +694,10 @@
                              '-D__USE_MINGW_ANSI_STDIO=1 '
                              '-DPy_BUILD_CORE_BUILTIN',
  'PY_CFLAGS': '-Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall '
-              '-march=pentium4 -mtune=generic -O2 -pipe -O3 -march=pentium4 '
-              '-mtune=generic -O2 -pipe -O3',
+              '-march=pentium4 -mtune=generic -O2 -pipe '
+              '-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3 '
+              '-march=pentium4 -mtune=generic -O2 -pipe '
+              '-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3',
  'PY_CFLAGS_NODIST': '-fno-semantic-interposition -std=c99 -Wextra '
                      '-Wno-unused-result -Wno-unused-parameter '
                      '-Wno-missing-field-initializers -Wstrict-prototypes '
@@ -697,8 +708,10 @@
                      '-fprofile-correction -I../Python-3.10.8/Include/internal',
  'PY_COERCE_C_LOCALE': 0,
  'PY_CORE_CFLAGS': '-Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 '
-                   '-Wall -march=pentium4 -mtune=generic -O2 -pipe -O3 '
-                   '-march=pentium4 -mtune=generic -O2 -pipe -O3 '
+                   '-Wall -march=pentium4 -mtune=generic -O2 -pipe '
+                   '-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3 '
+                   '-march=pentium4 -mtune=generic -O2 -pipe '
+                   '-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3 '
                    '-fno-semantic-interposition -std=c99 -Wextra '
                    '-Wno-unused-result -Wno-unused-parameter '
                    '-Wno-missing-field-initializers -Wstrict-prototypes '
@@ -711,20 +724,24 @@
                    '-I../Python-3.10.8/Include -I../Python-3.10.8/PC '
                    '-D__USE_MINGW_ANSI_STDIO=1 -I. -D__USE_MINGW_ANSI_STDIO=1 '
                    '-DPy_BUILD_CORE',
- 'PY_CORE_LDFLAGS': '-pipe -Wl,--no-seh -pipe -Wl,--no-seh '
+ 'PY_CORE_LDFLAGS': '-pipe -Wl,--no-seh -Wl,--large-address-aware -pipe '
+                    '-Wl,--no-seh -Wl,--large-address-aware '
                     '-fno-semantic-interposition',
  'PY_CPPFLAGS': '-IObjects -IInclude -IPython -I. -I../Python-3.10.8/Include '
                 '-I../Python-3.10.8/PC -D__USE_MINGW_ANSI_STDIO=1 -I. '
                 '-D__USE_MINGW_ANSI_STDIO=1',
  'PY_ENABLE_SHARED': 1,
  'PY_FORMAT_SIZE_T': '"z"',
- 'PY_LDFLAGS': '-pipe -Wl,--no-seh -pipe -Wl,--no-seh',
+ 'PY_LDFLAGS': '-pipe -Wl,--no-seh -Wl,--large-address-aware -pipe '
+               '-Wl,--no-seh -Wl,--large-address-aware',
  'PY_LDFLAGS_NODIST': '-fno-semantic-interposition',
  'PY_SSL_DEFAULT_CIPHERS': 1,
  'PY_SSL_DEFAULT_CIPHER_STRING': 0,
  'PY_STDMODULE_CFLAGS': '-Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv '
                         '-O3 -Wall -march=pentium4 -mtune=generic -O2 -pipe '
-                        '-O3 -march=pentium4 -mtune=generic -O2 -pipe -O3 '
+                        '-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3 '
+                        '-march=pentium4 -mtune=generic -O2 -pipe '
+                        '-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3 '
                         '-fno-semantic-interposition -std=c99 -Wextra '
                         '-Wno-unused-result -Wno-unused-parameter '
                         '-Wno-missing-field-initializers -Wstrict-prototypes '

mingw32/bin/git-askyesno.exe

@@ -82,7 +82,7 @@ MAKESETUP=      $(srcdir)/Modules/makesetup
 OPT=		-DNDEBUG -g -fwrapv -O3 -Wall
 BASECFLAGS=	 -Wno-unused-result -Wsign-compare
 BASECPPFLAGS=	-IObjects -IInclude -IPython
-CONFIGURE_CFLAGS=	-march=pentium4 -mtune=generic -O2 -pipe -O3
+CONFIGURE_CFLAGS=	-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -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).
@@ -92,7 +92,7 @@ CONFIGURE_CFLAGS_NODIST= -fno-semantic-interposition -std=c99 -Wextra -Wno-unuse
 # once Python is installed (bpo-35257)
 CONFIGURE_LDFLAGS_NODIST= -fno-semantic-interposition
 CONFIGURE_CPPFLAGS=	-I$(srcdir)/PC -D__USE_MINGW_ANSI_STDIO=1 -I.
-CONFIGURE_LDFLAGS=	-pipe -Wl,--no-seh
+CONFIGURE_LDFLAGS=	-pipe -Wl,--no-seh -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
 # values.
@@ -213,9 +213,9 @@ RUNSHARED=
 ENSUREPIP=      no
 
 # OpenSSL options for setup.py so sysconfig can pick up AC_SUBST() vars.
-OPENSSL_INCLUDES=-ID:/a/msys64/mingw32/include
+OPENSSL_INCLUDES=
 OPENSSL_LIBS=-lssl -lcrypto
-OPENSSL_LDFLAGS=-LD:/a/msys64/mingw32/lib
+OPENSSL_LDFLAGS=
 OPENSSL_RPATH=
 
 # Default zoneinfo.TZPATH. Added here to expose it in sysconfig.get_config_var
@@ -228,7 +228,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' 'CC=gcc' 'CFLAGS=-march=pentium4 -mtune=generic -O2 -pipe -O3' 'LDFLAGS=-pipe -Wl,--no-seh' 'CPPFLAGS=-D__USE_MINGW_ANSI_STDIO=1' 'PKG_CONFIG_PATH=/mingw32/lib/pkgconfig:/mingw32/share/pkgconfig'
+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' 'CC=gcc' 'CFLAGS=-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -O3' 'LDFLAGS=-pipe -Wl,--no-seh -Wl,--large-address-aware' 'CPPFLAGS=-D__USE_MINGW_ANSI_STDIO=1' 'PKG_CONFIG_PATH=/mingw32/lib/pkgconfig:/mingw32/share/pkgconfig'
 
 
 # Subdirectories with code
@@ -332,7 +332,7 @@ IO_OBJS=	\
 
 ##########################################################################
 
-LIBFFI_INCLUDEDIR=	D:/a/msys64/mingw32/include
+LIBFFI_INCLUDEDIR=	
 NCURSESW_INCLUDEDIR=	D:/a/msys64/mingw32/include/ncursesw
 
 ##########################################################################

mingw32/bin/git-credential-helper-selector.exe

@@ -27,8 +27,10 @@
 @REM Set to MSYS mode
 @SET MSYSTEM=MSYS
 
-@ECHO Run Pacman
+@ECHO Run Pacman (First Pass)
 @pacman -Syyu --noconfirm
+@ECHO End of Pacman (First Pass)
+@ECHO ==
 @IF ERRORLEVEL 1 GOTO DIE
 
 @REM If Pacman updated "core" packages, e.g. the MSYS2 runtime, it stops
@@ -65,22 +67,28 @@
 @REM error level is 0 *or higher*, i.e. it would always jump. Not what we want.
 @REM So we *must* make it an "error" when everything is upgraded already.
 
+@ECHO Find last Upgrade in Pacman.log
 @git-cmd.exe --command=usr\bin\bash.exe -lc ^" ^
 	needle=\^"$(tail -c 16384 /var/log/pacman.log ^| ^
 		   grep '\[PACMAN\] starting .* system upgrade' ^| ^
 		   tail -n 1)\^" ^&^& ^
 	test -n \^"$needle\^" ^&^& ^
 	test \^"a$needle\^" = \^"a${needle#*full system upgrade}\^"^"
-
+@ECHO End of search for full/partial Upgrade indicator in Pacman.log
+@ECHO ==
 @IF ERRORLEVEL 1 GOTO FINISH
 
-@ECHO "Run Pacman again to upgrade the remaining (non-core) packages"
+@ECHO "Run Pacman again (Second Pass) to upgrade the remaining (non-core) packages"
 @pacman -Su --noconfirm
+@ECHO "End of Pacman (Second Pass) for (non-core) packages"
+@ECHO ==
 @IF ERRORLEVEL 1 GOTO DIE
 
 :FINISH
-@REM Wrapping up: re-install git-extra
+@ECHO Wrapping up: re-install git-extra
 @pacman -S --noconfirm git-extra
+@ECHO End of re-install of git-extra
+@ECHO ==
 @IF ERRORLEVEL 1 GOTO DIE
 
 @ECHO All done!

mingw32/bin/libpython3.10.dll

@@ -12,7 +12,14 @@ case "$1" in
 		odt2txt "$1" || cat "$1"
 		;;
 	*.doc | *.DOC | *.dot | *.DOT)
-		out=$(antiword -m UTF-8 "$1") && sed "s/\^M$//" <<<$out || cat "$1"
+		case "$(file --brief --mime-type "$1")" in
+			application/msword)
+				out=$(antiword -m UTF-8 "$1") && sed "s/\^M$//" <<<$out || cat "$1"
+				;;
+			*)
+				cat "$1"
+				;;
+		esac
 		;;
 	*.docx | *.DOCX | *.dotx | *.DOTX | *.docm | *.DOCM | *.dotm | *.DOTM)
 		docx2txt.pl "$1" - || cat "$1"

mingw32/bin/proxy-lookup.exe

@@ -31,7 +31,7 @@ OS="msys"
 CC="gcc"
 CFLAGS="-march=i686 -mtune=generic -O2 -pipe -D_STATIC_BUILD"
 RELEASE="5.2"
-PATCHLEVEL="2"
+PATCHLEVEL="9"
 RELSTATUS="release"
 MACHTYPE="i686-pc-msys"
 

mingw32/bin/python-config

@@ -2,7 +2,7 @@
 bash
 
 %VERSION%
-5.2.002-1
+5.2.009-1
 
 %BASE%
 bash
@@ -17,16 +17,16 @@ https://www.gnu.org/software/bash/bash.html
 i686
 
 %BUILDDATE%
-1667495324
+1667853645
 
 %INSTALLDATE%
-1667503088
+1667879997
 
 %PACKAGER%
 Git for Windows Build Agent <[email protected]>
 
 %SIZE%
-10442670
+10443694
 
 %LICENSE%
 GPL

mingw32/bin/python.exe

@@ -2,7 +2,7 @@
 git-extra
 
 %VERSION%
-1.1.600.cbd5e15-1
+1.1.609.6752ff0-1
 
 %BASE%
 git-extra
@@ -17,16 +17,16 @@ https://github.com/git-for-windows/build-extra
 i686
 
 %BUILDDATE%
-1658917789
+1667846182
 
 %INSTALLDATE%
-1667706573
+1667880022
 
 %PACKAGER%
 Git for Windows Build Agent <[email protected]>
 
 %SIZE%
-519866
+525601
 
 %GROUPS%
 VCS

mingw32/bin/python3-config

@@ -8,9 +8,7 @@ post_install () {
 	symlinks = false
 	autocrlf = true
 [color]
-	diff = auto
-	status = auto
-	branch = auto
+	ui = auto
 	interactive = true
 [pack]
 	packSizeLimit = 2g

mingw32/bin/python3.10-config

@@ -2,7 +2,7 @@
 mingw-w64-i686-python
 
 %VERSION%
-3.10.8-1
+3.10.8-2
 
 %BASE%
 mingw-w64-python
@@ -17,16 +17,16 @@ https://www.python.org/
 any
 
 %BUILDDATE%
-1665860503
+1667777196
 
 %INSTALLDATE%
-1665982812
+1667880019
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/9d582e19/3256715755)
+CI (msys2/msys2-autobuild/59e8e1af/3406443007)
 
 %SIZE%
-123597404
+123771712
 
 %REASON%
 1