import webkit2gtk3-2.30.4-3.el8_4

SOURCES/CVE-2021-30858.patch

@@ -0,0 +1,30 @@
+Index: /Source/WTF/wtf/CrossThreadTask.h
+===================================================================
+--- /Source/WTF/wtf/CrossThreadTask.h	(revision 281383)
++++ /Source/WTF/wtf/CrossThreadTask.h	(revision 281384)
+@@ -88,5 +88,5 @@
+ }
+ 
+-template<typename T, typename std::enable_if<std::is_base_of<ThreadSafeRefCounted<T>, T>::value, int>::type = 0, typename... Parameters, typename... Arguments>
++template<typename T, typename std::enable_if<std::is_base_of<ThreadSafeRefCountedBase, T>::value, int>::type = 0, typename... Parameters, typename... Arguments>
+ CrossThreadTask createCrossThreadTask(T& callee, void (T::*method)(Parameters...), const Arguments&... arguments)
+ {
+@@ -96,5 +96,5 @@
+ }
+ 
+-template<typename T, typename std::enable_if<!std::is_base_of<ThreadSafeRefCounted<T>, T>::value, int>::type = 0, typename... Parameters, typename... Arguments>
++template<typename T, typename std::enable_if<!std::is_base_of<ThreadSafeRefCountedBase, T>::value, int>::type = 0, typename... Parameters, typename... Arguments>
+ CrossThreadTask createCrossThreadTask(T& callee, void (T::*method)(Parameters...), const Arguments&... arguments)
+ {
+Index: /Source/WebCore/Modules/indexeddb/IDBRequest.cpp
+===================================================================
+--- /Source/WebCore/Modules/indexeddb/IDBRequest.cpp	(revision 281383)
++++ /Source/WebCore/Modules/indexeddb/IDBRequest.cpp	(revision 281384)
+@@ -309,5 +309,6 @@
+         targets = { this, m_transaction.get(), &m_transaction->database() };
+ 
+-    m_hasPendingActivity = false;
++    if (event.isTrusted())
++        m_hasPendingActivity = false;
+ 
+     {

SOURCES/aarch64-page-size.patch

@@ -0,0 +1,9 @@
+Index: trunk/Source/cmake/WebKitFeatures.cmake
+===================================================================
+--- trunk/Source/cmake/WebKitFeatures.cmake	(revision 277012)
++++ trunk/Source/cmake/WebKitFeatures.cmake	(revision 277015)
+@@ -452,2 +452,4 @@
+ option(ENABLE_EXPERIMENTAL_FEATURES "Enable experimental features" OFF)
+ SET_AND_EXPOSE_TO_BUILD(ENABLE_EXPERIMENTAL_FEATURES ${ENABLE_EXPERIMENTAL_FEATURES})
++
++SET_AND_EXPOSE_TO_BUILD(USE_64KB_PAGE_BLOCK ${USE_64KB_PAGE_BLOCK})

SPECS/webkit2gtk3.spec

@@ -12,7 +12,7 @@
 
 Name:           webkit2gtk3
 Version:        2.30.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
@@ -25,6 +25,12 @@ Patch0:         evolution-shared-secondary-process.patch
 # https://bugs.webkit.org/show_bug.cgi?id=219288
 Patch1:         aarch64-build.patch
 
+# https://bugs.webkit.org/show_bug.cgi?id=225393
+Patch2:         aarch64-page-size.patch
+
+# https://bugs.webkit.org/show_bug.cgi?id=229375
+Patch3:         CVE-2021-30858.patch
+
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -298,6 +304,14 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Tue Oct 05 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-3
+- Fix crashing on aarch64
+- Resolves: #2010825
+
+* Tue Sep 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-2
+- Fix CVE-2021-30858
+- Resolves: #2006427
+
 * Tue Dec 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-1
 - Update to 2.30.4
 - Related: #1883304