From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 18 Apr 2020 12:01:30 +0000 (+0100)
Subject: Merge version 2.26.4-1~deb10u2+rpi1 and 2.26.4-1~deb10u3 to produce 2.26.4-1~deb10u3... 
X-Git-Tag: archive/raspbian/2.26.4-1_deb10u3+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e42284d5ae587a8102cd9f2d0283ed11f377cc44;p=webkit2gtk.git

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

e42284d5ae587a8102cd9f2d0283ed11f377cc44
diff --cc debian/changelog
index 271271ac04,d41903f2b4..13990aa507
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- webkit2gtk (2.26.4-1~deb10u2+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.26.4-1~deb10u3+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)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Mar 2020 02:31:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 18 Apr 2020 12:01:30 +0000
++
+ webkit2gtk (2.26.4-1~deb10u3) buster-security; urgency=medium
+ 
+   * debian/patches/cve-2020-11793-fix.patch:
+     + Cherry-pick fix for CVE-2020-11793.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Thu, 16 Apr 2020 18:37:24 +0200
  
  webkit2gtk (2.26.4-1~deb10u2) buster-security; urgency=medium