Updated to msys2-base-x86_64-20230718

2025-08-13 18:17:02 -07:00 · 2023-09-22 00:10:50 +02:00 · 2023-09-22 00:10:50 +02:00 · 3ecafa4835
commit 3ecafa4835
parent 818333091b
12407 changed files with 212713 additions and 604543 deletions
--- a/msys2/.gitattributes
+++ b/msys2/.gitattributes
@ -1 +0,0 @@
-* binary
--- a/msys2/clang32.exe
+++ b/msys2/clang32.exe
--- a/msys2/clang32.ico
+++ b/msys2/clang32.ico
--- a/msys2/clang32.ini
+++ b/msys2/clang32.ini
@ -0,0 +1,5 @@
+#MSYS=winsymlinks:nativestrict
+#MSYS=error_start:mingw64/bin/qtcreator.exe|-debug|<process-id>
+#CHERE_INVOKING=1
+#MSYS2_PATH_TYPE=inherit
+MSYSTEM=CLANG32
--- a/msys2/clang64.exe
+++ b/msys2/clang64.exe
--- a/msys2/clangarm64.exe
+++ b/msys2/clangarm64.exe
--- a/msys2/clangarm64.ico
+++ b/msys2/clangarm64.ico
--- a/msys2/clangarm64.ini
+++ b/msys2/clangarm64.ini
@ -0,0 +1,5 @@
+#MSYS=winsymlinks:nativestrict
+#MSYS=error_start:mingw64/bin/qtcreator.exe|-debug|<process-id>
+#CHERE_INVOKING=1
+#MSYS2_PATH_TYPE=inherit
+MSYSTEM=CLANGARM64
--- a/msys2/dir
+++ b/msys2/dir
@ -1,15 +0,0 @@
-This is the file .../info/dir, which contains the
-topmost node of the Info hierarchy, called (dir)Top.
-The first time you invoke Info you start off looking at this node.
-
-File: dir,	Node: Top	This is the top of the INFO tree
-
-  This (the Directory node) gives a menu of major topics.
-  Typing "q" exits, "H" lists all Info commands, "d" returns here,
-  "h" gives a primer for first-timers,
-  "mEmacs<Return>" visits the Emacs manual, etc.
-
-  In Emacs, you can click mouse button 2 on a menu item or cross reference
-  to select it.
-
-* Menu:
--- a/msys2/etc/bash.bashrc
+++ b/msys2/etc/bash.bashrc
@ -54,8 +54,12 @@ if [[ -n "$(command -v getent)" ]] && id -G | grep -q "$(getent -w group 'S-1-16
  then _ps1_symbol='\[\e[1m\]#\[\e[0m\]'
  else _ps1_symbol='\$'
 fi
-[[ $(declare -p PS1 2>/dev/null | cut -c 1-11) = 'declare -x ' ]] || \
+case "$(declare -p PS1 2>/dev/null)" in
+'declare -x '*) ;; # okay
+*)
  export PS1='\[\e]0;\w\a\]\n\[\e[32m\]\u@\h \[\e[35m\]$MSYSTEM\[\e[0m\] \[\e[33m\]\w\[\e[0m\]\n'"${_ps1_symbol}"' '
+  ;;
+esac
 unset _ps1_symbol

 # Uncomment to use the terminal colours set in DIR_COLORS
--- a/msys2/etc/inputrc
+++ b/msys2/etc/inputrc
@ -0,0 +1,103 @@
+# To the extent possible under law, the author(s) have dedicated all 
+# copyright and related and neighboring rights to this software to the 
+# public domain worldwide. This software is distributed without any warranty. 
+# You should have received a copy of the CC0 Public Domain Dedication along 
+# with this software. 
+# If not, see <https://creativecommons.org/publicdomain/zero/1.0/>. 
+
+# "\e[3~": delete-char
+
+# VT
+# "\e[1~": beginning-of-line
+# "\e[4~": end-of-line
+
+# kvt
+# "\e[H": beginning-of-line
+# "\e[F": end-of-line
+
+# rxvt and konsole (i.e. the KDE-app...)
+# "\e[7~": beginning-of-line
+# "\e[8~": end-of-line
+
+# VT220
+# "\eOH": beginning-of-line
+# "\eOF": end-of-line
+
+# Allow 8-bit input/output
+# set meta-flag on
+# set convert-meta off
+# set input-meta on
+# set output-meta on
+#$if Bash
+  # Don't ring bell on completion
+  set bell-style none
+
+  # or, don't beep at me - show me
+  #set bell-style visible
+
+  # Show all instead of beeping first
+  set show-all-if-ambiguous off
+
+  # Filename completion/expansion
+  set completion-ignore-case on
+  #set show-all-if-ambiguous on
+
+  # Expand homedir name
+  #set expand-tilde on
+
+  # Append "/" to all dirnames
+  #set mark-directories on
+  #set mark-symlinked-directories on
+
+  # visible-stats
+  # Append a mark according to the file type in a listing
+  set visible-stats off
+  set mark-directories on
+
+  # Match all files
+  #set match-hidden-files on
+
+  # 'Magic Space'
+  # Insert a space character then performs
+  # a history expansion in the line
+  #Space: magic-space
+#$endif
+
+# MSYSTEM is emacs based
+$if mode=emacs
+  # Common to Console & RXVT
+  "\e[2~": paste-from-clipboard      # "Ins. Key"
+  "\e[5~": beginning-of-history      # Page up
+  "\e[6~": end-of-history            # Page down
+
+  $if term=msys # RXVT
+    "\e[7~": beginning-of-line      # Home Key
+    "\e[8~": end-of-line            # End Key
+    "\e[11~": display-shell-version # F1
+    "\e[15~": re-read-init-file     # F5
+    "\e[12~": "Function Key 2"
+    "\e[13~": "Function Key 3"
+    "\e[14~": "Function Key 4"
+    "\e[17~": "Function Key 6"
+    "\e[18~": "Function Key 7"
+    "\e[19~": "Function Key 8"
+    "\e[20~": "Function Key 9"
+    "\e[21~": "Function Key 10"
+  $else
+  # Eh, normal Console is not really cygwin anymore, is it? Using 'else' instead. -mstormo
+  # $if term=cygwin # Console
+    "\e[1~": beginning-of-line      # Home Key
+    "\e[4~": end-of-line            # End Key
+    "\e[3~": delete-char      # Delete Key
+    "\e\e[C": forward-word      # Alt-Right
+    "\e\e[D": backward-word      # Alt-Left
+    "\e[1;5C": forward-word   # ctrl + right
+    "\e[1;5D": backward-word  # ctrl + left 
+    "\e[17~": "Function Key 6"
+    "\e[18~": "Function Key 7"
+    "\e[19~": "Function Key 8"
+    "\e[20~": "Function Key 9"
+    "\e[21~": "Function Key 10"
+    "\e[23~": "Function Key 11"
+  $endif
+$endif
--- a/msys2/etc/makepkg.conf
+++ b/msys2/etc/makepkg.conf
@ -28,15 +28,6 @@ VCSCLIENTS=('bzr::bzr'
            'hg::mercurial'
            'svn::subversion')

-#-- Using git am to apply patches has benefits, but also downsides
-#   one being that people without their .gitconfig set get prompts
-#   and the other being that the sha1s vary each time, so fix them
-GIT_COMMITTER_NAME="makepkg"
-GIT_COMMITTER_EMAIL="makepkg@msys2.org"
-function gitam_mkpkg() {
-  git am --committer-date-is-author-date "$@"
-}
-
 #########################################################################
 # ARCHITECTURE, COMPILE FLAGS
 #########################################################################
@ -50,8 +41,8 @@ CHOST="x86_64-pc-msys"
 CC=gcc
 CXX=g++
 CPPFLAGS=
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
+CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
+CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
 LDFLAGS="-pipe"
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j$(($(nproc)+1))"
@ -154,7 +145,7 @@ COMPRESSLZ=(lzip -c -f)
 #########################################################################
 #
 PKGEXT='.pkg.tar.zst'
-SRCEXT='.src.tar.gz'
+SRCEXT='.src.tar.zst'

 #########################################################################
 # OTHER
--- a/msys2/etc/makepkg_mingw.conf
+++ b/msys2/etc/makepkg_mingw.conf
@ -28,15 +28,6 @@ VCSCLIENTS=('bzr::bzr'
            'hg::mercurial'
            'svn::subversion')

-#-- Using git am to apply patches has benefits, but also downsides
-#   one being that people without their .gitconfig set get prompts
-#   and the other being that the sha1s vary each time, so fix them
-GIT_COMMITTER_NAME="makepkg"
-GIT_COMMITTER_EMAIL="makepkg@msys2.org"
-function gitam_mkpkg() {
-  git am --committer-date-is-author-date "$@"
-}
-
 #########################################################################
 # ARCHITECTURE, COMPILE FLAGS
 #########################################################################
@ -51,9 +42,9 @@ if [[ "$MSYSTEM" == "MINGW64" ]]; then
  CC="gcc"
  CXX="g++"
  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,--default-image-base-high"
+  CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
+  LDFLAGS="-pipe"
 elif [[ "$MSYSTEM" == "MINGW32" ]]; then
  CARCH="i686"
  CHOST="i686-w64-mingw32"
@ -63,9 +54,9 @@ elif [[ "$MSYSTEM" == "MINGW32" ]]; then
  CC="gcc"
  CXX="g++"
  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-  CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-  LDFLAGS="-pipe -Wl,--dynamicbase,--nxcompat,--no-seh"
+  CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CXXFLAGS="-march=pentium4 -mtune=generic -O2 -pipe"
+  LDFLAGS="-pipe -Wl,--no-seh -Wl,--large-address-aware"
 elif [[ "$MSYSTEM" == "CLANG64" ]]; then
  CARCH="x86_64"
  CHOST="x86_64-w64-mingw32"
@ -75,9 +66,9 @@ elif [[ "$MSYSTEM" == "CLANG64" ]]; then
  CC="clang"
  CXX="clang++"
  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"
+  CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
+  LDFLAGS="-pipe"
 elif [[ "$MSYSTEM" == "CLANG32" ]]; then
  CARCH="i686"
  CHOST="i686-w64-mingw32"
@ -87,9 +78,9 @@ elif [[ "$MSYSTEM" == "CLANG32" ]]; then
  CC="clang"
  CXX="clang++"
  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-  CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
-  LDFLAGS="-pipe -Wl,--dynamicbase,--no-seh"
+  CFLAGS="-march=pentium4 -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CXXFLAGS="-march=pentium4 -mtune=generic -O2 -pipe"
+  LDFLAGS="-pipe -Wl,--no-seh -Wl,--large-address-aware"
 elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
  CARCH="aarch64"
  CHOST="aarch64-w64-mingw32"
@ -99,9 +90,9 @@ elif [[ "$MSYSTEM" == "CLANGARM64" ]]; then
  CC="clang"
  CXX="clang++"
  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-O2 -pipe"
+  CFLAGS="-O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
  CXXFLAGS="-O2 -pipe"
-  LDFLAGS="-pipe -Wl,--dynamicbase"
+  LDFLAGS="-pipe"
 elif [[ "$MSYSTEM" == "UCRT64" ]]; then
  CARCH="x86_64"
  CHOST="x86_64-w64-mingw32"
@ -111,8 +102,8 @@ elif [[ "$MSYSTEM" == "UCRT64" ]]; then
  CC="gcc"
  CXX="g++"
  CPPFLAGS="-D__USE_MINGW_ANSI_STDIO=1"
-  CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-  CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
+  CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong"
+  CXXFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe"
  LDFLAGS="-pipe"
 else
  echo "Unsupported MSYSTEM: $MSYSTEM"
@ -226,7 +217,7 @@ COMPRESSLZ=(lzip -c -f)
 #########################################################################
 #
 PKGEXT='.pkg.tar.zst'
-SRCEXT='.src.tar.gz'
+SRCEXT='.src.tar.zst'

 #########################################################################
 # OTHER
--- a/msys2/etc/msystem
+++ b/msys2/etc/msystem
@ -78,7 +78,7 @@ case "${MSYSTEM}" in
    *)
        MSYSTEM_PREFIX='/usr'
        MSYSTEM_CARCH="$(/usr/bin/uname -m)"
-        MSYSTEM_CHOST="$(/usr/bin/uname -m)-pc-msys"
+        MSYSTEM_CHOST="${MSYSTEM_CARCH}-pc-msys"
        export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST
        ;;
 esac
--- a/msys2/etc/nanorc
+++ b/msys2/etc/nanorc
@ -58,6 +58,10 @@
 ## will be the terminal's width minus this number.
 # set fill -8

+## Draw a vertical stripe at the given column, to help judge text width.
+## (This option does not have a default value.)
+# set guidestripe 75
+
 ## Remember the used search/replace strings for the next session.
 # set historylog

@ -78,18 +82,19 @@
 ## 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.
+## The opening and closing brackets that are found by a matching-bracket
+## search.  This may not contain blank characters.  The opening brackets
+## must come before the closing ones, and they must be in the same order.
 # set matchbrackets "(<[{)>]}"

-## Suppress title bar and show file name and editor state at the bottom.
+## Suppress the title bar and show the filename plus a cursor-position
+## percentage in the space of the status bar.
 # set minibar

 ## 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.
+## 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
@ -117,10 +122,9 @@
 ## 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.
+## The characters treated as closing punctuation when justifying paragraphs.
+## This may not contain blank characters.  Only these closing punctuations,
+## optionally followed by closing brackets, can end sentences.
 # set punct "!.?"

 ## Make status-bar messages disappear after 1 keystroke instead of after 20.
@ -142,18 +146,17 @@

 ## 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.
+## 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
+## 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.
+## cursor is already at that position, it will jump to the true start
+## of the line (the left edge).
 # set smarthome

 ## Spread overlong lines over multiple screen lines.
@ -167,19 +170,18 @@
 ## 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.
+## Convert each typed tab to the fitting number of spaces.
 # set tabstospaces

 ## Snip whitespace at the end of lines when justifying or hard-wrapping.
 # set trimblanks

+## Save files by default in Unix format (also when they were DOS or Mac).
+# set unix
+
 ## 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.
@ -201,14 +203,17 @@
 ## of a single character, and without affecting the cutbuffer).
 # set zap

+## Hide the bars plus help lines and use the whole terminal as edit area.
+# set zero
+

 ## Paint the interface elements of nano.  These are examples; there are
 ## no colors by default, except for errorcolor and spotlightcolor.
-# set titlecolor bold,lightwhite,blue
-# set promptcolor lightwhite,lightblack
-# set statuscolor bold,lightwhite,green
-# set errorcolor bold,lightwhite,red
-# set spotlightcolor black,lime
+# set titlecolor bold,white,blue
+# set promptcolor lightwhite,grey
+# set statuscolor bold,white,green
+# set errorcolor bold,white,red
+# set spotlightcolor black,lightyellow
 # set selectedcolor lightwhite,magenta
 # set stripecolor ,yellow
 # set scrollercolor cyan
@ -217,10 +222,10 @@
 # set functioncolor green

 ## In root's .nanorc you might want to use:
-# set titlecolor bold,lightwhite,magenta
+# set titlecolor bold,white,magenta
 # set promptcolor black,yellow
-# set statuscolor bold,lightwhite,magenta
-# set errorcolor bold,lightwhite,red
+# set statuscolor bold,white,magenta
+# set errorcolor bold,white,red
 # set spotlightcolor black,orange
 # set selectedcolor lightwhite,cyan
 # set stripecolor ,yellow
@ -256,6 +261,9 @@
 ## === Key bindings ===
 ## For all details, see 'man nanorc', section REBINDING KEYS.

+## If you want to suspend nano with one keystroke (instead of with ^T^Z):
+# bind ^Z suspend main
+
 ## 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
@ -265,19 +273,39 @@
 ## <Ctrl+Backspace> delete the word to the left of the cursor with:
 # bind ^H chopwordleft main

-## For quickly uppercasing or lowercasing the word under the cursor.
-## (These effectively do a Ctrl+Right followed by a Shift+Ctrl+Left,
-## and then pipe the selected text through a sed command.)
-#bind Sh-M-U "Oc[1;6D|sed 's/.*/\U&/'
" main
-#bind Sh-M-L "Oc[1;6D|sed 's/.*/\L&/'
" main
+## For a more mnemonic Comment keystroke (overriding Cut-from-cursor):
+# bind M-K comment main
+
+## If you want ^L to just refresh the screen and not center the cursor:
+# bind ^L refresh main
+
+## When you sometimes type M-J instead of M-K, or M-T instead of M-R:
+# unbind M-J main
+# unbind M-T main
+## (Those functions are still accessible through ^T^J and ^T^V.)
+
+## For quickly uppercasing or lowercasing the word under or after the cursor.
+## (These effectively select a word and pipe it through a sed command.)
+#bind Sh-M-U "{nextword}{mark}{prevword}{execute}|sed 's/.*/\U&/'{enter}" main
+#bind Sh-M-L "{nextword}{mark}{prevword}{execute}|sed 's/.*/\L&/'{enter}" main
+
+## For copying a marked region to the system clipboard:
+# bind Sh-M-T "{execute}|xsel -ib{enter}{undo}" main
+
+## For snipping trailing blanks when you save a file:
+# bind ^S "{execute}| sed 's/\s\+$//' {enter}{savefile}" 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 ^X cut main
+#bind ^C copy main
+#bind ^V paste all
 #bind ^Q exit all
 #bind ^S savefile main
 #bind ^W writeout main
 #bind ^O insert main
+#set multibuffer
 #bind ^H help all
 #bind ^H exit help
 #bind ^F whereis all
@ -285,24 +313,19 @@
 #bind ^B wherewas all
 #bind ^D findprevious all
 #bind ^R replace main
-#bind ^X cut main
-#bind ^C copy main
-#bind ^V paste all
-#bind ^P location main
-#bind ^E execute 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 ^A mark main
+#bind ^P location main
 #bind ^T gotoline main
 #bind ^T gotodir browser
 #bind ^T cutrestoffile execute
 #bind ^L linter execute
-#bind M-U undo main
-#bind M-R redo main
+#bind ^E execute main
+#bind ^K "{mark}{end}{zap}" main
+#bind ^U "{mark}{home}{zap}" main
 #bind ^Z undo main
 #bind ^Y redo main
-#set multibuffer
--- a/msys2/etc/pacman.conf
+++ b/msys2/etc/pacman.conf
@ -65,6 +65,14 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.

+# Staging packages: enable at your own risk
+# [staging]
+# Server = https://repo.msys2.org/staging/
+# SigLevel = Never
+
+[clangarm64]
+Include = /etc/pacman.d/mirrorlist.mingw
+
 [mingw32]
 Include = /etc/pacman.d/mirrorlist.mingw

@ -74,6 +82,9 @@ Include = /etc/pacman.d/mirrorlist.mingw
 [ucrt64]
 Include = /etc/pacman.d/mirrorlist.mingw

+[clang32]
+Include = /etc/pacman.d/mirrorlist.mingw
+
 [clang64]
 Include = /etc/pacman.d/mirrorlist.mingw

--- a/msys2/etc/pacman.d/mirrorlist.clang32
+++ b/msys2/etc/pacman.d/mirrorlist.clang32
@ -5,27 +5,36 @@ Server = https://mirror.msys2.org/mingw/clang32/
 Server = https://repo.msys2.org/mingw/clang32/

 ## Tier 1
+Server = https://mirror.umd.edu/msys2/mingw/clang32/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/clang32/
 Server = https://download.nus.edu.sg/mirror/msys2/mingw/clang32/
 Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/clang32/
 Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/clang32/
 Server = https://ftp.osuosl.org/pub/msys2/mingw/clang32/
-Server = https://mirror.clarkson.edu/msys2/mingw/clang32/
 Server = https://mirror.internet.asn.au/pub/msys2/mingw/clang32/
 Server = https://mirror.selfnet.de/msys2/mingw/clang32/
 Server = https://mirror.ufro.cl/msys2/mingw/clang32/
 Server = https://mirrors.dotsrc.org/msys2/mingw/clang32/
+Server = https://mirrors.bfsu.edu.cn/msys2/mingw/clang32/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/clang32/
 Server = https://mirrors.ustc.edu.cn/msys2/mingw/clang32/
+Server = https://mirror.nju.edu.cn/msys2/mingw/clang32/
+Server = https://repo.extreme-ix.org/msys2/mingw/clang32/
+Server = https://mirrors.hit.edu.cn/msys2/mingw/clang32/
+Server = https://mirror.clarkson.edu/msys2/mingw/clang32/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/clang32/
+Server = https://mirror2.sandyriver.net/pub/software/msys2/mingw/clang32/
+Server = https://mirror.archlinux.tw/MSYS2/mingw/clang32/

 ## Tier 2
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/clang32/
 Server = https://fastmirror.pp.ua/msys2/mingw/clang32/
 Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/clang32/
 Server = https://mirror.jmu.edu/pub/msys2/mingw/clang32/
 Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/clang32/
-Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/clang32/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/clang32/
 Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/clang32/
 Server = https://mirrors.bit.edu.cn/msys2/mingw/clang32/
 Server = https://repo.casualgamer.ca/mingw/clang32/
+Server = https://mirrors.aliyun.com/msys2/mingw/clang32/
+Server = https://mirror.iscas.ac.cn/msys2/mingw/clang32/
+Server = https://mirrors.tencent.com/msys2/mingw/clang32/
--- a/msys2/etc/pacman.d/mirrorlist.clang64
+++ b/msys2/etc/pacman.d/mirrorlist.clang64
@ -5,27 +5,36 @@ Server = https://mirror.msys2.org/mingw/clang64/
 Server = https://repo.msys2.org/mingw/clang64/

 ## Tier 1
+Server = https://mirror.umd.edu/msys2/mingw/clang64/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/clang64/
 Server = https://download.nus.edu.sg/mirror/msys2/mingw/clang64/
 Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/clang64/
 Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/clang64/
 Server = https://ftp.osuosl.org/pub/msys2/mingw/clang64/
-Server = https://mirror.clarkson.edu/msys2/mingw/clang64/
 Server = https://mirror.internet.asn.au/pub/msys2/mingw/clang64/
 Server = https://mirror.selfnet.de/msys2/mingw/clang64/
 Server = https://mirror.ufro.cl/msys2/mingw/clang64/
 Server = https://mirrors.dotsrc.org/msys2/mingw/clang64/
+Server = https://mirrors.bfsu.edu.cn/msys2/mingw/clang64/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/clang64/
 Server = https://mirrors.ustc.edu.cn/msys2/mingw/clang64/
+Server = https://mirror.nju.edu.cn/msys2/mingw/clang64/
+Server = https://repo.extreme-ix.org/msys2/mingw/clang64/
+Server = https://mirrors.hit.edu.cn/msys2/mingw/clang64/
+Server = https://mirror.clarkson.edu/msys2/mingw/clang64/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/clang64/
+Server = https://mirror2.sandyriver.net/pub/software/msys2/mingw/clang64/
+Server = https://mirror.archlinux.tw/MSYS2/mingw/clang64/

 ## Tier 2
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/clang64/
 Server = https://fastmirror.pp.ua/msys2/mingw/clang64/
 Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/clang64/
 Server = https://mirror.jmu.edu/pub/msys2/mingw/clang64/
 Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/clang64/
-Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/clang64/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/clang64/
 Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/clang64/
 Server = https://mirrors.bit.edu.cn/msys2/mingw/clang64/
 Server = https://repo.casualgamer.ca/mingw/clang64/
+Server = https://mirrors.aliyun.com/msys2/mingw/clang64/
+Server = https://mirror.iscas.ac.cn/msys2/mingw/clang64/
+Server = https://mirrors.tencent.com/msys2/mingw/clang64/
--- a/msys2/etc/pacman.d/mirrorlist.mingw
+++ b/msys2/etc/pacman.d/mirrorlist.mingw
@ -5,27 +5,36 @@ Server = https://mirror.msys2.org/mingw/$repo/
 Server = https://repo.msys2.org/mingw/$repo/

 ## Tier 1
+Server = https://mirror.umd.edu/msys2/mingw/$repo/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/$repo/
 Server = https://download.nus.edu.sg/mirror/msys2/mingw/$repo/
 Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/$repo/
 Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/$repo/
 Server = https://ftp.osuosl.org/pub/msys2/mingw/$repo/
-Server = https://mirror.clarkson.edu/msys2/mingw/$repo/
 Server = https://mirror.internet.asn.au/pub/msys2/mingw/$repo/
 Server = https://mirror.selfnet.de/msys2/mingw/$repo/
 Server = https://mirror.ufro.cl/msys2/mingw/$repo/
 Server = https://mirrors.dotsrc.org/msys2/mingw/$repo/
+Server = https://mirrors.bfsu.edu.cn/msys2/mingw/$repo/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/$repo/
 Server = https://mirrors.ustc.edu.cn/msys2/mingw/$repo/
+Server = https://mirror.nju.edu.cn/msys2/mingw/$repo/
+Server = https://repo.extreme-ix.org/msys2/mingw/$repo/
+Server = https://mirrors.hit.edu.cn/msys2/mingw/$repo/
+Server = https://mirror.clarkson.edu/msys2/mingw/$repo/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/$repo/
+Server = https://mirror2.sandyriver.net/pub/software/msys2/mingw/$repo/
+Server = https://mirror.archlinux.tw/MSYS2/mingw/$repo/

 ## Tier 2
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/$repo/
 Server = https://fastmirror.pp.ua/msys2/mingw/$repo/
 Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/$repo/
 Server = https://mirror.jmu.edu/pub/msys2/mingw/$repo/
 Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/$repo/
-Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/$repo/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/$repo/
 Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/$repo/
 Server = https://mirrors.bit.edu.cn/msys2/mingw/$repo/
 Server = https://repo.casualgamer.ca/mingw/$repo/
+Server = https://mirrors.aliyun.com/msys2/mingw/$repo/
+Server = https://mirror.iscas.ac.cn/msys2/mingw/$repo/
+Server = https://mirrors.tencent.com/msys2/mingw/$repo/
--- a/msys2/etc/pacman.d/mirrorlist.mingw32
+++ b/msys2/etc/pacman.d/mirrorlist.mingw32
@ -5,27 +5,36 @@ Server = https://mirror.msys2.org/mingw/i686/
 Server = https://repo.msys2.org/mingw/i686/

 ## Tier 1
+Server = https://mirror.umd.edu/msys2/mingw/i686/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/i686/
 Server = https://download.nus.edu.sg/mirror/msys2/mingw/i686/
 Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/i686/
 Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/i686/
 Server = https://ftp.osuosl.org/pub/msys2/mingw/i686/
-Server = https://mirror.clarkson.edu/msys2/mingw/i686/
 Server = https://mirror.internet.asn.au/pub/msys2/mingw/i686/
 Server = https://mirror.selfnet.de/msys2/mingw/i686/
 Server = https://mirror.ufro.cl/msys2/mingw/i686/
 Server = https://mirrors.dotsrc.org/msys2/mingw/i686/
+Server = https://mirrors.bfsu.edu.cn/msys2/mingw/i686/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/i686/
 Server = https://mirrors.ustc.edu.cn/msys2/mingw/i686/
+Server = https://mirror.nju.edu.cn/msys2/mingw/i686/
+Server = https://repo.extreme-ix.org/msys2/mingw/i686/
+Server = https://mirrors.hit.edu.cn/msys2/mingw/i686/
+Server = https://mirror.clarkson.edu/msys2/mingw/i686/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/i686/
+Server = https://mirror2.sandyriver.net/pub/software/msys2/mingw/i686/
+Server = https://mirror.archlinux.tw/MSYS2/mingw/i686/

 ## Tier 2
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/i686/
 Server = https://fastmirror.pp.ua/msys2/mingw/i686/
 Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/i686/
 Server = https://mirror.jmu.edu/pub/msys2/mingw/i686/
 Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/i686/
-Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/i686/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/i686/
 Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/i686/
 Server = https://mirrors.bit.edu.cn/msys2/mingw/i686/
 Server = https://repo.casualgamer.ca/mingw/i686/
+Server = https://mirrors.aliyun.com/msys2/mingw/i686/
+Server = https://mirror.iscas.ac.cn/msys2/mingw/i686/
+Server = https://mirrors.tencent.com/msys2/mingw/i686/
--- a/msys2/etc/pacman.d/mirrorlist.mingw64
+++ b/msys2/etc/pacman.d/mirrorlist.mingw64
@ -5,27 +5,36 @@ Server = https://mirror.msys2.org/mingw/x86_64/
 Server = https://repo.msys2.org/mingw/x86_64/

 ## Tier 1
+Server = https://mirror.umd.edu/msys2/mingw/x86_64/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/x86_64/
 Server = https://download.nus.edu.sg/mirror/msys2/mingw/x86_64/
 Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/x86_64/
 Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/x86_64/
 Server = https://ftp.osuosl.org/pub/msys2/mingw/x86_64/
-Server = https://mirror.clarkson.edu/msys2/mingw/x86_64/
 Server = https://mirror.internet.asn.au/pub/msys2/mingw/x86_64/
 Server = https://mirror.selfnet.de/msys2/mingw/x86_64/
 Server = https://mirror.ufro.cl/msys2/mingw/x86_64/
 Server = https://mirrors.dotsrc.org/msys2/mingw/x86_64/
+Server = https://mirrors.bfsu.edu.cn/msys2/mingw/x86_64/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/x86_64/
 Server = https://mirrors.ustc.edu.cn/msys2/mingw/x86_64/
+Server = https://mirror.nju.edu.cn/msys2/mingw/x86_64/
+Server = https://repo.extreme-ix.org/msys2/mingw/x86_64/
+Server = https://mirrors.hit.edu.cn/msys2/mingw/x86_64/
+Server = https://mirror.clarkson.edu/msys2/mingw/x86_64/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/x86_64/
+Server = https://mirror2.sandyriver.net/pub/software/msys2/mingw/x86_64/
+Server = https://mirror.archlinux.tw/MSYS2/mingw/x86_64/

 ## Tier 2
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/
 Server = https://fastmirror.pp.ua/msys2/mingw/x86_64/
 Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/x86_64/
 Server = https://mirror.jmu.edu/pub/msys2/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://www2.futureware.at/~nickoe/msys2-mirror/mingw/x86_64/
 Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/x86_64/
 Server = https://mirrors.bit.edu.cn/msys2/mingw/x86_64/
 Server = https://repo.casualgamer.ca/mingw/x86_64/
+Server = https://mirrors.aliyun.com/msys2/mingw/x86_64/
+Server = https://mirror.iscas.ac.cn/msys2/mingw/x86_64/
+Server = https://mirrors.tencent.com/msys2/mingw/x86_64/
--- a/msys2/etc/pacman.d/mirrorlist.msys
+++ b/msys2/etc/pacman.d/mirrorlist.msys
@ -5,27 +5,36 @@ Server = https://mirror.msys2.org/msys/$arch/
 Server = https://repo.msys2.org/msys/$arch/

 ## Tier 1
+Server = https://mirror.umd.edu/msys2/msys/$arch/
 Server = https://mirror.yandex.ru/mirrors/msys2/msys/$arch/
 Server = https://download.nus.edu.sg/mirror/msys2/msys/$arch/
 Server = https://ftp.acc.umu.se/mirror/msys2.org/msys/$arch/
 Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/msys/$arch/
 Server = https://ftp.osuosl.org/pub/msys2/msys/$arch/
-Server = https://mirror.clarkson.edu/msys2/msys/$arch/
 Server = https://mirror.internet.asn.au/pub/msys2/msys/$arch/
 Server = https://mirror.selfnet.de/msys2/msys/$arch/
 Server = https://mirror.ufro.cl/msys2/msys/$arch/
 Server = https://mirrors.dotsrc.org/msys2/msys/$arch/
+Server = https://mirrors.bfsu.edu.cn/msys2/msys/$arch/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/msys/$arch/
 Server = https://mirrors.ustc.edu.cn/msys2/msys/$arch/
+Server = https://mirror.nju.edu.cn/msys2/msys/$arch/
+Server = https://repo.extreme-ix.org/msys2/msys/$arch/
+Server = https://mirrors.hit.edu.cn/msys2/msys/$arch/
+Server = https://mirror.clarkson.edu/msys2/msys/$arch/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/msys/$arch/
+Server = https://mirror2.sandyriver.net/pub/software/msys2/msys/$arch/
+Server = https://mirror.archlinux.tw/MSYS2/msys/$arch/

 ## Tier 2
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MSYS2/$arch/
 Server = https://fastmirror.pp.ua/msys2/msys/$arch/
 Server = https://ftp.cc.uoc.gr/mirrors/msys2/msys/$arch/
 Server = https://mirror.jmu.edu/pub/msys2/msys/$arch/
 Server = https://mirrors.piconets.webwerks.in/msys2-mirror/msys/$arch/
-Server = https://quantum-mirror.hu/mirrors/pub/msys2/msys/$arch/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/msys/$arch/
 Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/msys/$arch/
 Server = https://mirrors.bit.edu.cn/msys2/msys/$arch/
 Server = https://repo.casualgamer.ca/msys/$arch/
+Server = https://mirrors.aliyun.com/msys2/msys/$arch/
+Server = https://mirror.iscas.ac.cn/msys2/msys/$arch/
+Server = https://mirrors.tencent.com/msys2/msys/$arch/
--- a/msys2/etc/pacman.d/mirrorlist.ucrt64
+++ b/msys2/etc/pacman.d/mirrorlist.ucrt64
@ -5,27 +5,36 @@ Server = https://mirror.msys2.org/mingw/ucrt64/
 Server = https://repo.msys2.org/mingw/ucrt64/

 ## Tier 1
+Server = https://mirror.umd.edu/msys2/mingw/ucrt64/
 Server = https://mirror.yandex.ru/mirrors/msys2/mingw/ucrt64/
 Server = https://download.nus.edu.sg/mirror/msys2/mingw/ucrt64/
 Server = https://ftp.acc.umu.se/mirror/msys2.org/mingw/ucrt64/
 Server = https://ftp.nluug.nl/pub/os/windows/msys2/builds/mingw/ucrt64/
 Server = https://ftp.osuosl.org/pub/msys2/mingw/ucrt64/
-Server = https://mirror.clarkson.edu/msys2/mingw/ucrt64/
 Server = https://mirror.internet.asn.au/pub/msys2/mingw/ucrt64/
 Server = https://mirror.selfnet.de/msys2/mingw/ucrt64/
 Server = https://mirror.ufro.cl/msys2/mingw/ucrt64/
 Server = https://mirrors.dotsrc.org/msys2/mingw/ucrt64/
+Server = https://mirrors.bfsu.edu.cn/msys2/mingw/ucrt64/
 Server = https://mirrors.tuna.tsinghua.edu.cn/msys2/mingw/ucrt64/
 Server = https://mirrors.ustc.edu.cn/msys2/mingw/ucrt64/
+Server = https://mirror.nju.edu.cn/msys2/mingw/ucrt64/
+Server = https://repo.extreme-ix.org/msys2/mingw/ucrt64/
+Server = https://mirrors.hit.edu.cn/msys2/mingw/ucrt64/
+Server = https://mirror.clarkson.edu/msys2/mingw/ucrt64/
+Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/ucrt64/
+Server = https://mirror2.sandyriver.net/pub/software/msys2/mingw/ucrt64/
+Server = https://mirror.archlinux.tw/MSYS2/mingw/ucrt64/

 ## Tier 2
-Server = https://sourceforge.net/projects/msys2/files/REPOS/MINGW/ucrt64/
 Server = https://fastmirror.pp.ua/msys2/mingw/ucrt64/
 Server = https://ftp.cc.uoc.gr/mirrors/msys2/mingw/ucrt64/
 Server = https://mirror.jmu.edu/pub/msys2/mingw/ucrt64/
 Server = https://mirrors.piconets.webwerks.in/msys2-mirror/mingw/ucrt64/
-Server = https://quantum-mirror.hu/mirrors/pub/msys2/mingw/ucrt64/
 Server = https://www2.futureware.at/~nickoe/msys2-mirror/mingw/ucrt64/
 Server = https://mirrors.sjtug.sjtu.edu.cn/msys2/mingw/ucrt64/
 Server = https://mirrors.bit.edu.cn/msys2/mingw/ucrt64/
 Server = https://repo.casualgamer.ca/mingw/ucrt64/
+Server = https://mirrors.aliyun.com/msys2/mingw/ucrt64/
+Server = https://mirror.iscas.ac.cn/msys2/mingw/ucrt64/
+Server = https://mirrors.tencent.com/msys2/mingw/ucrt64/
--- a/msys2/etc/pki/ca-trust/extracted/java/cacerts
+++ b/msys2/etc/pki/ca-trust/extracted/java/cacerts
--- a/msys2/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt
+++ b/msys2/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt
--- a/msys2/etc/pki/ca-trust/extracted/pem/email-ca-bundle.pem
+++ b/msys2/etc/pki/ca-trust/extracted/pem/email-ca-bundle.pem
@ -186,6 +186,43 @@ lmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G3mB/ufNPRJLv
 KrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
 -----END CERTIFICATE-----

