From 077d7da9fec6c428a318f5a9185d0b4e7b4c5e50e158f9dde5dc84e42aae1118 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 9 Apr 2020 08:27:52 +0000 Subject: [PATCH] Accepting request 792651 from home:bmwiedemann:branches:openSUSE:Factory Add fix1163766.patch to fix opensuse-welcome on i686 (boo#1163766) helps to make openQA greener. more testing wanted OBS-URL: https://build.opensuse.org/request/show/792651 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtwebengine?expand=0&rev=14 --- fix1163766.patch | 56 ++++++++++++++++++++++++++++++++++++++ libqt5-qtwebengine.changes | 5 ++++ libqt5-qtwebengine.spec | 1 + 3 files changed, 62 insertions(+) create mode 100644 fix1163766.patch diff --git a/fix1163766.patch b/fix1163766.patch new file mode 100644 index 0000000..c7ea384 --- /dev/null +++ b/fix1163766.patch @@ -0,0 +1,56 @@ +Author Bernhard M. Wiedemann +Date: 2020-04-07 + +https://bugzilla.opensuse.org/show_bug.cgi?id=1163766 + +seccomp filters disallow a new kernel syscall to get time +used on i586 + +Index: qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h +=================================================================== +--- qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h ++++ qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h +@@ -1422,5 +1422,13 @@ + #define __NR_memfd_create 356 + #endif + ++#if !defined(__NR_clock_gettime64) ++#define __NR_clock_gettime64 403 ++#endif ++ ++#if !defined(__NR_clock_nanosleep_time64) ++#define __NR_clock_nanosleep_time64 407 ++#endif ++ + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_ + +Index: qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +=================================================================== +--- qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ++++ qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +@@ -151,6 +151,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de + if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) { + return RestrictClockID(); + } ++#if defined(__NR_clock_gettime64) ++ if (sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep_time64) { ++ return RestrictClockID(); ++ } ++#endif + + if (sysno == __NR_clone) { + return RestrictCloneToThreadsAndEPERMFork(); +Index: qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_ime_policy_linux.cc +=================================================================== +--- qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_ime_policy_linux.cc ++++ qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_ime_policy_linux.cc +@@ -30,6 +30,9 @@ ResultExpr ImeProcessPolicy::EvaluateSys + #if defined(__NR_clock_gettime) + case __NR_clock_gettime: + #endif ++#if defined(__NR_clock_gettime64) ++ case __NR_clock_gettime64: ++#endif + return Allow(); + default: + auto* broker_process = SandboxLinux::GetInstance()->broker_process(); diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index f58afc1..6c86e2d 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 9 08:21:02 UTC 2020 - Bernhard Wiedemann + +- Add fix1163766.patch to fix opensuse-welcome on i686 (boo#1163766) + ------------------------------------------------------------------- Mon Mar 30 13:49:40 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 17c0279..c3bc4af 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -76,6 +76,7 @@ Patch4: QTBUG-81574.patch Patch5: QTBUG-82186.patch # PATCH-FIX-OPENSUSE Patch6: some-more-includes-gcc10.patch +Patch7: fix1163766.patch # http://www.chromium.org/blink not ported to PowerPC ExcludeArch: ppc ppc64 ppc64le s390 s390x # Try to fix i586 MemoryErrors with rpmlint