From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4A9F138334 for ; Sat, 16 Jun 2018 19:34:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C27B1E0823; Sat, 16 Jun 2018 19:34:21 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76E55E0823 for ; Sat, 16 Jun 2018 19:34:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9ACE335C63 for ; Sat, 16 Jun 2018 19:34:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FFA52BD for ; Sat, 16 Jun 2018 19:34:18 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1529177651.4f14cecc16899c822f3bc0eae536c80b0b62888b.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-69.0.3452.0.ebuild www-client/chromium/files/chromium-disable_xml_catalogs.patch X-VCS-Directories: www-client/chromium/ www-client/chromium/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 4f14cecc16899c822f3bc0eae536c80b0b62888b X-VCS-Branch: master Date: Sat, 16 Jun 2018 19:34:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0d1bb9ff-665b-4d66-9dab-4a70884d2779 X-Archives-Hash: d55fea5864555d5c6b0a8f8119c8f106 commit: 4f14cecc16899c822f3bc0eae536c80b0b62888b Author: Mike Gilbert gentoo org> AuthorDate: Sat Jun 16 19:33:58 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jun 16 19:34:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f14cecc www-client/chromium: disable xml catalogs Bug: https://bugs.gentoo.org/653078 Package-Manager: Portage-2.3.40_p14, Repoman-2.3.9_p246 www-client/chromium/chromium-69.0.3452.0.ebuild | 1 + .../files/chromium-disable_xml_catalogs.patch | 34 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/www-client/chromium/chromium-69.0.3452.0.ebuild b/www-client/chromium/chromium-69.0.3452.0.ebuild index fa806ad8d2d..f6ce8e32881 100644 --- a/www-client/chromium/chromium-69.0.3452.0.ebuild +++ b/www-client/chromium/chromium-69.0.3452.0.ebuild @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}/chromium-stdint.patch" "${FILESDIR}/chromium-ffmpeg-r1.patch" "${FILESDIR}/chromium-libwebp-shim-r0.patch" + "${FILESDIR}/chromium-disable_xml_catalogs.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-disable_xml_catalogs.patch b/www-client/chromium/files/chromium-disable_xml_catalogs.patch new file mode 100644 index 00000000000..7aff36c782a --- /dev/null +++ b/www-client/chromium/files/chromium-disable_xml_catalogs.patch @@ -0,0 +1,34 @@ +--- a/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc ++++ b/third_party/blink/renderer/core/xml/parser/xml_document_parser.cc +@@ -28,6 +28,10 @@ + + #include + #include ++#include ++#if defined(LIBXML_CATALOG_ENABLED) ++#include ++#endif + #include + + #include +@@ -538,10 +542,6 @@ + static bool ShouldAllowExternalLoad(const KURL& url) { + String url_string = url.GetString(); + +- // libxml should not be configured with catalogs enabled, so it +- // should not be asking to load default catalogs. +- CHECK(!IsLibxmlDefaultCatalogFile(url)); +- + // The most common DTD. There isn't much point in hammering www.w3c.org by + // requesting this URL for every XHTML document. + if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml")) +@@ -648,6 +648,9 @@ + if (did_init) + return; + ++#if defined(LIBXML_CATALOG_ENABLED) ++ xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE); ++#endif + xmlInitParser(); + xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); + xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc);