From fe73e5405716531e85440772f69ad74943024eee Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 15 Jun 2018 09:54:16 +0200 Subject: Update Chromium and changelog Pulls in following commits: * bad02200 [Backport] CVE-2018-6149 * 8cc9828a Workaround long path issue on Window * b42eb615 [Backport] gpu: Address piman's nits from crrev.com/c/969639 Change-Id: I3077df475503db990988ff0ab42724d11341db25 Reviewed-by: Kai Koehne --- dist/changes-5.11.1 | 4 +++- src/3rdparty | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1 index 88d0baccd..2d0820680 100644 --- a/dist/changes-5.11.1 +++ b/dist/changes-5.11.1 @@ -32,7 +32,7 @@ Chromium -------- - Updated Chromium to 65.0.3325.230 - - Security fixes from Chromium up to version 67.0.3396.79, including: + - Security fixes from Chromium up to version 67.0.3396.87, including: * CVE-2018-6120 * CVE-2018-6123 * CVE-2018-6124 @@ -50,6 +50,7 @@ Chromium * CVE-2018-6144 * CVE-2018-6145 * CVE-2018-6148 + * CVE-2018-6149 * Security Bug 826946 * Security Bug 826193 * Security Bug 825524 @@ -85,6 +86,7 @@ Build * [QTBUG-67977] Cleanup pdfium_document_wrapper_qt.h include * [QTBUG-68439] Do make freetype checks in Qt Gui and Qt WebEngine orthogonal * [QTBUG-67983] Fix hostcompiler test for qt 'root' build + * [QTBUG-68464] Workaround long path issue on Windows * Fix build without qtlocation diff --git a/src/3rdparty b/src/3rdparty index 94a0b5152..bad02200c 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 94a0b51526ced8d7649e78ec035b3aa1949c8547 +Subproject commit bad02200c68d7e0c758dc4f1805e58d0e03fdea9 -- cgit v1.2.3