From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 17 Jul 2022 18:38:02 +0000 (+0100)
Subject: Merge version 2.36.3-1~deb10u1+rpi1 and 2.36.4-1~deb10u1 to produce 2.36.4-1~deb10u1... 
X-Git-Tag: archive/raspbian/2.36.4-1_deb10u1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e4dc1f2065090803ac0bad726fa177c40ff425ee;p=webkit2gtk.git

Merge version 2.36.3-1~deb10u1+rpi1 and 2.36.4-1~deb10u1 to produce 2.36.4-1~deb10u1+rpi1
---

e4dc1f2065090803ac0bad726fa177c40ff425ee
diff --cc debian/changelog
index 527eae7ac3,fbcaa0f0c9..614127de62
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,6 +1,14 @@@
- webkit2gtk (2.36.3-1~deb10u1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.36.4-1~deb10u1+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>  Thu, 09 Jun 2022 19:03:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 17 Jul 2022 18:38:01 +0000
 +
- webkit2gtk (2.36.3-1~deb10u1) buster-security; urgency=high
+ webkit2gtk (2.36.4-1~deb10u1) buster-security; urgency=high
  
    * Rebuild for buster-security.
-     - This fixes CVE-2022-26700, CVE-2022-26709, CVE-2022-26716,
-       CVE-2022-26717, CVE-2022-26719, CVE-2022-30293 and CVE-2022-30294.
    * debian/patches/force-single-process.patch:
      - Force the single-process mode in Evolution and Geary
    * debian/control: