commit:     030898ec7dfd200a15c25027787ccb588627e031
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 13 19:42:19 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 19:49:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030898ec

dev-qt/qtwebengine: import glibc-2.41 crash fix from chromium

qtwebengine appears affected as well, reproduced the crash on
imgur's main page by scrolling in qutebrowser. Haven't tested
the patch myself but it appears to works fine for qtwebengine
according to Chiitoo.

Bug: https://bugs.gentoo.org/949654
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/qtwebengine-6.8.2-glibc2.41.patch          | 20 ++++++++++++++++++++
 ...gine-6.8.2.ebuild => qtwebengine-6.8.2-r1.ebuild} |  1 +
 2 files changed, 21 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.2-glibc2.41.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.8.2-glibc2.41.patch
new file mode 100644
index 000000000000..85288a94a6a0
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.2-glibc2.41.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/949654
+
+Quick downstream fix for now. Hasn't been sent to upstream(s) yet
+as of the writing of this, but believe it should happen soon.
+
+From 6c7a3a3a733cf33e9355f497815700e5e26e7c3d Mon Sep 17 00:00:00 2001
+From: Mike Lothian <[email protected]>
+Date: Wed, 12 Feb 2025 13:52:01 +0000
+Subject: [PATCH] Test fix
+--- 
a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ 
b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -238,7 +238,7 @@ ResultExpr RestrictMmapFlags() {
+   // TODO(davidung), remove MAP_DENYWRITE with updated Tegra libraries.
+   const uint64_t kAllowedMask = MAP_SHARED | MAP_PRIVATE | MAP_ANONYMOUS |
+                                 MAP_STACK | MAP_NORESERVE | MAP_FIXED |
+-                                MAP_DENYWRITE | MAP_LOCKED |
++                                MAP_DENYWRITE | MAP_LOCKED | MAP_DROPPABLE |
+                                 kArchSpecificAllowedMask;
+   const Arg<int> flags(3);
+   return If((flags & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS());

diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.2.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild
similarity index 99%
rename from dev-qt/qtwebengine/qtwebengine-6.8.2.ebuild
rename to dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild
index 0988f8bb29d5..5953fdc5e01c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.2-r1.ebuild
@@ -110,6 +110,7 @@ PATCHES+=(
        # add extras as needed here, may merge in set if carries across versions
        "${FILESDIR}"/${PN}-6.8.1-aarch64-xnnpack.patch
        "${FILESDIR}"/${PN}-6.8.1-cstdint.patch
+       "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch
 )
 
 python_check_deps() {

Reply via email to