| Message ID | 20171221133630.29763-1-aperez@igalia.com |
|---|---|
| State | Accepted |
| Commit | fbf6a483e00a87fb561fa5fe9a423c4a14867f50 |
| Headers | show |
| Series | [1/1] webkitgtk: security bimp to version 2.18.4 | expand |
>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes: > This is a maintenance release of the current stable WebKitGTK+ version, > which contains for CVE-2017-13866, CVE-2017-13870, CVE-2017-7156, and s/contains/contains fixes/ Committed, thanks - I already had it on my todo list, so thanks for taking care of it.
>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes: > This is a maintenance release of the current stable WebKitGTK+ version, > which contains for CVE-2017-13866, CVE-2017-13870, CVE-2017-7156, and > CVE-2017-13856. Additionally, this release brings improvements in the > WebDriver spec-compliance, plugs several memory leaks in its GStreamer > based multimedia backend, and fixes a bug when handling cookie removal. > Release notes can be found in the announcement: > https://webkitgtk.org/2017/12/19/webkitgtk2.18.4-released.html > More details about the security fixes are provided in the following > WebKitGTK+ Security Advisory report: > https://webkitgtk.org/security/WSA-2017-0010.html > Last but not least, this new release includes the fix for honoring the > CMAKE_BUILD_TYPE value from CMake toolchain files and the corresponding > patch is removed. > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> Committed to 2017.11.x, thanks.
>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes: > This is a maintenance release of the current stable WebKitGTK+ version, > which contains for CVE-2017-13866, CVE-2017-13870, CVE-2017-7156, and > CVE-2017-13856. Additionally, this release brings improvements in the > WebDriver spec-compliance, plugs several memory leaks in its GStreamer > based multimedia backend, and fixes a bug when handling cookie removal. > Release notes can be found in the announcement: > https://webkitgtk.org/2017/12/19/webkitgtk2.18.4-released.html > More details about the security fixes are provided in the following > WebKitGTK+ Security Advisory report: > https://webkitgtk.org/security/WSA-2017-0010.html > Last but not least, this new release includes the fix for honoring the > CMAKE_BUILD_TYPE value from CMake toolchain files and the corresponding > patch is removed. > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> Committed to 2017.02.x, thanks.
diff --git a/package/webkitgtk/0001-CMake-Values-of-CMAKE_BUILD_TYPE-from-toolchain-file.patch b/package/webkitgtk/0001-CMake-Values-of-CMAKE_BUILD_TYPE-from-toolchain-file.patch deleted file mode 100644 index 6ac1258626..0000000000 --- a/package/webkitgtk/0001-CMake-Values-of-CMAKE_BUILD_TYPE-from-toolchain-file.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3b13b1ec9985e72132ec6a3ba13cf60b34848817 Mon Sep 17 00:00:00 2001 -From: "aperez@igalia.com" - <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Mon, 27 Nov 2017 15:34:49 +0000 -Subject: [PATCH] [CMake] Values of CMAKE_BUILD_TYPE from toolchain file are - ignored https://bugs.webkit.org/show_bug.cgi?id=179971 - -Reviewed by Carlos Alberto Lopez Perez. - -* CMakeLists.txt: Call project() first, as it loads the toolchain -file, so that's done before checking CMAKE_BUILD_TYPE. - - -git-svn-id: http://svn.webkit.org/repository/webkit/trunk@225168 268f45cc-cd09-0410-ab3c-d52691b4dbfc - -Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> -Backported from: 75986e1807b - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d80c37b950a..0a9bd17b981 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,8 +1,17 @@ - # ----------------------------------------------------------------------------- - # Determine CMake version and build type. - # ----------------------------------------------------------------------------- -+# -+# NOTE: cmake_minimum_required() and project() *MUST* be the two fist commands -+# used, see https://cmake.org/cmake/help/v3.3/command/project.html -- the -+# latter in particular handles loading a bunch of shared CMake definitions -+# and loading the cross-compilation settings from CMAKE_TOOLCHAIN_FILE. -+# -+ - cmake_minimum_required(VERSION 3.3) - -+project(WebKit) -+ - if (NOT CMAKE_BUILD_TYPE) - message(WARNING "No CMAKE_BUILD_TYPE value specified, defaulting to RelWithDebInfo.") - set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build." FORCE) -@@ -10,8 +19,6 @@ else () - message(STATUS "The CMake build type is: ${CMAKE_BUILD_TYPE}") - endif () - --project(WebKit) -- - set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake") - - set(ENABLE_WEBCORE ON) --- -2.15.1 - diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 9e207c541b..3d64b6f5a9 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.18.3.tar.xz.sums -md5 264a22d7467deae606e42b6eb5dd65af webkitgtk-2.18.3.tar.xz -sha1 164cad34281ef597a3d4ad214e8037c3ddef4d17 webkitgtk-2.18.3.tar.xz -sha256 e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e webkitgtk-2.18.3.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.18.4.tar.xz.sums +md5 c4686971eac2760bab685e21ac8849be webkitgtk-2.18.4.tar.xz +sha1 709616b445158dc3163a64bb59e95aadbe58949c webkitgtk-2.18.4.tar.xz +sha256 87b6bb9a6065b949ecbe6191313c43e57ad28efdf1f2b5e763405093520632b8 webkitgtk-2.18.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index c4675463fa..142f9766e7 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.18.3 +WEBKITGTK_VERSION = 2.18.4 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES
This is a maintenance release of the current stable WebKitGTK+ version, which contains for CVE-2017-13866, CVE-2017-13870, CVE-2017-7156, and CVE-2017-13856. Additionally, this release brings improvements in the WebDriver spec-compliance, plugs several memory leaks in its GStreamer based multimedia backend, and fixes a bug when handling cookie removal. Release notes can be found in the announcement: https://webkitgtk.org/2017/12/19/webkitgtk2.18.4-released.html More details about the security fixes are provided in the following WebKitGTK+ Security Advisory report: https://webkitgtk.org/security/WSA-2017-0010.html Last but not least, this new release includes the fix for honoring the CMAKE_BUILD_TYPE value from CMake toolchain files and the corresponding patch is removed. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com> --- ...s-of-CMAKE_BUILD_TYPE-from-toolchain-file.patch | 52 ---------------------- package/webkitgtk/webkitgtk.hash | 8 ++-- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 5 insertions(+), 57 deletions(-) delete mode 100644 package/webkitgtk/0001-CMake-Values-of-CMAKE_BUILD_TYPE-from-toolchain-file.patch