diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-01-11 18:16:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-13 18:11:36 +0000 |
commit | 78f29a052477dd81f0819287e3db405932bb7fae (patch) | |
tree | 4199883f8a21c1ace8a9ce58c80b239f49699f75 /meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch | |
parent | 4e1fbaa73be9b026e14a8b26c91485de8b91d90f (diff) | |
download | openembedded-core-78f29a052477dd81f0819287e3db405932bb7fae.tar.gz |
webkitgtk: update to 2.18.5 (includes Spectre mitigations; see commit description)
This is the only available stable version with mitigation fixes for Spectre.
Webkit upstream developers do not port CVE fixes to earlier stable series,
no exception was made in this case.
More information:
https://webkit.org/blog/8048/what-spectre-and-meltdown-mean-for-webkit/
https://webkitgtk.org/security/WSA-2018-0001.html
https://webkitgtk.org/2018/01/10/webkitgtk2.18.5-released.html
This commit also contains the following commits added in master branch after rocko release:
===
webkitgtk: update to 2.18.3
gcc7.patch, musl-fixes.patch, and ppc-musl-fix.patch all change code that is no
longer present in upstream tree. However, a patch with different musl fixes
has been added.
The rest of the patches are rebased to the new tree.
Libtasn is a new dependency.
Disable Gstreamer GL support on x86 due to clashing headers problem.
(From OE-Core rev: 3acae2dcd130122fe76504ec855af78db829d6ec)
===
webkitgtk: fix build with musl and x32
Make the x32 check generic to make it work with musl as well.
Fixes [YOCTO #12118]
(From OE-Core rev: dbd604ccf34e304769937b15051c047561de47f7)
===
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch index 12836f28f2..c6157e1037 100644 --- a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch +++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch @@ -1,22 +1,31 @@ +From 0b3811771ae6385503f2d949f9433d8f810d2ff9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 May 2017 22:34:24 -0700 +Subject: [PATCH 8/9] webkitgtk: Fix build for armv5 + Taken from https://bugs.webkit.org/show_bug.cgi?id=161900 Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt -=================================================================== ---- webkitgtk-2.16.1.orig/Source/WTF/wtf/CMakeLists.txt -+++ webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt -@@ -182,7 +182,6 @@ set(WTF_HEADERS +--- + Source/WTF/wtf/CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt +index 6b5e45b9..46ee3c22 100644 +--- a/Source/WTF/wtf/CMakeLists.txt ++++ b/Source/WTF/wtf/CMakeLists.txt +@@ -205,7 +205,6 @@ set(WTF_HEADERS set(WTF_SOURCES Assertions.cpp - Atomics.cpp AutomaticThread.cpp BitVector.cpp - ClockType.cpp -@@ -301,6 +300,15 @@ if (NOT USE_SYSTEM_MALLOC) + CPUTime.cpp +@@ -336,6 +335,15 @@ if (NOT USE_SYSTEM_MALLOC) list(APPEND WTF_LIBRARIES bmalloc) endif () @@ -32,3 +41,6 @@ Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt list(APPEND WTF_SOURCES unicode/icu/CollatorICU.cpp ) +-- +2.14.1 + |