+# Autoridad de Certificacion Firmaprofesional CIF A62634068
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UE
+BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
+cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1
+MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
+Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
+thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
+cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
+L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
+NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
+X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
+m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
+Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
+EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
+KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
+6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
+OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1UdDgQWBBRlzeurNR4APn7VdMAc
+tHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4wgZswgZgGBFUd
+IAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j
+b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABC
+AG8AbgBhAG4AbwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAw
+ADEANzAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9m
+iWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL4QjbEwj4KKE1soCzC1HA01aajTNF
+Sa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDbLIpgD7dvlAceHabJ
+hfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1ilI45P
+Vf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZE
+EAEeiGaPcjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV
+1aUsIC+nmCjuRfzxuIgALI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2t
+CsvMo2ebKHTEm9caPARYpoKdrcd7b/+Alun4jWq9GJAd/0kakFI3ky88Al2CdgtR
+5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH9IBk9W6VULgRfhVwOEqw
+f9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpfNIbnYrX9
+ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNK
+GbqEZycPvEJdvSRUDewdcAZfpLz6IHxV
+-----END CERTIFICATE-----
+
 # Autoridad de Certificacion Firmaprofesional CIF A62634068
 -----BEGIN CERTIFICATE-----
 MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
@ -309,36 +346,6 @@ eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
 tGWaIZDgqtCYvDi1czyL+Nw=
 -----END CERTIFICATE-----

-# Camerfirma Global Chambersign Root
-----BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
-YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
-MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
-NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
-A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
-A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
-Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
-QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
-eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
-B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
-z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
-AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
-ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
-TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
-MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
-VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
-VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
-AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
-bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
-ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
-VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
-ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
-AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
-----END CERTIFICATE-----
-
 # Certigna
 -----BEGIN CERTIFICATE-----
 MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
@ -423,6 +430,23 @@ i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
 9u6wWk5JRFRYX0KD
 -----END CERTIFICATE-----

+# Certum EC-384 CA
+-----BEGIN CERTIFICATE-----
+MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQsw
+CQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScw
+JQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMT
+EENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2MDcyNDU0WhcNNDMwMzI2MDcyNDU0
+WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBT
+LkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGTAX
+BgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATE
+KI6rGFtqvm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7Tm
+Fy8as10CW4kjPMIRBSqniBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68Kj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI0GZnQkdjrzife81r1HfS+8
+EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNoADBlAjADVS2m5hjEfO/J
+UG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0QoSZ/6vn
+nvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k=
+-----END CERTIFICATE-----
+
 # Certum Root CA
 -----BEGIN CERTIFICATE-----
 MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
@ -504,6 +528,41 @@ XALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLXis7VmFxWlgPF7ncGNf/P
 DrW5viSP
 -----END CERTIFICATE-----

+# Certum Trusted Root CA
+-----BEGIN CERTIFICATE-----
+MIIFwDCCA6igAwIBAgIQHr9ZULjJgDdMBvfrVU+17TANBgkqhkiG9w0BAQ0FADB6
+MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEu
+MScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNV
+BAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwHhcNMTgwMzE2MTIxMDEzWhcNNDMw
+MzE2MTIxMDEzWjB6MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEg
+U3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQDRLY67tzbqbTeRn06TpwXkKQMlzhyC93yZ
+n0EGze2jusDbCSzBfN8pfktlL5On1AFrAygYo9idBcEq2EXxkd7fO9CAAozPOA/q
+p1x4EaTByIVcJdPTsuclzxFUl6s1wB52HO8AU5853BSlLCIls3Jy/I2z5T4IHhQq
+NwuIPMqw9MjCoa68wb4pZ1Xi/K1ZXP69VyywkI3C7Te2fJmItdUDmj0VDT06qKhF
+8JVOJVkdzZhpu9PMMsmN74H+rX2Ju7pgE8pllWeg8xn2A1bUatMn4qGtg/BKEiJ3
+HAVz4hlxQsDsdUaakFjgao4rpUYwBI4Zshfjvqm6f1bxJAPXsiEodg42MEx51UGa
+mqi4NboMOvJEGyCI98Ul1z3G4z5D3Yf+xOr1Uz5MZf87Sst4WmsXXw3Hw09Omiqi
+7VdNIuJGmj8PkTQkfVXjjJU30xrwCSss0smNtA0Aq2cpKNgB9RkEth2+dv5yXMSF
+ytKAQd8FqKPVhJBPC/PgP5sZ0jeJP/J7UhyM9uH3PAeXjA6iWYEMspA90+NZRu0P
+qafegGtaqge2Gcu8V/OXIXoMsSt0Puvap2ctTMSYnjYJdmZm/Bo/6khUHL4wvYBQ
+v3y1zgD2DGHZ5yQD4OMBgQ692IU0iL2yNqh7XAjlRICMb/gv1SHKHRzQ+8S1h9E6
+Tsd2tTVItQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSM+xx1
+vALTn04uSNn5YFSqxLNP+jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQAD
+ggIBAEii1QALLtA/vBzVtVRJHlpr9OTy4EA34MwUe7nJ+jW1dReTagVphZzNTxl4
+WxmB82M+w85bj/UvXgF2Ez8sALnNllI5SW0ETsXpD4YN4fqzX4IS8TrOZgYkNCvo
+zMrnadyHncI013nR03e4qllY/p0m+jiGPp2Kh2RX5Rc64vmNueMzeMGQ2Ljdt4NR
+5MTMI9UGfOZR0800McD2RrsLrfw9EAUqO0qRJe6M1ISHgCq8CYyqOhNf6DR5UMEQ
+GfnTKB7U0VEwKbOukGfWHwpjscWpxkIxYxeU72nLL/qMFH3EQxiJ2fAyQOaA4kZf
+5ePBAFmo+eggvIksDkc0C+pXwlM2/KfUrzHN/gLldfq5Jwn58/U7yn2fqSLLiMmq
+0Uc9NneoWWRrJ8/vJ8HjJLWG965+Mk2weWjROeiQWMODvA8s1pfrzgzhIMfatz7D
+P78v3DSk+yshzWePS/Tj6tQ/50+6uaWTRRxmHyH6ZF5v4HaUMst19W7l9o/HuKTM
+qJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmTOPQD8rv7gmsHINFSH5pkAnuYZttcTVoP
+0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZckbxJF0WddCajJFdr60qZf
+E2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb
+-----END CERTIFICATE-----
+
 # Chambers of Commerce Root - 2008
 -----BEGIN CERTIFICATE-----
 MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
@ -811,6 +870,55 @@ vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
 +OkuE6N36B9K
 -----END CERTIFICATE-----

+# DigiCert SMIME ECC P384 Root G5
+-----BEGIN CERTIFICATE-----
+MIICHDCCAaOgAwIBAgIQBT9uoAYBcn3tP8OjtqPW7zAKBggqhkjOPQQDAzBQMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xKDAmBgNVBAMTH0Rp
+Z2lDZXJ0IFNNSU1FIEVDQyBQMzg0IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcN
+NDYwMTE0MjM1OTU5WjBQMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQs
+IEluYy4xKDAmBgNVBAMTH0RpZ2lDZXJ0IFNNSU1FIEVDQyBQMzg0IFJvb3QgRzUw
+djAQBgcqhkjOPQIBBgUrgQQAIgNiAAQWnVXlttT7+2drGtShqtJ3lT6I5QeftnBm
+ICikiOxwNa+zMv83E0qevAED3oTBuMbmZUeJ8hNVv82lHghgf61/6GGSKc8JR14L
+HMAfpL/yW7yY75lMzHBrtrrQKB2/vgSjQjBAMB0GA1UdDgQWBBRzemuW20IHi1Jm
+wmQyF/7gZ5AurTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAKBggq
+hkjOPQQDAwNnADBkAjA3RPUygONx6/Rtz3zMkZrDbnHY0iNdkk2CQm1cYZX2kfWn
+CPZql+mclC2YcP0ztgkCMAc8L7lYgl4Po2Kok2fwIMNpvwMsO1CnO69BOMlSSJHW
+Dvu8YDB8ZD8SHkV/UT70pg==
+-----END CERTIFICATE-----
+
+# DigiCert SMIME RSA4096 Root G5
+-----BEGIN CERTIFICATE-----
+MIIFajCCA1KgAwIBAgIQBfa6BCODRst9XOa5W7ocVTANBgkqhkiG9w0BAQwFADBP
+MQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJzAlBgNVBAMT
+HkRpZ2lDZXJ0IFNNSU1FIFJTQTQwOTYgUm9vdCBHNTAeFw0yMTAxMTUwMDAwMDBa
+Fw00NjAxMTQyMzU5NTlaME8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2Vy
+dCwgSW5jLjEnMCUGA1UEAxMeRGlnaUNlcnQgU01JTUUgUlNBNDA5NiBSb290IEc1
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4Gpb2fj5fey1e+9f3Vw0
+2Npd0ctldashfFsA1IJvRYVBiqkSAnIy8BT1A3W7Y5dJD0CZCxoeVqfS0OGr3eUE
+G+MfFBICiPWggAn2J5pQ8LrjouCsahSRtWs4EHqiMeGRG7e58CtbyHcJdrdRxDYK
+mVNURCW3CTWGFwVWkz1BtwLXYh+KkhGH6hFt6ggR3LF4SEmS9rRRgHgj2P7hVho6
+kBNWNInV4pWLX96yzPs/OLeF9+qevy6hLi9NfWoRLjag/xEIBJVV4Bs7Z5OplFXq
+Mu0GOn/Cf+OtEyfRNEGzMMO/tIj4A4Kk3z6reHegWZNx593rAAR7zEg5KOAeoxVp
+yDayoQuX31XW75GcpPYW91EK7gMjkdwE/+DdOPYiAwDCB3EaEsnXRiqUG83Wuxvu
+v75NUFiwC80wdin1z+W2ai92sLBpatBtZRg1fpO8chfBVULNL8Ilu/T9HaFkIlRd
+4p5yQYRucZbqRQe2XnpKhp1zZHc4A9IPU6VVIMRN/2hvVanq3XHkT9mFo3xOKQKe
+CwnyGlPMAKbd0TT2DcEwsZwCZKw17aWwKbHSlTMP0iAzvewjS/IZ+dqYZOQsMR8u
+4Y0cBJUoTYxYzUvlc4KGjOyo1nlc+2S73AxMKPYXr+Jo1haGmNv8AdwxuvicDvko
+Rkrh/ZYGRXkRaBdlXIsmh1sCAwEAAaNCMEAwHQYDVR0OBBYEFNGj1FcdT1XbdUxc
+Qp5jFs60xjsfMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBDAUAA4ICAQAHpwreU7ua63C/sjaQzeSnuPEM5F1aHXhl/Mm4HiMRV3xp
+NW0B/1NQvwcOuscBP1gqlHUDqxwLI9wbih43PR1Yj3PZsypv3xCgWwynyrB/uSSi
+ATUy5V5GQevYf3PnQumkUSZ3gQqo6w8KUJ1+iiBn/AuOOhHTxYxgGNlLsfzU8bRJ
+Tq6H4dH7dqFf8wbPl5YM6Z51gVxTDSL8NuZJbnTbAIWNfCKgjvsQTNRiE1vvS3Im
+i/xOio/+lxBTxXiLQmQbX+CJ/bsJf1DgVIUmEWodZflJKdx8Nt/7PffSrO4yjW6m
+fTmcRcTKDfU7tHlTpS9Wx1HFikxkXZBDI45rTBd4zOi/9TvkqEjPrZsM3zJK09kS
+jiN4DS2vn6+ePAnClwDtOmkccT8539OPxGb17zaUD/PdkraWX5Cm3XOqpiCUlCVq
+CQxy5BMjYEyjyhcue2cA29DN6nofOSZXiTB3y07llUVPX/s2XD35ILU6ECVPkzJa
+7sGW6OlWBLBJYU3seKidGMH/2OovVu+VK3sEXmfjVUDtOQT5C3n1aoxcD4makMfN
+i97bJjWhbs2zQvKiDzsMjpP/FM/895P35EEIbhlSEQ9TGXN4DM/YhYH4rVXIsJ5G
+Y6+cUu5cv/DAWzceCSDSPiPGoRVKDjZ+MMV5arwiiNkMUkAf3U4PZyYW0q0XHA==
+-----END CERTIFICATE-----
+
 # DigiCert Trusted Root G4
 -----BEGIN CERTIFICATE-----
 MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi
@ -845,6 +953,58 @@ r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1
 gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
 -----END CERTIFICATE-----

+# DIGITALSIGN GLOBAL ROOT ECDSA CA
+-----BEGIN CERTIFICATE-----
+MIICajCCAfCgAwIBAgIUNi2PcoiiKCfkAP8kxi3k6/qdtuEwCgYIKoZIzj0EAwMw
+ZDELMAkGA1UEBhMCUFQxKjAoBgNVBAoMIURpZ2l0YWxTaWduIENlcnRpZmljYWRv
+cmEgRGlnaXRhbDEpMCcGA1UEAwwgRElHSVRBTFNJR04gR0xPQkFMIFJPT1QgRUNE
+U0EgQ0EwHhcNMjEwMTIxMTEwNzUwWhcNNDYwMTE1MTEwNzUwWjBkMQswCQYDVQQG
+EwJQVDEqMCgGA1UECgwhRGlnaXRhbFNpZ24gQ2VydGlmaWNhZG9yYSBEaWdpdGFs
+MSkwJwYDVQQDDCBESUdJVEFMU0lHTiBHTE9CQUwgUk9PVCBFQ0RTQSBDQTB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABG4Lo6szTRzqSuj8BI0UoH3wCCxfg6uT0dJ7utdJ
+fY/sElBf1LnL5fD5M2MfyVfsQNgRC5foUhbMKY70BoYeONw9V8Tuqr3IVAQmWicT
+UUc9Hx8ajqiVpDPQzEfMbbj8SKNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSME
+GDAWgBTOr0qLGnXi8TjnAvAWrV7qZNV7tDAdBgNVHQ4EFgQUzq9Kixp14vE45wLw
+Fq1e6mTVe7QwDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gAMGUCMAqIxHGc
+RANNjbTHvKiu2TAnNWprFmPX/OdZ4aeJG0wxmiNVRObzQyHVRydvbVcBqgIxAPuy
+6uKXf1G1n0jrvG81iahkcKtXds3AxhRgyn/iggBz98w16o4km+UIWccEjHN4/g==
+-----END CERTIFICATE-----
+
+# DIGITALSIGN GLOBAL ROOT RSA CA
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIUXVnIyqsJV/XmtdoplARq/8XUlYcwDQYJKoZIhvcNAQEN
+BQAwYjELMAkGA1UEBhMCUFQxKjAoBgNVBAoMIURpZ2l0YWxTaWduIENlcnRpZmlj
+YWRvcmEgRGlnaXRhbDEnMCUGA1UEAwweRElHSVRBTFNJR04gR0xPQkFMIFJPT1Qg
+UlNBIENBMB4XDTIxMDEyMTEwNTAzNFoXDTQ2MDExNTEwNTAzNFowYjELMAkGA1UE
+BhMCUFQxKjAoBgNVBAoMIURpZ2l0YWxTaWduIENlcnRpZmljYWRvcmEgRGlnaXRh
+bDEnMCUGA1UEAwweRElHSVRBTFNJR04gR0xPQkFMIFJPT1QgUlNBIENBMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyIe2ONMc8N4S+IPHxIriibi0Inp4
+AxmUWh2NwrVT8JaCLgWXPdyAQk3hIEqVGvXktBs+qinQxI06w7bNw8p/ooxUULo
+S5yQqMgsEdP9oCl+zt6U9oLgWLRORSXxIvI90w97VBrcMrbWUU5+QbRXuCzGuQ4u
+ylfx1cjTWOel6UIRrtMgJZRp14/Kog3D058HaD8V0mcuU/12gpsLc6kpDZ4RkxQI
+mOyeVBJKVqIGFexrbC6SYC6GDa6CH1FN47IH1xAZVyL2qWlEhPPZPaAGv8yIfn/1
+zlulwipqdELqb6b/+Wix0F+9kdJVbzNXTB6d5OKLwYVloOBqnAAAiJLdWAgW8nAx
+qBzh3r1OcenWvn61oVrDTfe/m72UpP31qlOTRskmAQRwxKBxus4lZvuRflVw7kkK
+TWJ/wlCacvIYZ53pRag0hOj4gfbRWiIeB087s3/dEaVz3L6pGTppqW0bMuKJqqUn
+C1p+dOIPZDldfly5wRf8x41eyewk7dLyP3qERTcCvj5rWcTmWxZtwKqeqrVZLixw
+VZzMmZaYJFTRjtrKtBG0t3BDH2+QCyCgqHYTZdvbI1p1S6ELMXcK7n1oYRoTjOpR
+flxWo1dMXaHrE2W/VBTM8+7c1+w8l/J4Vrjfclxw/M4G3Z/SBzHv51KRns2618AY
+RAcxZUkyaRNK648CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAW
+gBS1Nrw8jBqrLPZZGS2DFNqTJRXWhjAdBgNVHQ4EFgQUtTa8PIwaqyz2WRktgxTa
+kyUV1oYwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDQUAA4ICAQAU+zElODH4
+ygiyI3Y4rfjTWfXMtFcl4US+fvwW7K76Jp9PZxZKVvD97ccZATSOkFot1oBc7HHS
+gSWCHgBx35rR1R0iu9Gl82IPtOvcJHP+plbNmhTFBDUWMaIH66UA4rb4X3L9P2FJ
+jt5+TTjXeh50N2xR3L4ABLg4FPMgwe2bpyP9DUKEHX/yc8PQeGPxn+zXW+nxvmyg
+SwOejWnhFNqIEIEjU//aVCsLxrmWlQQYRvN7qJfYW2ik5DgcDkXlmNMJrppe7LN5
+DTly8vSUnQ6eYCLmqPZMhc0HgjpoOc09X+M49LavO2tKn2BRRaJAAuWqDOM+0XjU
+onScJroFmihwSj6mC9AdSfC6+K5BEH6kBxK9qM8pPVe7x/FDRwA+rnAYWiB7Ccs6
+OnCA5UxgmMEVwR1K98jwm+FyreddaFgLBLGMvJ+3+26LWwRV++sjVdd4UNoly74n
+NrskGnkcUdH+E7v/eCzcpL4v9sVLU8+nTJlecKxZiASuZAS/e6Z6TdPod72hflAV
+8+9JMIVNIVeq2yx1l62BAYeisXCdHgZaA2CxP6ZtgizUFLGBpeg9iB20cixYN4qO
+OJS4c92p4Lj2d6KzfFjermk6tYulGrvy2HQGnP1icyAhdrF+cJ4Z1OsXYhk4mc02
+K0f+McvfueSsCNPYpuvUnn5LZKRVXSsXyQ==
+-----END CERTIFICATE-----
+
 # D-TRUST Root CA 3 2013
 -----BEGIN CERTIFICATE-----
 MIIEDjCCAvagAwIBAgIDD92sMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkRF
@ -1160,17 +1320,16 @@ v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z

 # GlobalSign ECC Root CA - R4
 -----BEGIN CERTIFICATE-----
-MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEk
-MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpH
-bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
-DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
-QSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprlOQcJ
-FspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAw
-DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61F
-uOJAf/sKbvu+M8k8o4TVMAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGX
-kPoUVy0D7O48027KqGx2vKLeuwIgJ6iFJzWbVsaj8kfSt24bAgAXqmemFZHe+pTs
-ewv4n4Q=
+MIIB3DCCAYOgAwIBAgINAgPlfvU/k/2lCSGypjAKBggqhkjOPQQDAjBQMSQwIgYD
+VQQLExtHbG9iYWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2Jh
+bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTIxMTEzMDAwMDAwWhcNMzgw
+MTE5MDMxNDA3WjBQMSQwIgYDVQQLExtHbG9iYWxTaWduIEVDQyBSb290IENBIC0g
+UjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wWTAT
+BgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4xnnTj2wlDp8uORkcA6SumuU5BwkWymOx
+uYb4ilfBV85C+nOh92VC/x7BALJucw7/xyHlGKSq2XE/qNS5zowdo0IwQDAOBgNV
+HQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVLB7rUW44kB/
+wpu+74zyTyjhNUwCgYIKoZIzj0EAwIDRwAwRAIgIk90crlgr/HmnKAWBVBfw147
+bmF0774BxL4YSFlhgjICICadVGNA3jdgUM/I2O2dgq43mLyjj0xMqTQrbO/7lZsm
 -----END CERTIFICATE-----

 # GlobalSign ECC Root CA - R5
@ -1212,30 +1371,6 @@ DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
 HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
 -----END CERTIFICATE-----

-# GlobalSign Root CA - R2
-----BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
-MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
-v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
-eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
-tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
-C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
-zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
-mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
-V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
-bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
-3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
-J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
-291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
-ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
-AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
-----END CERTIFICATE-----
-
 # GlobalSign Root CA - R3
 -----BEGIN CERTIFICATE-----
 MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
@ -1293,6 +1428,90 @@ JJUEeKgDu+6B5dpffItKoZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R
 5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
 -----END CERTIFICATE-----

+# GlobalSign Secure Mail Root E45
+-----BEGIN CERTIFICATE-----
+MIICITCCAaegAwIBAgIQdlP+qicdlUZd1vGe5biQCjAKBggqhkjOPQQDAzBSMQsw
+CQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEoMCYGA1UEAxMf
+R2xvYmFsU2lnbiBTZWN1cmUgTWFpbCBSb290IEU0NTAeFw0yMDAzMTgwMDAwMDBa
+Fw00NTAzMTgwMDAwMDBaMFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxT
+aWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIFNlY3VyZSBNYWlsIFJvb3Qg
+RTQ1MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE+XmLgUc3iZY/RUlQfxomC5Myfi7A
+wKcImsNuj5s+CyLsN1O3b4qwvCc3S22pRjvZH/+loUS7LXO/nkEHXFObUQg6Wrtv
+OMcWkXjCShNpHYLfWi8AiJaiLhx0+Z1+ZjeKo0IwQDAOBgNVHQ8BAf8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU3xNei1/CQAL9VreUTLYe1aaxFJYw
+CgYIKoZIzj0EAwMDaAAwZQIwE7C+13EgPuSrnM42En1fTB8qtWlFM1/TLVqy5IjH
+3go2QjJ5naZruuH5RCp7isMSAjEAoGYcToedh8ntmUwbCu4tYMM3xx3NtXKw2cbv
+vPL/P/BS3QjnqmR5w+RpV5EvpMt8
+-----END CERTIFICATE-----
+
+# GlobalSign Secure Mail Root R45
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIQdlP+qExQq5+NMrUdA49X3DANBgkqhkiG9w0BAQwFADBS
+MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEoMCYGA1UE
+AxMfR2xvYmFsU2lnbiBTZWN1cmUgTWFpbCBSb290IFI0NTAeFw0yMDAzMTgwMDAw
+MDBaFw00NTAzMTgwMDAwMDBaMFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIFNlY3VyZSBNYWlsIFJv
+b3QgUjQ1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3HnMbQb5bbvg
+VgRsf+B1zC0FSehL3FTsW3eVcr9/Yp2FqYokUF9T5dt0b6QpWxMqCa2axS/C93Y7
+oUVGqkPmJP4rsG8ycBlGWnkmL/w9fV9ky1fMYWGo2ZVu45Wgbn9HEhjW7wPJ+4r6
+mr2CFalVd0sRT1nga8Nx8wzYVNWBaD4TuRUuh4o8RCc2YiRu+CwFcjBhvUKRI8Sd
+JafZVJoUozGtgHkMp2NsmKOsV0czH2WW4dDSNdr5cfehpiW1QV3fPmDY0fafpfK4
+zBOqj/mybuGDLZPdPoUa3eixXCYBy0mF/PzS1H+FYoZ0+cvsNSKiDDCPO6t561by
+kLz7fkfRYlAKa3qknTqUv1WtCvaou11wm6rzlKQS/be8EmPmkjUiBltRebMjLnd
+ZGBgAkD4uc+8WOs9hbnGCtOcB2aPxxg5I0bhPB6jL1Bhkgs9K2zxo0c4V5GrDY/G
+nU0E0iZSXOWl/SotFioBaeepfeE2t7Eqxdmxjb25i87Mi6E+C0jNUJU0xNgIWdhr
+JvS+9dQiFwBXya6bBDAznwv731aiyW5Udtqxl2InWQ8RiiIbZJY/qPG3JEqNPFN8
+bYN2PbImSHP1RBYBLQkqjhaWUNBzBl27IkiCTApGWj+A/1zy8pqsLAjg1urwEjiB
+T6YQ7UarzBacC89kppkChURnRq39TecCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgGG
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKCTFShu7o8IsjXGnmJ5dKexDit7
+MA0GCSqGSIb3DQEBDAUAA4ICAQBFCvjRXKxigdAE17b/V1GJCwzL3iRlN/urnu1m
+9OoMGWmJuBmxMFa02fb3vsaul8tF9hGMOjBkTMGfWcBGQggGR2QXeOCVBwbWjKKs
+qdk/03tWT/zEhyjftisWI8CfH1vj1kReIk8jBIw1FrV5B4ZcL5fi9ghkptzbqIrj
+pHt3DdEpkyggtFOjS05f3sH2dSP8Hzx4T3AxeC+iNVRxBKzIxG3D9pGx/s3uRG6B
+9kDFPioBv6tMsQM/DRHkD9Ik4yKIm59fRz1RSeAJN34XITF2t2dxSChLJdcQ6J9h
+WRbFPjJOHwzOo8wP5McRByIvOAjdW5frQmxZmpruetCd38XbCUMuCqoZPWvoajB6
+V+a/s2o5qY/j8U9laLa9nyiPoRZaCVA6Mi4dL0QRQqYA5jGY/y2hD+akYFbPedey
+Ttew+m4MVyPHzh+lsUxtGUmeDn9wj3E/WCifdd1h4Dq3Obbul9Q1UfuLSWDIPGau
+l+6NJllXu3jwelAwCbBgqp9O3Mk+HjrcYpMzsDpUdG8sMUXRaxEyamh29j32ahNe
+JJjn6h2az3iCB2D3TRDTgZpFjZ6vm9yAx0OylWikww7oCkcVv1Qz3AHn1aYec9h6
+sr8vreNVMJ7fDkG84BH1oQyoIuHjAKNOcHyS4wTRekKKdZBZ45vRTKJkvXN5m2/y
+s8H2PA==
+-----END CERTIFICATE-----
+
+# GLOBALTRUST 2020
+-----BEGIN CERTIFICATE-----
+MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkG
+A1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkw
+FwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYx
+MDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9u
+aXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWiD59b
+RatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9Z
+YybNpyrOVPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3
+QWPKzv9pj2gOlTblzLmMCcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPw
+yJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCmfecqQjuCgGOlYx8ZzHyyZqjC0203b+J+
+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKAA1GqtH6qRNdDYfOiaxaJ
+SaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9ORJitHHmkH
+r96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj0
+4KlGDfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9Me
+dKZssCz3AwyIDMvUclOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIw
+q7ejMZdnrY8XD2zHc+0klGvIg5rQmjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2
+nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1UdIwQYMBaAFNwu
+H9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
+VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJC
+XtzoRlgHNQIw4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd
+6IwPS3BD0IL/qMy/pJTAvoe9iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf
+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS8cE54+X1+NZK3TTN+2/BT+MAi1bi
+kvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2HcqtbepBEX4tdJP7
+wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxSvTOB
+TI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6C
+MUO+1918oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn
+4rnvyOL2NSl6dPrFf4IFYqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+I
+aFvowdlxfv1k7/9nR4hYJS8+hge9+6jlgqispdNpQ80xiEmEU5LAsTkbOYMBMMTy
+qfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
+-----END CERTIFICATE-----
+
 # Go Daddy Class 2 CA
 -----BEGIN CERTIFICATE-----
 MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
@ -1319,6 +1538,154 @@ dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
 ReYNnyicsbkqWletNw+vHX/bvZ8=
 -----END CERTIFICATE-----

+# GTS Root R1
+-----BEGIN CERTIFICATE-----
+MIIFVzCCAz+gAwIBAgINAgPlk28xsBNJiGuiFzANBgkqhkiG9w0BAQwFADBHMQsw
+CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEU
+MBIGA1UEAxMLR1RTIFJvb3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAw
+MDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZp
+Y2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx9vaMf/vo
+27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7w
+Cl7raKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjw
+TcLCeoiKu7rPWRnWr4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0Pfybl
+qAj+lug8aJRT7oM6iCsVlgmy4HqMLnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaH
+szVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly4cpk9+aCEI3oncKKiPo4Zor8
+Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr06zqkUspzBmk
+MiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
+wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70p
+aDPvOmbsB4om3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrN
+VjzRlwW5y0vtOUucxD/SVRNuJLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQID
+AQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEMBQADggIBAJ+qQibb
+C5u+/x6Wki4+omVKapi6Ist9wTrYggoGxval3sBOh2Z5ofmmWJyq+bXmYOfg6LEe
+QkEzCzc9zolwFcq1JKjPa7XSQCGYzyI0zzvFIoTgxQ6KfF2I5DUkzps+GlQebtuy
+h6f88/qBVRRiClmpIgUxPoLW7ttXNLwzldMXG+gnoot7TiYaelpkttGsN/H9oPM4
+7HLwEXWdyzRSjeZ2axfG34arJ45JK3VmgRAhpuo+9K4l/3wV3s6MJT/KYnAK9y8J
+ZgfIPxz88NtFMN9iiMG1D53Dn0reWVlHxYciNuaCp+0KueIHoI17eko8cdLiA6Ef
+MgfdG+RCzgwARWGAtQsgWSl4vflVy2PFPEz0tv/bal8xa5meLMFrUKTX5hgUvYU/
+Z6tGn6D/Qqc6f1zLXbBwHSs09dR2CQzreExZBfMzQsNhFRAbd03OIozUhfJFfbdT
+6u9AWpQKXCBfTkBdYiJ23//OYb2MI3jSNwLgjt7RETeJ9r/tSQdirpLsQBqvFAnZ
+0E6yove+7u7Y/9waLd64NnHi/Hm3lCXRSHNboTXns5lndcEZOitHTtNCjv0xyBZm
+2tIMPNuzjsmhDYAPexZ3FL//2wmUspO8IFgV6dtxQ/PeEMMA3KgqlbbC1j+Qa3bb
+bP6MvPJwNQzcmRk13NfIRmPVNnGuV/u3gm3c
+-----END CERTIFICATE-----
+
+# GTS Root R2
+-----BEGIN CERTIFICATE-----
+MIIFVzCCAz+gAwIBAgINAgPlrsWNBCUaqxElqjANBgkqhkiG9w0BAQwFADBHMQsw
+CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEU
+MBIGA1UEAxMLR1RTIFJvb3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAw
+MDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZp
+Y2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTukk3LvCvpt
+nfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY
+6Dlo7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAu
+MC6C/Pq8tBcKSOWIm8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7k
+RXuJVfeKH2JShBKzwkCX44ofR5GmdFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWg
+f9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbuak7MkogwTZq9TwtImoS1mKPV
+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscszcTJGr61K8Yzo
+dDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
+Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKa
+G73VululycslaVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCq
+gc7dGtxRcw1PcOnlthYhGXmy5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwID
+AQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEMBQADggIBAB/Kzt3H
+vqGf2SdMC9wXmBFqiN495nFWcrKeGk6c1SuYJF2ba3uwM4IJvd8lRuqYnrYb/oM8
+0mJhwQTtzuDFycgTE1XnqGOtjHsB/ncw4c5omwX4Eu55MaBBRTUoCnGkJE+M3DyC
+B19m3H0Q/gxhswWV7uGugQ+o+MePTagjAiZrHYNSVc61LwDKgEDg4XSsYPWHgJ2u
+NmSRXbBoGOqKYcl3qJfEycel/FVL8/B/uWU9J2jQzGv6U53hkRrJXRqWbTKH7QMg
+yALOWr7Z6v2yTcQvG99fevX4i8buMTolUVVnjWQye+mew4K6Ki3pHrTgSAai/Gev
+HyICc/sgCq+dVEuhzf9gR7A/Xe8bVr2XIZYtCtFenTgCR2y59PYjJbigapordwj6
+xLEokCZYCDzifqrXPW+6MYgKBesntaFJ7qBFVHvmJ2WZICGoo7z7GJa7Um8M7YNR
+TOlZ4iBgxcJlkoKM8xAfDoqXvneCbT+PHV28SSe9zE8P4c52hgQjxcCMElv924Sg
+JPFI/2R80L5cFtHvma3AH/vLrrw4IgYmZNralw4/KBVEqE8AyvCazM90arQ+POuV
+7LXTWtiBmelDGDfrs7vRWGJB82bSj6p4lVQgw1oudCvV0b4YacCs1aTPObpRhANl
+6WLAYv7YTVWW4tAR+kg0Eeye7QUd5MjWHYbL
+-----END CERTIFICATE-----
+
+# GTS Root R3
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPluILrIPglJ209ZjAKBggqhkjOPQQDAzBHMQswCQYD
+VQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIG
+A1UEAxMLR1RTIFJvb3QgUjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAw
+WjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2Vz
+IExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
+AAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUURout736G
+jOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL2
+4CejQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBTB8Sa6oC2uhYHP0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEA9uEglRR7
+VKOQFhG/hMjqb2sXnh5GmCCbn9MN2azTL818+FsuVbu/3ZL3pAzcMeGiAjEA/Jdm
+ZuVDFhOD3cffL74UOO0BzrEXGhF16b0DjyZ+hOXJYKaV11RZt+cRLInUue4X
+-----END CERTIFICATE-----
+
+# GTS Root R4
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPlwGjvYxqccpBQUjAKBggqhkjOPQQDAzBHMQswCQYD
+VQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIG
+A1UEAxMLR1RTIFJvb3QgUjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAw
+WjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2Vz
+IExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
+AATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa6zzuhXyi
+QHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvR
+HYqjQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBSATNbrdP9JNqPV2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D
+9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/Cr8deVl5c1RxYIigL9zC2L7F8AjEA8GE8
+p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh4rsUecrNIdSUtUlD
+-----END CERTIFICATE-----
+
+# HARICA Client ECC Root CA 2021
+-----BEGIN CERTIFICATE-----
+MIICWjCCAeGgAwIBAgIQMWjZ2OFiVx7SGUSI5hB98DAKBggqhkjOPQQDAzBvMQsw
+CQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2Vh
+cmNoIEluc3RpdHV0aW9ucyBDQTEnMCUGA1UEAwweSEFSSUNBIENsaWVudCBFQ0Mg
+Um9vdCBDQSAyMDIxMB4XDTIxMDIxOTExMDMzNFoXDTQ1MDIxMzExMDMzM1owbzEL
+MAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgQ0ExJzAlBgNVBAMMHkhBUklDQSBDbGllbnQgRUND
+IFJvb3QgQ0EgMjAyMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABAcYrZWWlNBcD4L3
+KkD6AsnJPTamowRqwW2VAYhgElRsXKIrbhM6iJUMHCaGNkqJGbcY3jvoqFAfyt9b
+v0mAFdvjMOEdWscqigEH/m0sNO8oKJe8wflXhpWLNc+eWtFolaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUUgjSvjKBJf31GpfsTl8au1PNkK0wDgYDVR0P
+AQH/BAQDAgGGMAoGCCqGSM49BAMDA2cAMGQCMEwxRUZPqOa+w3eyGhhLLYh7WOar
+lGtEA7AX/9+Cc0RRLP2THQZ7FNKJ7EAM7yEBLgIwL8kuWmwsHdmV4J6wuVxSfPb4
+OMou8dQd8qJJopX4wVheT/5zCu8xsKsjWBOMi947
+-----END CERTIFICATE-----
+
+# HARICA Client RSA Root CA 2021
+-----BEGIN CERTIFICATE-----
+MIIFqjCCA5KgAwIBAgIQVVL4HtsbJCyeu5YYzQIoPjANBgkqhkiG9w0BAQsFADBv
+MQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
+c2VhcmNoIEluc3RpdHV0aW9ucyBDQTEnMCUGA1UEAwweSEFSSUNBIENsaWVudCBS
+U0EgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTEwNTg0NloXDTQ1MDIxMzEwNTg0NVow
+bzELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBS
+ZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJzAlBgNVBAMMHkhBUklDQSBDbGllbnQg
+UlNBIFJvb3QgQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AIHbV0KQLHQ19Pi4dBlNqwlad0WBc2KwNZ/40LczAIcTtparDlQSMAe8m7dI19EZ
+g66O2KnxqQCEsIxenugMj1Rpv/bUCE8mcP4YQWMaszKLQPgHq1cx8MYWdmeatN0v
+8tFrxdCShJFxbg8uY+kfU6TdUhPMCYMpgQzFU3VEsQ5nUxjQwx+IS5+UJLQpvLvo
+Tv1v0hUdSdyNcPIRGiBRVRG6iG/E91B51qox4oQ9XjLIdypQceULL+m26u+rCjM5
+Dv2PpWdDgo6YaQkJG0DNOGdH6snsl3ES3iT1cjzR90NMJveQsonpRUtVPTEFekHi
+lbpDwBfFtoU9GY1kcPNbrM2f0yl1h0uVZ2qm+NHdvJCGiUMpqTdb9V2wJlpTQnaQ
+K8+eVmwrVM9cmmXfW4tIYDh8+8ULz3YEYwIzKn31g2fn+sZD/SsP1CYvd6QywSTq
+ZJ2/szhxMUTyR7iiZkGh+5t7vMdGanW/WqKM6GpEwbiWtcAyCC17dDVzssrG/q8R
+chj258jCz6Uq6nvWWeh8oLJqQAlpDqWW29EAufGIbjbwiLKd8VLyw3y/MIk8Cmn5
+IqRl4ZvgdMaxhZeWLK6Uj1CmORIfvkfygXjTdTaefVogl+JSrpmfxnybZvP+2M/u
+vZcGHS2F3D42U5Z7ILroyOGtlmI+EXyzAISep0xxq0o3AgMBAAGjQjBAMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFKDWBz1eJPd7oEQuJFINGaorBJGnMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEADUf5CWYxUux57sKo8mg+7ZZF
+yzqmmGM/6itNTgPQHILhy9Pl1qtbZyi8nf4MmQqAVafOGyNhDbBX8P7gyr7mkNuD
+LL6DjvR5tv7QDUKnWB9p6oH1BaX+RmjrbHjJ4Orn5t4xxdLVLIJjKJ1dqBp+iObn
+K/Es1dAFntwtvTdm1ASip62/OsKoO63/jZ0z4LmahKGHH3b0gnTXDvkwSD5biD6q
+XGvWLwzojnPCGJGDObZmWtAfYCddTeP2Og1mUJx4e6vzExCuDy+r6GSzGCCdRjVk
+JXPqmxBcWDWJsUZIp/Ss1B2eW8yppRoTTyRQqtkbbbFA+53dWHTEwm8UcuzbNZ+4
+VHVFw6bIGig1Oq5l8qmYzq9byTiMMTt/zNyW/eJb1tBZ9Ha6C8tPgxDHQNAdYOkq
+5UhYdwxFab4ZcQQk4uMkH0rIwT6Z9ZaYOEgloRWwG9fihBhb9nE1mmh7QMwYXAwk
+ndSV9ZmqRuqurL/0FBkk6Izs4/W8BmiKKgwFXwqXdafcfsD913oY3zDROEsfsJhw
+v8x8c/BuxDGlpJcdrL/ObCFKvicjZ/MGVoEKkY624QMFMyzaNAhNTlAjrR+lxdR6
+/uoJ7KcoYItGfLXqm91P+edrFcaIz0Pb5SfcBFZub0YV8VYt6FwMc8MjgTggy8kM
+ac8sqzuEYDMZUv1pFDM=
+-----END CERTIFICATE-----
+
 # Hellenic Academic and Research Institutions ECC RootCA 2015
 -----BEGIN CERTIFICATE-----
 MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzAN
