Merge version 2.34.6-1~deb10u1+rpi1 and 2.36.0-3~deb10u1 to produce 2.36.0-3~deb10u1... archive/raspbian/2.36.0-3_deb10u1+rpi1 raspbian/2.36.0-3_deb10u1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sat, 9 Apr 2022 05:41:26 +0000 (06:41 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Sat, 9 Apr 2022 05:41:26 +0000 (06:41 +0100)
1  2 
debian/changelog
debian/rules

index e1967aa40f7529d3cdcaa20fc59a7318cff4505b,ba6645e564aa96af7f23c34c211a7a56b783b076..96a3923134ada4352f0a3898384e67ec791afd10
@@@ -1,22 -1,18 +1,26 @@@
- webkit2gtk (2.34.6-1~deb10u1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.36.0-3~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>  Sun, 20 Feb 2022 22:37:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 09 Apr 2022 05:41:25 +0000
 +
- webkit2gtk (2.34.6-1~deb10u1) buster-security; urgency=high
+ webkit2gtk (2.36.0-3~deb10u1) buster-security; urgency=high
  
    * Rebuild for buster-security.
+     - This fixes CVE-2022-22624, CVE-2022-22628 and CVE-2022-22629.
    * debian/patches/force-single-process.patch:
-     + Force the single-process mode in Evolution and Geary
+     - Force the single-process mode in Evolution and Geary
+   * debian/patches/support-ruby2.5.patch:
+     - Support building with Ruby 2.5.
    * debian/control:
-     + Remove Breaks for Evolution < 3.34.1.
-     + Remove build dependency on libwpebackend-fdo-1.0-dev,
-       libmanette-0.2-dev and liblcms2-dev.
-     + Switch build dependency from libenchant-2-dev to libenchant-dev.
-     + Switch build dependencies on libgl-dev and libgles-dev with
+     - Remove all 4.1 API packages (soup3 build).
+     - Remove Breaks for Evolution < 3.34.1.
+     - Remove build dependencies on libwpebackend-fdo-1.0-dev,
+       libmanette-0.2-dev, liblcms2-dev and libsoup-3.0-dev.
+     - Switch build dependency from libenchant-2-dev to libenchant-dev.
+     - Switch build dependencies on libgl-dev and libgles-dev with
        libgl1-mesa-dev and libgles2-mesa-dev.
    * Downgrade xdg-desktop-portal-gtk from a recommendation to a
      suggestion (See #989307)
diff --cc debian/rules
Simple merge