From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 17 Mar 2020 02:31:24 +0000 (+0000)
Subject: Merge version 2.26.4-1~deb10u1+rpi1 and 2.26.4-1~deb10u2 to produce 2.26.4-1~deb10u2... 
X-Git-Tag: raspbian/2.26.4-1_deb10u2+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eb7e20a1c26ae543fee4eb283d2d3d047da4c59b;p=webkit2gtk.git

Merge version 2.26.4-1~deb10u1+rpi1 and 2.26.4-1~deb10u2 to produce 2.26.4-1~deb10u2+rpi1
---

29578e355367050aa1f137b18b9db863a9db8b9b
diff --cc debian/changelog
index 69a9de643a,d8f78ac096..271271ac04
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- webkit2gtk (2.26.4-1~deb10u1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.26.4-1~deb10u2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 18 Feb 2020 15:31:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Mar 2020 02:31:23 +0000
++
+ webkit2gtk (2.26.4-1~deb10u2) buster-security; urgency=medium
+ 
+   * debian/patches/cve-2020-10018-fix.patch:
+     + Cherry-pick fix for CVE-2020-10018.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Mon, 16 Mar 2020 15:25:01 +0100
  
  webkit2gtk (2.26.4-1~deb10u1) buster-security; urgency=medium