community/webkit2gtk: upgrade to 2.18.3

fixes #8193

CVE-2017-13783, CVE-2017-13784, CVE-2017-13785, CVE-2017-13788,
CVE-2017-13791, CVE-2017-13792, CVE-2017-13793, CVE-2017-13794,
CVE-2017-13795, CVE-2017-13796, CVE-2017-13798, CVE-2017-13802,
CVE-2017-13803

5 files changed, 45 insertions, 42 deletions

diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD
index e96aac7950..1c58a2f699 100644
--- a/community/webkit2gtk/APKBUILD
+++ b/community/webkit2gtk/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jiri Horner <laeqten@gmail.com>
 # Maintainer: Jiri Horner <laeqten@gmail.com>
 pkgname=webkit2gtk
-pkgver=2.16.6
+pkgver=2.18.3
 pkgrel=0
 pkgdesc="portable web rendering engine WebKit for GTK+"
 url="https://webkitgtk.org/"
@@ -17,6 +17,7 @@ makedepends="$depends_dev
 	gobject-introspection-dev
 	gperf
 	gst-plugins-base-dev
+	gst-plugins-bad-dev
 	gstreamer-dev
 	gtk+3.0-dev
 	gtk-doc
@@ -41,7 +42,8 @@ makedepends="$depends_dev
 replaces="webkit"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz
-	musl-fixes.patch
+	fix-fast-memory-disabled.patch
+	fix_armv6l.patch
 	"
 
 # secfixes:
@@ -86,6 +88,7 @@ build() {
 		-DENABLE_GTKDOC=ON \
 		-DENABLE_GEOLOCATION=OFF \
 		-DENABLE_PLUGIN_PROCESS_GTK2=OFF \
+		-DENABLE_SAMPLING_PROFILER=OFF \
 		$_archopt \
 		.. || return 1
 	make || return 1
@@ -98,5 +101,6 @@ package() {
 	paxmark -m "$pkgdir"/usr/lib/webkit2gtk-4.0/WebKitWebProcess || return 1
 }
 
-sha512sums="bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b  webkitgtk-2.16.6.tar.xz
-95f88563cb83387e3f44781dd8b00c5adf53e352869ca1d217c6cfc0895e9b7680e24820b8df340316564dcbc4cb65eb502fb003089b4805b9ac9f583f454013  musl-fixes.patch"
+sha512sums="8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e  webkitgtk-2.18.3.tar.xz
+9d7de4755c21d2573103dde326bb86ba37d54032627cb1bd362138906ac1d6a1dc48d4e548f29e29dc507831bae833ac5a8d2cf7fdb3d6a9d5bd5fb06f222b00  fix-fast-memory-disabled.patch
+f8fad1450d87f1cb195818cddb8a2307616916612e4676a4d71a20d58864d1c153550e4465a128e04f136c437518a4b90f1fa685ef6519fa8054637760635c72  fix_armv6l.patch"
diff --git a/community/webkit2gtk/core b/community/webkit2gtk/core
new file mode 100644
index 0000000000..b0acda9172
--- /dev/null
+++ b/community/webkit2gtk/core
diff --git a/community/webkit2gtk/fix-fast-memory-disabled.patch b/community/webkit2gtk/fix-fast-memory-disabled.patch
new file mode 100644
index 0000000000..95b9f6a091
--- /dev/null
+++ b/community/webkit2gtk/fix-fast-memory-disabled.patch
@@ -0,0 +1,14 @@
+--- a/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp.orig	2017-09-14 10:03:40.908890971 +0200
++++ b/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp	2017-09-14 10:04:17.084859537 +0200
+@@ -112,7 +112,11 @@ void unregisterCode(void* start, void* e
+ 
+ bool fastMemoryEnabled()
+ {
++#if ENABLE(WEBASSEMBLY_FAST_MEMORY)
+     return fastHandlerInstalled;
++#else
++    return false;
++#endif // ENABLE(WEBASSEMBLY_FAST_MEMORY)
+ }
+ 
+ void enableFastMemory()
diff --git a/community/webkit2gtk/fix_armv6l.patch b/community/webkit2gtk/fix_armv6l.patch
new file mode 100644
index 0000000000..c07a95b9c3
--- /dev/null
+++ b/community/webkit2gtk/fix_armv6l.patch
@@ -0,0 +1,23 @@
+Fix code emitted for armv6l to not use movw/movt but ldr.
+See https://bugs.webkit.org/show_bug.cgi?id=131612
+and https://bugs.webkit.org/show_bug.cgi?id=141288
+
+--- a/Source/JavaScriptCore/offlineasm/arm.rb	2015-07-22 14:37:57.000000000 +0200
++++ b/Source/JavaScriptCore/offlineasm/arm.rb	2015-08-08 00:31:21.011824644 +0200
+@@ -473,8 +473,16 @@
+                 $asm.puts "mov #{armFlippedOperands(operands)}"
+             end
+         when "mvlbl"
++            if isARMv7 or isARMv7Traditional
+                 $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
+                 $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
++            else
++                $mvlbl_counter ||= 0
++                $mvlbl_counter += 1
++                const_label = "_mvlbl_const_label#{$mvlbl_counter}"
++                $asm.puts ".equ #{const_label}, (#{operands[0].value})"
++                $asm.puts "ldr  #{operands[1].armOperand}, =#{const_label}"
++            end
+         when "nop"
+             $asm.puts "nop"
+         when "bieq", "bpeq", "bbeq"
diff --git a/community/webkit2gtk/musl-fixes.patch b/community/webkit2gtk/musl-fixes.patch
deleted file mode 100644
index cb1090f337..0000000000
--- a/community/webkit2gtk/musl-fixes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig
-+++ ./Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -566,7 +566,7 @@
- #error Unknown Architecture
- #endif
- 
--#elif defined(__GLIBC__) && ENABLE(JIT)
-+#elif defined(__linux__) && ENABLE(JIT)
- 
- #if CPU(X86)
-     return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
-@@ -665,7 +665,7 @@
- #error Unknown Architecture
- #endif
- 
--#elif defined(__GLIBC__)
-+#elif defined(__linux__) // glibc and musl
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -747,7 +747,7 @@
- #error Unknown Architecture
- #endif
- 
--#elif defined(__GLIBC__)
-+#elif defined(__linux__) // glibc and musl
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -838,7 +838,7 @@
- #error Unknown Architecture
- #endif
- 
--#elif defined(__GLIBC__)
-+#elif defined(__linux__) // glibc and musl
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)