From ae0be165a7b409c3090360955fcd1b4ae6cd5987 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 11 Apr 2019 11:15:59 -0400 Subject: [PATCH] update to 73.0.3683.103, add CLONE_VFORK to seccomp filter for linux to handle glibc 2.29 change --- .gitignore | 1 + chromium-73.0.3683.86-glibc-2.29-clone-vfork.patch | 13 +++++++++++++ chromium.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 chromium-73.0.3683.86-glibc-2.29-clone-vfork.patch diff --git a/.gitignore b/.gitignore index c2058f9a..ad17be0e 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ /chromium-72.0.3626.121-clean.tar.xz /chromium-73.0.3683.75-clean.tar.xz /chromium-73.0.3683.86-clean.tar.xz +/chromium-73.0.3683.103-clean.tar.xz diff --git a/chromium-73.0.3683.86-glibc-2.29-clone-vfork.patch b/chromium-73.0.3683.86-glibc-2.29-clone-vfork.patch new file mode 100644 index 00000000..752090a8 --- /dev/null +++ b/chromium-73.0.3683.86-glibc-2.29-clone-vfork.patch @@ -0,0 +1,13 @@ +diff -up chromium-73.0.3683.86/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.clonevfork chromium-73.0.3683.86/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +--- chromium-73.0.3683.86/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.clonevfork 2019-04-11 10:22:21.250929060 -0400 ++++ chromium-73.0.3683.86/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2019-04-11 10:23:58.832770803 -0400 +@@ -146,7 +146,8 @@ ResultExpr RestrictCloneToThreadsAndEPER + + const uint64_t kGlibcPthreadFlags = + CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | +- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID; ++ CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | ++ CLONE_CHILD_CLEARTID | CLONE_VFORK; + const BoolExpr glibc_test = flags == kGlibcPthreadFlags; + + const BoolExpr android_test = diff --git a/chromium.spec b/chromium.spec index 25c9b0c0..dbc5a569 100644 --- a/chromium.spec +++ b/chromium.spec @@ -161,8 +161,8 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.3683.86 -Release: 2%{?dist} +Version: %{majorversion}.0.3683.103 +Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser Url: http://www.chromium.org/Home License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) @@ -328,6 +328,8 @@ Patch137: chromium-73.0.3683.75-no-header-hygiene.patch Patch138: chromium-73.0.3683.75-aarch64-crashpad-limits.patch # el7 only patch Patch139: chromium-73.0.3683.75-el7-fix-noexcept.patch +# https://bugs.chromium.org/p/chromium/issues/detail?id=949312 +Patch140: chromium-73.0.3683.86-glibc-2.29-clone-vfork.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -910,6 +912,7 @@ udev. %if 0%{?rhel} == 7 %patch139 -p1 -b .el7-noexcept %endif +%patch140 -p1 -b .clonevfork # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works @@ -1898,6 +1901,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Thu Apr 11 2019 Tom Callaway - 73.0.3683.103-1 +- update to 73.0.3683.103 +- add CLONE_VFORK to seccomp filter for linux to handle glibc 2.29 change + * Wed Mar 27 2019 Tom Callaway - 73.0.3683.86-2 - remove lang macro from en-US.pak* because Chromium crashes if it is not present (bz1692660) diff --git a/sources b/sources index 43b333f1..ad9a0eec 100644 --- a/sources +++ b/sources @@ -17,4 +17,4 @@ SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0 SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd SHA512 (node-v8.9.1-linux-x64.tar.gz) = a707fd4567041c56e7f9d415e505e3fa650627f31def7fefdd7ec50f9e7066bb33332b67f479e1159d85e1105a7e6d034aad7429f4f3d034c9161170d7e0b844 -SHA512 (chromium-73.0.3683.86-clean.tar.xz) = 0bdd96420814dbd9b14385abc529ef69f8565a9277e118bade44c43bc0d8024b496db23b1385684744b5931565b6a1baf8cb13bfa7e609a20408238c302bf3c2 +SHA512 (chromium-73.0.3683.103-clean.tar.xz) = 73d43cc50586f4313994711ec45ddfe6b5780d13dff9004522c596035d2b75b197de0cdeab70c4c69da18846a3cd1ec6b5a264a8015eb46e4ce42db7b5ca793a