Msys2 base update to msys2-base-x86_64-20210215

README.md

@@ -11,7 +11,7 @@ ProxSpace comes with 2 different executables .bat files.
 ProxSpace will automatically download and update to the latest required packages. All tools will be contained within the ProxSpace folder, however **once ProxSpace is setup the ProxSpace folder must not be moved**. If you wish to have ProxSpace in a different directory, you need to reinstall it.
 
 ProxSpace is based on:
- - msys2-x86_64-20200903
+ - msys2-x86_64-20210215
  
  Following packages will be automatically download or updated:
  - arm-none-eabi-gcc

msys2/etc/makepkg_clang32.conf

@@ -48,7 +48,7 @@ CHOST="i686-w64-mingw32"
 #
 MINGW_CHOST="i686-w64-mingw32"
 MINGW_PREFIX="/clang32"
-MINGW_PACKAGE_PREFIX="clang-mingw-w64-i686"
+MINGW_PACKAGE_PREFIX="mingw-w64-clang-i686"
 
 # DirectX compatibility environment variable
 DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
@@ -59,9 +59,7 @@ DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
 CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
 CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
 CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-LDFLAGS="-pipe"
-# Uncomment to enable hardening (ASLR, DEP)
-#LDFLAGS="-pipe -Wl,--dynamicbase,--nxcompat"
+LDFLAGS="-pipe -Wl,--dynamicbase,--no-seh"
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j$(($(nproc)+1))"
 #-- Debugging flags

msys2/etc/makepkg_clang64.conf

@@ -48,7 +48,7 @@ CHOST="x86_64-w64-mingw32"
 #
 MINGW_CHOST="x86_64-w64-mingw32"
 MINGW_PREFIX="/clang64"
-MINGW_PACKAGE_PREFIX="clang-mingw-w64-x86_64"
+MINGW_PACKAGE_PREFIX="mingw-w64-clang-x86_64"
 
 # DirectX compatibility environment variable
 DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
@@ -59,9 +59,7 @@ DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
 CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
 CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-LDFLAGS="-pipe"
-# Uncomment to enable hardening (ASLR, High entropy ASLR, DEP)
-#LDFLAGS="-pipe -Wl,--dynamicbase,--high-entropy-va,--nxcompat"
+LDFLAGS="-pipe -Wl,--dynamicbase"
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j$(($(nproc)+1))"
 #-- Debugging flags

msys2/etc/makepkg_mingw64.conf

@@ -59,7 +59,7 @@ DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST}
 CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
 CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-LDFLAGS="-pipe -Wl,--dynamicbase,--high-entropy-va,--nxcompat"
+LDFLAGS="-pipe -Wl,--dynamicbase,--high-entropy-va,--nxcompat,--default-image-base-high"
 # Uncomment to disable hardening (ASLR, High entropy ASLR, DEP)
 #LDFLAGS="-pipe"
 #-- Make Flags: change this for DistCC/SMP systems

msys2/etc/msystem

@@ -43,6 +43,26 @@ case "${MSYSTEM}" in
         CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
         export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
         ;;
+    CLANG32)
+        MSYSTEM_PREFIX='/clang32'
+        MSYSTEM_CARCH='i686'
+        MSYSTEM_CHOST='i686-w64-mingw32'
+        MINGW_CHOST="${MSYSTEM_CHOST}"
+        MINGW_PREFIX="${MSYSTEM_PREFIX}"
+        MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
+        CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
+        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
+        ;;
+    CLANG64)
+        MSYSTEM_PREFIX='/clang64'
+        MSYSTEM_CARCH='x86_64'
+        MSYSTEM_CHOST='x86_64-w64-mingw32'
+        MINGW_CHOST="${MSYSTEM_CHOST}"
+        MINGW_PREFIX="${MSYSTEM_PREFIX}"
+        MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}"
+        CONFIG_SITE="${MSYSTEM_PREFIX}/etc/config.site"
+        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX CONFIG_SITE
+        ;;
     *)
         MSYSTEM_PREFIX='/usr'
         MSYSTEM_CARCH="$(/usr/bin/uname -m)"

