mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 08:03:51 +02:00
qt5-webengine: boop
just like with chromium, add a time64 patch from debian to fix sandbox with glibc 2.32
This commit is contained in:
parent
ec3d2e3389
commit
80e6aa02bf
2 changed files with 90 additions and 1 deletions
89
srcpkgs/qt5-webengine/patches/0114-time64.patch
Normal file
89
srcpkgs/qt5-webengine/patches/0114-time64.patch
Normal file
|
@ -0,0 +1,89 @@
|
||||||
|
Description: fix seccomp-bpf failures in syscalls 0403, 0407
|
||||||
|
glibc ≥ 2.31 uses these syscalls on 32-bit platforms:
|
||||||
|
.
|
||||||
|
- https://sourceware.org/git/?p=glibc.git;a=commit;h=2e44b10b42d68d98
|
||||||
|
- https://sourceware.org/git/?p=glibc.git;a=commit;h=ec138c67cbda8b58
|
||||||
|
Author: Andreas Müller <schnitzeltony@gmail.com>
|
||||||
|
Forwarded: no
|
||||||
|
Last-Update: 2020-09-02
|
||||||
|
|
||||||
|
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||||
|
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||||
|
@@ -148,7 +148,14 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||||
|
return Allow();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
|
||||||
|
+ if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep
|
||||||
|
+#if defined(__NR_clock_gettime64)
|
||||||
|
+ || sysno == __NR_clock_gettime64
|
||||||
|
+#endif
|
||||||
|
+#if defined(__NR_clock_nanosleep_time64)
|
||||||
|
+ || sysno == __NR_clock_nanosleep_time64
|
||||||
|
+#endif
|
||||||
|
+ ) {
|
||||||
|
return RestrictClockID();
|
||||||
|
}
|
||||||
|
|
||||||
|
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
|
||||||
|
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
|
||||||
|
@@ -60,6 +60,12 @@ class RestrictClockIdPolicy : public bpf
|
||||||
|
case __NR_clock_gettime:
|
||||||
|
case __NR_clock_getres:
|
||||||
|
case __NR_clock_nanosleep:
|
||||||
|
+#if defined(__NR_clock_nanosleep_time64)
|
||||||
|
+ case __NR_clock_nanosleep_time64:
|
||||||
|
+#endif
|
||||||
|
+#if defined(__NR_clock_gettime64)
|
||||||
|
+ case __NR_clock_gettime64:
|
||||||
|
+#endif
|
||||||
|
return RestrictClockID();
|
||||||
|
default:
|
||||||
|
return Allow();
|
||||||
|
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
@@ -39,6 +39,12 @@ bool SyscallSets::IsAllowedGettime(int s
|
||||||
|
// filtered by RestrictClokID().
|
||||||
|
case __NR_clock_gettime: // Parameters filtered by RestrictClockID().
|
||||||
|
case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID().
|
||||||
|
+#if defined(__NR_clock_gettime64)
|
||||||
|
+ case __NR_clock_gettime64: // Parameters filtered by RestrictClockID().
|
||||||
|
+#endif
|
||||||
|
+#if defined(__NR_clock_nanosleep_time64)
|
||||||
|
+ case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID().
|
||||||
|
+#endif
|
||||||
|
case __NR_clock_settime: // Privileged.
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||||
|
+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||||
|
@@ -1385,6 +1385,14 @@
|
||||||
|
#define __NR_memfd_create (__NR_SYSCALL_BASE+385)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if !defined(__NR_clock_gettime64)
|
||||||
|
+#define __NR_clock_gettime64 (__NR_SYSCALL_BASE+403)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if !defined(__NR_clock_nanosleep_time64)
|
||||||
|
+#define __NR_clock_nanosleep_time64 (__NR_SYSCALL_BASE+407)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
// ARM private syscalls.
|
||||||
|
#if !defined(__ARM_NR_BASE)
|
||||||
|
#define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
|
||||||
|
--- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
|
||||||
|
+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
|
||||||
|
@@ -1433,4 +1433,12 @@
|
||||||
|
#define __NR_memfd_create (__NR_Linux + 354)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if !defined(__NR_clock_gettime64)
|
||||||
|
+#define __NR_clock_gettime64 (__NR_Linux + 403)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if !defined(__NR_clock_nanosleep_time64)
|
||||||
|
+#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'qt5-webengine'
|
# Template file for 'qt5-webengine'
|
||||||
pkgname=qt5-webengine
|
pkgname=qt5-webengine
|
||||||
version=5.15.2
|
version=5.15.2
|
||||||
revision=1
|
revision=2
|
||||||
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
|
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
|
||||||
wrksrc="qtwebengine-everywhere-src-${version}"
|
wrksrc="qtwebengine-everywhere-src-${version}"
|
||||||
build_style=qmake
|
build_style=qmake
|
||||||
|
|
Loading…
Add table
Reference in a new issue