@ -1338,33 +1705,6 @@ lSTAGiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7Sof
 TUwJCA3sS61kFyjndc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
 -----END CERTIFICATE-----

-# Hellenic Academic and Research Institutions RootCA 2011
-----BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
-RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
-dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
-YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
-NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
-EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
-cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
-c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
-dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
-fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
-bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
-75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
-FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
-HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
-5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
-b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
-A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
-6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
-dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
-Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
-l7WdmplNsDz4SgCbZN2fOUvRJ9e4
-----END CERTIFICATE-----
-
 # Hellenic Academic and Research Institutions RootCA 2015
 -----BEGIN CERTIFICATE-----
 MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1Ix
@ -1587,42 +1927,6 @@ rYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0EAwMDaAAwZQIwJsdpW9zV
 Mgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
 -----END CERTIFICATE-----

-# QuoVadis Root CA
-----BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
-MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
-IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
-dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
-li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
-rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
-WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
-F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
-xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
-Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
-dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
-ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
-IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
-c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
-ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
-KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
-KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
-y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
-dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
-VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
-fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
-7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
-cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
-mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
-xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
-SnQ2+Q==
-----END CERTIFICATE-----
-
 # QuoVadis Root CA 1 G3
 -----BEGIN CERTIFICATE-----
 MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQEL
@ -1788,6 +2092,22 @@ iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
 f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
 -----END CERTIFICATE-----

+# Security Communication ECC RootCA1
+-----BEGIN CERTIFICATE-----
+MIICODCCAb6gAwIBAgIJANZdm7N4gS7rMAoGCCqGSM49BAMDMGExCzAJBgNVBAYT
+AkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYD
+VQQDEyJTZWN1cml0eSBDb21tdW5pY2F0aW9uIEVDQyBSb290Q0ExMB4XDTE2MDYx
+NjA1MTUyOFoXDTM4MDExODA1MTUyOFowYTELMAkGA1UEBhMCSlAxJTAjBgNVBAoT
+HFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKzApBgNVBAMTIlNlY3VyaXR5
+IENvbW11bmljYXRpb24gRUNDIFJvb3RDQTEwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
+AASkpW9gAwPDvTH00xecK4R1rOX9PVdu12O/5gSJko6BnOPpR27KkBLIE+Cnnfdl
+dB9sELLo5OnvbYUymUSxXv3MdhDYW72ixvnWQuRXdtyQwjWpS4g8EkdtXP9JTxpK
+ULGjQjBAMB0GA1UdDgQWBBSGHOf+LaVKiwj+KBH6vqNm+GBZLzAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu
+9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3LsnNdo4gIxwwCMQDAqy0O
+be0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70eN9k=
+-----END CERTIFICATE-----
+
 # Security Communication Root CA
 -----BEGIN CERTIFICATE-----
 MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
@ -1833,25 +2153,38 @@ t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
 SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
 -----END CERTIFICATE-----

-# Sonera Class 2 Root CA
+# Security Communication RootCA3
 -----BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
-MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
-MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
-BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
-Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
-5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
-3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
-vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
-8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
-DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
-zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
-3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
-FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
-Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
-ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
+BAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScw
+JQYDVQQDEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2
+MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UEAxMeU2VjdXJpdHkg
+Q29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4r
+CmDvu20rhvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzA
+lrenfna84xtSGc4RHwsENPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MG
+TfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF7
+9+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGmnpjKIG58u4iFW/vAEGK7
+8vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtYXLVqAvO4
+g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3we
+GVPKp7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst
+3A7caoreyYn8xrC3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M
+0V9hvqG8OmpI6iZVIhZdXw3/JzOfGAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQ
+T9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0VcwCBEF/VfR2ccCAwEAAaNCMEAw
+HQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
+YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PA
+FNr0Y/Dq9HHuTofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd
+9XbXv8S2gVj/yP9kaWJ5rW4OH3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQI
+UYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASxYfQAW0q3nHE3GYV5v4GwxxMOdnE+
+OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZXSEIx2C/pHF7uNke
+gr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml+LLf
+iAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUV
+nuiZIesnKwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD
+2NCcnWXL0CsnMQMeNuE9dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//
+1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm6Vwdp6POXiUyK+OVrCoHzrQoeIY8Laad
+TdJ0MN1kURXbg4NR16/9M51NZg==
 -----END CERTIFICATE-----

 # SSL.com Root Certification Authority ECC
@ -2003,41 +2336,6 @@ ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
 Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
 -----END CERTIFICATE-----

-# SwissSign Platinum CA - G2
-----BEGIN CERTIFICATE-----
-MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu
-IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw
-WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD
-ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y
-IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn
-IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+
-6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob
-jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw
-izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl
-+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY
-zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP
-pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF
-KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW
-ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB
-AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0
-ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
-IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA
-A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0
-uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+
-FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7
-jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/
-u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D
-YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1
-puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa
-icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG
-DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x
-kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z
-Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
-----END CERTIFICATE-----
-
 # SwissSign Silver CA - G2
 -----BEGIN CERTIFICATE-----
 MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
@ -2148,6 +2446,40 @@ d05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6+/NNIxuZMzSg
 LvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
 -----END CERTIFICATE-----

+# Telia Root CA v2
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIPAWdfJ9b+euPkrL4JWwWeMA0GCSqGSIb3DQEBCwUAMEQx
+CzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UE
+AwwQVGVsaWEgUm9vdCBDQSB2MjAeFw0xODExMjkxMTU1NTRaFw00MzExMjkxMTU1
+NTRaMEQxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZ
+MBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2MjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBALLQPwe84nvQa5n44ndp586dpAO8gm2h/oFlH0wnrI4AuhZ76zBq
+AMCzdGh+sq/H1WKzej9Qyow2RCRj0jbpDIX2Q3bVTKFgcmfiKDOlyzG4OiIjNLh9
+vVYiQJ3q9HsDrWj8soFPmNB06o3lfc1jw6P23pLCWBnglrvFxKk9pXSW/q/5iaq9
+lRdU2HhE8Qx3FZLgmEKnpNaqIJLNwaCzlrI6hEKNfdWV5Nbb6WLEWLN5xYzTNTOD
+n3WhUidhOPFZPY5Q4L15POdslv5e2QJltI5c0BE0312/UqeBAMN/mUWZFdUXyApT
+7GPzmX3MaRKGwhfwAZ6/hLzRUssbkmbOpFPlob/E2wnW5olWK8jjfN7j/4nlNW4o
+6GwLI1GpJQXrSPjdscr6bAhR77cYbETKJuFzxokGgeWKrLDiKca5JLNrRBH0pUPC
+TEPlcDaMtjNXepUugqD0XBCzYYP2AgWGLnwtbNwDRm41k9V6lS/eINhbfpSQBGq6
+WT0EBXWdN6IOLj3rwaRSg/7Qa9RmjtzG6RJOHSpXqhC8fF6CfaamyfItufUXJ63R
+DolUK5X6wK0dmBR4M0KGCqlztft0DbcbMBnEWg4cJ7faGND/isgFuvGqHKI3t+ZI
+pEYslOqodmJHixBTB0hXbOKSTbauBcvcwUpej6w9GU7C7WB1K9vBykLVAgMBAAGj
+YzBhMB8GA1UdIwQYMBaAFHKs5DN5qkWH9v2sHZ7Wxy+G2CQ5MB0GA1UdDgQWBBRy
+rOQzeapFh/b9rB2e1scvhtgkOTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAoDtZpwmUPjaE0n4vOaWWl/oRrfxn83EJ
+8rKJhGdEr7nv7ZbsnGTbMjBvZ5qsfl+yqwE2foH65IRe0qw24GtixX1LDoJt0nZi
+0f6X+J8wfBj5tFJ3gh1229MdqfDBmgC9bXXYfef6xzijnHDoRnkDry5023X4blMM
+A8iZGok1GTzTyVR8qPAs5m4HeW9q4ebqkYJpCh3DflminmtGFZhb069GHWLIzoBS
+SRE/yQQSwxN8PzuKlts8oB4KtItUsiRnDe+Cy748fdHif64W1lZYudogsYMVoe+K
+TTJvQS8TUoKU1xrBeKJR3Stwbbca+few4GeXVtt8YVMJAygCQMez2P2ccGrGKMOF
+6eLtGpOg3kuYooQ+BXcBlj37tCAPnHICehIv1aO6UXivKitEZU61/Qrowc15h2Er
+3oBXRb9n8ZuRXqWk7FlIEA04x7D6w0RtBPV4UBySllva9bguulvP5fBqnUsvWHMt
+Ty3EHD70sz+rFQ47GUGKpMFXEmZxTPpT41frYpUJnlTd0cI8Vzy9OK2YZLe4A5pT
+VmBds9hCG1xLEooc6+t9xnppxyd/pPiL8uSUZodL6ZQHCRJ5irLrdATczvREWeAW
+ysUsWNc8e89ihmpQfTU2Zqf7N+cox9jQraVplI/owd8k+BsHMYeB2F326CjYSlKA
+rBPuUBQemMc=
+-----END CERTIFICATE-----
+
 # TeliaSonera Root CA v1
 -----BEGIN CERTIFICATE-----
 MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw
@ -2272,29 +2604,6 @@ As8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp
 1uwJ
 -----END CERTIFICATE-----

-# Trustis FPS Root CA
-----BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
-MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
-ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
-MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
-MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
-AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
-iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
-vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
-0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
-OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
-BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
-FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
-GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
-zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
-1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
-f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
-jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
-ZetX2fNXlrtIzYE=
-----END CERTIFICATE-----
-
 # Trustwave Global Certification Authority
 -----BEGIN CERTIFICATE-----
 MIIF2jCCA8KgAwIBAgIMBfcOhtpJ80Y1LrqyMA0GCSqGSIb3DQEBCwUAMIGIMQsw
@ -2587,36 +2896,6 @@ sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP
 cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
 -----END CERTIFICATE-----

-# VeriSign Universal Root Certification Authority
-----BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
-vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
-ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
-IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
-IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
-bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
-9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
-H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
-LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
-/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
-rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
-WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
-exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
-sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
-seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
-4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
-BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
-lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
-7M2CYfE45k+XmCpajQ==
-----END CERTIFICATE-----
-
 # XRamp Global CA Root
 -----BEGIN CERTIFICATE-----
 MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
--- a/msys2/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
+++ b/msys2/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
--- a/msys2/etc/post-install/01-devices.post
+++ b/msys2/etc/post-install/01-devices.post
@ -1,31 +1,6 @@
 maybe_create_devs ()
 {
  local DEVDIR=/dev
-  # Check for ${DEVDIR} directory
-  if [ -e "${DEVDIR}" -a ! -d "${DEVDIR}" ]
-  then 
-    # No mercy.  Try to remove.
-    rm -f "${DEVDIR}"
-    if [ -e "${DEVDIR}" -a ! -d "${DEVDIR}" ]
-    then 
-      echo
-      echo "${DEVDIR} is existant but not a directory."
-      echo "Please fix that manually, otherwise you WILL get problems."
-      echo
-      exit 1
-    fi
-  fi
-
-  # Create it if necessary
-  mkdir -m 755 "${DEVDIR}" 2> /dev/null
-  if [ ! -e "${DEVDIR}" ]
-  then
-    echo
-    echo "Creating ${DEVDIR} directory failed."
-    echo "Please fix that manually, otherwise you WILL get problems."
-    echo
-    exit 1
-  fi

  # Check for ${DEVDIR}/shm directory (for POSIX semaphores and POSIX shared mem)
  if [ -e "${DEVDIR}/shm" -a ! -d "${DEVDIR}/shm" ]
@ -44,7 +19,7 @@ maybe_create_devs ()
  # Create it if necessary
  if [ ! -e "${DEVDIR}/shm" ]
  then
-    mkdir -m 1777 "${DEVDIR}/shm"
+    mkdir "${DEVDIR}/shm"
    if [ ! -e "${DEVDIR}/shm" ]
    then
      echo
@ -71,7 +46,7 @@ maybe_create_devs ()
  # Create it if necessary
  if [ ! -e "${DEVDIR}/mqueue" ]
  then
-    mkdir -m 1777 "${DEVDIR}/mqueue"
+    mkdir "${DEVDIR}/mqueue"
    if [ ! -e "${DEVDIR}/mqueue" ]
    then
      echo
@ -80,13 +55,6 @@ maybe_create_devs ()
      echo
    fi
  fi
-  
-  # Install /dev/fd, /dev/std{in,out,err}.  The bash builtin test was compiled
-  # to assume these exist, so use /bin/test to really check.
-  /usr/bin/test -h /dev/stdin  || ln -sf /proc/self/fd/0 /dev/stdin
-  /usr/bin/test -h /dev/stdout || ln -sf /proc/self/fd/1 /dev/stdout
-  /usr/bin/test -h /dev/stderr || ln -sf /proc/self/fd/2 /dev/stderr
-  /usr/bin/test -h /dev/fd     || ln -sf /proc/self/fd   /dev/fd
 }

 maybe_create_devs
--- a/msys2/etc/post-install/06-windows-files.post
+++ b/msys2/etc/post-install/06-windows-files.post
@ -1,6 +1,12 @@
 maybe_create_winetc ()
 {
  local FILES="hosts protocols services networks"
+
+  local mketc=
+  for mketc in ${FILES}
+  do
+    if [ ! -e "/etc/${mketc}" -a ! -L "/etc/${mketc}" ]
+    then
      local WINSYS32HOME="$(exec /usr/bin/cygpath -S -w)"
      local WINETC="${WINSYS32HOME}\\drivers\\etc"

@ -10,18 +16,11 @@ maybe_create_winetc ()
        exit 1
      fi

-  local mketc=
-  for mketc in ${FILES}
-  do
-    if [ ! -e "/etc/${mketc}" -a ! -L "/etc/${mketc}" ]
-    then
      # Windows only uses the first 8 characters
      local WFILE="${WINETC}\\$(exec expr substr "${mketc}" 1 8)"
      /usr/bin/cp -p -v "${WFILE}" "/etc/${mketc}"
    fi
  done
-
-  /usr/bin/chmod 1777 /tmp 2>/dev/null
 }

 maybe_create_winetc
--- a/msys2/etc/post-install/07-pacman-key.post
+++ b/msys2/etc/post-install/07-pacman-key.post
@ -7,8 +7,6 @@ maybe_init_keyring ()
    /usr/bin/pacman-key --populate msys2 || true
    /usr/bin/pacman-key --refresh-keys || true
    /usr/bin/gpgconf --kill all
-    
-    MAYBE_FIRST_START=true
  fi
 }

--- a/msys2/etc/post-install/08-xml-catalog.post
+++ b/msys2/etc/post-install/08-xml-catalog.post
@ -1,12 +0,0 @@
-maybe_create_xml_catalog ()
-{
-  if [ ! -f "/etc/xml/catalog" ]
-  then
-    /usr/bin/mkdir -p /etc/xml
-    /usr/bin/xmlcatalog --noout --create /etc/xml/catalog
-    
-    MAYBE_FIRST_START=true
-  fi
-}
-
-maybe_create_xml_catalog
--- a/msys2/etc/profile
+++ b/msys2/etc/profile
@ -51,8 +51,11 @@ MINGW*|CLANG*|UCRT*)
  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"
+  PKG_CONFIG_SYSTEM_INCLUDE_PATH="${MINGW_MOUNT_POINT}/include"
+  PKG_CONFIG_SYSTEM_LIBRARY_PATH="${MINGW_MOUNT_POINT}/lib"
  ACLOCAL_PATH="${MINGW_MOUNT_POINT}/share/aclocal:/usr/share/aclocal"
  MANPATH="${MINGW_MOUNT_POINT}/local/man:${MINGW_MOUNT_POINT}/share/man:${MANPATH}"
+  INFOPATH="${MINGW_MOUNT_POINT}/local/info:${MINGW_MOUNT_POINT}/share/info:${INFOPATH}"
  ;;
 *)
  PATH="${MSYS2_PATH}:/opt/bin${ORIGINAL_PATH:+:${ORIGINAL_PATH}}"
@ -62,6 +65,11 @@ esac
 CONFIG_SITE="/etc/config.site"

 MAYBE_FIRST_START=false
+if [ ! -d "${HOME}" ]; then
+  printf "\e[1;32mMSYS2 is starting for the first time. Executing the initial setup.\e[1;0m\n" 1>&2;
+  MAYBE_FIRST_START=true
+fi
+
 SYSCONFDIR="${SYSCONFDIR:=/etc}"

 # TMP and TEMP as defined in the Windows environment must be kept
