Update patches for M144

Author: Hibbiki

patch/0001-Patch-installer-to-close-previous-browser-instance-o.patch

@@ -1,4 +1,4 @@
-From 6672d08c0f5587b6450b2137cf41cd69acc37b10 Mon Sep 17 00:00:00 2001
+From 42415a266a519540186c16eaf5c4791f2ad2db2a Mon Sep 17 00:00:00 2001
 From: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
 Date: Thu, 5 Aug 2021 02:09:34 +0200
 Subject: [PATCH 1/4] Patch installer to close previous browser instance on
@@ -10,7 +10,7 @@ Signed-off-by: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
  1 file changed, 48 insertions(+)
 
 diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
-index 3393a297bb712..40f877019cd32 100644
+index 317e77e81c040..a635e1b48d637 100644
 --- a/chrome/installer/setup/install_worker.cc
 +++ b/chrome/installer/setup/install_worker.cc
 @@ -29,6 +29,8 @@

patch/0002-Patch-updater-to-work-with-unsigned-and-unbranded-bu.patch

@@ -1,18 +1,18 @@
-From b6d0c246ec55919274446bcb7701a17eb5c4af7c Mon Sep 17 00:00:00 2001
+From 7a0c840a1732f84b1e1805fc7998a12fddca1af6 Mon Sep 17 00:00:00 2001
 From: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
 Date: Wed, 12 Jun 2024 02:14:41 +0200
 Subject: [PATCH 2/4] Patch updater to work with unsigned and unbranded builds
 
 Signed-off-by: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
 ---
- .../install_static/chromium_install_modes.h   |  3 +--
+ .../install_static/chromium_install_modes.h   |  3 +-
  chrome/updater/BUILD.gn                       |  1 +
- chrome/updater/win/installer/installer.cc     | 15 +++++++++++++
- chrome/updater/win/signing/sign.py            | 21 ++-----------------
- 4 files changed, 19 insertions(+), 21 deletions(-)
+ chrome/updater/win/installer/installer.cc     | 15 +++++++
+ chrome/updater/win/signing/sign.py            | 42 +------------------
+ 4 files changed, 19 insertions(+), 42 deletions(-)
 
 diff --git a/chrome/install_static/chromium_install_modes.h b/chrome/install_static/chromium_install_modes.h
