www/*chromium: update to 123.0.6312.122

Security: https://vuxml.freebsd.org/freebsd/7314942b-0889-46f0-b02b-2c60aabe4a82.html
freebsd · Apr 12, 2024 · 06aaad2 · 06aaad2
1 parent ed0c58d
commit 06aaad2
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 34 deletions.
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	chromium
-PORTVERSION=	123.0.6312.105
+PORTVERSION=	123.0.6312.122
 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 = 1712258158
-SHA256 (chromium-123.0.6312.105.tar.xz) = 0a14fba1fb1a288d99b188160e3138295aa8604bdf492e62a94c0ec35a4e229d
-SIZE (chromium-123.0.6312.105.tar.xz) = 3481204616
-SHA256 (chrome-linux-123.0.6312.105-llvm17.profdata.tar.xz) = 0904993faf06565a538b1eaab56119642204b8ca8748ea51a436ac55a5723f8b
-SIZE (chrome-linux-123.0.6312.105-llvm17.profdata.tar.xz) = 29802596
-SHA256 (chromium-123.0.6312.105-testdata.tar.xz) = c843a48cdeb6e140cd60121b4bf94ce81a109912def7488b341244f188d8f91b
-SIZE (chromium-123.0.6312.105-testdata.tar.xz) = 279677040
+TIMESTAMP = 1712941203
+SHA256 (chromium-123.0.6312.122.tar.xz) = c883f192af7cb76cf46de4044349645b0fb0b5c42a1c0f7950a24c825c17f885
+SIZE (chromium-123.0.6312.122.tar.xz) = 3488275388
+SHA256 (chrome-linux-123.0.6312.122-llvm17.profdata.tar.xz) = b039c11fc2d1df8c36dd511552f2f8f6e08e471b5b0792328c72cdfc291a49f6
+SIZE (chrome-linux-123.0.6312.122-llvm17.profdata.tar.xz) = 29800600
+SHA256 (chromium-123.0.6312.122-testdata.tar.xz) = f9075629ea813e184977811fd95c9edf3ca499d83af4e934706a0b344c874cbf
+SIZE (chromium-123.0.6312.122-testdata.tar.xz) = 279875756
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2024-03-22 08:19:40 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2024-04-12 16:47:14 UTC
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -116,7 +116,7 @@
+@@ -115,7 +115,7 @@
 
  #if BUILDFLAG(IS_MAC)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
  #include "content/child/child_process_sandbox_support_impl_linux.h"
  #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
-@@ -186,13 +186,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -185,13 +185,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
        is_locked_to_site_(false),
        main_thread_scheduler_(main_thread_scheduler),
        next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -25,7 +25,7 @@
      mojo::PendingRemote<font_service::mojom::FontService> font_service;
      RenderThreadImpl::current()->BindHostReceiver(
          font_service.InitWithNewPipeAndPassReceiver());
-@@ -201,7 +201,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -200,7 +200,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
  #endif
    }
 
@@ -34,7 +34,7 @@
    if (sandboxEnabled()) {
  #if BUILDFLAG(IS_MAC)
      sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -262,7 +262,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -261,7 +261,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
  #endif
 
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {

diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2024-03-22 08:19:40 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig	2024-04-12 16:47:14 UTC
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -247,7 +247,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -246,7 +246,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
                                     const gpu::GPUInfo& gpu_info) const;
 

diff --git a/www/chromium/files/patch-third__party_blink_public_platform_platform.h b/www/chromium/files/patch-third__party_blink_public_platform_platform.h
@@ -1,6 +1,6 @@
---- third_party/blink/public/platform/platform.h.orig	2024-03-22 08:19:40 UTC
+--- third_party/blink/public/platform/platform.h.orig	2024-04-12 16:47:14 UTC
 +++ third_party/blink/public/platform/platform.h
-@@ -351,7 +351,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -347,7 +347,7 @@ class BLINK_PLATFORM_EXPORT Platform {
      return nullptr;
    }
 

diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ungoogled-chromium
-PORTVERSION=	123.0.6312.105
+PORTVERSION=	123.0.6312.122
 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 = 1712258253
-SHA256 (chromium-123.0.6312.105.tar.xz) = 0a14fba1fb1a288d99b188160e3138295aa8604bdf492e62a94c0ec35a4e229d
-SIZE (chromium-123.0.6312.105.tar.xz) = 3481204616
-SHA256 (ungoogled-chromium-123.0.6312.105-1.tar.gz) = 4786ed32d19a0c960ce8aa4a2c87ea80b9527d1bbcbcf6b3a18a253efe3b667b
-SIZE (ungoogled-chromium-123.0.6312.105-1.tar.gz) = 668197
-SHA256 (chromium-123.0.6312.105-testdata.tar.xz) = c843a48cdeb6e140cd60121b4bf94ce81a109912def7488b341244f188d8f91b
-SIZE (chromium-123.0.6312.105-testdata.tar.xz) = 279677040
+TIMESTAMP = 1712941251
+SHA256 (chromium-123.0.6312.122.tar.xz) = c883f192af7cb76cf46de4044349645b0fb0b5c42a1c0f7950a24c825c17f885
+SIZE (chromium-123.0.6312.122.tar.xz) = 3488275388
+SHA256 (ungoogled-chromium-123.0.6312.122-1.tar.gz) = 41bcd3b62218d02806063f247316c59f2beb899905457ab00bce7ce342f443fd
+SIZE (ungoogled-chromium-123.0.6312.122-1.tar.gz) = 668203
+SHA256 (chromium-123.0.6312.122-testdata.tar.xz) = f9075629ea813e184977811fd95c9edf3ca499d83af4e934706a0b344c874cbf
+SIZE (chromium-123.0.6312.122-testdata.tar.xz) = 279875756
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2024-03-22 14:16:19 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2024-04-12 16:47:26 UTC
 +++ content/renderer/renderer_blink_platform_impl.cc
-@@ -116,7 +116,7 @@
+@@ -115,7 +115,7 @@
 
  #if BUILDFLAG(IS_MAC)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
  #include "content/child/child_process_sandbox_support_impl_linux.h"
  #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
-@@ -186,13 +186,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -185,13 +185,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
        is_locked_to_site_(false),
        main_thread_scheduler_(main_thread_scheduler),
        next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -25,7 +25,7 @@
      mojo::PendingRemote<font_service::mojom::FontService> font_service;
      RenderThreadImpl::current()->BindHostReceiver(
          font_service.InitWithNewPipeAndPassReceiver());
-@@ -201,7 +201,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -200,7 +200,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
  #endif
    }
 
@@ -34,7 +34,7 @@
    if (sandboxEnabled()) {
  #if BUILDFLAG(IS_MAC)
      sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -262,7 +262,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -261,7 +261,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
  #endif
 
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {

diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,6 +1,15 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2024-03-22 14:16:19 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig	2024-04-12 16:47:26 UTC
 +++ content/renderer/renderer_blink_platform_impl.h
-@@ -247,7 +247,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -237,7 +237,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+ #endif  // BUILDFLAG(IS_ANDROID)
+
+   // Tells this platform that the renderer is locked to a site (i.e., a scheme
+-  // plus eTLD+1, such as https://9oo91e.qjz9zk), or to a more specific origin.
++  // plus eTLD+1, such as https://google.com), or to a more specific origin.
+   void SetIsLockedToSite();
+
+  private:
+@@ -246,7 +246,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
                                     const gpu::GPUInfo& gpu_info) const;
 

diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h
@@ -1,6 +1,15 @@
---- third_party/blink/public/platform/platform.h.orig	2024-03-22 14:16:19 UTC
+--- third_party/blink/public/platform/platform.h.orig	2024-04-12 16:47:26 UTC
 +++ third_party/blink/public/platform/platform.h
-@@ -351,7 +351,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -252,7 +252,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+   virtual viz::FrameSinkId GenerateFrameSinkId() { return viz::FrameSinkId(); }
+
+   // Returns whether this process is locked to a single site (i.e. a scheme
+-  // plus eTLD+1, such as https://9oo91e.qjz9zk), or to a more specific origin.
++  // plus eTLD+1, such as https://google.com), or to a more specific origin.
+   // This means the process will not be used to load documents or workers from
+   // URLs outside that site.
+   virtual bool IsLockedToSite() const { return false; }
+@@ -347,7 +347,7 @@ class BLINK_PLATFORM_EXPORT Platform {
      return nullptr;
    }