aboutsummaryrefslogtreecommitdiff
path: root/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc')
-rw-r--r--www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc27
1 files changed, 18 insertions, 9 deletions
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc
index 0ad768406f15..dde0143d78ed 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2023-11-20 16:08:07 UTC
+--- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2023-12-12 22:08:45 UTC
+++ src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc
-@@ -20,8 +20,10 @@
+@@ -20,13 +20,19 @@
#include "build/chromeos_buildflags.h"
#include "content/common/zygote/zygote_commands_linux.h"
#include "content/common/zygote/zygote_communication_linux.h"
@@ -11,7 +11,16 @@
#include "sandbox/linux/services/credentials.h"
#include "sandbox/linux/services/namespace_sandbox.h"
#include "sandbox/linux/suid/client/setuid_sandbox_host.h"
-@@ -39,6 +41,7 @@ namespace {
+ #include "sandbox/linux/suid/common/sandbox.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
++#else
+ #include "sandbox/policy/linux/sandbox_linux.h"
++#endif
+ #include "sandbox/policy/switches.h"
+
+ #if BUILDFLAG(IS_CHROMEOS)
+@@ -39,6 +45,7 @@ namespace {
namespace {
@@ -19,7 +28,7 @@
// Receive a fixed message on fd and return the sender's PID.
// Returns true if the message received matches the expected message.
bool ReceiveFixedMessage(int fd,
-@@ -60,6 +63,7 @@ bool ReceiveFixedMessage(int fd,
+@@ -60,6 +67,7 @@ bool ReceiveFixedMessage(int fd,
return false;
return true;
}
@@ -27,7 +36,7 @@
} // namespace
-@@ -69,9 +73,13 @@ ZygoteHostImpl::ZygoteHostImpl()
+@@ -69,9 +77,13 @@ ZygoteHostImpl::ZygoteHostImpl()
}
ZygoteHostImpl::ZygoteHostImpl()
@@ -41,7 +50,7 @@
sandbox_binary_(),
zygote_pids_lock_(),
zygote_pids_() {}
-@@ -84,6 +92,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
+@@ -84,6 +96,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
}
void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
@@ -49,7 +58,7 @@
if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) {
return;
}
-@@ -134,6 +143,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
+@@ -134,6 +147,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
"you can try using --"
<< sandbox::policy::switches::kNoSandbox << ".";
}
@@ -57,7 +66,7 @@
}
void ZygoteHostImpl::AddZygotePid(pid_t pid) {
-@@ -158,6 +168,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
+@@ -158,6 +172,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
base::CommandLine* cmd_line,
base::ScopedFD* control_fd,
base::FileHandleMappingVector additional_remapped_fds) {
@@ -65,7 +74,7 @@
int fds[2];
#if !defined(TOOLKIT_QT)
CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
-@@ -232,9 +243,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
+@@ -232,9 +247,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
AddZygotePid(pid);
return pid;