msys2/etc/nanorc

@@ -0,0 +1,295 @@
+## Sample initialization file for GNU nano.
+##
+## For the options that take parameters, the default value is shown.
+## Other options are unset by default.  To make sure that an option
+## is disabled, you can use "unset <option>".
+##
+## Characters that are special in a shell should not be escaped here.
+## Inside string parameters, quotes should not be escaped -- the last
+## double quote on the line will be seen as the closing quote.
+
+## Make 'nextword' (Ctrl+Right) and 'chopwordright' (Ctrl+Delete)
+## stop at word ends instead of at beginnings.
+# set afterends
+
+## When soft line wrapping is enabled, make it wrap lines at blanks
+## (tabs and spaces) instead of always at the edge of the screen.
+# set atblanks
+
+## Automatically indent a newly created line to the same number of
+## tabs and/or spaces as the preceding line -- or as the next line
+## if the preceding line is the beginning of a paragraph.
+# set autoindent
+
+## Back up files to the current filename plus a tilde.
+# set backup
+
+## The directory to put unique backup files in.
+# set backupdir ""
+
+## Use bold text instead of reverse video text.
+# set boldtext
+
+## Treat any line with leading whitespace as the beginning of a paragraph.
+# set bookstyle
+
+## The characters treated as closing brackets when justifying paragraphs.
+## This may not include any blank characters.  Only closing punctuation,
+## optionally followed by these closing brackets, can end sentences.
+# set brackets ""')>]}"
+
+## Automatically hard-wrap the current line when it becomes overlong.
+# set breaklonglines
+
+## Do case-sensitive searches by default.
+# set casesensitive
+
+## Constantly display the cursor position in the status bar.  Note that
+## this overrides "quickblank".
+# set constantshow
+
+## Use cut-from-cursor-to-end-of-line by default.
+# set cutfromcursor
+
+## Do not use the line below the title bar, leaving it entirely blank.
+# set emptyline
+
+## Set the target width for automatic hard-wrapping and for justifying
+## paragraphs.  If the specified value is 0 or less, the wrapping point
+## will be the terminal's width minus this number.
+# set fill -8
+
+## Remember the used search/replace strings for the next session.
+# set historylog
+
+## Display a "scrollbar" on the righthand side of the edit window.
+# set indicator
+
+## Scroll the buffer contents per half-screen instead of per line.
+# set jumpyscrolling
+
+## Display line numbers to the left (and any anchors in the margin).
+# set linenumbers
+
+## Enable vim-style lock-files.  This is just to let a vim user know you
+## are editing a file [s]he is trying to edit and vice versa.  There are
+## no plans to implement vim-style undo state in these files.
+# set locking
+
+## Fall back to slow libmagic to try and determine an applicable syntax.
+# set magic
+
+## The opening and closing brackets that can be found by bracket
+## searches.  They cannot contain blank characters.  The former set must
+## come before the latter set, and both must be in the same order.
+# set matchbrackets "(<[{)>]}"
+
+## Enable mouse support, if available for your system.  When enabled,
+## mouse clicks can be used to place the cursor, set the mark (with a
+## double click), and execute shortcuts.  The mouse will work in the X
+## Window System, and on the console when gpm is running.
+# set mouse
+
+## Switch on multiple file buffers (inserting a file will put it into
+## a separate buffer).
+# set multibuffer
+
+## Don't convert files from DOS/Mac format.
+# set noconvert
+
+## Don't display the helpful shortcut lists at the bottom of the screen.
+# set nohelp
+
+## Don't automatically add a newline when a file does not end with one.
+# set nonewlines
+
+## Set operating directory.  nano will not read or write files outside
+## this directory and its subdirectories.  Also, the current directory
+## is changed to here, so any files are inserted from this dir.  A blank
+## string means the operating-directory feature is turned off.
+# set operatingdir ""
+
+## Remember the cursor position in each file for the next editing session.
+# set positionlog
+
+## Preserve the XON and XOFF keys (^Q and ^S).
+# set preserve
+
+## The characters treated as closing punctuation when justifying
+## paragraphs.  They cannot contain blank characters.  Only closing
+## punctuation, optionally followed by closing brackets, can end
+## sentences.
+# set punct "!.?"
+
+## Do quick status-bar blanking.  Status-bar messages will disappear after
+## 1 keystroke instead of 26.  Note that "constantshow" overrides this.
+# set quickblank
+
+## The regular expression that matches quoting characters in email
+## or line-comment introducers in source code.  The default is:
+# set quotestr "^([ 	]*([!#%:;>|}]|//))+"
+
+## Try to work around a mismatching terminfo terminal description.
+# set rawsequences
+
+## Fix Backspace/Delete confusion problem.
+# set rebinddelete
+
+## Do regular-expression searches by default.
+## Regular expressions are of the extended type (ERE).
+# set regexp
+
+## Save a changed buffer automatically on exit; don't prompt.
+# set saveonexit
+## (The old form of this option, 'set tempfile', is deprecated.)
+
+## Put the cursor on the highlighted item in the file browser, and show
+## the cursor in the help viewer; useful for people who use a braille
+## display and people with poor vision.
+# set showcursor
+
+## Make the Home key smarter.  When Home is pressed anywhere but at the
+## very beginning of non-whitespace characters on a line, the cursor
+## will jump to that beginning (either forwards or backwards).  If the
+## cursor is already at that position, it will jump to the true
+## beginning of the line.
+# set smarthome
+
+## Spread overlong lines over multiple screen lines.
+# set softwrap
+
+## Use this spelling checker instead of the internal one.  This option
+## does not have a default value.
+# set speller "aspell -x -c"
+
+## Use the end of the title bar for some state flags: I = auto-indenting,
+## M = mark, L = hard-wrapping long lines, R = recording, S = soft-wrapping.
+# set stateflags
+
+## Allow nano to be suspended (with ^Z by default).
+# set suspendable
+## (The old form of this option, 'set suspend', is deprecated.)
+
+## Use this tab size instead of the default; it must be greater than 0.
+# set tabsize 8
+
+## Convert typed tabs to spaces.
+# set tabstospaces
+
+## Snip whitespace at the end of lines when justifying or hard-wrapping.
+# set trimblanks
+
+## The two single-column characters used to display the first characters
+## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
+## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
+## The default when in a UTF-8 locale:
+# set whitespace "»·"
+## The default otherwise:
+# set whitespace ">."
+
+## Detect word boundaries differently by treating punctuation
+## characters as parts of words.
+# set wordbounds
+
+## The characters (besides alphanumeric ones) that should be considered
+## as parts of words.  This option does not have a default value.  When
+## set, it overrides option 'set wordbounds'.
+# set wordchars "<_>."
+
+## Let an unmodified Backspace or Delete erase the marked region (instead
+## of a single character, and without affecting the cutbuffer).
+# set zap
+
+## Paint the interface elements of nano.  These are examples;
+## by default there are no colors, except for errorcolor.
+# set titlecolor bold,lightwhite,blue
+# set statuscolor bold,lightwhite,green
+# set errorcolor bold,lightwhite,red
+# set selectedcolor lightwhite,magenta
+# set stripecolor ,yellow
+# set scrollercolor cyan
+# set numbercolor cyan
+# set keycolor cyan
+# set functioncolor green
+
+## In root's .nanorc you might want to use:
+# set titlecolor bold,lightwhite,magenta
+# set statuscolor bold,lightwhite,magenta
+# set errorcolor bold,lightwhite,red
+# set selectedcolor lightwhite,cyan
+# set stripecolor ,yellow
+# set scrollercolor magenta
+# set numbercolor magenta
+# set keycolor lightmagenta
+# set functioncolor magenta
+
+
+## === Syntax coloring ===
+## 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"
+
+## 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"
+
+## In /usr/share/nano/extra/ you can find some syntaxes that are
+## specific for certain distros or for some less common languages.
+
+
+## If <Tab> should always produce four spaces when editing a Python file,
+## independent of the settings of 'tabsize' and 'tabstospaces':
+# extendsyntax python tabgives "    "
+
+## If <Tab> should always produce an actual TAB when editing a Makefile:
+# extendsyntax makefile tabgives "	"
+
+
+## === Key bindings ===
+## For all details, see 'man nanorc', section REBINDING KEYS.
+
+## The <Ctrl+Delete> keystroke deletes the word to the right of the cursor.
+## On some terminals the <Ctrl+Backspace> keystroke produces ^H, which is
+## the ASCII character for backspace, so it is bound by default to the
+## backspace function.  The <Backspace> key itself produces a different
+## keycode, which is hard-bound to the backspace function.  So, if you
+## normally use <Backspace> for backspacing and not ^H, you can make
+## <Ctrl+Backspace> delete the word to the left of the cursor with:
+# bind ^H chopwordleft main
+
+## If you would like nano to have keybindings that are more "usual",
+## such as ^O for Open, ^F for Find, ^H for Help, and ^Q for Quit,
+## then uncomment these:
+#bind ^Q exit all
+#bind ^S savefile main
+#bind ^W writeout main
+#bind ^O insert main
+#bind ^H help all
+#bind ^H exit help
+#bind ^F whereis all
+#bind ^G findnext all
+#bind ^B wherewas all
+#bind ^D findprevious all
+#bind ^R replace main
+#bind M-X flipnewbuffer all
+#bind ^X cut all
+#bind ^C copy main
+#bind ^V paste all
+#bind ^P location main
+#bind ^A mark main
+#unbind ^K main
+#unbind ^U all
+#unbind ^N main
+#unbind ^Y all
+#unbind M-J main
+#unbind M-T main
+#bind ^T gotoline main
+#bind ^T gotodir browser
+#bind ^Y speller main
+#bind M-U undo main
+#bind M-R redo main
+#bind ^U undo main
+#bind ^E redo main
+#set multibuffer

