From 2e3f56462d694628019b01696997611c7245797b Mon Sep 17 00:00:00 2001 From: Hailiang Date: Thu, 6 Mar 2025 13:57:37 +0800 Subject: [PATCH] add sw_64 support for syscall_fork (cherry picked from commit ac0a95bd9f7016a85097b758f71221a99399f1a7) --- add-sw_64-support-for-syscall_fork.patch | 25 ++++++++++++++++++++++++ qt5-qtbase.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 add-sw_64-support-for-syscall_fork.patch diff --git a/add-sw_64-support-for-syscall_fork.patch b/add-sw_64-support-for-syscall_fork.patch new file mode 100644 index 0000000..a4d029d --- /dev/null +++ b/add-sw_64-support-for-syscall_fork.patch @@ -0,0 +1,25 @@ +From d6ee5ecb7bb9225787490268e887fc42f75092de Mon Sep 17 00:00:00 2001 +From: mahailiang +Date: Thu, 31 Oct 2024 22:06:16 +0800 +Subject: [PATCH] add-sw_64-support-for-syscall_fork + +--- + src/3rdparty/forkfd/forkfd_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/forkfd/forkfd_linux.c b/src/3rdparty/forkfd/forkfd_linux.c +index b1f5408d..642c007b 100644 +--- a/src/3rdparty/forkfd/forkfd_linux.c ++++ b/src/3rdparty/forkfd/forkfd_linux.c +@@ -83,7 +83,7 @@ static int sys_clone(unsigned long cloneflags, int *ptid) + #elif defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ + defined(__nds32__) || defined(__hppa__) || defined(__powerpc__) || defined(__i386__) || \ + defined(__x86_64__) || defined(__xtensa__) || defined(__alpha__) || defined(__riscv) || \ +- defined(__loongarch__) ++ defined(__loongarch__) || defined(__sw_64__) + /* ctid and newtls are inverted on CONFIG_CLONE_BACKWARDS architectures, + * but since both values are 0, there's no harm. */ + return syscall(__NR_clone, cloneflags, child_stack, ptid, ctid, newtls); +-- +2.20.1 + diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 9043183..a8aba56 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -36,7 +36,7 @@ Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.15.10 -Release: 10 +Release: 11 # See LGPL_EXCEPTIONS.txt, for exception details License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -136,6 +136,7 @@ Patch0029: qtbase5.15-CVE-2023-51714.patch Patch0030: CVE-2024-25580-qtbase-5.15.diff Patch0031: CVE-2023-45935.patch Patch0032: CVE-2024-39936.patch +Patch0033: add-sw_64-support-for-syscall_fork.patch # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Those themes are there for platform integration. If the required libraries are @@ -409,6 +410,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. %patch -P0030 -p1 %patch -P0031 -p1 %patch -P0032 -p1 +%patch -P0033 -p1 # move some bundled libs to ensure they're not accidentally used pushd src/3rdparty @@ -1067,6 +1069,9 @@ fi %changelog +* Thu Mar 06 2025 mahailiang - 5.15.10-11 +- add sw_64 support for syscall_fork + * Tue Dec 10 2024 ZhaoYu Jiang - 5.15.10-10 - add CVE-2024-39936.patch -- Gitee