Add refresh-keys, switch key-server to keyserver.ubuntu.com

Author: MSP-Greg

common.rb

@@ -30,6 +30,7 @@ module Common
   TAG = 'msys2-gcc-pkgs' # GitHub release tag
   MSYS2_ROOT = 'C:/msys64'
   PACMAN     = 'C:/msys64/usr/bin/pacman.exe'
+  BASH       = 'C:/msys64/usr/bin/bash.exe'
 
   def gh_api_graphql(http, query)
     body = {}
@@ -241,6 +242,35 @@ def update_release_notes(old_body, name, time)
     }
   end
 
+  def gpg_conf_key_server(old_uri, new_uri)
+    fn = "#{MSYS2_ROOT}/etc/pacman.d/gnupg/gpg.conf"
+    str = File.binread fn
+    if str.include? old_uri
+      str.sub! old_uri, new_uri
+      File.binwrite fn, str
+      STDOUT.syswrite "\ngpg.conf - changed '#{old_uri}' to '#{new_uri}'"
+    end
+  end
+
+  def refresh_keys
+    STDOUT.syswrite "\n#{YEL}#{LINE} Refresh keys#{RST}\n"
+    gpg_conf_key_server 'pool.sks-keyservers.net', 'keyserver.ubuntu.com'
+
+    str = ''
+    cmd = "#{BASH} -c \"pacman-key --refresh-keys\""
+
+    IO.popen(cmd, err: [:child, :out]) { |io| str = io.read }
+
+    system 'taskkill /f /fi "MODULES eq msys-2.0.dll"'
+
+    if str.match?(/new signatures:|signatures cleaned:/)
+      STDOUT.syswrite str
+      true
+    else
+      nil
+    end
+  end
+
   def pacman_syuu
     usr_bin = "#{MSYS2_ROOT}/usr/bin"
 
@@ -253,6 +283,8 @@ def pacman_syuu
     exec_check 'Updating all installed packages (2nd pass)', "#{PACMAN} -Syuu  --noconfirm"
 
     system 'taskkill /f /fi "MODULES eq msys-2.0.dll"'
+
+    refresh_keys
   end
 
   # logs message and runs cmd, checking for error

create_msys2_pkg.rb

@@ -22,11 +22,12 @@ class << self
     LOCAL = 'var/lib/pacman/local'
 
     def update_msys2
-      pacman_syuu
+      updated_keys = pacman_syuu
 
       pkgs = 'autoconf-wrapper autogen automake-wrapper bison diffutils libtool m4 make patch re2c texinfo texinfo-tex compression'
       exec_check "Install MSYS2 packages#{RST}\n#{YEL}#{pkgs}",
         "#{PACMAN} -S --noconfirm --needed --noprogressbar #{pkgs}"
+      updated_keys
     end
 
     def remove_non_msys2
@@ -72,15 +73,17 @@ def clean_database(pre)
     def run
       current_pkgs = %x[#{PACMAN} -Q].split("\n").reject { |l| l.start_with? 'mingw-w64-' }
 
-      update_msys2
+      updated_keys = update_msys2
 
       updated_pkgs = %x[#{PACMAN} -Q].split("\n").reject { |l| l.start_with? 'mingw-w64-' }
 
       time = Time.now.utc.strftime '%Y-%m-%d %H:%M:%S UTC'
 
       log_array_2_column updated_pkgs, 48, "Installed MSYS2 Packages"
 
-      if current_pkgs == updated_pkgs
+      gpg_files = Dir["#{MSYS2_ROOT}/etc/pacman.d/gnupg/*"].count { |fn| File.file? fn }
+
+      if current_pkgs == updated_pkgs && !updated_keys
         STDOUT.syswrite "\n** No update to MSYS2 tools needed **\n\n"
         exit 0
       else