msys2/etc/pacman.d/mirrorlist.mingw32

@@ -4,11 +4,23 @@
 
 ## Primary
 ## msys2.org
-Server = http://repo.msys2.org/mingw/i686/
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/i686/
+Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/i686/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/i686/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/i686/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/i686/
 Server = http://mirrors.ustc.edu.cn/msys2/mingw/i686/
 Server = http://mirror.bit.edu.cn/msys2/mingw/i686/
 Server = https://mirror.selfnet.de/msys2/mingw/i686/
+Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/i686/
+Server = https://mirror.jmu.edu/pub/msys2/mingw/i686/
+Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/i686/
+Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/i686/
+Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/i686/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/i686/
+Server = https://mirrors.dotsrc.org/msys2/mingw/i686/ 
+Server = https://mirror.ufro.cl/msys2/mingw/i686/
+Server = https://mirror.clarkson.edu/msys2/mingw/i686/
+Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/i686/
+Server = https://download.nus.edu.sg/mirror/msys2/mingw/i686/
+Server = https://ftp.osuosl.org/pub/msys2/mingw/i686/
+Server = https://fastmirror.pp.ua/msys2/mingw/i686/

msys2/etc/pacman.d/mirrorlist.mingw64

@@ -4,11 +4,23 @@
 
 ## Primary
 ## msys2.org
