From 40c48efc97e1692154f38e01ef1739bbef1e4728 Mon Sep 17 00:00:00 2001 From: Joseph Mingrone Date: Fri, 23 Oct 2020 04:29:32 +0000 Subject: www/chromium: Update to version 85.0.4183.121 Submitted by: cem, rene Obtained from: some patches from OpenBSD port --- .../patch-content_zygote_zygote__main__linux.cc | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 www/chromium/files/patch-content_zygote_zygote__main__linux.cc (limited to 'www/chromium/files/patch-content_zygote_zygote__main__linux.cc') diff --git a/www/chromium/files/patch-content_zygote_zygote__main__linux.cc b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc new file mode 100644 index 000000000000..90b7852c2028 --- /dev/null +++ b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc @@ -0,0 +1,48 @@ +--- content/zygote/zygote_main_linux.cc.orig 2020-09-16 15:49:35 UTC ++++ content/zygote/zygote_main_linux.cc +@@ -11,7 +11,9 @@ + #include + #include + #include ++#if !defined(OS_BSD) + #include ++#endif + #include + #include + #include +@@ -100,6 +102,7 @@ static bool CreateInitProcessReaper( + // created through the setuid sandbox. + static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, + base::OnceClosure post_fork_parent_callback) { ++#if !defined(OS_BSD) + DCHECK(setuid_sandbox); + DCHECK(setuid_sandbox->IsSuidSandboxChild()); + +@@ -132,6 +135,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli + + CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers()); + return true; ++#else ++ return false; ++#endif // !defined(OS_BSD) + } + + static void DropAllCapabilities(int proc_fd) { +@@ -177,6 +183,7 @@ static void EnterLayerOneSandbox(service_manager::Sand + + bool ZygoteMain( + std::vector> fork_delegates) { ++#if !defined(OS_BSD) + sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD()); + + auto* linux_sandbox = service_manager::SandboxLinux::GetInstance(); +@@ -242,6 +249,9 @@ bool ZygoteMain( + + // This function call can return multiple times, once per fork(). + return zygote.ProcessRequests(); ++#else ++ return false; ++#endif // !defined(OS_BSD) + } + + } // namespace content -- cgit v1.2.3