diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-06-21 13:08:33 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-07-17 05:42:51 -0300 |
| commit | ac2d4998591dfdb86ff5246afde94a19d1f21650 (patch) | |
| tree | 3dea7bad222a941570a27c6fd3754a750c5ee14e /community/webkit2gtk/APKBUILD | |
| parent | 4ef792fcbcde5c03768ed55cb37cd2ee38ab5ad6 (diff) | |
| download | aports-ac2d4998591dfdb86ff5246afde94a19d1f21650.tar.bz2 aports-ac2d4998591dfdb86ff5246afde94a19d1f21650.tar.xz | |
community/webkit2gtk: upgrade to 2.24.2
* Disable armv7/armhf, due to using a 32-bit kernel these arches can't allocate
enough memory during compilation for the massive compilation units webkit2gtk
does. We'll have to wait for 2.26.x to allow compilation without unified sources
to upgrade these arches.
* Disable GTK_DOC, which fails to build
* Disable system malloc on some arches. There were typos in the options anyway,
so they haven't done anything anyway. System malloc is discouraged by upstream
since bmalloc not only performs better it also has some security related
advantages.
fixes the following CVEs:
* CVE-2019-6251
* CVE-2019-8506
* CVE-2019-8524
* CVE-2019-8535
* CVE-2019-8536
* CVE-2019-8544
* CVE-2019-8551
* CVE-2019-8558
* CVE-2019-8559
* CVE-2019-8563
* CVE-2019-11070
Co-authored-by: TBK <tbk@jjtc.eu>
Diffstat (limited to 'community/webkit2gtk/APKBUILD')
| -rw-r--r-- | community/webkit2gtk/APKBUILD | 68 |
1 files changed, 47 insertions, 21 deletions
diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD index ce57ab2be5..cbd644760c 100644 --- a/community/webkit2gtk/APKBUILD +++ b/community/webkit2gtk/APKBUILD @@ -1,13 +1,15 @@ +# Contributor: Rasmus Thomsen <oss@cogitri.dev> # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Contributor: Jiri Horner <laeqten@gmail.com> # Maintainer: Jiri Horner <laeqten@gmail.com> pkgname=webkit2gtk -pkgver=2.22.7 +pkgver=2.24.2 pkgrel=0 pkgdesc="Portable web rendering engine WebKit for GTK+" url="https://webkitgtk.org/" -arch="all" -license="LGPL-2.0-or-later BSD-2-Clause" +# Not enough RAM on 32-bit arches, x86 works due to using x86_64 kernel on builders +arch="all !armv7 !armhf" +license="LGPL-2.0-or-later AND BSD-2-Clause" options="!check" # 2.20.3-r1 no idea why gtest is removed in prepare makedepends=" bison @@ -35,6 +37,8 @@ makedepends=" libxslt-dev libxt-dev mesa-dev + openjpeg-dev + openjpeg-tools pango-dev paxmark python2 @@ -42,15 +46,29 @@ makedepends=" sqlite-dev " replaces="webkit" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +options="!check" # upstream doesn't package them in release tarballs: Tools/Scripts/run-gtk-tests: Command not found +subpackages="$pkgname-dev $pkgname-lang" source="https://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz fix-fast-memory-disabled.patch fix_armv6l.patch musl-fixes.patch + fix-openjpeg.patch " builddir="$srcdir/webkitgtk-$pkgver" # secfixes: +# 2.24.1-r0: +# - CVE-2019-6251 +# - CVE-2019-8506 +# - CVE-2019-8524 +# - CVE-2019-8535 +# - CVE-2019-8536 +# - CVE-2019-8544 +# - CVE-2019-8551 +# - CVE-2019-8558 +# - CVE-2019-8559 +# - CVE-2019-8563 +# - CVE-2019-11070 # 2.22.7-r0: # - CVE-2018-4437 # - CVE-2019-6212 @@ -81,40 +99,47 @@ builddir="$srcdir/webkitgtk-$pkgver" # - CVE-2017-2371 # - CVE-2017-2373 -prepare() { - default_prepare - cd "$builddir" - rm -r Source/ThirdParty/gtest/ -} - build() { local _archopt= case "$CARCH" in - armhf) _archopt="-DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF -DUSE_SYSMEM_MALLOC=ON";; + x86) export CFLAGS="$CFLAGS -msse2" + _archopt="-DENABLE_JIT=OFF" + ;; + armhf) _archopt="-DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON";; + armv7) _archopt="-DENABLE_JIT=OFF -DENABLE_C_LOOP=ON";; aarch64) _archopt="-DUSE_LD_GOLD=OFF";; - ppc64le) _archopt="-DENABLE_JIT=OFF -DUSE_SYSMTE_MALLOC=ON";; - s390x) _archopt="-DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF -DUSE_SYSMEM_MALLOC=ON";; + ppc64le) _archopt="-DENABLE_JIT=OFF -DENABLE_C_LOOP=ON";; + s390x) _archopt="-DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF -ENABLE_C_LOOP=ON";; esac - cd "$builddir" mkdir build cd build - cmake -DPORT=GTK \ + cmake \ + -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib \ -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ - -DENABLE_GTKDOC=ON \ + -DENABLE_GTKDOC=OFF \ -DENABLE_GEOLOCATION=OFF \ -DENABLE_PLUGIN_PROCESS_GTK2=OFF \ -DENABLE_SAMPLING_PROFILER=OFF \ - -DUSE_WOFF2=OFF\ + -DENABLE_MINIBROWSER=ON \ + -DUSE_WOFF2=OFF \ $_archopt \ .. + + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923476 + make JavaScriptCore-4-gir make } +check() { + cd "$builddir"/build + make check +} + package() { cd "$builddir"/build make DESTDIR="$pkgdir" install @@ -122,7 +147,8 @@ package() { paxmark -m "$pkgdir"/usr/lib/webkit2gtk-4.0/WebKitWebProcess } -sha512sums="c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126 webkitgtk-2.22.7.tar.xz -9d7de4755c21d2573103dde326bb86ba37d54032627cb1bd362138906ac1d6a1dc48d4e548f29e29dc507831bae833ac5a8d2cf7fdb3d6a9d5bd5fb06f222b00 fix-fast-memory-disabled.patch -f8fad1450d87f1cb195818cddb8a2307616916612e4676a4d71a20d58864d1c153550e4465a128e04f136c437518a4b90f1fa685ef6519fa8054637760635c72 fix_armv6l.patch -922957ae400853bcfd5bff2c4e5b98a8351227a0b3b759dc34913ea5c8437e852899467a293cd2fb7a67f65022c4e99506f2be3c54fbcd74f038eb98ac02189e musl-fixes.patch" +sha512sums="8376167cfc4530886a2ac644ab84ff1021a63f6236d7be9eeb9e0ecade8bad5384b652dfe3720fdd31cddb39df6c935f859f1c0a59f42d7c71998992c4a9ffaa webkitgtk-2.24.2.tar.xz +e1537b9937af1cb936669d405993a52204cb9968b8b3161cb12a3f3f1343c260088c9490fcd7a7deeab6dbabdb5f7ce7e6cb2f857b9f0a4205aba6db2b11fb20 fix-fast-memory-disabled.patch +c567eeac3c5f87b12711b40269946be0996df7fd73790d46fed64100c79240fbc965200ba702ef73a091e08ef9c949aebced62a7e4f5aab4f9b657d7dd808802 fix_armv6l.patch +d0d5e37822644cab071e33d325affd1ce5948b414f6f54d695e6b4a7bffadecd25c0df6dc1cb63e70127499f5a8da43b02286a3518b2488b5da32c622df45d97 musl-fixes.patch +c517c012f5630ef6be5be7d9592c5e042a070f849a141859edefa7984acb98dbd0d718fe6613cd35ba3b7d8530beebcc7408fd077cd914ed335c5e524e9e746a fix-openjpeg.patch" |