From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 9 Jun 2022 19:03:32 +0000 (+0100)
Subject: Merge version 2.36.0-3~deb10u1+rpi1 and 2.36.3-1~deb10u1 to produce 2.36.3-1~deb10u1... 
X-Git-Tag: archive/raspbian/2.36.3-1_deb10u1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d36fd9dea83aafa1b92cc776f954dcedfc3ae887;p=webkit2gtk.git

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

d36fd9dea83aafa1b92cc776f954dcedfc3ae887
diff --cc debian/changelog
index 96a3923134,5ba75b722a..527eae7ac3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,10 +1,18 @@@
- webkit2gtk (2.36.0-3~deb10u1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.36.3-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>  Sat, 09 Apr 2022 05:41:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Jun 2022 19:03:32 +0000
 +
- webkit2gtk (2.36.0-3~deb10u1) buster-security; urgency=high
+ webkit2gtk (2.36.3-1~deb10u1) buster-security; urgency=high
  
    * Rebuild for buster-security.
-     - This fixes CVE-2022-22624, CVE-2022-22628 and CVE-2022-22629.
+     - 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/patches/support-ruby2.5.patch:
-     - Support building with Ruby 2.5.
    * debian/control:
      - Remove all 4.1 API packages (soup3 build).
      - Remove Breaks for Evolution < 3.34.1.