From 678ad1f08a719b2554ea446dc2384fd54946e412 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 15 Mar 2021 15:41:07 -0400 Subject: [PATCH] add support for futex_time64 --- ...um-89.0.4389.82-support-futex_time64.patch | 29 +++++++++++++++++++ chromium.spec | 10 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 chromium-89.0.4389.82-support-futex_time64.patch diff --git a/chromium-89.0.4389.82-support-futex_time64.patch b/chromium-89.0.4389.82-support-futex_time64.patch new file mode 100644 index 00000000..7103cf37 --- /dev/null +++ b/chromium-89.0.4389.82-support-futex_time64.patch @@ -0,0 +1,29 @@ +diff -up chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.futex-time64 chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +--- chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.futex-time64 2021-03-15 15:31:09.440719811 -0400 ++++ chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-03-15 15:33:27.494393985 -0400 +@@ -191,7 +191,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de + } + #endif + +- if (sysno == __NR_futex) ++ if (sysno == __NR_futex ++#if defined(__NR_futex_time64) ++ || sysno == __NR_futex_time64 ++#endif ++ ) + return RestrictFutex(); + + if (sysno == __NR_set_robust_list) +diff -up chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.futex-time64 chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +--- chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.futex-time64 2021-03-15 15:33:45.018479568 -0400 ++++ chromium-89.0.4389.82/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2021-03-15 15:34:55.002821350 -0400 +@@ -420,6 +420,9 @@ bool SyscallSets::IsAllowedFutex(int sys + case __NR_get_robust_list: + case __NR_set_robust_list: + case __NR_futex: ++#if defined(__NR_futex_time64) ++ case __NR_futex_time64: ++#endif + default: + return false; + } diff --git a/chromium.spec b/chromium.spec index 8ba094e5..fee8bf7e 100644 --- a/chromium.spec +++ b/chromium.spec @@ -216,7 +216,7 @@ Name: chromium%{chromium_channel}%{nsuffix} Name: chromium%{chromium_channel} %endif Version: %{majorversion}.0.4389.82 -Release: 1%{?dist} +Release: 2%{?dist} %if %{?freeworld} %if %{?shared} # chromium-libs-media-freeworld @@ -301,6 +301,10 @@ Patch75: chromium-88.0.4324.96-fstatfix.patch Patch76: chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch # Fix symbol visibility with gcc on swiftshader's libEGL Patch77: chromium-88.0.4324.182-gcc-fix-swiftshader-libEGL-visibility.patch +# Include support for futex_time64 (64bit time on 32bit platforms) +# https://chromium.googlesource.com/chromium/src/+/955a586c63c4f99fb734e44221db63f5b2ca25a9%5E%21/#F0 +Patch78: chromium-89.0.4389.82-support-futex_time64.patch + # Use lstdc++ on EPEL7 only Patch101: chromium-75.0.3770.100-epel7-stdc++.patch @@ -923,6 +927,7 @@ udev. %patch76 -p1 -b .sigstkszfix %endif %patch77 -p1 -b .gcc-swiftshader-visibility +%patch78 -p1 -b .futex-time64 # Fedora branded user agent %if 0%{?fedora} @@ -1960,6 +1965,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Mon Mar 15 2021 Tom Callaway - 89.0.4389.82-2 +- add support for futex_time64 + * Mon Mar 8 2021 Tom Callaway - 89.0.4389.82-1 - update to 89.0.4389.82