-Server = http://repo.msys2.org/mingw/x86_64/
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/
+Server = https://downloads.sourceforge.net/project/msys2/REPOS/MINGW/x86_64/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/x86_64/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/x86_64/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/x86_64/
 Server = http://mirrors.ustc.edu.cn/msys2/mingw/x86_64/
 Server = http://mirror.bit.edu.cn/msys2/mingw/x86_64/
 Server = https://mirror.selfnet.de/msys2/mingw/x86_64/
+Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/x86_64/
+Server = https://mirror.jmu.edu/pub/msys2/mingw/x86_64/
+Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/x86_64/
+Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/x86_64/
+Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/x86_64/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/x86_64/
+Server = https://mirrors.dotsrc.org/msys2/mingw/x86_64/ 
+Server = https://mirror.ufro.cl/msys2/mingw/x86_64/
+Server = https://mirror.clarkson.edu/msys2/mingw/x86_64/
+Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/x86_64/
+Server = https://download.nus.edu.sg/mirror/msys2/mingw/x86_64/
+Server = https://ftp.osuosl.org/pub/msys2/mingw/x86_64/
+Server = https://fastmirror.pp.ua/msys2/mingw/x86_64/

msys2/etc/pacman.d/mirrorlist.msys

@@ -4,11 +4,23 @@
 
 ## Primary
 ## msys2.org
