sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/chromium: update to 105.0.5195.102 and fix gpu watchdog thread while here

Browse source 
Security:	f38d25ac-2b7a-11ed-a1ef-3065ec8fd3ec
This commit is contained in:
Robert Nagy 2022-09-03 13:30:36 +02:00 • committed by Rene Ladan
parent 88ff3f3971
commit 96b9a69e70
5 changed files with 26 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/chromium/Makefile
View file

@ -1,5 +1,5 @@
PORTNAME= chromium PORTNAME= chromium
PORTVERSION= 105.0.5195.52 PORTVERSION= 105.0.5195.102
CATEGORIES= www wayland CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external https://nerd.hu/distfiles/:external

14
www/chromium/distinfo
View file

@ -1,9 +1,9 @@
TIMESTAMP = 1661937622 TIMESTAMP = 1662203957
SHA256 (chromium-105.0.5195.52.tar.xz) = dc71b2be9c30c2a7a250b3dbfb26f9b0d1aa2df7335b53ed44a203ff69947c42 SHA256 (chromium-105.0.5195.102.tar.xz) = 1cba0527c951e3c506ade96cf6ec2507ee9d43661764731ed896348182369262
SIZE (chromium-105.0.5195.52.tar.xz) = 1597749968 SIZE (chromium-105.0.5195.102.tar.xz) = 1597977496
SHA256 (chrome-linux-105.0.5195.52-llvm13.profdata.tar.xz) = be6371fbfe9949ee56c8ba5c45c2e3d31c36c153e035b89d4bbda4e35077c8c2 SHA256 (chrome-linux-105.0.5195.102-llvm13.profdata.tar.xz) = a32f0155ff13a09e3cd9a34b2eb1ab91d193058c89be8d1a3037bd80d8136c31
SIZE (chrome-linux-105.0.5195.52-llvm13.profdata.tar.xz) = 24879272 SIZE (chrome-linux-105.0.5195.102-llvm13.profdata.tar.xz) = 24879584
SHA256 (chromium-105.0.5195.52-testdata.tar.xz) = 486fe655cfc8a4210598f4797fbbc603a8783702c50b5c3a9badd3a179ba9106 SHA256 (chromium-105.0.5195.102-testdata.tar.xz) = 8ae1595c598a0941c877d4be1874a07bbef68665f5419433c9b91d2d5416d72a
SIZE (chromium-105.0.5195.52-testdata.tar.xz) = 264061000 SIZE (chromium-105.0.5195.102-testdata.tar.xz) = 264553400
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

30
www/chromium/files/patch-content_gpu_gpu__main.cc
View file

@ -1,4 +1,4 @@
--- content/gpu/gpu_main.cc.orig 2022-08-31 12:19:35 UTC --- content/gpu/gpu_main.cc.orig 2022-09-02 10:45:05 UTC
+++ content/gpu/gpu_main.cc +++ content/gpu/gpu_main.cc
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
#include "sandbox/win/src/sandbox.h" #include "sandbox/win/src/sandbox.h"
@ -36,7 +36,7 @@
#error "Unsupported Linux platform." #error "Unsupported Linux platform."
#elif BUILDFLAG(IS_MAC) #elif BUILDFLAG(IS_MAC)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
@@ -396,17 +396,19 @@ int GpuMain(MainFunctionParams parameters) { @@ -396,7 +396,7 @@ int GpuMain(MainFunctionParams parameters) {
namespace { namespace {
@ -45,29 +45,3 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info, const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) { const gpu::GpuPreferences& gpu_prefs) {
TRACE_EVENT0("gpu,startup", "Initialize sandbox");
+#if !BUILDFLAG(IS_BSD)
if (watchdog_thread) {
// SandboxLinux needs to be able to ensure that the thread
// has really been stopped.
sandbox::policy::SandboxLinux::GetInstance()->StopThread(watchdog_thread);
}
+#endif
// SandboxLinux::InitializeSandbox() must always be called
// with only one thread.
@@ -453,11 +455,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
*base::CommandLine::ForCurrentProcess()),
base::BindOnce(GpuProcessPreSandboxHook), sandbox_options);
+#if !BUILDFLAG(IS_BSD)
if (watchdog_thread) {
base::Thread::Options thread_options;
thread_options.timer_slack = base::TIMER_SLACK_MAXIMUM;
watchdog_thread->StartWithOptions(std::move(thread_options));
}
+#endif
return res;
}

10
www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
View file

@ -1,6 +1,6 @@
--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2022-04-21 18:48:31 UTC --- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2022-09-02 10:45:05 UTC
+++ sandbox/policy/freebsd/sandbox_freebsd.cc +++ sandbox/policy/freebsd/sandbox_freebsd.cc
@@ -0,0 +1,247 @@ @@ -0,0 +1,253 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be +// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file. +// found in the LICENSE file.
@ -35,6 +35,7 @@
+#include "base/posix/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h"
+#include "base/strings/string_number_conversions.h" +#include "base/strings/string_number_conversions.h"
+#include "base/system/sys_info.h" +#include "base/system/sys_info.h"
+#include "base/threading/thread.h"
+#include "base/time/time.h" +#include "base/time/time.h"
+#include "build/build_config.h" +#include "build/build_config.h"
+#include "sandbox/constants.h" +#include "sandbox/constants.h"
@ -97,6 +98,11 @@
+ return instance; + return instance;
+} +}
+ +
+void SandboxLinux::StopThread(base::Thread* thread) {
+ DCHECK(thread);
+ thread->Stop();
+}
+
+void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) { +void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) {
+ CHECK(!pre_initialized_); + CHECK(!pre_initialized_);
+#if BUILDFLAG(USING_SANITIZER) +#if BUILDFLAG(USING_SANITIZER)

10
www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
View file

@ -1,6 +1,6 @@
--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2022-04-21 18:48:31 UTC --- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2022-09-02 10:45:05 UTC
+++ sandbox/policy/openbsd/sandbox_openbsd.cc +++ sandbox/policy/openbsd/sandbox_openbsd.cc
@@ -0,0 +1,407 @@ @@ -0,0 +1,413 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be +// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file. +// found in the LICENSE file.
@ -36,6 +36,7 @@
+#include "base/posix/eintr_wrapper.h" +#include "base/posix/eintr_wrapper.h"
+#include "base/strings/string_number_conversions.h" +#include "base/strings/string_number_conversions.h"
+#include "base/system/sys_info.h" +#include "base/system/sys_info.h"
+#include "base/threading/thread.h"
+#include "base/time/time.h" +#include "base/time/time.h"
+#include "build/build_config.h" +#include "build/build_config.h"
+#include "sandbox/constants.h" +#include "sandbox/constants.h"
@ -101,6 +102,11 @@
+ return instance; + return instance;
+} +}
+ +
+void SandboxLinux::StopThread(base::Thread* thread) {
+ DCHECK(thread);
+ thread->Stop();
+}
+
+void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) { +void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) {
+ CHECK(!pre_initialized_); + CHECK(!pre_initialized_);
+#if BUILDFLAG(USING_SANITIZER) +#if BUILDFLAG(USING_SANITIZER)