diff mbox series

[1/1] package/wpewebkit: security bump to version 2.36.3

Message ID 20220530215627.1441783-1-aperez@igalia.com
State Accepted
Headers show
Series [1/1] package/wpewebkit: security bump to version 2.36.3 | expand

Commit Message

Adrian Perez de Castro May 30, 2022, 9:56 p.m. UTC
Bugfix release, mostly with build fixes, media playback improvements,
an important fix for when using threaded rendering, and security patches
for CVE-2022-26700, CVE-2022-26709, CVE-2022-26717, CVE-2022-26716, and
CVE-2022-26719.

Release notes:

  https://wpewebkit.org/release/wpewebkit-2.36.2.html
  https://wpewebkit.org/release/wpewebkit-2.36.3.html

Accompanying security advisory:

  https://wpewebkit.org/security/WSA-2022-0005.html

This also imports a build fix which has not made it into the release.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 ...en-cross-building-for-64-bit-ARM-htt.patch | 32 +++++++++++++++++++
 package/wpewebkit/wpewebkit.hash              |  8 ++---
 package/wpewebkit/wpewebkit.mk                |  2 +-
 3 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 package/wpewebkit/0001-Build-failure-when-cross-building-for-64-bit-ARM-htt.patch

Comments

Thomas Petazzoni May 31, 2022, 6:54 a.m. UTC | #1
On Tue, 31 May 2022 00:56:27 +0300
Adrian Perez de Castro <aperez@igalia.com> wrote:

> Bugfix release, mostly with build fixes, media playback improvements,
> an important fix for when using threaded rendering, and security patches
> for CVE-2022-26700, CVE-2022-26709, CVE-2022-26717, CVE-2022-26716, and
> CVE-2022-26719.
> 
> Release notes:
> 
>   https://wpewebkit.org/release/wpewebkit-2.36.2.html
>   https://wpewebkit.org/release/wpewebkit-2.36.3.html
> 
> Accompanying security advisory:
> 
>   https://wpewebkit.org/security/WSA-2022-0005.html
> 
> This also imports a build fix which has not made it into the release.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
>  ...en-cross-building-for-64-bit-ARM-htt.patch | 32 +++++++++++++++++++
>  package/wpewebkit/wpewebkit.hash              |  8 ++---
>  package/wpewebkit/wpewebkit.mk                |  2 +-
>  3 files changed, 37 insertions(+), 5 deletions(-)
>  create mode 100644 package/wpewebkit/0001-Build-failure-when-cross-building-for-64-bit-ARM-htt.patch

Applied to master, thanks.

Thomas
Peter Korsgaard June 7, 2022, 12:16 p.m. UTC | #2
>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:

 > Bugfix release, mostly with build fixes, media playback improvements,
 > an important fix for when using threaded rendering, and security patches
 > for CVE-2022-26700, CVE-2022-26709, CVE-2022-26717, CVE-2022-26716, and
 > CVE-2022-26719.

 > Release notes:

 >   https://wpewebkit.org/release/wpewebkit-2.36.2.html
 >   https://wpewebkit.org/release/wpewebkit-2.36.3.html

 > Accompanying security advisory:

 >   https://wpewebkit.org/security/WSA-2022-0005.html

 > This also imports a build fix which has not made it into the release.

 > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>

Committed to 2021.02.x and 2022.02.x, thanks.
diff mbox series

Patch

diff --git a/package/wpewebkit/0001-Build-failure-when-cross-building-for-64-bit-ARM-htt.patch b/package/wpewebkit/0001-Build-failure-when-cross-building-for-64-bit-ARM-htt.patch
new file mode 100644
index 0000000000..7c9c8666ad
--- /dev/null
+++ b/package/wpewebkit/0001-Build-failure-when-cross-building-for-64-bit-ARM-htt.patch
@@ -0,0 +1,32 @@ 
+From b0c63502f004db68b485354967bb1c56c071f4eb Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Tue, 31 May 2022 00:48:21 +0300
+Subject: [PATCH] Build failure when cross-building for 64-bit ARM
+ https://bugs.webkit.org/show_bug.cgi?id=241109
+
+Unreviewed build fix.
+
+* Source/WebCore/bindings/js/JSDOMMapLike.cpp: Add missing
+  JavaScriptCore/HashMapImplInlines.h header inclusion.
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+Upstream status: https://github.com/WebKit/WebKit/pull/1165
+---
+ Source/WebCore/bindings/js/JSDOMMapLike.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/bindings/js/JSDOMMapLike.cpp b/Source/WebCore/bindings/js/JSDOMMapLike.cpp
+index e132c39fa54..2cb4b1b59a3 100644
+--- a/Source/WebCore/bindings/js/JSDOMMapLike.cpp
++++ b/Source/WebCore/bindings/js/JSDOMMapLike.cpp
+@@ -28,6 +28,7 @@
+ 
+ #include "WebCoreJSClientData.h"
+ #include <JavaScriptCore/CatchScope.h>
++#include <JavaScriptCore/HashMapImplInlines.h>
+ #include <JavaScriptCore/JSMap.h>
+ #include <JavaScriptCore/VMTrapsInlines.h>
+ 
+-- 
+2.36.1
+
diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash
index 3923c32111..253b4756d0 100644
--- a/package/wpewebkit/wpewebkit.hash
+++ b/package/wpewebkit/wpewebkit.hash
@@ -1,7 +1,7 @@ 
-# From https://wpewebkit.org/releases/wpewebkit-2.36.1.tar.xz.sums
-md5  7ba1c7fd0f67891ad137d11cac12f7a9  wpewebkit-2.36.1.tar.xz
-sha1  0918a4daded01f42e65ec02a69f21cd6705311db  wpewebkit-2.36.1.tar.xz
-sha256  ec83d8b2f8c3479ce9950d69440f3b9876ab70200fe6f4e07686054a0cba5723  wpewebkit-2.36.1.tar.xz
+# From https://wpewebkit.org/releases/wpewebkit-2.36.3.tar.xz.sums
+md5  8bc53f86a3489da31fdbb581e1b87f7a  wpewebkit-2.36.3.tar.xz
+sha1  44a3d99ae48481917ddc478c5f91e6a4faa21ff5  wpewebkit-2.36.3.tar.xz
+sha256  66275debca7497daff3a7826734cd56262a807adb76c5dccdf257c89968c2fc8  wpewebkit-2.36.3.tar.xz
 
 # Hashes for license files:
 sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk
index 9c9a9a2838..abd09829a5 100644
--- a/package/wpewebkit/wpewebkit.mk
+++ b/package/wpewebkit/wpewebkit.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-WPEWEBKIT_VERSION = 2.36.1
+WPEWEBKIT_VERSION = 2.36.3
 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases
 WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
 WPEWEBKIT_INSTALL_STAGING = YES