@ -69,18 +77,8 @@ SYSCONFDIR="${SYSCONFDIR:=/etc}"
 # them set to the default Windows temporary directory or unset
 # can have unexpected consequences for msys2 apps, so we define 
 # our own to match GNU/Linux behaviour.
-#
-# Note: this uppercase/lowercase workaround does not seem to work.
-# In fact, it has been removed from Cygwin some years ago. See:
-#
-#     * https://cygwin.com/git/gitweb.cgi?p=cygwin-apps/base-files.git;a=commitdiff;h=3e54b07
-#     * https://cygwin.com/git/gitweb.cgi?p=cygwin-apps/base-files.git;a=commitdiff;h=7f09aef
-#
 ORIGINAL_TMP="${ORIGINAL_TMP:-${TMP}}"
 ORIGINAL_TEMP="${ORIGINAL_TEMP:-${TEMP}}"
-unset TMP TEMP
-tmp=$(exec cygpath -w "$ORIGINAL_TMP" 2> /dev/null)
-temp=$(exec cygpath -w "$ORIGINAL_TEMP" 2> /dev/null)
 TMP="/tmp"
 TEMP="/tmp"

@ -92,14 +90,6 @@ if [ -e "${p}" ] ; then
 fi
 unset p

-print_flags ()
-{
-  (( $1 & 0x0002 )) && echo -n "binary" || echo -n "text"
-  (( $1 & 0x0010 )) && echo -n ",exec"
-  (( $1 & 0x0040 )) && echo -n ",cygexec"
-  (( $1 & 0x0100 )) && echo -n ",notexec"
-}
-
 # Shell dependent settings
 profile_d ()
 {
@ -148,30 +138,10 @@ then
  export ACLOCAL_PATH
 fi

-export PATH MANPATH INFOPATH PKG_CONFIG_PATH USER TMP TEMP PRINTER HOSTNAME PS1 SHELL tmp temp ORIGINAL_TMP ORIGINAL_TEMP ORIGINAL_PATH CONFIG_SITE
+export PATH MANPATH INFOPATH PKG_CONFIG_PATH PKG_CONFIG_SYSTEM_INCLUDE_PATH PKG_CONFIG_SYSTEM_LIBRARY_PATH USER TMP TEMP PRINTER HOSTNAME PS1 SHELL ORIGINAL_TMP ORIGINAL_TEMP ORIGINAL_PATH CONFIG_SITE
 unset PATH_SEPARATOR

 if [ "$MAYBE_FIRST_START" = "true" ]; then
-
-  if [ -f "/usr/bin/update-ca-trust" ]
-  then 
-    sh /usr/bin/update-ca-trust
-  fi
-
-  clear
-  echo
-  echo
-  echo "###################################################################"
-  echo "#                                                                 #"
-  echo "#                                                                 #"
-  echo "#                   C   A   U   T   I   O   N                     #"
-  echo "#                                                                 #"
-  echo "#                  This is first start of MSYS2.                  #"
-  echo "#       You MUST restart shell to apply necessary actions.        #"
-  echo "#                                                                 #"
-  echo "#                                                                 #"
-  echo "###################################################################"
-  echo
-  echo
+  printf "\e[1;32mInitial setup complete. MSYS2 is now ready to use.\e[1;0m\n" 1>&2;
 fi
 unset MAYBE_FIRST_START
--- a/msys2/etc/profile.d/000-msys2.sh
+++ b/msys2/etc/profile.d/000-msys2.sh
@ -4,3 +4,24 @@ if [ ! "${MINGW_PREFIX}" = "" ]; then
    XDG_DATA_DIRS="/usr/local/share/:/usr/share/"
    export XDG_DATA_DIRS="$MINGW_PREFIX/share/:$XDG_DATA_DIRS"
 fi
+
+# Warn the user on the first login shell in case we detect a too old Windows version
+_warn_deprecated_winver()
+{
+    if [ "$__MSYS2_WINDOWS_VERSION_WARNING_DONE" = "true" ]; then
+        return;
+    fi
+
+    local winver
+    winver=$(uname -s)   # looks like `MINGW64_NT-10.0-22621`
+    winver=${winver#*-}  # strip off `<prefix>-`
+    winver=${winver%%-*} # strip off `-<suffix>`, if any
+    if [ "$winver" = "6.1" ] || [ "$winver" = "6.2" ]; then
+        export __MSYS2_WINDOWS_VERSION_WARNING_DONE="true"
+        printf "\e[1;33mThe MSYS2 project no longer supports Windows 7 and 8.0.\e[1;0m\n" 1>&2;
+        printf "\e[1;33mFor more information visit https://www.msys2.org/docs/windows_support\e[1;0m\n" 1>&2;
+    fi
+}
+
+_warn_deprecated_winver;
+unset _warn_deprecated_winver;
--- a/msys2/etc/skel/.inputrc
+++ b/msys2/etc/skel/.inputrc
@ -1,111 +0,0 @@
-# To the extent possible under law, the author(s) have dedicated all 
-# copyright and related and neighboring rights to this software to the 
-# public domain worldwide. This software is distributed without any warranty. 
-# You should have received a copy of the CC0 Public Domain Dedication along 
-# with this software. 
-# If not, see <https://creativecommons.org/publicdomain/zero/1.0/>. 
-
-# ~/.inputrc: readline initialization file.
-
-# The copy in your home directory (~/.inputrc) is yours, please
-# feel free to customise it to create a shell
-# environment to your liking.  If you feel a change
-# would be benifitial to all, please feel free to send
-# a patch to the msys2 mailing list.
-
-# "\e[3~": delete-char
-
-# VT
-# "\e[1~": beginning-of-line
-# "\e[4~": end-of-line
-
-# kvt
-# "\e[H": beginning-of-line
-# "\e[F": end-of-line
-
-# rxvt and konsole (i.e. the KDE-app...)
-# "\e[7~": beginning-of-line
-# "\e[8~": end-of-line
-
-# VT220
-# "\eOH": beginning-of-line
-# "\eOF": end-of-line
-
-# Allow 8-bit input/output
-# set meta-flag on
-# set convert-meta off
-# set input-meta on
-# set output-meta on
-#$if Bash
-  # Don't ring bell on completion
-  set bell-style none
-
-  # or, don't beep at me - show me
-  #set bell-style visible
-
-  # Show all instead of beeping first
-  set show-all-if-ambiguous off
-
-  # Filename completion/expansion
-  set completion-ignore-case on
-  #set show-all-if-ambiguous on
-
-  # Expand homedir name
-  #set expand-tilde on
-
-  # Append "/" to all dirnames
-  #set mark-directories on
-  #set mark-symlinked-directories on
-
-  # visible-stats
-  # Append a mark according to the file type in a listing
-  set visible-stats off
-  set mark-directories on
-
-  # Match all files
-  #set match-hidden-files on
-
-  # 'Magic Space'
-  # Insert a space character then performs
-  # a history expansion in the line
-  #Space: magic-space
-#$endif
-
-# MSYSTEM is emacs based
-$if mode=emacs
-  # Common to Console & RXVT
-  "\e[2~": paste-from-clipboard      # "Ins. Key"
-  "\e[5~": beginning-of-history      # Page up
-  "\e[6~": end-of-history            # Page down
-
-  $if term=msys # RXVT
-    "\e[7~": beginning-of-line      # Home Key
-    "\e[8~": end-of-line            # End Key
-    "\e[11~": display-shell-version # F1
-    "\e[15~": re-read-init-file     # F5
-    "\e[12~": "Function Key 2"
-    "\e[13~": "Function Key 3"
-    "\e[14~": "Function Key 4"
-    "\e[17~": "Function Key 6"
-    "\e[18~": "Function Key 7"
-    "\e[19~": "Function Key 8"
-    "\e[20~": "Function Key 9"
-    "\e[21~": "Function Key 10"
-  $else
-  # Eh, normal Console is not really cygwin anymore, is it? Using 'else' instead. -mstormo
-  # $if term=cygwin # Console
-    "\e[1~": beginning-of-line      # Home Key
-    "\e[4~": end-of-line            # End Key
-    "\e[3~": delete-char      # Delete Key
-    "\e\e[C": forward-word      # Alt-Right
-    "\e\e[D": backward-word      # Alt-Left
-    "\e[1;5C": forward-word   # ctrl + right
-    "\e[1;5D": backward-word  # ctrl + left 
-    "\e[17~": "Function Key 6"
-    "\e[18~": "Function Key 7"
-    "\e[19~": "Function Key 8"
-    "\e[20~": "Function Key 9"
-    "\e[21~": "Function Key 10"
-    "\e[23~": "Function Key 11"
-  $endif
-$endif
--- a/msys2/etc/skel/.profile
+++ b/msys2/etc/skel/.profile
@ -27,26 +27,3 @@ if [ -n "${BASH_VERSION}" ]; then
    source "${HOME}/.bashrc"
  fi
 fi
-
-agm2() {
-  local MINGW_DIRS="mingw32 mingw64"
-  local AG_FIND=
-  
-  for dir in ${MINGW_DIRS}; do
-    if type -p /${dir}/bin/ag >/dev/null; then
-      AG_FIND=/${dir}/bin/ag
-    fi
-  done
-  
-  if ! type -p /usr/bin/git >/dev/null; then
-    echo "bash: git: command not found. Please install \"git\" package."
-    exit 1
-  fi
-  
-  if [ -n "$AG_FIND" ]; then
-    $AG_FIND --makepkg --depth 1 "$@" $(git rev-parse --show-toplevel)
-  else
-    echo "bash: ag: conmmand not found. Please install \"mingw-w64-i686-ag\" or \"mingw-w64-x86_64-ag\" package."
-    exit 1
-  fi
-}
--- a/msys2/mingw32.exe
+++ b/msys2/mingw32.exe
--- a/msys2/mingw64.exe
+++ b/msys2/mingw64.exe
--- a/msys2/msys2.exe
+++ b/msys2/msys2.exe
--- a/msys2/msys2_shell.cmd
+++ b/msys2/msys2_shell.cmd
@ -41,6 +41,8 @@ if "x%~1" == "x-mingw32" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW3
 if "x%~1" == "x-mingw64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW64& goto :checkparams
 if "x%~1" == "x-ucrt64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=UCRT64& goto :checkparams
 if "x%~1" == "x-clang64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANG64& goto :checkparams
+if "x%~1" == "x-clang32" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANG32& goto :checkparams
+if "x%~1" == "x-clangarm64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANGARM64& goto :checkparams
 if "x%~1" == "x-mingw" shift& set /a msys2_shiftCounter+=1& (if exist "%WD%..\..\mingw64" (set MSYSTEM=MINGW64) else (set MSYSTEM=MINGW32))& goto :checkparams
 rem Console types
 if "x%~1" == "x-mintty" shift& set /a msys2_shiftCounter+=1& set MSYSCON=mintty.exe& goto :checkparams
@ -108,6 +110,12 @@ if "%MSYSTEM%" == "MINGW32" (
 ) else if "%MSYSTEM%" == "CLANG64" (
  set "CONTITLE=MinGW Clang x64"
  set "CONICON=clang64.ico"
+) else if "%MSYSTEM%" == "CLANG32" (
+  set "CONTITLE=MinGW Clang x32"
+  set "CONICON=clang32.ico"
+) else if "%MSYSTEM%" == "CLANGARM64" (
+  set "CONTITLE=MinGW Clang ARM64"
+  set "CONICON=clangarm64.ico"
 ) else (
  set "CONTITLE=MSYS2 MSYS"
  set "CONICON=msys2.ico"
@ -121,9 +129,9 @@ if NOT EXIST "%WD%mintty.exe" goto startsh
 set MSYSCON=mintty.exe
 :startmintty
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
+  start "%CONTITLE%" "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" -l !SHELL_ARGS!
 ) else (
-  "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" --login !SHELL_ARGS!
+  "%WD%mintty" -i "/%CONICON%" -t "%CONTITLE%" "/usr/bin/%LOGINSHELL%" -l !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%

@ -133,18 +141,18 @@ call :conemudetect || (
  exit /b 1
 )
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\%CONICON%" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+  start "%CONTITLE%" "%ComEmuCommand%" /Here /Icon "%WD%..\..\%CONICON%" /cmd "%WD%\%LOGINSHELL%" -l !SHELL_ARGS!
 ) else (
-  "%ComEmuCommand%" /Here /Icon "%WD%..\..\%CONICON%" /cmd "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+  "%ComEmuCommand%" /Here /Icon "%WD%..\..\%CONICON%" /cmd "%WD%\%LOGINSHELL%" -l !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%

 :startsh
 set MSYSCON=
 if not defined MSYS2_NOSTART (
-  start "%CONTITLE%" "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+  start "%CONTITLE%" "%WD%\%LOGINSHELL%" -l !SHELL_ARGS!
 ) else (
-  "%WD%\%LOGINSHELL%" --login !SHELL_ARGS!
+  "%WD%\%LOGINSHELL%" -l !SHELL_ARGS!
 )
 exit /b %ERRORLEVEL%

--- a/msys2/ucrt64.exe
+++ b/msys2/ucrt64.exe
--- a/msys2/usr/bin/[.exe
+++ b/msys2/usr/bin/[.exe
--- a/msys2/usr/bin/agetty.exe
+++ b/msys2/usr/bin/agetty.exe
--- a/msys2/usr/bin/arch.exe
+++ b/msys2/usr/bin/arch.exe
--- a/msys2/usr/bin/ash.exe
+++ b/msys2/usr/bin/ash.exe
--- a/msys2/usr/bin/autopoint
+++ b/msys2/usr/bin/autopoint
@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002-2016 Free Software Foundation, Inc.
+# Copyright (C) 2002-2023 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
@ -13,7 +13,7 @@
 # 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 <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #

 # This file is meant for authors, maintainers, co-maintainers or installers
@ -22,8 +22,8 @@

 progname=$0
 package=gettext-tools
-version=0.19.8.1
-archive_version=0.19.8
+version=0.22
+archive_version=0.22

 # Set variables
 # - gettext_datadir     directory where the data files are stored.
@ -197,17 +197,23 @@ Options:
  -V version           copy the infrastructure of the specified gettext version
                         (dangerous)"
  echo "
-Report bugs to <bug-gnu-gettext@gnu.org>."
+Report bugs in the bug tracker at <https://savannah.gnu.org/projects/gettext>
+or by email to <bug-gettext@gnu.org>."
 }

-# func_version
+# func_version include_config_details
 # outputs to stdout the --version message.
+# Inputs:
+# - include_config_details   true or false
 func_version ()
 {
  echo "$progname (GNU $package) $version"
-  echo "Uses a versions archive in dirxz format."
-  echo "Copyright (C) 2002-2013 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+  if $1; then
+    echo "This binary is configured to use a versions archive in dirxz format."
+    echo
+  fi
+  echo "Copyright (C) 2002-2023 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law."
  echo "Written by" "Bruno Haible"
@ -260,8 +266,12 @@ unset CLICOLOR_FORCE GREP_OPTIONS
      -V*) # Some people omit the space between -V and the version number.
        ver=`echo "X$1" | sed -e 's/^X-V//'`
        shift ;;
+      --version-without-config )
+        # Print version output without build dependent details.
+        func_version false
+        exit 0 ;;
      --version | --versio | --versi | --vers | --ver | --ve | --v )
-        func_version
+        func_version true
        exit 0 ;;
      -- ) # Stop option prcessing
        shift; break ;;
@ -289,17 +299,17 @@ srcdir=`pwd`

 # Check integrity of package: A configure.in/ac must be present. Sets variable
 # - configure_in    name of configure.in/ac file.
-if test -f configure.in; then
-  configure_in=configure.in
-else
 if test -f configure.ac; then
  configure_in=configure.ac
+else
+  if test -f configure.in; then
+    configure_in=configure.in
  else
    # KDE specific convention: configure.in.in
    if test -f configure.in.in; then
      configure_in=configure.in.in
    else
-      func_fatal_error "Missing configure.in or configure.ac, please cd to your package first."
+      func_fatal_error "Missing configure.ac or configure.in, please cd to your package first."
    fi
  fi
 fi
@ -321,7 +331,7 @@ func_version_prereq ()
  req="$1"
  ver="$2"
  echo "m4_if(m4_version_compare([$ver], [$req]), [-1], [m4_exit([1])])" \
-    | "$AUTOM4TE" --language=M4sugar 2>&1 >/dev/null
+    | "$AUTOM4TE" --language=M4sugar >/dev/null
 }

 # If AM_GNU_GETTEXT_REQUIRE_VERSION is used and archive_version is newer than
@ -378,7 +388,10 @@ case "$ver" in
  0.16 | 0.16.1 | \
  0.17 | \
  0.18 | 0.18.1 | 0.18.2 | 0.18.3 | \
-  0.19 | 0.19.1 | 0.19.2 | 0.19.3 | 0.19.4 | 0.19.5 | 0.19.6 | 0.19.7 | 0.19.8 )
+  0.19 | 0.19.1 | 0.19.2 | 0.19.3 | 0.19.4 | 0.19.5 | 0.19.6 | 0.19.7 | 0.19.8 | \
+  0.20 | 0.20.2 | \
+  0.21 | 0.21.1 | \
+  0.22 )
    ;;
  *)
    func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in
@ -440,6 +453,13 @@ for arg in $xargs; do
 done
 IFS="$save_IFS"

+if test -z "$omitintl"; then
+  case "$ver" in
+    0.1[0-9] | 0.1[0-9].* ) ;;
+    *) func_fatal_error "AM_GNU_GETTEXT without 'external' argument is no longer supported in version $ver" ;;
+  esac
+fi
+
 # Check in which directory or directories the po/* infrastructure belongs.
 configfiles=`"$func_trace" AC_CONFIG_FILES "$configure_in"`
 # PO directories have a Makefile.in generated from Makefile.in.in.
@ -533,10 +553,10 @@ case "dirxz" in
    #
    # But the CVS format is now deprecated, because "cvs init" does not work in
    # all circumstances
-    # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-05/msg00003.html>)
+    # (see <https://lists.gnu.org/archive/html/bug-cvs/2010-05/msg00003.html>)
    # and we are not allowed to distribute the cvs infrastructure files
    # ourselves
-    # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-06/msg00011.html>).
+    # (see <https://lists.gnu.org/archive/html/bug-cvs/2010-06/msg00011.html>).
    #
    # Check availability of the CVS program.
    (cvs -v) >/dev/null 2>/dev/null || func_fatal_error "cvs program not found"
@ -610,7 +630,12 @@ case "dirxz" in
    (git --version) >/dev/null 2>/dev/null || func_fatal_error "git program not found"
    mkdir "$work_dir/archive"
    gzip -d -c < "$gettext_datadir/archive.git.tar.gz" | (cd "$work_dir/archive" && tar xf -)