-Server = http://repo.msys2.org/msys/$arch/
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MSYS2/$arch/
+Server = https://downloads.sourceforge.net/project/msys2/REPOS/MSYS2/$arch/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/msys/$arch/
 Server = https://mirror.yandex.ru/mirrors/msys2/msys/$arch/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/msys/$arch/
 Server = http://mirrors.ustc.edu.cn/msys2/msys/$arch/
 Server = http://mirror.bit.edu.cn/msys2/msys/$arch/
 Server = https://mirror.selfnet.de/msys2/msys/$arch/
+Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/msys/$arch/
+Server = https://mirror.jmu.edu/pub/msys2/msys/$arch/
+Server = https://ftp.cc.uoc.gr/mirrors/msys2/msys/$arch/
+Server = https://ftp.acc.umu.se/mirror/msys2.org/msys/$arch/
+Server = https://mirrors.piconets.webwerks.in/msys2-mirror/msys/$arch/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/msys/$arch/
+Server = https://mirrors.dotsrc.org/msys2/msys/$arch/ 
+Server = https://mirror.ufro.cl/msys2/msys/$arch/
+Server = https://mirror.clarkson.edu/msys2/msys/$arch/
+Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/msys/$arch/
+Server = https://download.nus.edu.sg/mirror/msys2/msys/$arch/
+Server = https://ftp.osuosl.org/pub/msys2/msys/$arch/
+Server = https://fastmirror.pp.ua/msys2/msys/$arch/

msys2/etc/post-install/01-devices.post

@@ -52,8 +52,6 @@ maybe_create_devs ()
       echo "POSIX semaphores and POSIX shared memory will not work"
       echo
     fi
-  else
-    chmod 1777 "${DEVDIR}/shm"
   fi
 
   # Check for ${DEVDIR}/mqueue directory (for POSIX message queues)
@@ -81,8 +79,6 @@ maybe_create_devs ()
       echo "POSIX message queues will not work"
       echo
     fi
-  else
-    chmod 1777 "${DEVDIR}/mqueue"
   fi
   
   # Install /dev/fd, /dev/std{in,out,err}.  The bash builtin test was compiled

msys2/etc/profile

@@ -47,14 +47,7 @@ esac
 unset MINGW_MOUNT_POINT
 . '/etc/msystem'
 case "${MSYSTEM}" in
-MINGW32)
-  MINGW_MOUNT_POINT="${MINGW_PREFIX}"
-  PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}"
-  PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig"
-  ACLOCAL_PATH="${MINGW_MOUNT_POINT}/share/aclocal:/usr/share/aclocal"
-  MANPATH="${MINGW_MOUNT_POINT}/local/man:${MINGW_MOUNT_POINT}/share/man:${MANPATH}"
-  ;;
-MINGW64)
+MINGW*|CLANG*)
   MINGW_MOUNT_POINT="${MINGW_PREFIX}"
   PATH="${MINGW_MOUNT_POINT}/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}"
   PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig"

