commit 4e8b03d900fe5c0a126217a9584f1be535330abb Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Feb 1 17:13:16 2020 +1100 qtwebengine: 5.13.2 -> 5.14.1 diff --git a/qtwebengine/.footprint b/qtwebengine/.footprint index e7ed1b882..5c4518ce5 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.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 +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.14.1/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebengineaction_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebengineaction_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginecertificateerror_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebengineclientcertificateselection_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginecontextmenurequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginedialogrequests_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginedownloaditem_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginedownloaditem_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginehistory_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginehistory_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebengineloadrequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginenavigationrequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginenewviewrequest_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebengineprofile_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginescript_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginesettings_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginesingleton_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginetestsupport_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebengineview_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qquickwebengineview_p_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/QtWebEngine/private/qtwebengine-config_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngine/5.14.1/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,18 +40,19 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngine/5.13.2/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.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 +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.14.1/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.14.1/QtWebEngineCore/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.14.1/QtWebEngineCore/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.14.1/QtWebEngineCore/private/qtwebenginecore-config_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.14.1/QtWebEngineCore/private/qtwebenginecoreglobal_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.14.1/QtWebEngineCore/private/qwebenginecallback_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.14.1/QtWebEngineCore/private/qwebenginecookiestore_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.14.1/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/5.14.1/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 +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineFindTextResult -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineHttpRequest -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineNotification -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/QWebEngineQuotaRequest @@ -70,6 +71,7 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.13.2/QtWebEngineCore/priv -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebenginecallback.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebengineclientcertificatestore.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebenginecookiestore.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebenginefindtextresult.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebenginehttprequest.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebenginenotification.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineCore/qwebenginequotarequest.h @@ -80,16 +82,17 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineCore/5.13.2/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.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 +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/QtWebEngineWidgets/ +drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/QtWebEngineWidgets/private/ +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/QtWebEngineWidgets/private/qtwebenginewidgets-config_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/QtWebEngineWidgets/private/qwebenginehistory_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/QtWebEngineWidgets/private/qwebenginepage_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/QtWebEngineWidgets/private/qwebengineprofile_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/5.14.1/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 @@ -106,6 +109,7 @@ drwxr-xr-x root/root usr/include/qt5/QtWebEngineWidgets/5.13.2/QtWebEngineWidget -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/QtWebEngineWidgets -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/QtWebEngineWidgetsDepends -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/QtWebEngineWidgetsVersion +-rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/qtwebenginewidgets-config.h (EMPTY) -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/qtwebenginewidgetsglobal.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/qtwebenginewidgetsversion.h -rw-r--r-- root/root usr/include/qt5/QtWebEngineWidgets/qwebenginecertificateerror.h @@ -136,22 +140,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.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 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so -> libQt5WebEngine.so.5.14.1 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5 -> libQt5WebEngine.so.5.14.1 +lrwxrwxrwx root/root usr/lib/libQt5WebEngine.so.5.14 -> libQt5WebEngine.so.5.14.1 +-rwxr-xr-x root/root usr/lib/libQt5WebEngine.so.5.14.1 -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.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 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so -> libQt5WebEngineCore.so.5.14.1 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5 -> libQt5WebEngineCore.so.5.14.1 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineCore.so.5.14 -> libQt5WebEngineCore.so.5.14.1 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineCore.so.5.14.1 -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.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 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so -> libQt5WebEngineWidgets.so.5.14.1 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5 -> libQt5WebEngineWidgets.so.5.14.1 +lrwxrwxrwx root/root usr/lib/libQt5WebEngineWidgets.so.5.14 -> libQt5WebEngineWidgets.so.5.14.1 +-rwxr-xr-x root/root usr/lib/libQt5WebEngineWidgets.so.5.14.1 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 d693c911c..425f5739b 100644 --- a/qtwebengine/.signature +++ b/qtwebengine/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -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 +RWSE3ohX2g5d/ZZGJJsCPCq5kCq8JFpgfEnooMO4UjLjG9iXel3V8mukDR1b4LZjqiRBUpVjhDFp5DFNttUgqsiHfDnfiEgQCQg= +SHA256 (Pkgfile) = e9c64dd7268cd5df725185d4e4b56644a1552302f546d4d9fa4028442fe29a40 +SHA256 (.footprint) = ac376febdff508d1d4c96cbaa1036088de3f98d67cbe81d8cb359f4e8eb677a3 +SHA256 (qtwebengine-everywhere-src-5.14.1.tar.xz) = 4ec77040a876a83aa2a833ebfe7b3e88dcc167ceb317095eb226a0b8d455e887 diff --git a/qtwebengine/CVE-2019-13720.patch b/qtwebengine/CVE-2019-13720.patch deleted file mode 100644 index 4beb38225..000000000 --- a/qtwebengine/CVE-2019-13720.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 ce794ddb3..d4fb44562 100644 --- a/qtwebengine/Pkgfile +++ b/qtwebengine/Pkgfile @@ -1,20 +1,16 @@ # Description: Provides support for web applications using the Chromium browser project. # URL: http://www.qt.io/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: nss qt5 xorg-libxscrnsaver xorg-libxtst +# Depends on: nss qt5 xorg-libxscrnsaver xorg-libxtst libvpx python name=qtwebengine -version=5.13.2 +version=5.14.1 release=1 -source=(https://download.qt.io/official_releases/qt/${version::4}/$version/submodules/$name-everywhere-src-$version.tar.xz - CVE-2019-13720.patch) +source=(https://download.qt.io/official_releases/qt/${version::4}/$version/submodules/$name-everywhere-src-$version.tar.xz) build() { cd $name-everywhere-src-$version - # 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" @@ -30,7 +26,7 @@ build() { install -d build cd build - qmake-qt5 .. -- -proprietary-codecs + qmake .. -- -proprietary-codecs make make INSTALL_ROOT=$PKG install