-    (cd "$work_dir/archive" && git checkout -q "gettext-$ver") || {
+    (unset GIT_CONFIG
+     unset XDG_CONFIG_HOME
+     unset HOME
+     GIT_CONFIG_NOSYSTEM=1; export GIT_CONFIG_NOSYSTEM
+     cd "$work_dir/archive" && git checkout -q "gettext-$ver"
+    ) || {
      rm -rf "$work_dir"
      func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
    }
@ -630,7 +655,7 @@ esac
 func_destfile ()
 {
  # There are five categories of files:
-  # ABOUT_NLS -> top level directory
+  # ABOUT-NLS -> top level directory
  # config.rpath mkinstalldirs -> $auxdir
  # m4/* -> $m4dir/
  # intl/* -> intl/
--- a/msys2/usr/bin/awk.exe
+++ b/msys2/usr/bin/awk.exe
--- a/msys2/usr/bin/b2sum.exe
+++ b/msys2/usr/bin/b2sum.exe
--- a/msys2/usr/bin/backup
+++ b/msys2/usr/bin/backup
@ -0,0 +1,257 @@
+#! /bin/sh
+# Make backups.
+
+# Copyright 2004-2006, 2013, 2019 Free Software Foundation
+
+# This file is part of GNU tar.
+
+# GNU tar 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 3 of the License, or
+# (at your option) any later version.
+
+# GNU tar 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 <http://www.gnu.org/licenses/>.
+
+# Load library routines
+SYSCONFDIR=${SYSCONFDIR-/usr/etc}
+. ${LIBDIR-/usr/lib/tar}/backup.sh
+
+DUMP_LEVEL=0
+TIME=
+NOW=`now`
+
+usage() {
+    	cat - <<EOF
+usage: $PROGNAME [OPTIONS] [WHEN]
+Options are:
+
+   -l, --level=LEVEL       Do backup level LEVEL (default $DUMP_LEVEL).
+   -f, --force             Force backup even if today's log file already
+                           exists.
+   -v, --verbose[=LEVEL]   Set verbosity level. Default 100.
+   -t, --time=TIME         Wait till TIME, then do backup.
+
+Informational options:
+   -h, --help              Display this help message.
+   -V, --version           Display program version.
+
+   Optional argument WHEN is for backward compatibility only. It has been
+   superseded by --time option.
+   TIME argument can be one of:
+
+	now          --     do backup immediately.
+	HH           --     do backup at HH hours.
+	HH:MM        --     do backup at HH:MM.
+
+Send bug reports to bug-tar@gnu.org.
+EOF
+}
+
+# For compatibility with previous versions, deduce the backup level
+# from the command name
+case "$PROGNAME" in
+level-[0-9]) DUMP_LEVEL=`expr $PROGNAME : 'level-\([0-9][0-9]*\)'`;;
+esac
+
+for opt
+do
+  if [ -z "$prev" ]; then
+      option=$opt
+      optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`
+  else
+      option="${prev}=$opt"
+      prev=""
+      optarg=$opt
+  fi
+  case $option in
+  --l=*|--le=*|--lev=*|--leve=*|--level=*)
+         DUMP_LEVEL=$optarg
+	 ;;
+  -l?*)  DUMP_LEVEL=`expr $option : '-l\(.*\)'`;;
+  -l|--l|--le|--lev|--leve|--level)
+	 prev=--level
+	 ;;
+  --verb=*|--verbo=*|--verbos=*|--verbose=*)
+         VERBOSE=$optarg
+	 ;;
+  -v|--verb|--verbo|--verbos|--verbose)
+         VERBOSE=100
+	 ;;
+  -v*)   VERBOSE=`expr $option : '-v\(.*\)'`;;
+  --t=*|--ti=*|--tim=*|--time=*)
+         TIME=$optarg
+	 ;;
+  -t?*)  TIME=`expr $option : '-t\(.*\)'`;;
+  -t|--t|--ti|--tim|--time)
+	 prev=--time
+    	 ;;
+  -V|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    	 echo "backup (GNU tar) 1.34"
+	 license
+	 exit;;
+  -h|--h|--he|--hel|--help)
+	 usage
+	 exit;;
+  -f|--f|--fo|--for|--forc|--force)
+      	 FORCE=yes
+	 ;;
+  *)     if [ "x$TIME" != "x" ]; then
+            bailout "Extra argument. Try $PROGNAME --help for more info."
+         else
+            TIME=$option
+         fi;;
+  esac
+done
+
+if [ "x$TIME" = x ]; then
+    bailout "No backup time specified. Try $PROGNAME --help for more info."
+    exit 1
+fi
+
+init_backup
+
+# Maybe sleep until around specified or default hour.
+wait_time $TIME
+
+if [ $DUMP_LEVEL -ne 0 ]; then
+    PREV_LEVEL=`expr $DUMP_LEVEL - 1`
+    PREV_DATE=`ls -t ${LOGPATH}/log-*-level-$PREV_LEVEL|
+                head -n 1|
+		sed "s,${LOGPATH}/log-\(.*\)-level.*,\1,"`
+    if [ "x$PREV_DATE" = x ]; then
+        bailout "Can't determine date of the previous backup"
+    fi
+    message 0 "Backup from $PREV_DATE to $NOW"
+fi
+
+# start doing things
+
+# Make sure the log file did not already exist.  Create it.
+
+if [ "x$FORCE" = "xyes" ]; then
+    rm ${LOGFILE}
+fi
+
+if [ -f "${LOGFILE}" ] ; then
+   bailout "Log file ${LOGFILE} already exists."
+else
+   touch "${LOGFILE}"
+fi
+message 1 "Ready for backup."
+message 10 "TAR invocation: $TAR_PART1"
+message 20 "Variables:"
+message 20 "BACKUP_DIRS=$BACKUP_DIRS"
+message 20 "BACKUP_FILES=$BACKUP_FILES"
+
+# The bunch of commands below is run in a subshell for which all output is
+# piped through 'tee' to the logfile.  Doing this, instead of having
+# multiple pipelines all over the place, is cleaner and allows access to
+# the exit value from various commands more easily.
+(
+ message 1 "preparing tapes"
+ if ! $MT_BEGIN "${TAPE_FILE}"; then
+    echo >&2 "$0: tape initialization failed"
+    exit 1
+ fi 
+ rm -f "${VOLNO_FILE}"
+
+ message 1 "processing backup directories"
+
+ set - ${BACKUP_DIRS}
+ while [ $# -ne 0 ] ; do
+     date="`date`"
+     fs="`echo \"${1}\" | sed -e 's/^.*://'`"
+     fs=`root_fs $fs`
+     fsname="`echo \"${1}\" | sed -e 's/\//:/g'`"
+     remotehost="`expr \"${1}\" : '\([^/][^/]*\):.*'`"
+     if [ -z "$remotehost" ]; then
+	 remotehost=$localhost
+     fi
+
+     echo "Backing up ${1} at ${date}"
+     message 10 "fs=$fs"
+     message 10 "fsname=$fsname"
+     message 10 "remotehost=$remotehost"
+     if [ $DUMP_LEVEL -eq 0 ]; then
+	 make_level_log ${remotehost}
+     else
+	 echo "Last `prev_level` dump on this filesystem was on $PREV_DATE"
+	 remote_run "${remotehost}" cp "`level_log_name ${fsname} $PREV_LEVEL`" "`level_log_name temp`"
+     fi
+
+     ${DUMP_BEGIN-:} $DUMP_LEVEL $remotehost $fs $fsname
+     backup_host ${remotehost} \
+                "--listed=`level_log_name temp`" \
+                "--label='`print_level` backup of ${fs} on ${remotehost} at ${NOW}'" \
+		-C ${fs} .
+
+     # 'rsh' doesn't exit with the exit status of the remote command.  What
+     # stupid lossage.  TODO: think of a reliable workaround.
+     if [ $? -ne 0 ] ; then
+	 echo "$0: backup of ${1} failed." 1>&2
+         # I'm assuming that the tar will have written an empty
+         # file to the tape, otherwise I should do a cat here.
+     else
+         flush_level_log ${remotehost} ${fsname}
+     fi
+     ${MT_STATUS} "$TAPE_FILE"
+     ${DUMP_END-:} $DUMP_LEVEL $remotehost $fs $fsname
+     echo "sleeping ${SLEEP_TIME} seconds"
+     sleep ${SLEEP_TIME}
+     shift
+ done
+
+ # Dump any individual files requested.
+
+ if [ "x${BACKUP_FILES}" != "x" ] ; then
+     message 1 "processing individual files"
+
+     date="`date`"
+
+     if [ $DUMP_LEVEL -eq 0 ]; then
+         make_level_log $localhost
+     else
+	 echo "Last `prev_level` dump on this filesystem was on $PREV_DATE"
+	 remote_run "${localhost}" cp "`level_log_name MISC $PREV_LEVEL`" "`level_log_name temp`"
+     fi
+
+     echo "Backing up miscellaneous files at ${date}"
+
+     ${DUMP_BEGIN-:} $DUMP_LEVEL $localhost MISC MISC
+     backup_host $localhost \
+               "--listed=`level_log_name temp`"\
+               "--label='`print_level` backup of miscellaneous files at ${NOW}'" \
+               ${BACKUP_FILES}
+
+     if [ $? -ne 0 ] ; then
+	 echo "Backup of miscellaneous files failed."
+	 # I'm assuming that the tar will have written an empty
+	 # file to the tape, otherwise I should do a cat here.
+     else
+	 flush_level_log $localhost MISC
+     fi
+     ${MT_STATUS} "$TAPE_FILE"
+     ${DUMP_END-:} $DUMP_LEVEL $localhost MISC MISC
+ else
+     echo "No miscellaneous files specified"
+ fi
+ message 1 "final cleanup"
+
+ $MT_REWIND "${TAPE_FILE}"
+ $MT_OFFLINE "${TAPE_FILE}"
+ echo "."
+) 2>&1 | tee -a "${LOGFILE}"
+RC=$?
+
+if test "${ADMINISTRATOR}" != NONE; then
+     echo "Sending the dump log to ${ADMINISTRATOR}"
+     mail -s "Results of backup started ${startdate}" ${ADMINISTRATOR} < "${LOGFILE}"
+fi
+exit $RC
+# EOF
--- a/msys2/usr/bin/base32.exe
+++ b/msys2/usr/bin/base32.exe
--- a/msys2/usr/bin/base64.exe
+++ b/msys2/usr/bin/base64.exe
--- a/msys2/usr/bin/basename.exe
+++ b/msys2/usr/bin/basename.exe
--- a/msys2/usr/bin/basenc.exe
+++ b/msys2/usr/bin/basenc.exe
--- a/msys2/usr/bin/bash.exe
+++ b/msys2/usr/bin/bash.exe
--- a/msys2/usr/bin/bashbug
+++ b/msys2/usr/bin/bashbug
@ -4,10 +4,10 @@
 #
 # The bug address depends on the release status of the shell.  Versions
 # with status `devel', `alpha', `beta', or `rc' mail bug reports to
-# chet@cwru.edu and, optionally, to bash-testers@cwru.edu.
+# chet.ramey@case.edu and, optionally, to bash-testers@cwru.edu.
 # Other versions send mail to bug-bash@gnu.org.
 #
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 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="-march=x86-64 -mtune=generic -O2 -pipe -D_STATIC_BUILD "
-RELEASE="5.1"
-PATCHLEVEL="8"
+CFLAGS="-march=nocona -msahf -mtune=generic -O2 -pipe -D_STATIC_BUILD"
+RELEASE="5.2"
+PATCHLEVEL="15"
 RELSTATUS="release"
 MACHTYPE="x86_64-pc-msys"

@ -102,7 +102,7 @@ esac
 BASHTESTERS="bash-testers@cwru.edu"

 case "$RELSTATUS" in
-alpha*|beta*|devel*|rc*)	BUGBASH=chet@cwru.edu ;;
+alpha*|beta*|devel*|rc*)	BUGBASH=chet.ramey@case.edu ;;
 *)				BUGBASH=bug-bash@gnu.org ;;
 esac

@ -132,6 +132,10 @@ if [ -z "$DEFEDITOR" ] && [ -z "$EDITOR" ]; then
 		DEFEDITOR=emacs
 	elif [ -x /usr/bin/xemacs ]; then
 		DEFEDITOR=xemacs