msys2/etc/profile.d/bash_completion.sh

@@ -3,9 +3,9 @@
 if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BASH_COMPLETION_VERSINFO-}" = x ]; then
 
     # Check for recent enough version of bash.
-    if [ "${BASH_VERSINFO[0]}" -gt 4 ] || \
-       [ "${BASH_VERSINFO[0]}" -eq 4 -a "${BASH_VERSINFO[1]}" -ge 1 ]; then
-        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
+    if [ "${BASH_VERSINFO[0]}" -gt 4 ] ||
+        [ "${BASH_VERSINFO[0]}" -eq 4 -a "${BASH_VERSINFO[1]}" -ge 2 ]; then
+        [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] &&
             . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
         if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then
             # Source completion code.

msys2/msys2_shell.cmd

@@ -93,13 +93,16 @@ set msys2_arg=
 set msys2_shiftCounter=
 set msys2_full_cmd=
 
-rem Setup proper title
+rem Setup proper title and icon
 if "%MSYSTEM%" == "MINGW32" (
   set "CONTITLE=MinGW x32"
+  set "CONICON=mingw32.ico"
 ) else if "%MSYSTEM%" == "MINGW64" (
   set "CONTITLE=MinGW x64"
+  set "CONICON=mingw64.ico"
 ) else (
   set "CONTITLE=MSYS2 MSYS"
+  set "CONICON=msys2.ico"
 )
 
 if "x%MSYSCON%" == "xmintty.exe" goto startmintty
