From 062c5377c1e90b455faa7e50319e8e061c8af498 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 10 2022 07:00:08 +0000 Subject: import webkit2gtk3-2.34.6-1.el8 --- diff --git a/.gitignore b/.gitignore index 00f18dc..56eef8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/webkitgtk-2.32.3.tar.xz +SOURCES/webkitgtk-2.34.6.tar.xz +SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 26448bb..5079354 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1 +1,2 @@ -9c9b2cb2638ea40706765768dd5cb3c95ab46dcb SOURCES/webkitgtk-2.32.3.tar.xz +bb82517289baf9c858fa406d1d845274f81e25cb SOURCES/webkitgtk-2.34.6.tar.xz +cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg diff --git a/SOURCES/CVE-2021-30858.patch b/SOURCES/CVE-2021-30858.patch deleted file mode 100644 index 230f788..0000000 --- a/SOURCES/CVE-2021-30858.patch +++ /dev/null @@ -1,30 +0,0 @@ -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, T>::value, int>::type = 0, typename... Parameters, typename... Arguments> -+template::value, int>::type = 0, typename... Parameters, typename... Arguments> - CrossThreadTask createCrossThreadTask(T& callee, void (T::*method)(Parameters...), const Arguments&... arguments) - { -@@ -96,5 +96,5 @@ - } - --template, T>::value, int>::type = 0, typename... Parameters, typename... Arguments> -+template::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; - - { diff --git a/SOURCES/aarch64-page-size.patch b/SOURCES/aarch64-page-size.patch index 5606dca..15aaacb 100644 --- a/SOURCES/aarch64-page-size.patch +++ b/SOURCES/aarch64-page-size.patch @@ -1,16 +1,19 @@ diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h -index c655a50c2c89..c4a6b8d09f16 100644 +index 9bb7fffcc1ae..3e1e24aa69f5 100644 --- a/Source/WTF/wtf/PageBlock.h +++ b/Source/WTF/wtf/PageBlock.h -@@ -49,9 +49,9 @@ namespace WTF { +@@ -45,11 +45,11 @@ namespace WTF { + // On Linux, Power systems normally use 64 KiB pages. + // // Use 64 KiB for any unknown CPUs to be conservative. - #if OS(DARWIN) || PLATFORM(PLAYSTATION) +-#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) || (OS(LINUX) && CPU(ARM64)) ++#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) constexpr size_t CeilingOnPageSize = 16 * KB; --#elif USE(64KB_PAGE_BLOCK) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) -+#elif USE(64KB_PAGE_BLOCK) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64) +-#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) ++#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64) constexpr size_t CeilingOnPageSize = 64 * KB; --#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) -+#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) +-#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64) ++#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64) constexpr size_t CeilingOnPageSize = 4 * KB; #else #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture! diff --git a/SOURCES/evolution-shared-secondary-process.patch b/SOURCES/evolution-shared-secondary-process.patch index 07cf31d..22c2d00 100644 --- a/SOURCES/evolution-shared-secondary-process.patch +++ b/SOURCES/evolution-shared-secondary-process.patch @@ -1,10 +1,10 @@ diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index 6dd9f20e4ff2..995f355f6ee3 100644 +index bd2d4d20206f..0fe471bde384 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -@@ -400,6 +400,9 @@ static void webkitWebContextConstructed(GObject* object) - #endif - #endif +@@ -415,6 +415,9 @@ static void webkitWebContextConstructed(GObject* object) + g_clear_pointer(&priv->memoryPressureSettings, webkit_memory_pressure_settings_free); + } + if (!g_strcmp0(g_get_prgname(), "evolution")) + configuration.setUsesSingleWebProcess(true); diff --git a/SOURCES/webkitgtk-2.34.6.tar.xz.asc b/SOURCES/webkitgtk-2.34.6.tar.xz.asc new file mode 100644 index 0000000..0d86d8f --- /dev/null +++ b/SOURCES/webkitgtk-2.34.6.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYg5JzQAKCRCRxVnb5MkS +O2fTAJ0bM+z81IRILK3jrBeY2FvVF9XMgACffrCY/lTW8tvkhMt+xNQvn5aPLO4= +=duRI +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index de8500c..d113401 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -11,13 +11,18 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.32.3 -Release: 2%{?dist} +Version: 2.34.6 +Release: 1%{?dist} Summary: GTK Web content engine library License: LGPLv2 URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz +Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc +# Use the keys from https://webkitgtk.org/verifying.html +# $ gpg --import aperez.key carlosgc.key +# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg +Source2: webkitgtk-keys.gpg # https://bugs.webkit.org/show_bug.cgi?id=193749 Patch0: evolution-shared-secondary-process.patch @@ -26,11 +31,7 @@ Patch0: evolution-shared-secondary-process.patch # https://bugs.webkit.org/show_bug.cgi?id=227905 Patch1: aarch64-page-size.patch -# https://bugs.webkit.org/show_bug.cgi?id=229375 -Patch2: CVE-2021-30858.patch - BuildRequires: bison -BuildRequires: bubblewrap BuildRequires: cmake BuildRequires: flex BuildRequires: gcc-c++ @@ -48,7 +49,6 @@ BuildRequires: python3 BuildRequires: ruby BuildRequires: rubygem-json BuildRequires: rubygems -#BuildRequires: xdg-dbus-proxy BuildRequires: pkgconfig(atspi-2) BuildRequires: pkgconfig(cairo) @@ -64,14 +64,13 @@ BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glesv2) -BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) -BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libnotify) @@ -82,6 +81,7 @@ BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libtasn1) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwoff2dec) BuildRequires: pkgconfig(libxslt) @@ -89,12 +89,17 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xt) # If Geoclue is not running, the geolocation API will not work. Recommends: geoclue2 +# Needed for various GStreamer elements. +Recommends: gstreamer1-plugins-bad-free +Recommends: gstreamer1-plugins-good + # Obsolete libwebkit2gtk from the webkitgtk3 package Obsoletes: libwebkit2gtk < 2.5.0 Provides: libwebkit2gtk = %{version}-%{release} @@ -169,6 +174,7 @@ The %{name}-jsc-devel package contains libraries, build data, and header files for developing applications that use JavaScript engine from %{name}. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n webkitgtk-%{version} -S git # Remove bundled libraries @@ -202,6 +208,7 @@ pushd %{_target_platform} -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ + -DUSE_SOUP2=ON \ %if %{with docs} -DENABLE_GTKDOC=ON \ %endif @@ -292,9 +299,22 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog -* Tue Sep 28 2021 Michael Catanzaro - 2.32.3-2 -- Fix CVE-2021-30858 -- Resolves: #2006428 +* Thu Feb 17 2022 Michael Catanzaro - 2.34.6-1 +- Update to 2.34.6 + Related: #1985042 + +* Wed Feb 09 2022 Michael Catanzaro - 2.34.5-1 +- Update to 2.34.5 +- Related: #1985042 + +* Fri Jan 21 2022 Michael Catanzaro - 2.34.4-1 +- Update to 2.34.4 +- Resolves: #1985042 + +* Tue Sep 28 2021 Michael Catanzaro - 2.32.4-1 +- Update to 2.32.4 +- Related: #1985042 +- Resolves: #2006429 * Fri Jul 23 2021 Michael Catanzaro - 2.32.3-1 - Update to 2.32.3