From nobody Sat Sep 03 12:02:08 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MKYL833V4z4b9lg; Sat, 3 Sep 2022 12:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MKYL82cdPz49ZG; Sat, 3 Sep 2022 12:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662206528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSq2GHSMBceIFjm+uWMmn2ejILi8vvQAOX98LJhva3w=; b=hKNyu9nBOG2QUw5Q2oZ4OsHsHm2au1J5jhS82UGtlRzFQsnN5QdV2fkY0pEEq4rb2+wxip oV34hA3j2niZzt9OWMJt9URheNu7tAr4PkKou08YMHuE+9QgpvVEhLSwpeUSyhGHpjVb5V n5JQaEZwKEsJTOL1+6zBTv7ZQLWalkHh9FLJd+7Qlo+M3430zkuHSZIgBI5vbvYcr1yPXl ZE2ywAkXEyKHjkHtHDtciDez/k8z5/MzYzKCLdEZwKZyEMmNLeoWxk5hp5/0B0GzhOeKqL CfwqbL9oSHGvdXRpxC5hrGQiTakMTSKnmu2VRdc8JVWIBYftgqa46HeCrQECkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MKYL81gcsz17xW; Sat, 3 Sep 2022 12:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 283C2834096637; Sat, 3 Sep 2022 12:02:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 283C28at096636; Sat, 3 Sep 2022 12:02:08 GMT (envelope-from git) Date: Sat, 3 Sep 2022 12:02:08 GMT Message-Id: <202209031202.283C28at096636@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 96b9a69e7010 - main - www/chromium: update to 105.0.5195.102 and fix gpu watchdog thread while here List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96b9a69e70108efa8f5a4783a530b94f663958ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662206528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSq2GHSMBceIFjm+uWMmn2ejILi8vvQAOX98LJhva3w=; b=Cwtkkn3QNYGwQDxKl/Ah0daf6N6StS+J7n4YzA53TaRVDkM3Ruvl/IO0hWpx278ekvH3ir 05ICffZLFTtTyQLxmdhK2B9l9TSWHdL98PAiMOKC3j458etNMSazamhCNOvLRcMcN0rSVO gzV+5rMcCP+N0pUGGij1wBqYSAxajVA0ZHW1hMpuH+UsyTpzoFSmt7/C7uk1/o3/AI38zZ s7e0Zn0AsiNKiNN6bev4XULlgEs2y2p1vj644OYIrNA+q2g8Xy6mlkjvixVwoVS2khSkFx fVKmBoMy9N3OF8D73BQLKBmNaWYj3IXCGKoot6qaq0c4wrE1dgi6vJJgzJztqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662206528; a=rsa-sha256; cv=none; b=oUfssLg51koUiDE0Sh3OsHqpiOyCDLmX4RJ4zdahr7CDd0YlaVKbr+oqN2spnd1eX1k7vC 8W1Bw1lfRBXV0e9vjNa0PIm/c9KZuYWhrzM/ncMCnzszk5C95dN0HNt6htMhNexEpBZtfk L8JH8QQ3nfnMmiIgF9bMzmUNy71dmKGfKO8T1P1GHqmzcCk4b4T9uH+EhrMumrfaTccNxC bfaCNLdfy+06weoPS8c23bKF9HDeOPT+FC3z+Z3LsnSPHzkAtTAOWyh8tbH5bNZ3wFDWLC tBvWYjuv+LwuxRrgeXRlxoyKVjU/Ie3S+bH5PIUB/43nG7Tk3aEIqmDlP0rH2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=96b9a69e70108efa8f5a4783a530b94f663958ce commit 96b9a69e70108efa8f5a4783a530b94f663958ce Author: Robert Nagy AuthorDate: 2022-09-03 11:30:36 +0000 Commit: Rene Ladan CommitDate: 2022-09-03 11:59:37 +0000 www/chromium: update to 105.0.5195.102 and fix gpu watchdog thread while here Security: f38d25ac-2b7a-11ed-a1ef-3065ec8fd3ec --- www/chromium/Makefile | 2 +- www/chromium/distinfo | 14 +++++----- www/chromium/files/patch-content_gpu_gpu__main.cc | 30 ++-------------------- ...atch-sandbox_policy_freebsd_sandbox__freebsd.cc | 10 ++++++-- ...atch-sandbox_policy_openbsd_sandbox__openbsd.cc | 10 ++++++-- 5 files changed, 26 insertions(+), 40 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 8d4cdb35057b..d3aba79d5700 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 105.0.5195.52 +PORTVERSION= 105.0.5195.102 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 index a0316463f879..d7115a6ea044 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1661937622 -SHA256 (chromium-105.0.5195.52.tar.xz) = dc71b2be9c30c2a7a250b3dbfb26f9b0d1aa2df7335b53ed44a203ff69947c42 -SIZE (chromium-105.0.5195.52.tar.xz) = 1597749968 -SHA256 (chrome-linux-105.0.5195.52-llvm13.profdata.tar.xz) = be6371fbfe9949ee56c8ba5c45c2e3d31c36c153e035b89d4bbda4e35077c8c2 -SIZE (chrome-linux-105.0.5195.52-llvm13.profdata.tar.xz) = 24879272 -SHA256 (chromium-105.0.5195.52-testdata.tar.xz) = 486fe655cfc8a4210598f4797fbbc603a8783702c50b5c3a9badd3a179ba9106 -SIZE (chromium-105.0.5195.52-testdata.tar.xz) = 264061000 +TIMESTAMP = 1662203957 +SHA256 (chromium-105.0.5195.102.tar.xz) = 1cba0527c951e3c506ade96cf6ec2507ee9d43661764731ed896348182369262 +SIZE (chromium-105.0.5195.102.tar.xz) = 1597977496 +SHA256 (chrome-linux-105.0.5195.102-llvm13.profdata.tar.xz) = a32f0155ff13a09e3cd9a34b2eb1ab91d193058c89be8d1a3037bd80d8136c31 +SIZE (chrome-linux-105.0.5195.102-llvm13.profdata.tar.xz) = 24879584 +SHA256 (chromium-105.0.5195.102-testdata.tar.xz) = 8ae1595c598a0941c877d4be1874a07bbef68665f5419433c9b91d2d5416d72a +SIZE (chromium-105.0.5195.102-testdata.tar.xz) = 264553400 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 5330461d3ca7..b79dc03f2618 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -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 @@ -86,7 +86,7 @@ #include "sandbox/win/src/sandbox.h" @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // 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 { @@ -45,29 +45,3 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, 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; - } diff --git a/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc index b853583c6f47..ad30b2a4413e 100644 --- a/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc +++ b/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc @@ -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 -@@ -0,0 +1,247 @@ +@@ -0,0 +1,253 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -35,6 +35,7 @@ +#include "base/posix/eintr_wrapper.h" +#include "base/strings/string_number_conversions.h" +#include "base/system/sys_info.h" ++#include "base/threading/thread.h" +#include "base/time/time.h" +#include "build/build_config.h" +#include "sandbox/constants.h" @@ -97,6 +98,11 @@ + return instance; +} + ++void SandboxLinux::StopThread(base::Thread* thread) { ++ DCHECK(thread); ++ thread->Stop(); ++} ++ +void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) { + CHECK(!pre_initialized_); +#if BUILDFLAG(USING_SANITIZER) diff --git a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc index 0898af1e5a6c..307217ed3ac3 100644 --- a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc @@ -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 -@@ -0,0 +1,407 @@ +@@ -0,0 +1,413 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -36,6 +36,7 @@ +#include "base/posix/eintr_wrapper.h" +#include "base/strings/string_number_conversions.h" +#include "base/system/sys_info.h" ++#include "base/threading/thread.h" +#include "base/time/time.h" +#include "build/build_config.h" +#include "sandbox/constants.h" @@ -101,6 +102,11 @@ + return instance; +} + ++void SandboxLinux::StopThread(base::Thread* thread) { ++ DCHECK(thread); ++ thread->Stop(); ++} ++ +void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) { + CHECK(!pre_initialized_); +#if BUILDFLAG(USING_SANITIZER)