Date: Sat, 19 Mar 2022 13:54:30 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: a007f83de55b - 2022Q1 - www/chromium: unbreak DEBUG build and update space requirements Message-ID: <202203191354.22JDsUbE081165@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=a007f83de55b1b44dcbbfc57293d4ef5c59f74b5 commit a007f83de55b1b44dcbbfc57293d4ef5c59f74b5 Author: Robert Nagy <robert@openbsd.org> AuthorDate: 2022-03-19 13:53:06 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2022-03-19 13:54:22 +0000 www/chromium: unbreak DEBUG build and update space requirements (cherry picked from commit 7f26584d0ed82325f0da45cee69609322e44d118) --- www/chromium/Makefile | 4 ++-- www/chromium/files/patch-net_BUILD.gn | 26 ++++++++++++++-------- ...rvices_network_network__sandbox__hook__linux.cc | 14 +++++++++--- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 9708df9d5c33..26ecb4f7eb36 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -159,13 +159,13 @@ DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_component_build=false \ GN_ARGS+=symbol_level=1 \ GN_BOOTSTRAP_FLAGS+=--debug \ - WANTSPACE="13 GB" + WANTSPACE="21 GB" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=blink_symbol_level=0 \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ - WANTSPACE="6.5 GB" + WANTSPACE="14 GB" DRIVER_MAKE_ARGS= chromedriver diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index b3348e6ae0ec..3d26c0584d04 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2022-03-16 08:38:25 UTC +--- net/BUILD.gn.orig 2022-03-19 12:56:15 UTC +++ net/BUILD.gn @@ -100,7 +100,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,15 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1215,6 +1215,15 @@ component("net") { +@@ -1087,6 +1087,7 @@ component("net") { + "//net/dns:mdns_client", + "//net/dns/public", + "//net/third_party/quiche", ++ "//sandbox/policy", + ] + + allow_circular_includes_from = [ +@@ -1215,6 +1216,15 @@ component("net") { ] } @@ -25,7 +33,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1347,7 +1356,7 @@ component("net") { +@@ -1347,7 +1357,7 @@ component("net") { } } @@ -34,7 +42,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1380,7 +1389,7 @@ component("net") { +@@ -1380,7 +1390,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -43,7 +51,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2451,7 +2460,7 @@ if (is_linux || is_chromeos || is_mac) { +@@ -2451,7 +2461,7 @@ if (is_linux || is_chromeos || is_mac) { } } @@ -52,7 +60,7 @@ static_library("epoll_server") { sources = [ "tools/epoll_server/platform/impl/epoll_bug_impl.h", -@@ -4445,7 +4454,7 @@ test("net_unittests") { +@@ -4445,7 +4455,7 @@ test("net_unittests") { ] } @@ -61,7 +69,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4519,6 +4528,10 @@ test("net_unittests") { +@@ -4519,6 +4529,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -72,7 +80,7 @@ allow_circular_includes_from = [ "//net/third_party/quiche:quiche_tests" ] if (enable_websockets) { -@@ -4566,7 +4579,7 @@ test("net_unittests") { +@@ -4566,7 +4580,7 @@ test("net_unittests") { ] } @@ -81,7 +89,7 @@ sources += [ "quic/platform/impl/quic_epoll_clock_test.cc", "quic/platform/impl/quic_flags_test.cc", -@@ -4712,7 +4725,7 @@ test("net_unittests") { +@@ -4712,7 +4726,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc index d5deac2ffc7d..8aec4c470be5 100644 --- a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc @@ -1,14 +1,22 @@ ---- services/network/network_sandbox_hook_linux.cc.orig 2022-02-07 13:39:41 UTC +--- services/network/network_sandbox_hook_linux.cc.orig 2022-03-19 12:56:15 UTC +++ services/network/network_sandbox_hook_linux.cc -@@ -32,6 +32,7 @@ std::vector<BrokerFilePermission> GetNetworkFilePermis +@@ -26,12 +26,15 @@ sandbox::syscall_broker::BrokerCommandSet GetNetworkBr + }); } ++#if !defined(OS_BSD) + std::vector<BrokerFilePermission> GetNetworkFilePermissions() { + // TODO(tsepez): remove universal permission under filesystem root. + return {BrokerFilePermission::ReadWriteCreateRecursive("/")}; + } ++#endif + bool NetworkPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { +#if !defined(OS_BSD) auto* instance = sandbox::policy::SandboxLinux::GetInstance(); instance->StartBrokerProcess( -@@ -39,6 +40,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin +@@ -39,6 +42,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203191354.22JDsUbE081165>