[neon/qt/qtwebengine/Neon/release] debian: Remove __NR_statx part from sandbox-time64-syscalls.patch.

Dmitry Shachnev null at kde.org
Mon Jan 9 14:26:51 GMT 2023


Git commit 10494e5fa4e1fb64fcd83907fc7e32ec7f796e53 by Dmitry Shachnev.
Committed on 25/11/2022 at 17:14.
Pushed by jriddell into branch 'Neon/release'.

Remove __NR_statx part from sandbox-time64-syscalls.patch.

A similar change was applied upstream in commit a7a23ccc69e6756e.

M  +2    -0    debian/changelog
M  +4    -22   debian/patches/sandbox-time64-syscalls.patch

https://invent.kde.org/neon/qt/qtwebengine/commit/10494e5fa4e1fb64fcd83907fc7e32ec7f796e53

diff --git a/debian/changelog b/debian/changelog
index 98b1269..1f11cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtwebengine-opensource-src (5.15.11+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update SUBMODULE_COMMIT for the new release.
   * Bump ABI version to qtwebengine-abi-5-15-11.
+  * Remove __NR_statx part from sandbox-time64-syscalls.patch.
+    A similar change was applied upstream in commit a7a23ccc69e6756e.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Nov 2022 19:50:58 +0300
 
diff --git a/debian/patches/sandbox-time64-syscalls.patch b/debian/patches/sandbox-time64-syscalls.patch
index 3e54e1a..092fb37 100644
--- a/debian/patches/sandbox-time64-syscalls.patch
+++ b/debian/patches/sandbox-time64-syscalls.patch
@@ -1,14 +1,9 @@
-Description: fix seccomp-bpf failures in syscalls 383 and 422
- glibc 2.33 and newer uses these syscalls on 32-bit platforms:
- .
- - syscall 383 = statx, used by glibc' __fstatat64_time64 function;
-   return -ENOSYS to trigger the fallback in glibc
-   https://sourceware.org/git/?p=glibc.git;a=commit;h=aa03f722f3b994aa
- - syscall 422 = futex_time64
-   https://sourceware.org/git/?p=glibc.git;a=commit;h=29e9874a048f47e2
+Description: fix seccomp-bpf failures in syscall 422 (futex_time64)
+ glibc 2.33 and newer uses this syscall on 32-bit platforms:
+ https://sourceware.org/git/?p=glibc.git;a=commit;h=29e9874a048f47e2
 Author: Fabian Vogt <fabian at ritter-vogt.de>
 Forwarded: no
-Last-Update: 2021-11-21
+Last-Update: 2022-11-25
 
 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
 +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
@@ -24,16 +19,3 @@ Last-Update: 2021-11-21
    if (sysno == __NR_set_robust_list)
      return Error(EPERM);
  
-@@ -271,6 +276,12 @@ ResultExpr EvaluateSyscallImpl(int fs_de
-     return RewriteFstatatSIGSYS(fs_denied_errno);
-   }
- 
-+#if defined(__NR_statx)
-+  if (sysno == __NR_statx) {
-+    return Error(ENOSYS);
-+  }
-+#endif
-+
-   if (SyscallSets::IsFileSystem(sysno) ||
-       SyscallSets::IsCurrentDirectory(sysno)) {
-     return Error(fs_denied_errno);



More information about the Neon-commits mailing list