From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 1 Feb 2018 15:14:03 +0000 (+0000)
Subject: Merge version 2.18.5-1+rpi1 and 2.18.6-1 to produce 2.18.6-1+rpi1
X-Git-Tag: raspbian/2.18.6-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a50e00942469658d5ea2275b9a0cef62e5c11eca;p=webkit2gtk.git

Merge version 2.18.5-1+rpi1 and 2.18.6-1 to produce 2.18.6-1+rpi1
---

693d0c4ee04567a17804d7b76ab661624564ec02
diff --cc debian/changelog
index b9ea1de8b0,027e4ecc32..ba89d7d43a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- webkit2gtk (2.18.5-1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.18.6-1+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, 18 Jan 2018 00:04:41 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 Feb 2018 15:14:02 +0000
++
+ webkit2gtk (2.18.6-1) unstable; urgency=high
+ 
+   * New upstream release.
+     + This fixes CVE-2018-4088, CVE-2017-13885, CVE-2017-7165,
+       CVE-2017-13884, CVE-2017-7160, CVE-2017-7153, CVE-2017-7153,
+       CVE-2017-7161 and CVE-2018-4096.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 24 Jan 2018 13:30:06 +0200
  
  webkit2gtk (2.18.5-1) unstable; urgency=high