From 40e9dfd0b07c55c82626436e74981c7c144b7785 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 3 Sep 2021 14:07:40 -0500 Subject: [PATCH] 5.15.6 --- .gitignore | 1 + qt5-qtwebengine.spec | 11 +++++++++-- qtwebengine-everywhere-src-5.15.6-clone3.patch | 16 ++++++++++++++++ qtwebengine-release.sh | 6 +++--- sources | 2 +- 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 qtwebengine-everywhere-src-5.15.6-clone3.patch diff --git a/.gitignore b/.gitignore index 6226724..d9f03a1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /qtwebengine-everywhere-src-5.15.1-clean.tar.xz /qtwebengine-everywhere-src-5.15.2-clean.tar.xz /qtwebengine-everywhere-src-5.15.5-clean.tar.xz +/qtwebengine-everywhere-src-5.15.6-clean.tar.xz diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 78efcc3..6f764b1 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -52,8 +52,8 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine -Version: 5.15.5 -Release: 3%{?dist} +Version: 5.15.6 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -108,6 +108,9 @@ Patch29: qtwebengine-everywhere-src-5.15.5-sandbox-time64-syscalls.patch Patch30: qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch # FTBFS TRUE/FALSE undeclared Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch +# Issue 1213452: Sandbox doesn't work with clone3 +# https://bugs.chromium.org/p/chromium/issues/detail?id=1213452 +Patch32: qtwebengine-everywhere-src-5.15.6-clone3.patch ## Upstream patches: @@ -416,6 +419,7 @@ popd %patch29 -p1 -b .sandbox-time64-syscalls %patch30 -p1 -b .SIGSTKSZ %patch31 -p1 -b .TRUE +%patch32 -p1 -b .clone3 # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS @@ -627,6 +631,9 @@ done %changelog +* Fri Sep 03 2021 Rex Dieter - 5.15.6-1 +- 5.15.6 + * Thu Aug 12 2021 Troy Dawson - 5.15.5-3 - Fix use-python2.patch diff --git a/qtwebengine-everywhere-src-5.15.6-clone3.patch b/qtwebengine-everywhere-src-5.15.6-clone3.patch new file mode 100644 index 0000000..a89a363 --- /dev/null +++ b/qtwebengine-everywhere-src-5.15.6-clone3.patch @@ -0,0 +1,16 @@ +diff -up qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.1213452 qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +--- qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.1213452 2021-09-03 10:35:33.069779845 -0500 ++++ qtwebengine-everywhere-src-5.15.6/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-09-03 10:36:43.891325411 -0500 +@@ -172,6 +172,12 @@ ResultExpr EvaluateSyscallImpl(int fs_de + return RestrictCloneToThreadsAndEPERMFork(); + } + ++ // clone3 takes a pointer argument which we cannot examine, so return ENOSYS ++ // to force the libc to use clone. See https://crbug.com/1213452. ++ if (sysno == __NR_clone3) { ++ return Error(ENOSYS); ++ } ++ + if (sysno == __NR_fcntl) + return RestrictFcntlCommands(); + diff --git a/qtwebengine-release.sh b/qtwebengine-release.sh index e5402d3..027cfc8 100644 --- a/qtwebengine-release.sh +++ b/qtwebengine-release.sh @@ -1,6 +1,6 @@ #!/bin/sh set -x -VERSION=5.15.5 +VERSION=5.15.6 CHROMIUMHASH=`wget https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/3rdparty?h=$VERSION -q --content-on-error -O - | grep "Bad object name: " | sed 's/^.*Bad object name: \([0-9a-f]\{40\}\).*$/\1/g'` rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION wget https://github.com/qt/qtwebengine/archive/$VERSION.tar.gz -O qtwebengine-$VERSION.tar.gz || exit $? @@ -8,8 +8,8 @@ tar xzf qtwebengine-$VERSION.tar.gz || exit $? wget https://github.com/qt/qtwebengine-chromium/archive/$CHROMIUMHASH.tar.gz -O qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $? tar xzf qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $? mv qtwebengine-$VERSION qtwebengine-everywhere-src-$VERSION || exit $? -cd qtwebengine-everywhere-src-$VERSION ; syncqt.pl -version $VERSION || exit $? +(cd qtwebengine-everywhere-src-$VERSION ; syncqt.pl -version $VERSION ) || exit $? rmdir qtwebengine-everywhere-src-$VERSION/src/3rdparty || exit $? mv qtwebengine-chromium-$CHROMIUMHASH qtwebengine-everywhere-src-$VERSION/src/3rdparty || exit $? -XZ_OPT=-9 tar cJf qtwebengine-everywhere-src-$VERSION.tar.xz qtwebengine-everywhere-src-$VERSION || exit $? +XZ_OPT="-9 -T2" tar cJf qtwebengine-everywhere-src-$VERSION.tar.xz qtwebengine-everywhere-src-$VERSION || exit $? rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION diff --git a/sources b/sources index 03ee456..9431908 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be -SHA512 (qtwebengine-everywhere-src-5.15.5-clean.tar.xz) = f23c28a430edea9d83eadc741fde26cbc8fe2965cc3372b38755d4850c80a404e9009187296b368ccc5093b92227d7830d263ec0fb6c152e5e4522d11c6aa46d +SHA512 (qtwebengine-everywhere-src-5.15.6-clean.tar.xz) = 7c05934769bbfef181c591b65916c456449a3dd6e653d80b6e601a5b4e22904a2256538edd771453e31dceae56b2075c88c19b00cfab234e561ed6ca72bb143e