diff --git a/backport-CVE-2025-24201.patch b/backport-CVE-2025-24201.patch deleted file mode 100644 index cb69567ea31821060a6720724b26052582f88f50..0000000000000000000000000000000000000000 --- a/backport-CVE-2025-24201.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7d784721e440d04932945e2decb933720c4e0fc7 Mon Sep 17 00:00:00 2001 -From: Kimmo Kinnunen -Date: Wed, 12 Mar 2025 01:42:08 -0700 -Subject: [PATCH] WebGL context primitive restart can be toggled from - WebContent process https://bugs.webkit.org/show_bug.cgi?id=285858 - rdar://142693598 - -Reviewed by Cameron McCormack. - -Primitive restart is enabled for WebGL2 and disabled for WebGL 1 -contexts by default. There is no use-case for toggling it from -WCP. Do not pass enable/disable to ANGLE. - -* Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp: -(WebCore::GraphicsContextGLANGLE::disable): -(WebCore::GraphicsContextGLANGLE::enable): - -Originally-landed-as: b48791700366. rdar://146807693 -Canonical link: https://commits.webkit.org/292004@main ---- - .../graphics/angle/GraphicsContextGLANGLE.cpp | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp b/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp -index 55f23b3eb337b..bbe382cf413d1 100644 ---- a/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp -+++ b/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp -@@ -1187,7 +1187,11 @@ void GraphicsContextGLANGLE::disable(GCGLenum cap) - { - if (!makeContextCurrent()) - return; -- -+ if (cap == PRIMITIVE_RESTART_FIXED_INDEX) { -+ if (m_isForWebGL2) -+ addError(GCGLErrorCode::InvalidOperation); -+ return; -+ } - GL_Disable(cap); - } - -@@ -1221,7 +1225,11 @@ void GraphicsContextGLANGLE::enable(GCGLenum cap) - { - if (!makeContextCurrent()) - return; -- -+ if (cap == PRIMITIVE_RESTART_FIXED_INDEX) { -+ if (!m_isForWebGL2) -+ addError(GCGLErrorCode::InvalidOperation); -+ return; -+ } - GL_Enable(cap); - } - diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 549f5ebcde59571491ca59dfcfa79bbe973d8ee1..712a5c44cc2f0c942236d5a5a4d3553b82ccc06f 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -22,8 +22,8 @@ %bcond_with gamepad Name: webkit2gtk3 -Version: 2.46.6 -Release: 2 +Version: 2.48.1 +Release: 1 Summary: GTK web content engine library License: BSD-3-Clause AND LGPL-2.0-or-later URL: https://www.webkitgtk.org/ @@ -31,14 +31,13 @@ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch1000: webkitgtk-add-loongarch-and-sw.patch -Patch6000: backport-CVE-2025-24201.patch - #Dependency BuildRequires: bison BuildRequires: bubblewrap BuildRequires: clang BuildRequires: cmake BuildRequires: flex +BuildRequires: flite-devel >= 2.2 BuildRequires: gettext BuildRequires: gi-docgen BuildRequires: git @@ -64,6 +63,7 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(epoxy) +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gbm) @@ -289,6 +289,9 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0 %endif %changelog +* Thu Apr 03 2025 Funda Wang - 2.48.1-1 +- update to 2.48.1 + * Mon Mar 17 2025 lingsheng - 2.46.6-2 - fix CVE-2025-24201 diff --git a/webkit2gtk4_1.spec b/webkit2gtk4_1.spec index 92744edc305c9e109865977569afe236d5d29a92..ddb640dfb8f112ca08508b78f04ec6f01b539661 100644 --- a/webkit2gtk4_1.spec +++ b/webkit2gtk4_1.spec @@ -22,8 +22,8 @@ %bcond_with gamepad Name: webkit2gtk4.1 -Version: 2.46.6 -Release: 2 +Version: 2.48.1 +Release: 1 Summary: GTK web content engine library License: BSD-3-Clause AND LGPL-2.0-or-later URL: https://www.webkitgtk.org/ @@ -31,14 +31,13 @@ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch1000: webkitgtk-add-loongarch-and-sw.patch -Patch6000: backport-CVE-2025-24201.patch - #Dependency BuildRequires: bison BuildRequires: bubblewrap BuildRequires: clang BuildRequires: cmake BuildRequires: flex +BuildRequires: flite-devel >= 2.2 BuildRequires: gettext BuildRequires: gi-docgen BuildRequires: git @@ -64,6 +63,7 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(epoxy) +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gbm) @@ -260,6 +260,9 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1 %endif %changelog +* Thu Apr 03 2025 Funda Wang - 2.48.1-1 +- update to 2.48.1 + * Mon Mar 17 2025 lingsheng - 2.46.6-2 - fix CVE-2025-24201 diff --git a/webkitgtk-2.46.6.tar.xz b/webkitgtk-2.48.1.tar.xz similarity index 32% rename from webkitgtk-2.46.6.tar.xz rename to webkitgtk-2.48.1.tar.xz index e842c08b51246acb1b148b6793039b33b0758b06..52c4031c33bbc9e64a0052ec2b7601443e579228 100644 --- a/webkitgtk-2.46.6.tar.xz +++ b/webkitgtk-2.48.1.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2b31de693220ba9bab76ce6ddfe5b0bfab2515cb2b0a70f3c54d4050766c32b -size 42914744 +oid sha256:98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f +size 44168216 diff --git a/webkitgtk6_0.spec b/webkitgtk6_0.spec index 71bc2b190bec24736b1cbbd39521f0f843f82c23..5ee84311668cb4aad1eb9ef22ac9918baa92c0b9 100644 --- a/webkitgtk6_0.spec +++ b/webkitgtk6_0.spec @@ -22,8 +22,8 @@ %bcond_with gamepad Name: webkitgtk6.0 -Version: 2.46.6 -Release: 2 +Version: 2.48.1 +Release: 1 Summary: GTK web content engine library License: BSD-3-Clause AND LGPL-2.0-or-later URL: https://www.webkitgtk.org/ @@ -31,14 +31,13 @@ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch1000: webkitgtk-add-loongarch-and-sw.patch -Patch6000: backport-CVE-2025-24201.patch - #Dependency BuildRequires: bison BuildRequires: bubblewrap BuildRequires: clang BuildRequires: cmake BuildRequires: flex +BuildRequires: flite-devel >= 2.2 BuildRequires: gettext BuildRequires: gi-docgen BuildRequires: git @@ -64,6 +63,7 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(epoxy) +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gbm) @@ -262,6 +262,9 @@ files for developing applications that use JavaScript engine from webkitgtk-6.0. %endif %changelog +* Thu Apr 03 2025 Funda Wang - 2.48.1-1 +- update to 2.48.1 + * Mon Mar 17 2025 lingsheng - 2.46.6-2 - fix CVE-2025-24201