git » qt5-webengine.git » commit ab47d19

Fix CVE-2019-5786 (FS#61947)

author Antonio Rojas
2019-03-08 09:21:29 UTC
committer Antonio Rojas
2019-03-08 09:21:29 UTC
parent 66b5d3ab1b31a1413bce16afb3de611a3b998797

Fix CVE-2019-5786 (FS#61947)

PKGBUILD +8 -3

diff --git a/PKGBUILD b/PKGBUILD
index f6d3241..a395c5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=qt5-webengine
 _qtver=5.12.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('LGPL3' 'LGPL2.1' 'BSD')
@@ -15,9 +15,11 @@ makedepends=('python2' 'git' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-         qtwebengine-harmony.patch)
+         qtwebengine-harmony.patch
+         CVE-2019-5786.patch::"http://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=43316b15")
 sha256sums=('43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0'
-            'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3')
+            'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
+            'd8434d27ac0dd8c4d49b0208fc2df91611440d3ee733bb8597212980f98d4b1b')
 
 prepare() {
   mkdir -p build
@@ -30,6 +32,9 @@ prepare() {
 
   # FreeType 2.8.1
   patch -Np1 -i ../qtwebengine-harmony.patch
+  
+  cd src/3rdparty
+  patch -p1 -i "$srcdir"/CVE-2019-5786.patch # https://bugreports.qt.io/browse/QTBUG-74254
 }
 
 build() {