commit 67a4854bea81503b3788b9ba15c5c3e8ffe0f0bd Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Nov 4 08:49:42 2019 +1100 qtwebengine: 5.13.1 -> 5.13.2 diff --git a/qtwebengine/.footprint b/qtwebengine/.footprint index 2d1074362..e7ed1b882 100644 --- a/qtwebengine/.footprint +++ b/qtwebengine/.footprint @@ -2,33 +2,33 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/qt5/ drwxr-xr-x root/root usr/include/qt5/QtWebEngine/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.13.1/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/ --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebengineaction_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebengineaction_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginecertificateerror_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebengineclientcertificateselection_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginedialogrequests_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginedownloaditem_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginehistory_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginehistory_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebengineloadrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginenavigationrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginenewviewrequest_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebengineprofile_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginescript_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginesettings_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginesingleton_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginetestsupport_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebengineview_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qquickwebengineview_p_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qtwebengine-config_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/qtwebengineglobal_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.13.2/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebengineaction_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebengineaction_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginecertificateerror_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebengineclientcertificateselection_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginedialogrequests_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginedownloaditem_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginehistory_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginehistory_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebengineloadrequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginenavigationrequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginenewviewrequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebengineprofile_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginescript_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginesettings_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginesingleton_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginetestsupport_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebengineview_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qquickwebengineview_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qtwebengine-config_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.13.2/QtWebEngine/private/qtwebengineglobal_p.h -rw-r--r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineProfile -rw-r--r-- root/root usr/include/qt5/QtWebEngine/QQuickWebEngineScript -rw-r--r-- root/root usr/include/qt5/QtWebEngine/QtWebEngine @@ -40,15 +40,15 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.13.1/QtWebEngine/private/ -rw-r--r-- root/root usr/include/qt5/QtWebEngine/qtwebengineglobal.h -rw-r--r-- root/root usr/include/qt5/QtWebEngine/qtwebengineversion.h drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.13.1/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.13.1/QtWebEngineCore/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.13.1/QtWebEngineCore/private/ --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.1/QtWebEngineCore/private/qtwebenginecore-config_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.1/QtWebEngineCore/private/qtwebenginecoreglobal_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.1/QtWebEngineCore/private/qwebenginecallback_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.1/QtWebEngineCore/private/qwebenginecookiestore_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.1/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.1/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.13.2/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.13.2/QtWebEngineCore/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.13.2/QtWebEngineCore/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.2/QtWebEngineCore/private/qtwebenginecore-config_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.2/QtWebEngineCore/private/qtwebenginecoreglobal_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.2/QtWebEngineCore/private/qwebenginecallback_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.2/QtWebEngineCore/private/qwebenginecookiestore_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.2/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.13.2/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCallback -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineClientCertificateStore -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineCookieStore @@ -80,16 +80,16 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.13.1/QtWebEngineCore/priv -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlscheme.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineurlschemehandler.h drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/QtWebEngineWidgets/ -drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/QtWebEngineWidgets/private/ --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/QtWebEngineWidgets/private/qwebenginehistory_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/QtWebEngineWidgets/private/qwebenginepage_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/QtWebEngineWidgets/private/qwebengineprofile_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h --rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.1/QtWebEngineWidgets/private/qwebengineview_p.h +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidgets/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidgets/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidgets/private/qwebenginehistory_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidgets/private/qwebenginepage_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidgets/private/qwebengineprofile_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidgets/private/qwebengineview_p.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineCertificateError -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineClientCertificateSelection -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/QWebEngineContextMenuData @@ -136,22 +136,22 @@ drwxr-xr-x root/root usr/lib/cmake/Qt5WebEngineWidgets/ -rw-r--r-- root/root usr/lib/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfigVersion.cmake -rw-r--r-- root/root usr/lib/libQt5WebEngine.la -rw-r--r-- root/root usr/lib/libQt5WebEngine.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.13.1 -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.13.1 -lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.13 -> libQt5WebEngine.so.5.13.1 --rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.13.1 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.13.2 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.13.2 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.13 -> libQt5WebEngine.so.5.13.2 +-rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.13.2 -rw-r--r-- root/root usr/lib/libQt5WebEngineCore.la -rw-r--r-- root/root usr/lib/libQt5WebEngineCore.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.13.1 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.13.1 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.13 -> libQt5WebEngineCore.so.5.13.1 --rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.13.1 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.13.2 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.13.2 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.13 -> libQt5WebEngineCore.so.5.13.2 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.13.2 -rw-r--r-- root/root usr/lib/libQt5WebEngineWidgets.la -rw-r--r-- root/root usr/lib/libQt5WebEngineWidgets.prl -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.13.1 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.13.1 -lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.13 -> libQt5WebEngineWidgets.so.5.13.1 --rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.13.1 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.13.2 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.13.2 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.13 -> libQt5WebEngineWidgets.so.5.13.2 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.13.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebEngine.pc -rw-r--r-- root/root usr/lib/pkgconfig/Qt5WebEngineCore.pc diff --git a/qtwebengine/.signature b/qtwebengine/.signature index 676e58254..d693c911c 100644 --- a/qtwebengine/.signature +++ b/qtwebengine/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XOgoK2xJRQhSy6dL6ie/EJ0F05Wh6ghz9lBZCTwRNaJ3csVH5uZrhKGIJlT/m9Ag0/g9fBEJ2PiSrBI3tOpSAU= -SHA256 (Pkgfile) = 36743ad3ba87ed5daca739bf8817770b3fbfe262576521d4ea8b200ded4d71b9 -SHA256 (.footprint) = 011d75dda5a4a45ad3e4f9cf04e555e0076381d064321871da0e07cf74caa6f0 -SHA256 (qtwebengine-everywhere-src-5.13.1.tar.xz) = 7f12e710b76ff2be4497bf368fc01ecd2419e2e962fb90599b0ece00ae2eb7d0 -SHA256 (qtbug-77037.patch) = 7ed06cc2d0e3cc86df33bb80468a5f0422ed2cc5985db86444949ef3b9a12f02 -SHA256 (qtbug-77209.patch) = 9773e1fed9b8998dd800ea89315b4ea70ed81b568b0a740945ac76577c62e6f1 +RWSE3ohX2g5d/YI30TfNWssI3Ky1qCSp3D65C9+Igopy8/Zp33RZVqt/OKbyDU67AXwcgPbeIDHJjx8a7c4X+wYCNJ2OMAPs3QY= +SHA256 (Pkgfile) = aee024d0ff9a67a353006e58b39369f07f276294e8f679a3ef3d8e4db33eda72 +SHA256 (.footprint) = f822403609ac62c075abecfa5838298241bfe85d126fd3be998ad359d70492cb +SHA256 (qtwebengine-everywhere-src-5.13.2.tar.xz) = adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb +SHA256 (CVE-2019-13720.patch) = 3b2ce75214e757f5d0d268fbb1009c2e0c660d19620ae27e8d92a0e492e5d9da diff --git a/qtwebengine/CVE-2019-13720.patch b/qtwebengine/CVE-2019-13720.patch new file mode 100644 index 000000000..4beb38225 --- /dev/null +++ b/qtwebengine/CVE-2019-13720.patch @@ -0,0 +1,55 @@ +From d6e5fc10e417efdf8665d9fba57c269f0534072f Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@qt.io> +Date: Fri, 1 Nov 2019 11:10:31 +0100 +Subject: [Backport] Fix for CVE-2019-13720 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Obtain graph/process lock when nullifying the buffer in Reverb + +When the buffer is set to `null` while there is an active buffer +within a reverb object, SetBuffer() function can prematurely +nullify the `reverb_` and `shared_buffer_` while it is still +being accessed by the rendering thread. + +This CL adds two locks (graph lock and process lock) when the +buffer gets nullified to ensure the synchronization between +two threads. + +(cherry picked from commit 6a2e670a243b815cf043f8da4d26ecb9a64d307b) + +Change-Id: I8f501b6a16b3c7e16db767e0b279a1a53d6eb290 +Bug: 1019226 +Reviewed-on: +https://chromium-review.googlesource.com/c/chromium/src/+/1888103 +Commit-Queue: Hongchan Choi <hongchan@chromium.org> +Reviewed-by: Robert Sesek <rsesek@chromium.org> +Cr-Original-Commit-Position: refs/heads/master@{#710627} +Reviewed-on: +https://chromium-review.googlesource.com/c/chromium/src/+/1889510 +Reviewed-by: Krishna Govind <govind@chromium.org> +Cr-Commit-Position: refs/branch-heads/3953@{#8} +Cr-Branched-From: +b5ceb94d4b9a2f629c84df1be72f9e3d0a79fd2d-refs/heads/master@{#710313} +Reviewed-by: Michael Brüning <michael.bruning@qt.io> +--- + chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc b/chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc +index a0c05beab71..066ed521d09 100644 +--- a/chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc ++++ b/chromium/third_party/blink/renderer/modules/webaudio/convolver_node.cc +@@ -95,6 +95,8 @@ void ConvolverHandler::SetBuffer(AudioBuffer* buffer, + DCHECK(IsMainThread()); + + if (!buffer) { ++ BaseAudioContext::GraphAutoLocker context_locker(Context()); ++ MutexLocker locker(process_lock_); + reverb_.reset(); + buffer_ = buffer; + return; +-- +cgit v1.2.1 + diff --git a/qtwebengine/Pkgfile b/qtwebengine/Pkgfile index 339dd01eb..ce794ddb3 100644 --- a/qtwebengine/Pkgfile +++ b/qtwebengine/Pkgfile @@ -4,21 +4,16 @@ # Depends on: nss qt5 xorg-libxscrnsaver xorg-libxtst name=qtwebengine -version=5.13.1 -release=2 +version=5.13.2 +release=1 source=(https://download.qt.io/official_releases/qt/${version::4}/$version/submodules/$name-everywhere-src-$version.tar.xz - qtbug-77037.patch qtbug-77209.patch) + CVE-2019-13720.patch) build() { cd $name-everywhere-src-$version - # https://bugreports.qt.io/browse/QTBUG-77209 - # https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=1c33a4a6 - patch -p1 -i $SRC/qtbug-77209.patch # Fix QWebEnginePage visibility state - - # https://bugreports.qt.io/browse/QTBUG-77037 - # https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=0b57f159 - patch -p1 -d src/3rdparty -i $SRC/qtbug-77037.patch # Fix build with pulseaudio 13 + # https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=d6e5fc10 + patch -d src/3rdparty -p1 -i $SRC/CVE-2019-13720.patch # Ninja, by default, sets the number of jobs to the number of availalble threads test -n "$JOBS" && export NINJAFLAGS+=" -j $JOBS" diff --git a/qtwebengine/qtbug-77037.patch b/qtwebengine/qtbug-77037.patch deleted file mode 100644 index 4dac59a9a..000000000 --- a/qtwebengine/qtbug-77037.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 0b57f15958f07ef12c8944d6db7a33a6fe9d9c59 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Mon, 23 Sep 2019 13:49:53 +0200 -Subject: Fix building with pulseaudio 13 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The function signature changed though the ABI stayed the same. - -Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876 -Fixes: QTBUG-77037 -Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> ---- - chromium/media/audio/pulse/pulse.sigs | 16 ++++++++-------- - chromium/media/audio/pulse/pulse_stub_header.fragment | 11 +++++++++++ - 2 files changed, 19 insertions(+), 8 deletions(-) - -diff --git a/chromium/media/audio/pulse/pulse.sigs b/chromium/media/audio/pulse/pulse.sigs -index 8b5888786a9..daaeb149c13 100644 ---- a/chromium/media/audio/pulse/pulse.sigs -+++ b/chromium/media/audio/pulse/pulse.sigs -@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p - pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata); - pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata); - pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata); --pa_context_state_t pa_context_get_state(pa_context* c); -+pa_context_state_t pa_context_get_state(const_pa_context_ptr c); - pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name); - pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata); - void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata); --pa_operation_state_t pa_operation_get_state(pa_operation* o); -+pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o); - void pa_context_unref(pa_context* c); - void pa_operation_unref(pa_operation* o); - int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes); -@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi - int pa_stream_disconnect(pa_stream* s); - int pa_stream_drop(pa_stream *p); - pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata); --uint32_t pa_stream_get_device_index(pa_stream* s); -+uint32_t pa_stream_get_device_index(const_pa_stream_ptr s); - int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative); --pa_stream_state_t pa_stream_get_state(pa_stream* p); -+pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p); - pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map); - pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p); - pa_proplist* pa_proplist_new(void); --int pa_proplist_contains(pa_proplist* p, const char* key); -+int pa_proplist_contains(const_pa_proplist_ptr p, const char* key); - void pa_proplist_free(pa_proplist* p); --const char* pa_proplist_gets(pa_proplist* p, const char* key); -+const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key); - int pa_proplist_sets(pa_proplist* p, const char* key, const char* value); --size_t pa_stream_readable_size(pa_stream *p); -+size_t pa_stream_readable_size(const_pa_stream_ptr p); - int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes); - void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata); - void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata); - int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek); - void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata); - void pa_stream_unref(pa_stream* s); --int pa_context_errno(pa_context *c); -+int pa_context_errno(const_pa_context_ptr c); - const char* pa_strerror(int error); - pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v); -diff --git a/chromium/media/audio/pulse/pulse_stub_header.fragment b/chromium/media/audio/pulse/pulse_stub_header.fragment -index 2a2d3e7552b..cdaa841b29f 100644 ---- a/chromium/media/audio/pulse/pulse_stub_header.fragment -+++ b/chromium/media/audio/pulse/pulse_stub_header.fragment -@@ -5,4 +5,15 @@ extern "C" { - - #include <pulse/pulseaudio.h> - -+#if PA_MAJOR > 12 -+typedef const pa_context* const_pa_context_ptr; -+typedef const pa_operation* const_pa_operation_ptr; -+typedef const pa_proplist* const_pa_proplist_ptr; -+typedef const pa_stream* const_pa_stream_ptr; -+#else -+typedef pa_context* const_pa_context_ptr; -+typedef pa_operation* const_pa_operation_ptr; -+typedef pa_proplist* const_pa_proplist_ptr; -+typedef pa_stream* const_pa_stream_ptr; -+#endif - } --- -cgit v1.2.1 - diff --git a/qtwebengine/qtbug-77209.patch b/qtwebengine/qtbug-77209.patch deleted file mode 100644 index 2585c1202..000000000 --- a/qtwebengine/qtbug-77209.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 1c33a4a6ae07106513a8105ebbc2d0c65363b333 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io> -Date: Mon, 29 Jul 2019 13:10:14 +0200 -Subject: Fix QWebEnginePage visibility state - -Calling - - view.show(); - view.load(...); - view.hide(); - -results in a WebContents in visible state because the first call to show() is -delayed via a timer and never canceled so it takes effect after the hide(). - -Also, the page's visibility state is not updated when changing views, so that a -visible QWebEngineView can be set to display a hidden QWebEnginePage. - -Fixes: QTBUG-77209 -Change-Id: I0243c659f4039a35c36e04ea55c5972666170fd0 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> ---- - src/webenginewidgets/api/qwebenginepage.cpp | 4 ++- - src/webenginewidgets/api/qwebengineview.cpp | 3 ++ - .../widgets/qwebengineview/tst_qwebengineview.cpp | 34 ++++++++++++++++++++++ - 3 files changed, 40 insertions(+), 1 deletion(-) - -diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp -index f252137a..8451bab1 100644 ---- a/src/webenginewidgets/api/qwebenginepage.cpp -+++ b/src/webenginewidgets/api/qwebenginepage.cpp -@@ -175,7 +175,6 @@ QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile) - wasShownTimer.setSingleShot(true); - QObject::connect(&wasShownTimer, &QTimer::timeout, [this](){ - ensureInitialized(); -- wasShown(); - }); - - profile->d_ptr->addWebContentsAdapterClient(this); -@@ -215,6 +214,9 @@ void QWebEnginePagePrivate::initializationFinished() - if (!qFuzzyCompare(adapter->currentZoomFactor(), defaultZoomFactor)) - adapter->setZoomFactor(defaultZoomFactor); - -+ if (view && view->isVisible()) -+ adapter->wasShown(); -+ - scriptCollection.d->initializationFinished(adapter); - - m_isBeingAdopted = false; -diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp -index 6c08df34..6e113852 100644 ---- a/src/webenginewidgets/api/qwebengineview.cpp -+++ b/src/webenginewidgets/api/qwebengineview.cpp -@@ -61,6 +61,7 @@ void QWebEngineViewPrivate::pageChanged(QWebEnginePage *oldPage, QWebEnginePage - Q_Q(QWebEngineView); - - if (oldPage) { -+ oldPage->d_ptr->wasHidden(); - oldPage->disconnect(q); - } - -@@ -74,6 +75,8 @@ void QWebEngineViewPrivate::pageChanged(QWebEnginePage *oldPage, QWebEnginePage - QObject::connect(newPage, &QWebEnginePage::loadFinished, q, &QWebEngineView::loadFinished); - QObject::connect(newPage, &QWebEnginePage::selectionChanged, q, &QWebEngineView::selectionChanged); - QObject::connect(newPage, &QWebEnginePage::renderProcessTerminated, q, &QWebEngineView::renderProcessTerminated); -+ if (q->isVisible()) -+ newPage->d_ptr->wasShown(); - } - - auto oldUrl = oldPage ? oldPage->url() : QUrl(); -diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp -index a7ff05f5..1bb65d7d 100644 ---- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp -+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp -@@ -192,6 +192,8 @@ private Q_SLOTS: - void webUIURLs_data(); - void webUIURLs(); - void visibilityState(); -+ void visibilityState2(); -+ void visibilityState3(); - void jsKeyboardEvent(); - void deletePage(); - void closeOpenerTab(); -@@ -3106,6 +3108,38 @@ void tst_QWebEngineView::visibilityState() - QCOMPARE(evaluateJavaScriptSync(view.page(), "document.visibilityState").toString(), QStringLiteral("visible")); - } - -+void tst_QWebEngineView::visibilityState2() -+{ -+ QWebEngineView view; -+ QSignalSpy spy(&view, &QWebEngineView::loadFinished); -+ view.show(); -+ view.load(QStringLiteral("about:blank")); -+ view.hide(); -+ QVERIFY(spy.count() || spy.wait()); -+ QVERIFY(spy.takeFirst().takeFirst().toBool()); -+ QCOMPARE(evaluateJavaScriptSync(view.page(), "document.visibilityState").toString(), QStringLiteral("hidden")); -+} -+ -+void tst_QWebEngineView::visibilityState3() -+{ -+ QWebEnginePage page1; -+ QWebEnginePage page2; -+ QSignalSpy spy1(&page1, &QWebEnginePage::loadFinished); -+ QSignalSpy spy2(&page2, &QWebEnginePage::loadFinished); -+ page1.load(QStringLiteral("about:blank")); -+ page2.load(QStringLiteral("about:blank")); -+ QVERIFY(spy1.count() || spy1.wait()); -+ QVERIFY(spy2.count() || spy2.wait()); -+ QWebEngineView view; -+ view.setPage(&page1); -+ view.show(); -+ QCOMPARE(evaluateJavaScriptSync(&page1, "document.visibilityState").toString(), QStringLiteral("visible")); -+ QCOMPARE(evaluateJavaScriptSync(&page2, "document.visibilityState").toString(), QStringLiteral("hidden")); -+ view.setPage(&page2); -+ QCOMPARE(evaluateJavaScriptSync(&page1, "document.visibilityState").toString(), QStringLiteral("hidden")); -+ QCOMPARE(evaluateJavaScriptSync(&page2, "document.visibilityState").toString(), QStringLiteral("visible")); -+} -+ - void tst_QWebEngineView::jsKeyboardEvent() - { - QWebEngineView view; --- -cgit v1.2.1 -