diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-30 13:08:15 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-30 13:22:28 +0000 |
commit | 2ff566b26ddaadbf1baf2d7883b04e3fae7d6749 (patch) | |
tree | b7773ec968b5e551a1b32ee3dbeba8fbaf0f24b5 | |
parent | 5f4bd1444dd98277632ca67b84f4f74ab496413e (diff) | |
download | alpine_aports-2ff566b26ddaadbf1baf2d7883b04e3fae7d6749.tar.bz2 alpine_aports-2ff566b26ddaadbf1baf2d7883b04e3fae7d6749.tar.xz alpine_aports-2ff566b26ddaadbf1baf2d7883b04e3fae7d6749.zip |
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
-rw-r--r-- | community/webkit2gtk/APKBUILD | 12 | ||||
-rw-r--r-- | community/webkit2gtk/core | bin | 0 -> 7540736 bytes | |||
-rw-r--r-- | community/webkit2gtk/fix-fast-memory-disabled.patch | 14 | ||||
-rw-r--r-- | community/webkit2gtk/fix_armv6l.patch | 23 | ||||
-rw-r--r-- | community/webkit2gtk/musl-fixes.patch | 38 |
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 @@ | |||
2 | # Contributor: Jiri Horner <laeqten@gmail.com> | 2 | # Contributor: Jiri Horner <laeqten@gmail.com> |
3 | # Maintainer: Jiri Horner <laeqten@gmail.com> | 3 | # Maintainer: Jiri Horner <laeqten@gmail.com> |
4 | pkgname=webkit2gtk | 4 | pkgname=webkit2gtk |
5 | pkgver=2.16.6 | 5 | pkgver=2.18.3 |
6 | pkgrel=0 | 6 | pkgrel=0 |
7 | pkgdesc="portable web rendering engine WebKit for GTK+" | 7 | pkgdesc="portable web rendering engine WebKit for GTK+" |
8 | url="https://webkitgtk.org/" | 8 | url="https://webkitgtk.org/" |
@@ -17,6 +17,7 @@ makedepends="$depends_dev | |||
17 | gobject-introspection-dev | 17 | gobject-introspection-dev |
18 | gperf | 18 | gperf |
19 | gst-plugins-base-dev | 19 | gst-plugins-base-dev |
20 | gst-plugins-bad-dev | ||
20 | gstreamer-dev | 21 | gstreamer-dev |
21 | gtk+3.0-dev | 22 | gtk+3.0-dev |
22 | gtk-doc | 23 | gtk-doc |
@@ -41,7 +42,8 @@ makedepends="$depends_dev | |||
41 | replaces="webkit" | 42 | replaces="webkit" |
42 | subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" | 43 | subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" |
43 | source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz | 44 | source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz |
44 | musl-fixes.patch | 45 | fix-fast-memory-disabled.patch |
46 | fix_armv6l.patch | ||
45 | " | 47 | " |
46 | 48 | ||
47 | # secfixes: | 49 | # secfixes: |
@@ -86,6 +88,7 @@ build() { | |||
86 | -DENABLE_GTKDOC=ON \ | 88 | -DENABLE_GTKDOC=ON \ |
87 | -DENABLE_GEOLOCATION=OFF \ | 89 | -DENABLE_GEOLOCATION=OFF \ |
88 | -DENABLE_PLUGIN_PROCESS_GTK2=OFF \ | 90 | -DENABLE_PLUGIN_PROCESS_GTK2=OFF \ |
91 | -DENABLE_SAMPLING_PROFILER=OFF \ | ||
89 | $_archopt \ | 92 | $_archopt \ |
90 | .. || return 1 | 93 | .. || return 1 |
91 | make || return 1 | 94 | make || return 1 |
@@ -98,5 +101,6 @@ package() { | |||
98 | paxmark -m "$pkgdir"/usr/lib/webkit2gtk-4.0/WebKitWebProcess || return 1 | 101 | paxmark -m "$pkgdir"/usr/lib/webkit2gtk-4.0/WebKitWebProcess || return 1 |
99 | } | 102 | } |
100 | 103 | ||
101 | sha512sums="bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b webkitgtk-2.16.6.tar.xz | 104 | sha512sums="8ba68d7234205728ed4b92358304cf0d0b771647d9b4316085241adeacafe67dee685225b0b46752087b93416ce8d2053a5a7c2376fda1eee7bc6d9024ae787e webkitgtk-2.18.3.tar.xz |
102 | 95f88563cb83387e3f44781dd8b00c5adf53e352869ca1d217c6cfc0895e9b7680e24820b8df340316564dcbc4cb65eb502fb003089b4805b9ac9f583f454013 musl-fixes.patch" | 105 | 9d7de4755c21d2573103dde326bb86ba37d54032627cb1bd362138906ac1d6a1dc48d4e548f29e29dc507831bae833ac5a8d2cf7fdb3d6a9d5bd5fb06f222b00 fix-fast-memory-disabled.patch |
106 | 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 | |||
Binary files differ | |||
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 @@ | |||
1 | --- a/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp.orig 2017-09-14 10:03:40.908890971 +0200 | ||
2 | +++ b/Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp 2017-09-14 10:04:17.084859537 +0200 | ||
3 | @@ -112,7 +112,11 @@ void unregisterCode(void* start, void* e | ||
4 | |||
5 | bool fastMemoryEnabled() | ||
6 | { | ||
7 | +#if ENABLE(WEBASSEMBLY_FAST_MEMORY) | ||
8 | return fastHandlerInstalled; | ||
9 | +#else | ||
10 | + return false; | ||
11 | +#endif // ENABLE(WEBASSEMBLY_FAST_MEMORY) | ||
12 | } | ||
13 | |||
14 | 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 @@ | |||
1 | Fix code emitted for armv6l to not use movw/movt but ldr. | ||
2 | See https://bugs.webkit.org/show_bug.cgi?id=131612 | ||
3 | and https://bugs.webkit.org/show_bug.cgi?id=141288 | ||
4 | |||
5 | --- a/Source/JavaScriptCore/offlineasm/arm.rb 2015-07-22 14:37:57.000000000 +0200 | ||
6 | +++ b/Source/JavaScriptCore/offlineasm/arm.rb 2015-08-08 00:31:21.011824644 +0200 | ||
7 | @@ -473,8 +473,16 @@ | ||
8 | $asm.puts "mov #{armFlippedOperands(operands)}" | ||
9 | end | ||
10 | when "mvlbl" | ||
11 | + if isARMv7 or isARMv7Traditional | ||
12 | $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}" | ||
13 | $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}" | ||
14 | + else | ||
15 | + $mvlbl_counter ||= 0 | ||
16 | + $mvlbl_counter += 1 | ||
17 | + const_label = "_mvlbl_const_label#{$mvlbl_counter}" | ||
18 | + $asm.puts ".equ #{const_label}, (#{operands[0].value})" | ||
19 | + $asm.puts "ldr #{operands[1].armOperand}, =#{const_label}" | ||
20 | + end | ||
21 | when "nop" | ||
22 | $asm.puts "nop" | ||
23 | 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 @@ | |||
1 | --- ./Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig | ||
2 | +++ ./Source/JavaScriptCore/heap/MachineStackMarker.cpp | ||
3 | @@ -566,7 +566,7 @@ | ||
4 | #error Unknown Architecture | ||
5 | #endif | ||
6 | |||
7 | -#elif defined(__GLIBC__) && ENABLE(JIT) | ||
8 | +#elif defined(__linux__) && ENABLE(JIT) | ||
9 | |||
10 | #if CPU(X86) | ||
11 | return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); | ||
12 | @@ -665,7 +665,7 @@ | ||
13 | #error Unknown Architecture | ||
14 | #endif | ||
15 | |||
16 | -#elif defined(__GLIBC__) | ||
17 | +#elif defined(__linux__) // glibc and musl | ||
18 | |||
19 | // The following sequence depends on glibc's sys/ucontext.h. | ||
20 | #if CPU(X86) | ||
21 | @@ -747,7 +747,7 @@ | ||
22 | #error Unknown Architecture | ||
23 | #endif | ||
24 | |||
25 | -#elif defined(__GLIBC__) | ||
26 | +#elif defined(__linux__) // glibc and musl | ||
27 | |||
28 | // The following sequence depends on glibc's sys/ucontext.h. | ||
29 | #if CPU(X86) | ||
30 | @@ -838,7 +838,7 @@ | ||
31 | #error Unknown Architecture | ||
32 | #endif | ||
33 | |||
34 | -#elif defined(__GLIBC__) | ||
35 | +#elif defined(__linux__) // glibc and musl | ||
36 | |||
37 | // The following sequence depends on glibc's sys/ucontext.h. | ||
38 | #if CPU(X86) | ||