From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 18 Jan 2018 00:04:41 +0000 (+0000)
Subject: Merge version 2.18.4-1+rpi1 and 2.18.5-1 to produce 2.18.5-1+rpi1
X-Git-Tag: archive/raspbian/2.18.5-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e72b3723d370bdda57be23009613c4f6e1d3a0bb;p=webkit2gtk.git

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

e72b3723d370bdda57be23009613c4f6e1d3a0bb
diff --cc debian/changelog
index 4e792ab1ba,c45310615a..b9ea1de8b0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- webkit2gtk (2.18.4-1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.18.5-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>  Wed, 27 Dec 2017 15:27:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jan 2018 00:04:41 +0000
++
+ webkit2gtk (2.18.5-1) unstable; urgency=high
+ 
+   * New upstream release.
+     + This includes fixes to mitigate the effects of the Spectre
+       vulnerability (CVE-2017-5753 and CVE-2017-5715).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 10 Jan 2018 14:23:33 +0200
  
  webkit2gtk (2.18.4-1) unstable; urgency=high