-index 7de32cf745755..9bbb8ecadd23a 100644
+index 0cf937413e08a..e2b57a664660f 100644
 --- a/chrome/install_static/chromium_install_modes.h
 +++ b/chrome/install_static/chromium_install_modes.h
 @@ -32,8 +32,7 @@ inline constexpr auto kInstallModes = std::to_array<InstallConstants>({
@@ -26,10 +26,10 @@ index 7de32cf745755..9bbb8ecadd23a 100644
          .base_app_id = L"Chromium",                // A distinct base_app_id.
          .browser_prog_id_prefix = L"ChromiumHTM",  // Browser ProgID prefix.
 diff --git a/chrome/updater/BUILD.gn b/chrome/updater/BUILD.gn
-index 58400305cb10a..b2fa2db65c701 100644
+index ae9d83075d2eb..64efb84497a14 100644
 --- a/chrome/updater/BUILD.gn
 +++ b/chrome/updater/BUILD.gn
-@@ -358,6 +358,7 @@ if (is_win || is_mac || is_linux) {
+@@ -377,6 +377,7 @@ if (is_win || is_mac || is_linux) {
          "//chrome/installer/util:constants",
          "//chrome/installer/util:metainstaller_utils",
          "//chrome/installer/util:work_item",
@@ -38,7 +38,7 @@ index 58400305cb10a..b2fa2db65c701 100644
          "//chrome/updater/app/server/win:updater_idl_system",
          "//chrome/updater/app/server/win:updater_idl_user",
 diff --git a/chrome/updater/win/installer/installer.cc b/chrome/updater/win/installer/installer.cc
-index 2444634092235..71f13cfa910f5 100644
+index 543e55df64519..bd732c5103745 100644
 --- a/chrome/updater/win/installer/installer.cc
 +++ b/chrome/updater/win/installer/installer.cc
 @@ -11,6 +11,11 @@
@@ -90,24 +90,24 @@ index 2444634092235..71f13cfa910f5 100644
 
  // Shows a splash screen "Initializing...".
 diff --git a/chrome/updater/win/signing/sign.py b/chrome/updater/win/signing/sign.py
-index d22b29c4875fc..6f7a0bbfc616e 100755
+index 42becb59dd93c..8304169764b80 100755
 --- a/chrome/updater/win/signing/sign.py
 +++ b/chrome/updater/win/signing/sign.py
-@@ -117,28 +117,11 @@ class Signer:
+@@ -124,49 +124,11 @@ class Signer:
          self._sign_flags = sign_flags
 
      def _add_tagging_cert(self, in_file, out_file):
 -        """Adds the tagging cert. Returns the path to the tagged file."""
 -        subprocess.run(
 -            [self._tagging_exe, '--set-tag',
 -             '--out=%s' % out_file, in_file],
--            check=True)
+-            check=True,
+-            stdout=subprocess.DEVNULL)
 +        shutil.copy(in_file, out_file)
          return out_file
 
      def _sign_item(self, in_file):
 -        """Sign an executable in-place."""
--        # Retries may be required: lore states the timestamp server is flaky.
 -        for flags in self._sign_flags:
 -            command = [self._signtool_exe, 'sign']
 -            command += flags
@@ -119,7 +119,28 @@ index d22b29c4875fc..6f7a0bbfc616e 100755
 -                command += ['/s', 'My', '/n', self._identity]
 -
 -            command += [in_file]
--            subprocess.run(command, check=True)
+-
+-            # Timestamp server is flaky, retry sign if timestamp server is used
+-            attempts = 10 if ({'/tr', '/tseal'} & set(command)) else 1
+-            delay = 1
+-            for attempt in range(1, attempts + 1):
+-                try:
+-                    subprocess.run(command,
+-                                   check=True,
+-                                   stdout=subprocess.DEVNULL)
+-                except subprocess.CalledProcessError:
+-                    if attempt == attempts:
+-                        raise
+-                    logging.exception(
+-                        'Sign attempt failed, attempts left: %d',
+-                        attempts - attempt
+-                    )
+-                    logging.info(
+-                        'Waiting for %d seconds before next attempt...', delay
+-                    )
+-                    time.sleep(delay)
+-                    continue
+-                break
 +        return
 
      def _generate_target_manifest(self, appid, installer_path, manifest_path,

patch/0003-Ensure-bogus-ElevationService-is-not-being-created-d.patch

@@ -1,4 +1,4 @@
-From 5221611b74b49a818db69aa6389c83eabb9860c0 Mon Sep 17 00:00:00 2001
+From bb9750f7ebbecb7c4cbf521c137829afe1a4c81a Mon Sep 17 00:00:00 2001
 From: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
 Date: Sat, 22 Jul 2023 01:33:35 +0200
 Subject: [PATCH 3/4] Ensure bogus ElevationService is not being created during
@@ -10,7 +10,7 @@ Signed-off-by: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
-index 40f877019cd32..52b872a32ee18 100644
+index a635e1b48d637..d14a65b70fc66 100644
 --- a/chrome/installer/setup/install_worker.cc
 +++ b/chrome/installer/setup/install_worker.cc
 @@ -320,6 +320,7 @@ void AddChromeWorkItems(const InstallParams& install_params,
@@ -21,15 +21,15 @@ index 40f877019cd32..52b872a32ee18 100644
  // Adds work items to register the Elevation Service with Windows. Only for
  // system level installs.
  void AddElevationServiceWorkItems(const base::FilePath& elevation_service_path,
-@@ -405,7 +406,6 @@ void AddTracingServiceWorkItems(const InstallationState& original_state,
+@@ -404,7 +405,6 @@ void AddTracingServiceWorkItems(const InstallationState& original_state,
    }
  }
 
 -#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
  // Adds work items to add the "store-dmtoken" command to Chrome's version key.
  // This method is a no-op if this is anything other than system-level Chrome.
  // The command is used when enrolling Chrome browser instances into enterprise
-@@ -1029,7 +1029,7 @@ void AddInstallWorkItems(const InstallParams& install_params,
+@@ -1028,7 +1028,7 @@ void AddInstallWorkItems(const InstallParams& install_params,
                                      install_list);
    AddPlatformExperienceHelperWorkItems(installer_state, new_version,
                                         install_list);
@@ -38,7 +38,7 @@ index 40f877019cd32..52b872a32ee18 100644
    AddFirewallRulesWorkItems(installer_state, !current_version.IsValid(),
                              install_list);
 
-@@ -1039,10 +1039,12 @@ void AddInstallWorkItems(const InstallParams& install_params,
+@@ -1038,10 +1038,12 @@ void AddInstallWorkItems(const InstallParams& install_params,
        installer_state.root_key(),
        GetNotificationHelperPath(target_path, new_version), install_list);
 
@@ -51,7 +51,7 @@ index 40f877019cd32..52b872a32ee18 100644
 
    AddUpdateDowngradeVersionItem(installer_state.root_key(), current_version,
                                  new_version, install_list);
-@@ -1322,10 +1324,12 @@ void AddFinalizeUpdateWorkItems(const InstallationState& original_state,
+@@ -1321,10 +1323,12 @@ void AddFinalizeUpdateWorkItems(const InstallationState& original_state,
    AddWerHelperRegistration(installer_state.root_key(),
                             GetWerHelperPath(target_path, new_version), list);
 

patch/0004-Fix-Grit-branding-args-for-policy_templates.patch

@@ -1,4 +1,4 @@
-From 09ce76599632777f51894548f69000c29f2d975c Mon Sep 17 00:00:00 2001
+From b0c07e6d032a576bd7bf2974244644e11f4f3d6f Mon Sep 17 00:00:00 2001
 From: Hibiki Tachibana <57486057+Hibbiki@users.noreply.github.com>
 Date: Thu, 3 Aug 2023 11:25:53 +0200
 Subject: [PATCH 4/4] Fix Grit branding args for policy_templates