!157 [sync] PR-154: add sw_64 support for syscall_fork
From: @openeuler-sync-bot Reviewed-by: @weidongkl Signed-off-by: @weidongkl
This commit is contained in:
commit
3dbd0a52a1
25
add-sw_64-support-for-syscall_fork.patch
Normal file
25
add-sw_64-support-for-syscall_fork.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From d6ee5ecb7bb9225787490268e887fc42f75092de Mon Sep 17 00:00:00 2001
|
||||||
|
From: mahailiang <mahailiang@uniontech.com>
|
||||||
|
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
|
||||||
|
|
||||||
@ -36,7 +36,7 @@
|
|||||||
Name: qt5-qtbase
|
Name: qt5-qtbase
|
||||||
Summary: Qt5 - QtBase components
|
Summary: Qt5 - QtBase components
|
||||||
Version: 5.15.10
|
Version: 5.15.10
|
||||||
Release: 9
|
Release: 10
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||||
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||||
@ -135,6 +135,7 @@ Patch0028: fix-build-error-of-libxkbcommon-1.6.0.patch
|
|||||||
Patch0029: qtbase5.15-CVE-2023-51714.patch
|
Patch0029: qtbase5.15-CVE-2023-51714.patch
|
||||||
Patch0030: CVE-2024-25580-qtbase-5.15.diff
|
Patch0030: CVE-2024-25580-qtbase-5.15.diff
|
||||||
Patch0031: CVE-2023-45935.patch
|
Patch0031: CVE-2023-45935.patch
|
||||||
|
Patch0032: add-sw_64-support-for-syscall_fork.patch
|
||||||
|
|
||||||
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
||||||
# Those themes are there for platform integration. If the required libraries are
|
# Those themes are there for platform integration. If the required libraries are
|
||||||
@ -407,6 +408,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|||||||
%patch -P0029 -p1
|
%patch -P0029 -p1
|
||||||
%patch -P0030 -p1
|
%patch -P0030 -p1
|
||||||
%patch -P0031 -p1
|
%patch -P0031 -p1
|
||||||
|
%patch -P0032 -p1
|
||||||
|
|
||||||
# move some bundled libs to ensure they're not accidentally used
|
# move some bundled libs to ensure they're not accidentally used
|
||||||
pushd src/3rdparty
|
pushd src/3rdparty
|
||||||
@ -1065,6 +1067,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 06 2025 mahailiang <mahailiang@uniontech.com> - 5.15.10-10
|
||||||
|
- add sw_64 support for syscall_fork
|
||||||
|
|
||||||
* Wed Apr 24 2024 lvfei <lvfei@kylinos.cn> - 5.15.10-9
|
* Wed Apr 24 2024 lvfei <lvfei@kylinos.cn> - 5.15.10-9
|
||||||
- add CVE-2023-45935.patch
|
- add CVE-2023-45935.patch
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user