www/*chromium: update to 115.0.5790.170

Security: https://vuxml.freebsd.org/freebsd/6e4e8e87-9fb8-4e32-9f8e-9b4303f4bfd5.html
freebsd · Aug 4, 2023 · b6a23d8 · b6a23d8
1 parent 657cb1f
commit b6a23d8
Show file tree

Hide file tree

Showing 14 changed files with 54 additions and 56 deletions.
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	chromium
-PORTVERSION=	115.0.5790.110
-PORTREVISION=	1
+PORTVERSION=	115.0.5790.170
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		https://nerd.hu/distfiles/:external

diff --git a/www/chromium/distinfo b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1690395777
-SHA256 (chromium-115.0.5790.110.tar.xz) = e9d4bcae7bc812afc430188b48cdc86ab31c4a6d161c34a770b8d56d3121f771
-SIZE (chromium-115.0.5790.110.tar.xz) = 1595009872
-SHA256 (chrome-linux-115.0.5790.110-llvm13.profdata.tar.xz) = 358e21aa4f218c45963df70246627daffefb3ce5a16aec015d526b276bbe6cc8
-SIZE (chrome-linux-115.0.5790.110-llvm13.profdata.tar.xz) = 27655928
-SHA256 (chromium-115.0.5790.110-testdata.tar.xz) = ef4e4837431bb18e948dbc66d88ae0592d7240c3a41131cfb656135460afa18f
-SIZE (chromium-115.0.5790.110-testdata.tar.xz) = 264954424
+TIMESTAMP = 1691150715
+SHA256 (chromium-115.0.5790.170.tar.xz) = ff9862d2e748c56940ffc222c2e6b2066a19ea1de0bc3fd99ed81c0b231172c0
+SIZE (chromium-115.0.5790.170.tar.xz) = 1595419840
+SHA256 (chrome-linux-115.0.5790.170-llvm13.profdata.tar.xz) = 77c03ffebbbc0c5e20ea5747c2247c8c7cc40d3cf418c3a70c746c7758c96a5a
+SIZE (chrome-linux-115.0.5790.170-llvm13.profdata.tar.xz) = 27615256
+SHA256 (chromium-115.0.5790.170-testdata.tar.xz) = a939490b5087ddffa47ae46bbd73edff33bc19e5cd7e7139040b9f31a7f4bc9c
+SIZE (chromium-115.0.5790.170-testdata.tar.xz) = 258994144
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig	2023-07-16 15:47:57 UTC
+--- chrome/test/BUILD.gn.orig	2023-08-04 12:03:57 UTC
 +++ chrome/test/BUILD.gn
-@@ -10596,7 +10596,7 @@ test("chrome_app_unittests") {
+@@ -10597,7 +10597,7 @@ test("chrome_app_unittests") {
      "//components/heap_profiling/in_process",
      "//components/safe_browsing:buildflags",
    ]

diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -1,4 +1,4 @@
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2023-02-08 09:03:45 UTC
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2023-08-04 12:03:57 UTC
 +++ chrome/test/chromedriver/chrome/chrome_finder.cc
 @@ -57,7 +57,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
          installation_locations[i].Append(L"Chromium\\Application"));
@@ -9,12 +9,12 @@
  void GetApplicationDirs(std::vector<base::FilePath>* locations) {
    // TODO: Respect users' PATH variables.
    // Until then, we use an approximation of the most common defaults.
-@@ -142,7 +142,7 @@ bool FindChrome(base::FilePath* browser_exe) {
-   base::FilePath browser_exes_array[] = {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-     base::FilePath(chrome::kBrowserProcessExecutablePath),
+@@ -157,7 +157,7 @@ bool FindChrome(base::FilePath* browser_exe) {
+     base::FilePath(chrome::kGoogleChromeForTestingBrowserProcessExecutablePath),
+     base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath),
+     base::FilePath(chrome::kChromiumBrowserProcessExecutablePath),
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     base::FilePath("google-chrome"),
      base::FilePath(chrome::kBrowserProcessExecutablePath),
-     base::FilePath("chromium"),
+     base::FilePath("chrome"),  // Chrome for Testing or Google Chrome
+     base::FilePath("google-chrome"),
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
@@ -1,4 +1,4 @@
---- content/test/BUILD.gn.orig	2023-07-16 15:47:57 UTC
+--- content/test/BUILD.gn.orig	2023-08-04 12:03:57 UTC
 +++ content/test/BUILD.gn
 @@ -2181,7 +2181,7 @@ static_library("run_all_unittests") {
      ":test_support",
@@ -9,7 +9,7 @@
      deps += [ "//content/common:set_process_title_linux" ]
    }
  }
-@@ -3234,7 +3234,7 @@ test("content_unittests") {
+@@ -3235,7 +3235,7 @@ test("content_unittests") {
      deps += [ "//third_party/boringssl" ]
    }
 

diff --git a/...hromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/...hromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2023-07-16 15:47:57 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2023-08-04 12:03:57 UTC
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
 @@ -1418,7 +1418,7 @@
      {
@@ -9,7 +9,7 @@
        status: {
          "Android": "",
          "ChromeOS_Lacros": "",
-@@ -2647,7 +2647,7 @@
+@@ -2652,7 +2652,7 @@
        name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_allows_third_party: true,
@@ -18,7 +18,7 @@
      },
      {
        name: "PaymentInstruments",
-@@ -3607,7 +3607,7 @@
+@@ -3612,7 +3612,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -27,7 +27,7 @@
      },
      {
        // A kill switch for crbug.com/1410332.
-@@ -3638,7 +3638,7 @@
+@@ -3643,7 +3643,7 @@
        origin_trial_feature_name: "UserAgentReduction",
        origin_trial_allows_third_party: true,
        // iOS not included as it should not send a reduced User-Agent string.
@@ -36,7 +36,7 @@
        base_feature: "ReduceUserAgent",
      },
      {
-@@ -3794,12 +3794,12 @@
+@@ -3799,12 +3799,12 @@
        status: "experimental",
        base_feature: "none",
        origin_trial_feature_name: "WebAppUrlHandling",

diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc
@@ -1,4 +1,4 @@
---- v8/src/execution/isolate.cc.orig	2023-07-16 15:47:57 UTC
+--- v8/src/execution/isolate.cc.orig	2023-08-04 12:03:57 UTC
 +++ v8/src/execution/isolate.cc
 @@ -146,6 +146,10 @@
  #include "src/execution/simulator-base.h"
@@ -11,12 +11,12 @@
  extern "C" const uint8_t v8_Default_embedded_blob_code_[];
  extern "C" uint32_t v8_Default_embedded_blob_code_size_;
  extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -3935,6 +3939,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -3958,6 +3962,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
    uint32_t code_size = DefaultEmbeddedBlobCodeSize();
    const uint8_t* data = DefaultEmbeddedBlobData();
    uint32_t data_size = DefaultEmbeddedBlobDataSize();
 +
-+#if defined(V8_OS_OPENBSD)
++#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
 +  mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)),
 +          code_size, PROT_READ | PROT_EXEC);
 +#endif

diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ungoogled-chromium
-PORTVERSION=	115.0.5790.110
-PORTREVISION=	1
+PORTVERSION=	115.0.5790.170
 UGVERSION=	${DISTVERSION}-1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \

diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1690454599
-SHA256 (chromium-115.0.5790.110.tar.xz) = e9d4bcae7bc812afc430188b48cdc86ab31c4a6d161c34a770b8d56d3121f771
-SIZE (chromium-115.0.5790.110.tar.xz) = 1595009872
-SHA256 (ungoogled-chromium-115.0.5790.110-1.tar.gz) = 39a8e3bb0cb4e3b40c0c657afa7baf4bef717b363b057a59cc379dcacc5ec142
-SIZE (ungoogled-chromium-115.0.5790.110-1.tar.gz) = 665568
-SHA256 (chromium-115.0.5790.110-testdata.tar.xz) = ef4e4837431bb18e948dbc66d88ae0592d7240c3a41131cfb656135460afa18f
-SIZE (chromium-115.0.5790.110-testdata.tar.xz) = 264954424
+TIMESTAMP = 1691150820
+SHA256 (chromium-115.0.5790.170.tar.xz) = ff9862d2e748c56940ffc222c2e6b2066a19ea1de0bc3fd99ed81c0b231172c0
+SIZE (chromium-115.0.5790.170.tar.xz) = 1595419840
+SHA256 (ungoogled-chromium-115.0.5790.170-1.tar.gz) = aa5aab1b7f8b72f43a2971a3147c552f2dd32bf4cfcff009e847b65785bff9ac
+SIZE (ungoogled-chromium-115.0.5790.170-1.tar.gz) = 665517
+SHA256 (chromium-115.0.5790.170-testdata.tar.xz) = a939490b5087ddffa47ae46bbd73edff33bc19e5cd7e7139040b9f31a7f4bc9c
+SIZE (chromium-115.0.5790.170-testdata.tar.xz) = 258994144
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig	2023-07-21 09:49:17 UTC
+--- chrome/test/BUILD.gn.orig	2023-08-04 12:10:50 UTC
 +++ chrome/test/BUILD.gn
-@@ -10594,7 +10594,7 @@ test("chrome_app_unittests") {
+@@ -10595,7 +10595,7 @@ test("chrome_app_unittests") {
      "//components/heap_profiling/in_process",
      "//components/safe_browsing:buildflags",
    ]

diff --git a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -1,4 +1,4 @@
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2023-02-11 09:11:04 UTC
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2023-08-04 12:10:50 UTC
 +++ chrome/test/chromedriver/chrome/chrome_finder.cc
 @@ -57,7 +57,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
          installation_locations[i].Append(L"Chromium\\Application"));
@@ -9,12 +9,12 @@
  void GetApplicationDirs(std::vector<base::FilePath>* locations) {
    // TODO: Respect users' PATH variables.
    // Until then, we use an approximation of the most common defaults.
-@@ -142,7 +142,7 @@ bool FindChrome(base::FilePath* browser_exe) {
-   base::FilePath browser_exes_array[] = {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-     base::FilePath(chrome::kBrowserProcessExecutablePath),
+@@ -157,7 +157,7 @@ bool FindChrome(base::FilePath* browser_exe) {
+     base::FilePath(chrome::kGoogleChromeForTestingBrowserProcessExecutablePath),
+     base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath),
+     base::FilePath(chrome::kChromiumBrowserProcessExecutablePath),
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     base::FilePath("google-chrome"),
      base::FilePath(chrome::kBrowserProcessExecutablePath),
-     base::FilePath("chromium"),
+     base::FilePath("chrome"),  // Chrome for Testing or Google Chrome
+     base::FilePath("google-chrome"),
diff --git a/www/ungoogled-chromium/files/patch-content_test_BUILD.gn b/www/ungoogled-chromium/files/patch-content_test_BUILD.gn
@@ -1,4 +1,4 @@
---- content/test/BUILD.gn.orig	2023-07-21 09:49:17 UTC
+--- content/test/BUILD.gn.orig	2023-08-04 12:10:50 UTC
 +++ content/test/BUILD.gn
 @@ -2181,7 +2181,7 @@ static_library("run_all_unittests") {
      ":test_support",
@@ -9,7 +9,7 @@
      deps += [ "//content/common:set_process_title_linux" ]
    }
  }
-@@ -3234,7 +3234,7 @@ test("content_unittests") {
+@@ -3235,7 +3235,7 @@ test("content_unittests") {
      deps += [ "//third_party/boringssl" ]
    }
 

diff --git a/...hromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/...hromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2023-07-21 09:49:17 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2023-08-04 12:10:50 UTC
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
 @@ -1418,7 +1418,7 @@
      {
@@ -9,7 +9,7 @@
        status: {
          "Android": "",
          "ChromeOS_Lacros": "",
-@@ -2656,7 +2656,7 @@
+@@ -2661,7 +2661,7 @@
        name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_allows_third_party: true,
@@ -18,7 +18,7 @@
      },
      {
        name: "PaymentInstruments",
-@@ -3616,7 +3616,7 @@
+@@ -3621,7 +3621,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -27,7 +27,7 @@
      },
      {
        // A kill switch for crbug.com/1410332.
-@@ -3647,7 +3647,7 @@
+@@ -3652,7 +3652,7 @@
        origin_trial_feature_name: "UserAgentReduction",
        origin_trial_allows_third_party: true,
        // iOS not included as it should not send a reduced User-Agent string.
@@ -36,7 +36,7 @@
        base_feature: "ReduceUserAgent",
      },
      {
-@@ -3803,12 +3803,12 @@
+@@ -3808,12 +3808,12 @@
        status: "experimental",
        base_feature: "none",
        origin_trial_feature_name: "WebAppUrlHandling",

diff --git a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc
@@ -1,4 +1,4 @@
---- v8/src/execution/isolate.cc.orig	2023-07-21 09:49:17 UTC
+--- v8/src/execution/isolate.cc.orig	2023-08-04 12:10:50 UTC
 +++ v8/src/execution/isolate.cc
 @@ -146,6 +146,10 @@
  #include "src/execution/simulator-base.h"
@@ -11,12 +11,12 @@
  extern "C" const uint8_t v8_Default_embedded_blob_code_[];
  extern "C" uint32_t v8_Default_embedded_blob_code_size_;
  extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -3935,6 +3939,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -3958,6 +3962,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
    uint32_t code_size = DefaultEmbeddedBlobCodeSize();
    const uint8_t* data = DefaultEmbeddedBlobData();
    uint32_t data_size = DefaultEmbeddedBlobDataSize();
 +
-+#if defined(V8_OS_OPENBSD)
++#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
 +  mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)),
 +          code_size, PROT_READ | PROT_EXEC);
 +#endif