From 3bfc0fd10455a4c98b2032dae11d2f24a259701c Mon Sep 17 00:00:00 2001 From: robert Date: Sun, 26 Apr 2020 11:42:32 +0000 Subject: [PATCH] merge a missing patch from chromium which initializes fontconfig before all the sandboxing in the renderer process to avoid hitting pledge violations --- www/iridium/Makefile | 4 ++-- ...vices_service_manager_sandbox_openbsd_sandbox_openbsd_cc | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/www/iridium/Makefile b/www/iridium/Makefile index cb93a7ea5fb..87f84123a7e 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.101 2020/04/24 07:21:55 robert Exp $ +# $OpenBSD: Makefile,v 1.102 2020/04/26 11:42:32 robert Exp $ .include @@ -13,7 +13,7 @@ DPB_PROPERTIES= lonesome COMMENT= Iridium browser V= 2020.04.81 -REVISION= 0 +REVISION= 1 DISTNAME= iridium-browser-${V} PKGNAME= iridium-${V} diff --git a/www/iridium/patches/patch-services_service_manager_sandbox_openbsd_sandbox_openbsd_cc b/www/iridium/patches/patch-services_service_manager_sandbox_openbsd_sandbox_openbsd_cc index 5bf77187408..e409bfaac14 100644 --- a/www/iridium/patches/patch-services_service_manager_sandbox_openbsd_sandbox_openbsd_cc +++ b/www/iridium/patches/patch-services_service_manager_sandbox_openbsd_sandbox_openbsd_cc @@ -1,7 +1,7 @@ Index: services/service_manager/sandbox/openbsd/sandbox_openbsd.cc --- services/service_manager/sandbox/openbsd/sandbox_openbsd.cc.orig +++ services/service_manager/sandbox/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,347 @@ +@@ -0,0 +1,351 @@ +// 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. @@ -61,6 +61,7 @@ Index: services/service_manager/sandbox/openbsd/sandbox_openbsd.cc +#include "crypto/nss_util.h" +#endif + ++#include "ui/gfx/font_util.h" +#include "ui/gfx/x/x11_types.h" +#include "ui/gfx/x/x11.h" + @@ -142,6 +143,9 @@ Index: services/service_manager/sandbox/openbsd/sandbox_openbsd.cc + } + } + ++ if (process_type == switches::kRendererProcess) ++ gfx::InitializeFonts(); ++ + if (!command_line->HasSwitch(switches::kDisableUnveil)) + SetUnveil(process_type, sandbox_type); +