From 29bdf33a69190c02be4277f43258ea251ff1ec40 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Thu, 17 Jun 2021 23:11:07 +0200
Subject: [PATCH] Revert (partially) "v89.0.1-1"

This partially reverts commit d47b22240106bb47326506a395570879cc32a6de.

The removed patch is still very much needed.
---
 .../sandbox-update-arm-syscall-numbers.patch  | 144 ++++++++++++++++++
 scripts/3_Configure_Source_Code.sh            |   1 +
 2 files changed, 145 insertions(+)
 create mode 100644 deb_patches/sandbox-update-arm-syscall-numbers.patch

diff --git a/deb_patches/sandbox-update-arm-syscall-numbers.patch b/deb_patches/sandbox-update-arm-syscall-numbers.patch
new file mode 100644
index 0000000..b6cf3bb
--- /dev/null
+++ b/deb_patches/sandbox-update-arm-syscall-numbers.patch
@@ -0,0 +1,144 @@
+From 05971bd227dc6c359657d1501711e6865e9430f9 Mon Sep 17 00:00:00 2001
+From: Matthew Denton <mpdenton@chromium.org>
+Date: Tue, 28 Jul 2020 00:29:01 +0000
+Subject: [PATCH] Linux sandbox: update arm syscall numbers
+
+Change-Id: Ia2c39a86fb3516040a74de963115e73b7b1a1e0c
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2318316
+Reviewed-by: Robert Sesek <rsesek@chromium.org>
+Commit-Queue: Matthew Denton <mpdenton@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#792090}
+---
+
+diff --git a/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h b/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+index 59d0eab8..a242c18c 100644
+--- a/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
++++ b/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
+@@ -1063,4 +1063,60 @@
+ #define __NR_memfd_create 279
+ #endif
+ 
++#if !defined(__NR_bpf)
++#define __NR_bpf 280
++#endif
++
++#if !defined(__NR_execveat)
++#define __NR_execveat 281
++#endif
++
++#if !defined(__NR_userfaultfd)
++#define __NR_userfaultfd 282
++#endif
++
++#if !defined(__NR_membarrier)
++#define __NR_membarrier 283
++#endif
++
++#if !defined(__NR_mlock2)
++#define __NR_mlock2 284
++#endif
++
++#if !defined(__NR_copy_file_range)
++#define __NR_copy_file_range 285
++#endif
++
++#if !defined(__NR_preadv2)
++#define __NR_preadv2 286
++#endif
++
++#if !defined(__NR_pwritev2)
++#define __NR_pwritev2 287
++#endif
++
++#if !defined(__NR_pkey_mprotect)
++#define __NR_pkey_mprotect 288
++#endif
++
++#if !defined(__NR_pkey_alloc)
++#define __NR_pkey_alloc 289
++#endif
++
++#if !defined(__NR_pkey_free)
++#define __NR_pkey_free 290
++#endif
++
++#if !defined(__NR_statx)
++#define __NR_statx 291
++#endif
++
++#if !defined(__NR_io_pgetevents)
++#define __NR_io_pgetevents 292
++#endif
++
++#if !defined(__NR_rseq)
++#define __NR_rseq 293
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
+diff --git a/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+index 1addd53..85e2110b 100644
+--- a/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
++++ b/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+@@ -1385,6 +1385,62 @@
+ #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
+ #endif
+ 
++#if !defined(__NR_bpf)
++#define __NR_bpf (__NR_SYSCALL_BASE+386)
++#endif
++
++#if !defined(__NR_execveat)
++#define __NR_execveat (__NR_SYSCALL_BASE+387)
++#endif
++
++#if !defined(__NR_userfaultfd)
++#define __NR_userfaultfd (__NR_SYSCALL_BASE+388)
++#endif
++
++#if !defined(__NR_membarrier)
++#define __NR_membarrier (__NR_SYSCALL_BASE+389)
++#endif
++
++#if !defined(__NR_mlock2)
++#define __NR_mlock2 (__NR_SYSCALL_BASE+390)
++#endif
++
++#if !defined(__NR_copy_file_range)
++#define __NR_copy_file_range (__NR_SYSCALL_BASE+391)
++#endif
++
++#if !defined(__NR_preadv2)
++#define __NR_preadv2 (__NR_SYSCALL_BASE+392)
++#endif
++
++#if !defined(__NR_pwritev2)
++#define __NR_pwritev2 (__NR_SYSCALL_BASE+393)
++#endif
++
++#if !defined(__NR_pkey_mprotect)
++#define __NR_pkey_mprotect (__NR_SYSCALL_BASE+394)
++#endif
++
++#if !defined(__NR_pkey_alloc)
++#define __NR_pkey_alloc (__NR_SYSCALL_BASE+395)
++#endif
++
++#if !defined(__NR_pkey_free)
++#define __NR_pkey_free (__NR_SYSCALL_BASE+396)
++#endif
++
++#if !defined(__NR_statx)
++#define __NR_statx (__NR_SYSCALL_BASE+397)
++#endif
++
++#if !defined(__NR_rseq)
++#define __NR_rseq (__NR_SYSCALL_BASE+398)
++#endif
++
++#if !defined(__NR_io_pgetevents)
++#define __NR_io_pgetevents (__NR_SYSCALL_BASE+399)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh
index 4067154..e4fb7df 100755
--- a/scripts/3_Configure_Source_Code.sh
+++ b/scripts/3_Configure_Source_Code.sh
@@ -127,6 +127,7 @@ patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/webrtc-fix-compiler-flags-for-armhf
 patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/reduce-rust-debuginfo.patch"
 patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/relax-cargo-dep.patch"
 patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch"
+patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/sandbox-update-arm-syscall-numbers.patch"
 
 # Remove some pre-installed addons that might be questionable
 patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch