From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 23 Nov 2017 17:57:56 +0000 (+0000)
Subject: Manual merge of version 2.18.2-1+rpi1 and 2.18.3-1 to produce 2.18.3-1+rpi1
X-Git-Tag: archive/raspbian/2.18.3-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8a9af73623e761b7da741e396a7872d3323b5c4c;p=webkit2gtk.git

Manual merge of version 2.18.2-1+rpi1 and 2.18.3-1 to produce 2.18.3-1+rpi1
---

8a9af73623e761b7da741e396a7872d3323b5c4c
diff --cc debian/changelog
index de1aa53fa5,48e8210492..123ba4cc90
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,24 +1,32 @@@
- webkit2gtk (2.18.2-1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.18.3-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, 02 Nov 2017 14:17:28 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 23 Nov 2017 17:51:27 +0000
++
+ webkit2gtk (2.18.3-1) unstable; urgency=high
+ 
+   * New upstream release.
+   * The WebKitGTK+ security advisory WSA-2017-0009 lists the following
+     security fixes in the latest versions of WebKitGTK+:
+     + CVE-2017-13783, CVE-2017-13784, CVE-2017-13785, CVE-2017-13791,
+       CVE-2017-13792, CVE-2017-13793, CVE-2017-13794, CVE-2017-13795,
+       CVE-2017-13796 and CVE-2017-13802 (fixed in 2.18.1).
+     + CVE-2017-13788, CVE-2017-13798, CVE-2017-13803 (fixed in 2.18.3)
+   * Several cross-compilation fixes in debian/rules (thanks, Helmut
+     Grohne) (Closes: #881341):
+     + Include /usr/share/dpkg/architecture.mk instead of calling
+       dpkg-architecture manually to set the DEB_*_ARCH variables.
+     + Use DEB_BUILD_ARCH_BITS to decide whether to pass --no-keep-memory
+       to the linker.
+     + Use DEB_HOST_ARCH to decide whether to use -g1, -DENABLE_JIT=OFF and
+       -DUSE_GSTREAMER_GL=OFF.
+     + Remove the --no-relax flag for alpha, this was a workaround for a 10
+       year old binutils bug.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Sat, 11 Nov 2017 14:26:11 +0200
  
  webkit2gtk (2.18.2-1) unstable; urgency=medium
  
diff --cc debian/rules
index e8c6716ab8,922debeda2..90bb5ed200
--- a/debian/rules
+++ b/debian/rules
@@@ -31,7 -25,7 +25,7 @@@ ifeq (,$(filter $(DEB_HOST_ARCH),amd64 
  	CFLAGS := $(CFLAGS:-g=-g1)
  endif
  
- ifeq (,$(filter $(DEB_BUILD_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 arm64))
 -ifeq (,$(filter $(DEB_HOST_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 armhf arm64))
++ifeq (,$(filter $(DEB_HOST_ARCH),i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 arm64))
  	EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF
  endif