@@ -110,9 +113,9 @@ if NOT EXIST "%WD%mintty.exe" goto startsh
 set MSYSCON=mintty.exe
 :startmintty
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
+  start "%CONTITLE%" "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
 ) else (
-  "%WD%mintty" -i /msys2.ico -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
+  "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%
 
@@ -122,9 +125,9 @@ call :conemudetect || (
   exit /b 1
 )
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+  start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\%CONICON%" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
 ) else (
-  "%ComEmuCommand%" /Here /Icon "%WD%..\..\msys2.ico" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+  "%ComEmuCommand%" /Here /Icon "%WD%..\..\%CONICON%" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%
 

msys2/usr/bin/bashbug

@@ -7,7 +7,7 @@
 # chet@cwru.edu and, optionally, to bash-testers@cwru.edu.
 # Other versions send mail to bug-bash@gnu.org.
 #
-# Copyright (C) 1996-2004 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -29,9 +29,9 @@
 MACHINE="x86_64"
 OS="msys"
 CC="gcc"
-CFLAGS=" -DPROGRAM='bash.exe' -DCONF_HOSTTYPE='x86_64' -DCONF_OSTYPE='msys' -DCONF_MACHTYPE='x86_64-pc-msys' -DCONF_VENDOR='pc' -DLOCALEDIR='/usr/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H -DRECYCLES_PIDS   -I.  -I. -I./include -I./lib  -DWORDEXP_OPTION -march=x86-64 -mtune=generic -O2 -pipe -Wno-parentheses -Wno-format-security -D_STATIC_BUILD"
-RELEASE="4.4"
-PATCHLEVEL="23"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -D_STATIC_BUILD "
+RELEASE="5.1"
+PATCHLEVEL="4"
 RELSTATUS="release"
 MACHTYPE="x86_64-pc-msys"
 
@@ -43,7 +43,7 @@ export PATH
 
 #Securely create a temporary directory for the temporary files
 TEMPDIR=$TMPDIR/bbug.$$
-(umask 077 && mkdir $TEMPDIR) || {
+(umask 077 && mkdir "$TEMPDIR") || {
 	echo "$0: could not create temporary directory" >&2
 	exit 1
 }
@@ -132,6 +132,8 @@ if [ -z "$DEFEDITOR" ] && [ -z "$EDITOR" ]; then
 		DEFEDITOR=emacs
 	elif [ -x /usr/bin/xemacs ]; then
 		DEFEDITOR=xemacs
+	elif [ -x /usr/bin/nano ]; then
+		DEFEDITOR=nano
 	elif [ -x /usr/contrib/bin/jove ]; then
 		DEFEDITOR=jove
 	elif [ -x /usr/local/bin/jove ]; then

msys2/usr/bin/checkupdates

@@ -19,7 +19,7 @@
 #
 
 declare -r myname='checkupdates'
-declare -r myver='1.3.0'
+declare -r myver='1.4.0'
 
 LIBRARY=${LIBRARY:-'/usr/share/makepkg'}
 

msys2/usr/bin/makepkg-clang

@@ -1,101 +0,0 @@
-#!/usr/bin/env bash
-#   makepkg-mingw - wrapper for makepkg to build mingw-w64 packages under  MSYS2
-#
-#   Copyright (c) 2018 Alexey Pavlov <alexpux@gmail.com>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-plain() {
-  local mesg=$1; shift
-  printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-print_warning() {
-  local mesg=$1; shift
-  printf "${YELLOW}=> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-print_msg1() {
-  local mesg=$1; shift
-  printf "${GREEN}==> ${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-print_msg2() {
-  local mesg=$1; shift
-  printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-print_error() {
-  local mesg=$1; shift
-  printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-if /usr/bin/tput setaf 0 &>/dev/null; then
-  ALL_OFF="$(/usr/bin/tput sgr0)"
-  BOLD="$(/usr/bin/tput bold)"
-  BLUE="${BOLD}$(/usr/bin/tput setaf 4)"
-  GREEN="${BOLD}$(/usr/bin/tput setaf 2)"
-  RED="${BOLD}$(/usr/bin/tput setaf 1)"
-  YELLOW="${BOLD}$(/usr/bin/tput setaf 3)"
-else
-  ALL_OFF="\e[1;0m"
-  BOLD="\e[1;1m"
-  BLUE="${BOLD}\e[1;34m"
-  GREEN="${BOLD}\e[1;32m"
-  RED="${BOLD}\e[1;31m"
-  YELLOW="${BOLD}\e[1;33m"
-fi
-
-readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
-MINGW_INSTALLS="${MINGW_INSTALLS,,}"
-MINGW_INSTALLS="${MINGW_INSTALLS:-clang64 clang32}"
-
-for _mingw in ${MINGW_INSTALLS}; do
-  if [ ! "${_mingw}" = 'clang32' -a ! "${_mingw}" = 'clang64' ]; then
-    print_error "Requested mingw installation '${_mingw}', but only 'clang32' and 'clang64' are allowed."
-    exit 1
-  fi
-done
-
-for _arg in "$@"; do
-  if [ ${_arg} = "--help" -o ${_arg} = "-h" -o ${_arg} = "--version" -o ${_arg} = "-V" ]; then
-    /usr/bin/makepkg $@
-    exit 0
-  fi
-done
-
-for _mingw in ${MINGW_INSTALLS}; do
-  case ${_mingw} in
-    clang32)
-      _arch=i686
-      _msystem=MINGW32
-    ;;
-    clang64)
-      _arch=x86_64
-      _msystem=MINGW64
-    ;;
-  esac
-
-  if [ -f "/${_mingw}/bin/clang.exe" ]; then
-    MSYSTEM=${_msystem} \
-    PATH=/${_mingw}/bin:$(echo $PATH | tr ':' '\n' | awk '$0 != "/opt/bin"' | paste -sd:) \
-    /usr/bin/makepkg --config /etc/makepkg_${_mingw}.conf $@ || exit 1
-  else
-    print_warning "You don't have installed mingw-w64 toolchain for architecture ${_arch}."
-    print_warning "To install it run: 'pacman -S mingw-w64-${_arch}-toolchain'"
-  fi
-done
-
-exit 0

msys2/usr/bin/makepkg-mingw

@@ -17,6 +17,8 @@
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+set -e
+
 plain() {
   local mesg=$1; shift
   printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
@@ -61,17 +63,18 @@ fi
 readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
 MINGW_INSTALLS="${MINGW_INSTALLS,,}"
 MINGW_INSTALLS="${MINGW_INSTALLS:-mingw64 mingw32}"
+MINGW_INSTALLS_ALLOWED=('mingw32' 'mingw64' 'clang32' 'clang64')
 
 for _mingw in ${MINGW_INSTALLS}; do
-  if [ ! "${_mingw}" = 'mingw32' -a ! "${_mingw}" = 'mingw64' ]; then
-    print_error "Requested mingw installation '${_mingw}', but only 'mingw32' and 'mingw64' are allowed."
+  if [[ ! " ${MINGW_INSTALLS_ALLOWED[*]} " = *" ${_mingw} "* ]]; then
+    print_error "Requested mingw installation '${_mingw}' unknown, possible values: ${MINGW_INSTALLS_ALLOWED[*]}"
     exit 1
   fi
 done
 
 for _arg in "$@"; do
-  if [ ${_arg} = "--help" -o ${_arg} = "-h" -o ${_arg} = "--version" -o ${_arg} = "-V" ]; then
-    /usr/bin/makepkg $@
+  if [ "${_arg}" = "--help" ] || [ "${_arg}" = "-h" ] || [ "${_arg}" = "--version" ] || [ "${_arg}" = "-V" ]; then
+    /usr/bin/makepkg "$@"
     exit 0
   fi
 done
@@ -79,23 +82,36 @@ done
 for _mingw in ${MINGW_INSTALLS}; do
   case ${_mingw} in
     mingw32)
-      _arch=i686
       _msystem=MINGW32
+      _compiler="/${_mingw}/bin/gcc.exe"
+      _toolchain="mingw-w64-i686-toolchain"
     ;;
     mingw64)
-      _arch=x86_64
       _msystem=MINGW64
+      _compiler="/${_mingw}/bin/gcc.exe"
+      _toolchain="mingw-w64-x86_64-toolchain"
+    ;;
+    clang32)
+      _msystem=CLANG32
+      _compiler="/${_mingw}/bin/clang.exe"
+      _toolchain="mingw-w64-clang-i686-clang"
+    ;;
+    clang64)
+      _msystem=CLANG64
+      _compiler="/${_mingw}/bin/clang.exe"
+      _toolchain="mingw-w64-clang-x86_64-clang"
     ;;
   esac
 
-  if [ -f "/${_mingw}/bin/gcc.exe" ]; then
-    MSYSTEM=${_msystem} \
-    PATH=/${_mingw}/bin:$(echo $PATH | tr ':' '\n' | awk '$0 != "/opt/bin"' | paste -sd:) \
-    /usr/bin/makepkg --config /etc/makepkg_${_mingw}.conf $@ || exit 1
-  else
-    print_warning "You don't have installed mingw-w64 toolchain for architecture ${_arch}."
-    print_warning "To install it run: 'pacman -S mingw-w64-${_arch}-toolchain'"
+  if [ ! -f "${_compiler}" ]; then
+    print_warning "You don't have the required toolchain installed for ${_mingw}."
+    print_warning "To install it run: 'pacman -S -${_toolchain}'"
   fi
+
+  MSYSTEM="${_msystem}" \
+  CHERE_INVOKING=1 \
+    bash -leo pipefail -c "/usr/bin/makepkg --config /etc/makepkg_${_mingw}.conf \"\$@\"" bash "$@"
+
 done
 
 exit 0