+	elif [ -x /usr/bin/vim; then
+		DEFEDITOR=vim
+	elif [ -x /usr/bin/gvim; then
+		DEFEDITOR=gvim
 	elif [ -x /usr/bin/nano ]; then
 		DEFEDITOR=nano
 	elif [ -x /usr/contrib/bin/jove ]; then
--- a/msys2/usr/bin/blkid.exe
+++ b/msys2/usr/bin/blkid.exe
--- a/msys2/usr/bin/brotli.exe
+++ b/msys2/usr/bin/brotli.exe
--- a/msys2/usr/bin/bsdtar.exe
+++ b/msys2/usr/bin/bsdtar.exe
--- a/msys2/usr/bin/bunzip2.exe
+++ b/msys2/usr/bin/bunzip2.exe
--- a/msys2/usr/bin/bzcat.exe
+++ b/msys2/usr/bin/bzcat.exe
--- a/msys2/usr/bin/bzip2.exe
+++ b/msys2/usr/bin/bzip2.exe
--- a/msys2/usr/bin/bzip2recover.exe
+++ b/msys2/usr/bin/bzip2recover.exe
--- a/msys2/usr/bin/c_rehash
+++ b/msys2/usr/bin/c_rehash
@ -2,9 +2,9 @@

 # WARNING: do not edit!
 # Generated by Makefile from tools/c_rehash.in
-# Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
 #
-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
@ -22,7 +22,7 @@ my $x509hash = "-subject_hash";
 my $crlhash = "-hash";
 my $verbose = 0;
 my $symlink_exists=eval {symlink("",""); 1};
-if ($^O eq "msys") { $symlink_exists=0 };
+$symlink_exists=0;
 my $removelinks = 1;

 ##  Parse flags.
@ -106,23 +106,46 @@ foreach (@dirlist) {
 }
 exit($errorcount);

+sub copy_file {
+    my ($src_fname, $dst_fname) = @_;
+
+    if (open(my $in, "<", $src_fname)) {
+        if (open(my $out, ">", $dst_fname)) {
+            print $out $_ while (<$in>);
+            close $out;
+        } else {
+            warn "Cannot open $dst_fname for write, $!";
+        }
+        close $in;
+    } else {
+        warn "Cannot open $src_fname for read, $!";
+    }
+}
+
 sub hash_dir {
+    my $dir = shift;
    my %hashlist;
-	print "Doing $_[0]\n";
-	chdir $_[0];
-	opendir(DIR, ".");
+
+    print "Doing $dir\n";
+
+    if (!chdir $dir) {
+        print STDERR "WARNING: Cannot chdir to '$dir', $!\n";
+        return;
+    }
+
+    opendir(DIR, ".") || print STDERR "WARNING: Cannot opendir '.', $!\n";
    my @flist = sort readdir(DIR);
    closedir DIR;
    if ( $removelinks ) {
        # Delete any existing symbolic links
        foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) {
            if (-l $_) {
-				print "unlink $_" if $verbose;
+                print "unlink $_\n" if $verbose;
                unlink $_ || warn "Can't unlink $_, $!\n";
            }
        }
    }
-	FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
+    FILE: foreach $fname (grep {/\.(pem|crt|cer|crl)$/} @flist) {
        # Check to see if certificates and/or CRLs present.
        my ($cert, $crl) = check_file($fname);
        if (!$cert && !$crl) {
@ -132,13 +155,16 @@ sub hash_dir {
        link_hash_cert($fname) if ($cert);
        link_hash_crl($fname) if ($crl);
    }
+
+    chdir $pwd;
 }

 sub check_file {
    my ($is_cert, $is_crl) = (0,0);
    my $fname = $_[0];
-	open IN, $fname;
-	while(<IN>) {
+
+    open(my $in, "<", $fname);
+    while(<$in>) {
        if (/^-----BEGIN (.*)-----/) {
            my $hdr = $1;
            if ($hdr =~ /^(X509 |TRUSTED |)CERTIFICATE$/) {
@ -150,10 +176,27 @@ sub check_file {
            }
        }
    }
-	close IN;
+    close $in;
    return ($is_cert, $is_crl);
 }

+sub compute_hash {
+    my $fh;
+    if ( $^O eq "VMS" ) {
+        # VMS uses the open through shell
+        # The file names are safe there and list form is unsupported
+        if (!open($fh, "-|", join(' ', @_))) {
+            print STDERR "Cannot compute hash on '$fname'\n";
+            return;
+        }
+    } else {
+        if (!open($fh, "-|", @_)) {
+            print STDERR "Cannot compute hash on '$fname'\n";
+            return;
+        }
+    }
+    return (<$fh>, <$fh>);
+}

 # Link a certificate to its subject name hash value, each hash is of
 # the form <hash>.<n> where n is an integer. If the hash value already exists
@ -162,72 +205,49 @@ sub check_file {
 # certificate fingerprints

 sub link_hash_cert {
-		my $fname = $_[0];
-		$fname =~ s/\"/\\\"/g;
-		my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
-		chomp $hash;
-		chomp $fprint;
-		$fprint =~ s/^.*=//;
-		$fprint =~ tr/://d;
-		my $suffix = 0;
-		# Search for an unused hash filename
-		while(exists $hashlist{"$hash.$suffix"}) {
-			# Hash matches: if fingerprint matches its a duplicate cert
-			if ($hashlist{"$hash.$suffix"} eq $fprint) {
-				print STDERR "WARNING: Skipping duplicate certificate $fname\n";
-				return;
-			}
-			$suffix++;
-		}
-		$hash .= ".$suffix";
-		if ($symlink_exists) {
-			print "link $fname -> $hash\n" if $verbose;
-			symlink $fname, $hash || warn "Can't symlink, $!";
-		} else {
-			print "copy $fname -> $hash\n" if $verbose;
-                        if (open($in, "<", $fname)) {
-                            if (open($out,">", $hash)) {
-                                print $out $_ while (<$in>);
-                                close $out;
-                            } else {
-                                warn "can't open $hash for write, $!";
-                            }
-                            close $in;
-                        } else {
-                            warn "can't open $fname for read, $!";
-                        }
-		}
-		$hashlist{$hash} = $fprint;
+    link_hash($_[0], 'cert');
 }

 # Same as above except for a CRL. CRL links are of the form <hash>.r<n>

 sub link_hash_crl {
-		my $fname = $_[0];
-		$fname =~ s/'/'\\''/g;
-		my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
+    link_hash($_[0], 'crl');
+}
+
+sub link_hash {
+    my ($fname, $type) = @_;
+    my $is_cert = $type eq 'cert';
+
+    my ($hash, $fprint) = compute_hash($openssl,
+                                       $is_cert ? "x509" : "crl",
+                                       $is_cert ? $x509hash : $crlhash,
+                                       "-fingerprint", "-noout",
+                                       "-in", $fname);
    chomp $hash;
+    $hash =~ s/^.*=// if !$is_cert;
    chomp $fprint;
+    return if !$hash;
    $fprint =~ s/^.*=//;
    $fprint =~ tr/://d;
    my $suffix = 0;
    # Search for an unused hash filename
-		while(exists $hashlist{"$hash.r$suffix"}) {
+    my $crlmark = $is_cert ? "" : "r";
+    while(exists $hashlist{"$hash.$crlmark$suffix"}) {
        # Hash matches: if fingerprint matches its a duplicate cert
-			if ($hashlist{"$hash.r$suffix"} eq $fprint) {
-				print STDERR "WARNING: Skipping duplicate CRL $fname\n";
+        if ($hashlist{"$hash.$crlmark$suffix"} eq $fprint) {
+            my $what = $is_cert ? 'certificate' : 'CRL';
+            print STDERR "WARNING: Skipping duplicate $what $fname\n";
            return;
        }
        $suffix++;
    }
-		$hash .= ".r$suffix";
+    $hash .= ".$crlmark$suffix";
    if ($symlink_exists) {
        print "link $fname -> $hash\n" if $verbose;
        symlink $fname, $hash || warn "Can't symlink, $!";
    } else {
-			print "cp $fname -> $hash\n" if $verbose;
-			system ("cp", $fname, $hash);
-                        warn "Can't copy, $!" if ($? >> 8) != 0;
+        print "copy $fname -> $hash\n" if $verbose;
+        copy_file($fname, $hash);
    }
    $hashlist{$hash} = $fprint;
 }
--- a/msys2/usr/bin/cal.exe
+++ b/msys2/usr/bin/cal.exe
--- a/msys2/usr/bin/captoinfo.exe
+++ b/msys2/usr/bin/captoinfo.exe
--- a/msys2/usr/bin/cat.exe
+++ b/msys2/usr/bin/cat.exe
--- a/msys2/usr/bin/cfdisk.exe
+++ b/msys2/usr/bin/cfdisk.exe
--- a/msys2/usr/bin/chattr.exe
+++ b/msys2/usr/bin/chattr.exe
--- a/msys2/usr/bin/chcon.exe
+++ b/msys2/usr/bin/chcon.exe
--- a/msys2/usr/bin/checkupdates
+++ b/msys2/usr/bin/checkupdates
@ -19,36 +19,63 @@
 #

 declare -r myname='checkupdates'
-declare -r myver='1.4.0'
+declare -r myver='1.9.1'

 LIBRARY=${LIBRARY:-'/usr/share/makepkg'}

 DOWNLOAD_CACHE=0
-USE_COLOR=0
+USE_COLOR='y'

 # Import libmakepkg
 source "$LIBRARY"/util/message.sh
 source "$LIBRARY"/util/parseopts.sh

+die() {
+	error "$@"
+	exit 1
+}
+
+runcmd() {
+	if (( EUID != 0 )); then
+		msg 'Escalating privileges using sudo'
+		if sudo -v &>/dev/null && sudo -l &>/dev/null; then
+			sudo "$@"
+		else
+			die 'Failed to escalate'
+		fi
+	else
+		"$@"
+	fi
+}
+
 usage() {
-	cat << __EOF__
+	cat <<EOF
 ${myname} v${myver}

-Safely print a list of pending updates
+Safely print a list of pending updates.

 Usage: ${myname} [options]

 Options:
-    -d, --download        download pending updates to the pacman cache.
-    -h, --help            display this help message and exit.
+  -d, --download  download pending updates to the pacman cache
+      --nocolor   do not colorize output
+  -n, --nosync    do not sync the temporary database
+  -h, --help      display this help message and exit
+  -V, --version   display version information and exit

-Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.
-
-__EOF__
+Environment Variables:
+  CHECKUPDATES_DB  override the path of the temporary database
+                   (default: "\${TMPDIR:-/tmp}/checkup-db-\${UID}")
+  TMPDIR           override the temporary directory (default: '/tmp')
+EOF
 }

-OPT_SHORT='dh'
-OPT_LONG=('download' 'help' 'nocolor')
+version() {
+	printf "%s %s\n" "$myname" "$myver"
+}
+
+OPT_SHORT='dnhV'
+OPT_LONG=('download' 'nosync' 'help' 'nocolor' 'version')

 if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
 	exit 1
@ -56,15 +83,21 @@ fi
 set -- "${OPTRET[@]}"
 unset OPT_SHORT OPT_LONG OPTRET

+SYNC=1
 while :; do
 	case $1 in
 		-d|--download)
 			DOWNLOAD_CACHE=1 ;;
+		--nocolor)
+			USE_COLOR='n';;
+		-n|--nosync)
+			SYNC=0 ;;
 		-h|--help)
 			usage
 			exit 0 ;;
-		--nocolor)
-			USE_COLOR='n';;
+		-V|--version)
+			version
+			exit 0 ;;
 		--)
 			shift
 			break ;;
@ -90,21 +123,20 @@ if [[ -z "$DBPath" ]] || [[ ! -d "$DBPath" ]]; then
 	DBPath="/var/lib/pacman/"
 fi

+if (( ${SYNC} )); then
 	mkdir -p "$CHECKUPDATES_DB"
 	ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null
 	if ! pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null; then
-	error 'Cannot fetch updates'
-	exit 1
+	    die 'Cannot fetch updates'
+	fi
 fi
 mapfile -t updates < <(pacman -Qu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]')

 if (( ${#updates[@]} )); then
 	printf '%s\n' "${updates[@]}"
 	if (( DOWNLOAD_CACHE )); then
-		sudo pacman -Sw --noconfirm "${updates[@]%% *}" --dbpath "$CHECKUPDATES_DB" --logfile /dev/null
+		runcmd pacman -Sw --noconfirm "${updates[@]%% *}" --dbpath "$CHECKUPDATES_DB" --logfile /dev/null
 	fi
 else
 	exit 2
 fi
-
-# vim: set noet:
--- a/msys2/usr/bin/chgrp.exe
+++ b/msys2/usr/bin/chgrp.exe
--- a/msys2/usr/bin/chmod.exe
+++ b/msys2/usr/bin/chmod.exe
--- a/msys2/usr/bin/chown.exe
+++ b/msys2/usr/bin/chown.exe
--- a/msys2/usr/bin/chroot.exe
+++ b/msys2/usr/bin/chroot.exe
--- a/msys2/usr/bin/chrt.exe
+++ b/msys2/usr/bin/chrt.exe
--- a/msys2/usr/bin/cksum.exe
+++ b/msys2/usr/bin/cksum.exe
--- a/msys2/usr/bin/clear.exe
+++ b/msys2/usr/bin/clear.exe
--- a/msys2/usr/bin/col.exe
+++ b/msys2/usr/bin/col.exe
--- a/msys2/usr/bin/colcrt.exe
+++ b/msys2/usr/bin/colcrt.exe
--- a/msys2/usr/bin/colrm.exe
+++ b/msys2/usr/bin/colrm.exe
--- a/msys2/usr/bin/column.exe
+++ b/msys2/usr/bin/column.exe
--- a/msys2/usr/bin/comm.exe
+++ b/msys2/usr/bin/comm.exe
--- a/msys2/usr/bin/core_perl/corelist
+++ b/msys2/usr/bin/core_perl/corelist
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 #!/usr/bin/perl

 =head1 NAME
--- a/msys2/usr/bin/core_perl/cpan
+++ b/msys2/usr/bin/core_perl/cpan
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 #!/usr/local/bin/perl

 BEGIN { pop @INC if $INC[-1] eq '.' }
@ -254,9 +254,9 @@ The build tools, L<ExtUtils::MakeMaker> and L<Module::Build> use some,
 while others matter to the levels above them. Some of these are specified
 by the Perl Toolchain Gang:

-Lancaster Concensus: L<https://github.com/Perl-Toolchain-Gang/toolchain-site/blob/master/lancaster-consensus.md>
+Lancaster Consensus: L<https://github.com/Perl-Toolchain-Gang/toolchain-site/blob/master/lancaster-consensus.md>

-Oslo Concensus: L<https://github.com/Perl-Toolchain-Gang/toolchain-site/blob/master/oslo-consensus.md>
+Oslo Consensus: L<https://github.com/Perl-Toolchain-Gang/toolchain-site/blob/master/oslo-consensus.md>

 =over 4

--- a/msys2/usr/bin/core_perl/enc2xs
+++ b/msys2/usr/bin/core_perl/enc2xs
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 #!./perl
 BEGIN {
    # @INC poking  no longer needed w/ new MakeMaker and Makefile.PL's
@ -14,7 +14,7 @@ use warnings;
 use Getopt::Std;
 use Config;
 my @orig_ARGV = @ARGV;
-our $VERSION  = do { my @r = (q$Revision: 2.23 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION  = do { my @r = (q$Revision: 2.24 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };

 # These may get re-ordered.
 # RAW is a do_now as inserted by &enter
@ -252,7 +252,12 @@ if ($cname =~ /\.(c|xs)$/i) # VMS may have upcased filenames with DECC$ARGV_PARS
 END
  }

-  if ($cname =~ /(\w+)\.xs$/)
+  if ($cname =~ /\.c$/i && $Config{ccname} eq "gcc")
+   {
+    print C qq(#pragma GCC diagnostic ignored "-Wc++-compat"\n);
+   }
+
+  if ($cname =~ /\.xs$/i)
   {
    print C "#define PERL_NO_GET_CONTEXT\n";
    print C "#include <EXTERN.h>\n";
@ -262,15 +267,15 @@ END
  print C "#include \"encode.h\"\n\n";

 }
-elsif ($cname =~ /\.enc$/)
+elsif ($cname =~ /\.enc$/i)
 {
  $doEnc = 1;
 }
-elsif ($cname =~ /\.ucm$/)
+elsif ($cname =~ /\.ucm$/i)
 {
  $doUcm = 1;
 }
-elsif ($cname =~ /\.pet$/)
+elsif ($cname =~ /\.pet$/i)
 {
  $doPet = 1;
 }
--- a/msys2/usr/bin/core_perl/encguess
+++ b/msys2/usr/bin/core_perl/encguess
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 #!./perl
 use 5.008001;
 BEGIN { pop @INC if $INC[-1] eq '.' }
@ -64,7 +64,7 @@ encguess - guess character encodings of files

 =head1 VERSION

-$Id: encguess,v 0.2 2016/08/04 03:15:58 dankogai Exp $
+$Id: encguess,v 0.3 2020/12/02 01:28:17 dankogai Exp $

 =head1 SYNOPSIS

@ -81,7 +81,7 @@ show this message and exit.
 =item -s

 specify a list of "suspect encoding types" to test, 
-seperated by either C<:> or C<,>
+separated by either C<:> or C<,>

 =item -S

--- a/msys2/usr/bin/core_perl/h2ph
+++ b/msys2/usr/bin/core_perl/h2ph
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell

 BEGIN { pop @INC if $INC[-1] eq '.' }

--- a/msys2/usr/bin/core_perl/h2xs
+++ b/msys2/usr/bin/core_perl/h2xs
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell

 BEGIN { pop @INC if $INC[-1] eq '.' }

--- a/msys2/usr/bin/core_perl/instmodsh
+++ b/msys2/usr/bin/core_perl/instmodsh
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 #!/usr/bin/perl -w

 BEGIN { pop @INC if $INC[-1] eq '.' }
--- a/msys2/usr/bin/core_perl/json_pp
+++ b/msys2/usr/bin/core_perl/json_pp
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 #!/usr/bin/perl

 BEGIN { pop @INC if $INC[-1] eq '.' }
--- a/msys2/usr/bin/core_perl/libnetcfg
+++ b/msys2/usr/bin/core_perl/libnetcfg
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell

 =head1 NAME

--- a/msys2/usr/bin/core_perl/perlbug
+++ b/msys2/usr/bin/core_perl/perlbug
@ -1,10 +1,10 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell

-my $config_tag1 = '5.32.1 - Mon Mar 22 22:24:49 GMT 2021';
+my $config_tag1 = '5.36.1 - Thu Jul 13 18:17:31 UTC 2023';

-my $patchlevel_date = 1616451871;
+my $patchlevel_date = 1681659354;
 my @patches = Config::local_patches();
 my $patch_tags = join "", map /(\S+)/ ? "+$1 " : (), @patches;

@ -24,7 +24,7 @@ BEGIN {
    eval { require Mail::Send;};
    $::HaveSend = ($@ eq "");
    eval { require Mail::Util; } ;
-    $::HaveUtil = ($@ eq "");
+    $::HaveUtil = (!$ENV{PERL_BUILD_PACKAGING} and $@ eq "");
    # use secure tempfiles wherever possible
    eval { require File::Temp; };
    $::HaveTemp = ($@ eq "");
@ -1264,9 +1264,6 @@ release of Perl, are likely to receive less attention from the
 volunteers who build and maintain Perl than reports about bugs in
 the current release.

-This tool isn't appropriate for reporting bugs in any version
-prior to Perl 5.0.
-
 =item Are you sure what you have is a bug?

 A significant number of the bug reports we get turn out to be
--- a/msys2/usr/bin/core_perl/perldoc
+++ b/msys2/usr/bin/core_perl/perldoc
@ -1,14 +0,0 @@
-#!/usr/bin/perl
-    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if 0;
-
-# This "perldoc" file was generated by "perldoc.PL"
-
-require 5;
-BEGIN {
-    $^W = 1 if $ENV{'PERLDOCDEBUG'};
-    pop @INC if $INC[-1] eq '.';
-}
-use Pod::Perldoc;
-exit( Pod::Perldoc->run() );
-
--- a/msys2/usr/bin/core_perl/perlivp
+++ b/msys2/usr/bin/core_perl/perlivp
@ -1,8 +1,8 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-        if $running_under_some_shell;
+        if 0; # ^ Run only under a shell

-# perlivp v5.32.1
+# perlivp v5.36.1

 BEGIN { pop @INC if $INC[-1] eq '.' }

@ -67,7 +67,7 @@ $tests_total++;

 print "## Checking Perl version via variable '\$]'.\n" if $opt{'p'};

-my $ivp_VERSION = "5.032001";
+my $ivp_VERSION = "5.036001";


 $label = 'Perl version correct';
--- a/msys2/usr/bin/core_perl/perlthanks
+++ b/msys2/usr/bin/core_perl/perlthanks
@ -1,10 +1,10 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell

-my $config_tag1 = '5.32.1 - Mon Mar 22 22:24:49 GMT 2021';
+my $config_tag1 = '5.36.1 - Thu Jul 13 18:17:31 UTC 2023';

-my $patchlevel_date = 1616451871;
+my $patchlevel_date = 1681659354;
 my @patches = Config::local_patches();
 my $patch_tags = join "", map /(\S+)/ ? "+$1 " : (), @patches;

@ -24,7 +24,7 @@ BEGIN {
    eval { require Mail::Send;};
    $::HaveSend = ($@ eq "");
    eval { require Mail::Util; } ;
-    $::HaveUtil = ($@ eq "");
+    $::HaveUtil = (!$ENV{PERL_BUILD_PACKAGING} and $@ eq "");
    # use secure tempfiles wherever possible
    eval { require File::Temp; };
    $::HaveTemp = ($@ eq "");
@ -1264,9 +1264,6 @@ release of Perl, are likely to receive less attention from the
 volunteers who build and maintain Perl than reports about bugs in
 the current release.

-This tool isn't appropriate for reporting bugs in any version
-prior to Perl 5.0.
-
 =item Are you sure what you have is a bug?

 A significant number of the bug reports we get turn out to be
--- a/msys2/usr/bin/core_perl/piconv
+++ b/msys2/usr/bin/core_perl/piconv
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 #!./perl
 # $Id: piconv,v 2.8 2016/08/04 03:15:58 dankogai Exp $
 #
--- a/msys2/usr/bin/core_perl/pl2pm
+++ b/msys2/usr/bin/core_perl/pl2pm
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell

 =head1 NAME

--- a/msys2/usr/bin/core_perl/pod2html
+++ b/msys2/usr/bin/core_perl/pod2html
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 =pod

 =head1 NAME
--- a/msys2/usr/bin/core_perl/pod2usage
+++ b/msys2/usr/bin/core_perl/pod2usage
@ -87,7 +87,9 @@ This option assumes that the formatter (see above) understands the option
 =item I<file>

 The pathname of a file containing pod documentation to be output in
-usage message format (defaults to standard input).
+usage message format. If omitted, standard input is read - but the
+output is then formatted with L<Pod::Text> only - unless a specific
+formatter has been specified with B<-formatter>.

 =back

@ -102,7 +104,8 @@ module. Please see L<Pod::Usage/pod2usage()>.

 =head1 SEE ALSO

-L<Pod::Usage>, L<pod2text(1)>
+L<Pod::Usage>, L<pod2text>, L<Pod::Text>, L<Pod::Text::Termcap>,
+L<perldoc>

 =head1 AUTHOR

@ -141,14 +144,13 @@ pod2usage(VERBOSE => 2)  if ($options{man});
 ## Dont default to STDIN if connected to a terminal
 pod2usage(2) if ((@ARGV == 0) && (-t STDIN));

-@ARGV = ('-')  unless (@ARGV);
 if (@ARGV > 1) {
    print STDERR "pod2usage: Too many filenames given\n\n";
    pod2usage(2);
 }

 my %usage = ();
-$usage{-input}    = shift(@ARGV);
+$usage{-input}    = shift(@ARGV) || \*STDIN;
 $usage{-exitval}  = $options{'exit'}      if (defined $options{'exit'});
 $usage{-output}   = $options{'output'}    if (defined $options{'output'});
 $usage{-verbose}  = $options{'verbose'}   if (defined $options{'verbose'});
--- a/msys2/usr/bin/core_perl/prove
+++ b/msys2/usr/bin/core_perl/prove
@ -1,6 +1,6 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 #!/usr/bin/perl -w

 BEGIN { pop @INC if $INC[-1] eq '.' }
@ -210,7 +210,7 @@ new problems have been introduced.

 =item C<all>

-Run all tests in normal order. Multple options may be specified, so to
+Run all tests in normal order. Multiple options may be specified, so to
 run all tests with the failures from last time first:

    $ prove -b --state=failed,all,save
--- a/msys2/usr/bin/core_perl/ptar
+++ b/msys2/usr/bin/core_perl/ptar
@ -1,8 +1,9 @@
 #!/usr/bin/perl
    eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
+	if 0; # ^ Run only under a shell
 #!/usr/bin/perl
 use strict;
+use warnings;

 BEGIN { pop @INC if $INC[-1] eq '.' }
 use File::Find;
--- a/Show more
+++ b/Show more