From 94667abf214e0d6c4ca55260d233b7025cb2bfbc Mon Sep 17 00:00:00 2001
From: omni <omni+alpine@hack.org>
Date: Sat, 8 May 2021 01:51:07 +0000
Subject: [PATCH] community/qt5-qtwebengine: upgrade to 5.15.3_git20210510

- align patches
- sort patches alphanumerically (in patch order)
- list CVE secfixes from upstream commit messages
---
 ...um-musl-Match-syscalls-to-match-musl.patch |   8 +-
 community/qt5-qtwebengine/APKBUILD            | 162 ++++++++++++------
 community/qt5-qtwebengine/musl-hacks.patch    |   2 +-
 community/qt5-qtwebengine/musl-sandbox.patch  |  21 +--
 community/qt5-qtwebengine/nasm.patch          |   2 +-
 .../qt-musl-dispatch_to_musl.patch            |  12 +-
 .../qt5-qtwebengine/qt-musl-elf-arm.patch     |   2 +-
 .../qt5-qtwebengine/qt-musl-execinfo.patch    |   4 +-
 community/qt5-qtwebengine/qt-musl-off_t.patch |  12 +-
 .../qt-musl-pread-pwrite.patch                |   2 +-
 .../qt5-qtwebengine/qt-musl-resolve.patch     |  14 +-
 .../qt5-qtwebengine/qt-musl-siginfo_t.patch   |  16 +-
 .../qt5-qtwebengine/qt-musl-stackstart.patch  |   4 +-
 .../qt-musl-sysreg-for__WORDSIZE.patch        |   4 +-
 .../qt-musl-thread-stacksize.patch            |   2 +-
 .../qt5-qtwebengine/remove-glibc-check.patch  |   5 +-
 16 files changed, 170 insertions(+), 102 deletions(-)

diff --git a/community/qt5-qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch b/community/qt5-qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch
index e8a1d8454d43..524d75d9e7ac 100644
--- a/community/qt5-qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch
+++ b/community/qt5-qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch
@@ -12,7 +12,7 @@ diff --git a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h b/chr
 index 80a3e56..1e57b1a 100644
 --- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
 +++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
-@@ -794,6 +794,14 @@ struct kernel_statfs {
+@@ -824,6 +824,14 @@ struct kernel_statfs {
  #endif
  
  
@@ -27,9 +27,9 @@ index 80a3e56..1e57b1a 100644
  #if defined(__x86_64__)
  #ifndef ARCH_SET_GS
  #define ARCH_SET_GS             0x1001
-@@ -1211,6 +1219,14 @@ struct kernel_statfs {
- #ifndef __NR_fallocate
- #define __NR_fallocate          285
+@@ -1258,6 +1266,14 @@ struct kernel_statfs {
+ #ifndef __NR_getrandom
+ #define __NR_getrandom          318
  #endif
 +
 +#ifndef __NR_pread
diff --git a/community/qt5-qtwebengine/APKBUILD b/community/qt5-qtwebengine/APKBUILD
index 9b1d20d997e0..a7c277ccf949 100644
--- a/community/qt5-qtwebengine/APKBUILD
+++ b/community/qt5-qtwebengine/APKBUILD
@@ -1,8 +1,11 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtwebengine
-pkgver=5.15.3_git20200401
-pkgrel=3
-_commit="e0b4b9436033e9bc376597ed90dd1fca9cdc90ff"
+pkgver=5.15.3_git20210510
+pkgrel=0
+# latest commit of 5.15 branch at pkgver date
+_commit="349db5edcb67574f646eca7b336b9571b9777816"
+# from latest "Update Chromium" commit in above 5.15 branch
+_chromium_commit="6c7b4ffb3fe19e7c6a2db60ce2d05c3b50c16ffc"
 pkgdesc="Qt5 - QtWebEngine components"
 url="https://www.qt.io/developers/"
 # ppc64le and s390x are not supported
@@ -63,47 +66,109 @@ makedepends="$depends_dev
 	zlib-dev
 	python2
 	"
-subpackages="$pkgname-dev $pkgname-dbg"
+subpackages="$pkgname-dbg $pkgname-dev"
 
-case $pkgver in
-	*_beta*|*_rc*) _rel=development_releases;;
-	*) _rel=official_releases;;
-esac
-
-source="https://dev.alpinelinux.org/archive/qt5-qtwebengine/qtwebengine-$_commit.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://invent.kde.org/qt/qt/qtwebengine/-/archive/$_commit.tar.gz
+	qtwebengine-chromium-$_chromium_commit.tar.gz::https://invent.kde.org/qt/qt/qtwebengine-chromium/-/archive/$_chromium_commit.tar.gz
+	0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch
+	0010-chromium-musl-Match-syscalls-to-match-musl.patch
+	musl-hacks.patch
+	musl-sandbox.patch
+	nasm.patch
+	qt-musl-crashpad.patch
 	qt-musl-dispatch_to_musl.patch
+	qt-musl-elf-arm.patch
 	qt-musl-execinfo.patch
 	qt-musl-mallinfo.patch
 	qt-musl-off_t.patch
+	qt-musl-pread-pwrite.patch
 	qt-musl-pvalloc.patch
 	qt-musl-resolve.patch
 	qt-musl-siginfo_t.patch
-	qt-musl-pread-pwrite.patch
-	qt-musl-sysreg-for__WORDSIZE.patch
 	qt-musl-stackstart.patch
+	qt-musl-sysreg-for__WORDSIZE.patch
 	qt-musl-thread-stacksize.patch
-	qt-musl-elf-arm.patch
-	qt-musl-crashpad.patch
-	musl-sandbox.patch	
-	nasm.patch
-	musl-hacks.patch
 	remove-glibc-check.patch
-	0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch
-	0010-chromium-musl-Match-syscalls-to-match-musl.patch
 	"
-builddir="$srcdir/qtwebengine"
+builddir="$srcdir/qtwebengine-$_commit"
 
-disturl="dev.alpinelinux.org:/archive/$pkgname/"
+# secfixes:
+#   5.15.3_git20210510-r0:
+#     - CVE-2021-21201
+#     - CVE-2021-21202
+#     - CVE-2021-21203
+#     - CVE-2021-21204
+#     - CVE-2021-21206
+#     - CVE-2021-21207
+#     - CVE-2021-21209
+#     - CVE-2021-21213
+#     - CVE-2021-21214
+#     - CVE-2021-21217
+#     - CVE-2021-21219
+#     - CVE-2021-21220
+#     - CVE-2021-21221
+#     - CVE-2021-21222
+#     - CVE-2021-21223
+#     - CVE-2021-21224
+#     - CVE-2021-21225
+#     - CVE-2021-21227
+#     - CVE-2021-21230
+#     - CVE-2021-21231
+#     - CVE-2021-21233
+#   5.15.3_git20200401-r0:
+#     - CVE-2020-16044
+#     - CVE-2020-27844
+#     - CVE-2021-21118
+#     - CVE-2021-21119
+#     - CVE-2021-21120
+#     - CVE-2021-21121
+#     - CVE-2021-21122
+#     - CVE-2021-21123
+#     - CVE-2021-21126
+#     - CVE-2021-21127
+#     - CVE-2021-21128
+#     - CVE-2021-21132
+#     - CVE-2021-21135
+#     - CVE-2021-21137
+#     - CVE-2021-21138
+#     - CVE-2021-21140
+#     - CVE-2021-21145
+#     - CVE-2021-21146
+#     - CVE-2021-21147
+#     - CVE-2021-21148
+#     - CVE-2021-21149
+#     - CVE-2021-21150
+#     - CVE-2021-21152
+#     - CVE-2021-21153
+#     - CVE-2021-21156
+#     - CVE-2021-21157
+#     - CVE-2021-21160
+#     - CVE-2021-21162
+#     - CVE-2021-21165
+#     - CVE-2021-21166
+#     - CVE-2021-21168
+#     - CVE-2021-21169
+#     - CVE-2021-21171
+#     - CVE-2021-21172
+#     - CVE-2021-21173
+#     - CVE-2021-21174
+#     - CVE-2021-21175
+#     - CVE-2021-21178
+#     - CVE-2021-21179
+#     - CVE-2021-21183
+#     - CVE-2021-21187
+#     - CVE-2021-21188
+#     - CVE-2021-21190
+#     - CVE-2021-21191
+#     - CVE-2021-21193
+#     - CVE-2021-21195
+#     - CVE-2021-21198
 
-snapshot() {
-	clean
-	deps
-	mkdir -p "$srcdir"
-	cd "$srcdir"
-	git clone https://invent.kde.org/qt/qt/qtwebengine -b kde/5.15 --recursive
-	cd qtwebengine && git checkout $_commit && cd -
-	tar czvf $SRCDEST/qtwebengine-$_commit.tar.gz qtwebengine
-	rsync --progress -La $SRCDEST/qtwebengine-$_commit.tar.gz $disturl
+prepare() {
+	rmdir "$builddir/src/3rdparty"
+	mv "$srcdir/qtwebengine-chromium-$_chromium_commit" "$builddir/src/3rdparty"
+	mkdir "$builddir"/.git "$builddir/src/3rdparty/chromium/.git"
+	default_prepare
 }
 
 build() {
@@ -123,23 +188,24 @@ package() {
 	ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
 }
 
-sha512sums="9620b9cc8585c108fa1798f6bc98975d0054ce744ce551edea9405505172492a2b9391fda164d34217f099fe352adbcba906e203000ff98916beb653666fbd57  qtwebengine-e0b4b9436033e9bc376597ed90dd1fca9cdc90ff.tar.gz
-5ecbf435062b8565322dd1cbd0cbdb44f3daef264ab677fe22fe8cb400d4bb22281cc607ea419c7362c483312482632ed41bd67130413188425ef6e0ae184f07  qt-musl-dispatch_to_musl.patch
-7084a07386fb9f66fbfeadac53869c0f386cea98dbb29787f030635bc8cd116b7459acafbe06540f1aef79d8a69817520ad18bcb9ac24954dd70773ef083537e  qt-musl-execinfo.patch
+sha512sums="a9b0a7ebb5cfeb9fc6d5401e0402670efa099e8bc4d631c1ca3dfa8d42bcd0a6e5c12bbba018097f1f8bea6193589999e266632bfe5e6dea97e45dfb832023aa  qt5-qtwebengine-5.15.3_git20210510.tar.gz
+f8cb55f3eb4d4785c9af749e32f9d327415f2a6c6716330e5f3d467bca30b955e5e7fc6fd101a92d3f4efd68baa4a02900b9de3d3432a87915b3408a1ca2a2b8  qtwebengine-chromium-6c7b4ffb3fe19e7c6a2db60ce2d05c3b50c16ffc.tar.gz
+487e3d3e338cab5becb6073e8587c200653af8a35ac507bcfae5267b9d4f11e0b2b18447ffde1ef9d25f2a2ec5661982b50fcb1d3a683cd76e59fa7f37e531ce  0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch
+2438ac56b1c819d1f6634814b148919e15d7d4e41a64fedab38358d794e8286a1eebaaa8579661e8e75fbc321f4d16c47b1838219cb0aadc307c4c8dd97e91b1  0010-chromium-musl-Match-syscalls-to-match-musl.patch
+555ad1df44f2317e335d23c47626b788ec91b43b05ff694f4281331bc9cc7dd5255aeddd7d7bb277c51d69b9ff6668362ec3ea5d5ff873ee64a9af32fe665a4a  musl-hacks.patch
+f7380e97018a93c786a95650646d135ceb326ecdb615ffdcb1ed004f1c2ca2e1da1a5b0729969b7f2fed60c8fa048b36db055df4cca4bdedc8a7060c65ac5bd7  musl-sandbox.patch
+7d94e588e72926fc79ead8d34fb65016144df66808f8629ae91fddb1fda2208b7c2bb8c0fdf5a0e35234dbb9c5b4868f9f7a494fc4f6f2b4363dbb1bd7e07e43  nasm.patch
+173c401e1a0daa7a1471880807e4fb0a74fc338a0f306dc067147878c29e7bb94cae43c37fe2bf21dd7a7ffd2d739697fd21d10c059ce647df01d8236612cc68  qt-musl-crashpad.patch
+a0560953cc5de1c94df10d13b328d6cb32a80ee3236171faf6f2d893f91838373b3489f18082368b399403ba066b561c157be3c41f3e6d5214f4946353650023  qt-musl-dispatch_to_musl.patch
+126bee2e7040ca96fe0df1c80b14009d514ee4fcc5af22b9d2c654b1472a1653de036a0e7a3661881479f033156b78b51a1a5c34d8e778496b6993f22b1c94b1  qt-musl-elf-arm.patch
+e8a0c15c4b17a0a64f760eeb2d2e90859a5704f88a57d348b38a5c36522d4ad9ba97b21895d95aa53554f83c40d3e3e238a0e25a1e2ad4720b5e669766f2dce0  qt-musl-execinfo.patch
 b021664599128cd614daaf39f7592ea98b3d1d5815a9768ff11515fad28b723f678df78d5fe3122ea7d0c043dc997f1e53e528359663960d44805e3b2d8e4ee3  qt-musl-mallinfo.patch
-7eba28eb015f1a7e5cf70e9354fcd647b69f4e7c061b889a8c0d55f4a94a033f95d0252f9baebf13c3d501438074a05d547eef2c8cf898dc2c87cec3b60e76e0  qt-musl-off_t.patch
+15592d64777ed835bb472bcd212fcfa2e941f0a607767f0754693dc43ddc2d6d6ebb86e3a44d3938cc0356638bb14e20dd74a522239b01afb0a6a93a944d5f68  qt-musl-off_t.patch
+23dfe11a5eab795f8cea8da8d900f6be4b6515d73a48cdfba9a92c4ffe2243275345d9e64b624165a1fb4a74cb82848ca77fdc06686efa6e865d2d660df5bb2c  qt-musl-pread-pwrite.patch
 ac563e0c444a6d3214ff7465cad2c701692cfa90408c57243d3ae9459937c36e88acd57335bb90da85157e03865faaf17d61a767483b00ed8f3580ebf8a2fbb5  qt-musl-pvalloc.patch
-8d95e4fcb463b5d2053c9538e66150ec9a3acddd7815cc34c8cd6fa115e49f1d602c4f1fc73f5e507a932c918e36c9c3d1386476dca91c5fc422906d0d88f610  qt-musl-resolve.patch
-2fead16e7d7379b622da0e3172905444d9d72d1a53ff080327a3d59f60541c5c076d9b58f110b039da8c9ebc3b5efec53af118e1172efd01886ff9ac2b730d5f  qt-musl-siginfo_t.patch
-b1f7823d0bdd14dbcb4dbd72ab2d16460d343722d2601921a50f8912ce580a632e0d7b01d7fea6f27ff5014a1f21595c6d8d4500b995bcc6db38cbd10ac4aa96  qt-musl-pread-pwrite.patch
-987b9b35d04317e22ae2cce382e776f3309fc7fd4588e408cd6bed846f47620d01e2b9958cb60c84b8f6f496de6544a21ba399ba8b8f107b73df179794740092  qt-musl-sysreg-for__WORDSIZE.patch
-d1662975ecd6a9fbf37ddba095764412bdaa1af78f171d5f45dd10f9d8aa41b401712cef2663c1c3689c8a273ea891538864dc0d5f7203e7bb3447c9b84db4ba  qt-musl-stackstart.patch
-b37fbc4df03c82123f94982039defa12d9bb8c885c9dcf8fff556b5f9cc58182fa471f970cc3a5e2d5dbe964855f591b474366b6a8926d94ae6a78e883811c1a  qt-musl-thread-stacksize.patch
-7e4e404913bfa23e4cf5ff7cd6abf6f57064da86a3740933eb84cf34b88db94dd605cd886b3554b24994c62f01ddeb328dd2f1ace0145b3cc670451761c2f5f9  qt-musl-elf-arm.patch
-173c401e1a0daa7a1471880807e4fb0a74fc338a0f306dc067147878c29e7bb94cae43c37fe2bf21dd7a7ffd2d739697fd21d10c059ce647df01d8236612cc68  qt-musl-crashpad.patch
-f6712b3986597df082e22b5b091994d629e7f704332bb94f821e3de893559531e5f476b64a15326bff28f9743d0131e1dad529da8fcf3b7a497f8c1482240a6d  musl-sandbox.patch
-9add958caa0d6acb2866d3927aadfa6b378c92d62463f1b3d65ae1e5400915d89388ac54beb30c4d4d42d2901ee28f404d8574b771854556f6a75698301870eb  nasm.patch
-b99eaa4a0b06ab1cb461fc4bfc7416c779ba1e847614b96f08de97a137a09577ea642813e5e3235167ccc5180c6ffcc06ebf2a61e3b4c210de9dee765e0e7404  musl-hacks.patch
-7153ce7372fed73dccb676079bc5af37f56be113f42ee64ed48cd7997dc2a4aa287523f36f0b8d3c717f1c4ad7f796843850b86a2dce50de5f0ade6a47785bee  remove-glibc-check.patch
-487e3d3e338cab5becb6073e8587c200653af8a35ac507bcfae5267b9d4f11e0b2b18447ffde1ef9d25f2a2ec5661982b50fcb1d3a683cd76e59fa7f37e531ce  0001-Revert-Bump-version-from-5.15.3-to-5.15.4.patch
-a0d1f44403fa21aed1cfd7390287fc8b9fc4ad559ecc982ed1e8f9cf05ce0a772982e47df1e0af69caf517545dc14e21460e70dfd4b77a859b8b502b00752686  0010-chromium-musl-Match-syscalls-to-match-musl.patch"
+6e915b0eb6cddf27100bdd80ed3a90ca64257f0a3be2c0f9a9c9baf30d9baaf0466b0cf4f310a4aaf7ff8195afe733d129b7f356b7a957f578f39927cce9308a  qt-musl-resolve.patch
+0a7518e4e4866e9bf5aa90ab92fef0e0d2fd76f3a3800965c689b86c7ba42f31233849b41a0a268afeca5ea44a818fa0aa61d0087f17188a06a6a6734b8e44ef  qt-musl-siginfo_t.patch
+b5e117f94811c4c65cfd99885b0f23e82cabf25529b2a867f8dec5efdbcef98441d32b5b89e96c9681fed6fb99ccf3850b2a32dd618be957ef9bdcd5f2b6a7e4  qt-musl-stackstart.patch
+1b9abcd43238491cca641f4dca36ca27b97f4dba9b54ba0f25e7e5c777d590717838ae6cab4cd8fcce35e994215432c456d376f9239836cff3f9df38d6994a76  qt-musl-sysreg-for__WORDSIZE.patch
+f565a31b007db408ef96db3f7d003f465d1db765fb84b50a1f82b449d49949dd4fafa2b374889621a5c431c1d6e758797dfce76e34199282aa2fbe03bbf5aa38  qt-musl-thread-stacksize.patch
+a20ea2a8969e218aa592bf044bb71232d22eaece762ffecaf6e4eb9976c64438946521d49d4cc9c23cad4e44622f1f34bcf67c723e9ba569e090b60329f3f103  remove-glibc-check.patch"
diff --git a/community/qt5-qtwebengine/musl-hacks.patch b/community/qt5-qtwebengine/musl-hacks.patch
index ee82b48d3dd9..3c94b191409d 100644
--- a/community/qt5-qtwebengine/musl-hacks.patch
+++ b/community/qt5-qtwebengine/musl-hacks.patch
@@ -2,7 +2,7 @@ diff --git a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc b/src/3rdparty
 index dbc8c5aaf..077bbde33 100644
 --- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
 +++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
-@@ -1191,7 +1191,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
+@@ -1152,7 +1152,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
      msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
    msgvec->reserve(buffers.size());
    for (size_t j = 0; j < buffers.size(); j++)
diff --git a/community/qt5-qtwebengine/musl-sandbox.patch b/community/qt5-qtwebengine/musl-sandbox.patch
index ac411f846d73..ad01ea8d3ef5 100644
--- a/community/qt5-qtwebengine/musl-sandbox.patch
+++ b/community/qt5-qtwebengine/musl-sandbox.patch
@@ -2,7 +2,7 @@ diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_par
 index 348ab6e8c..2eac6ef82 100644
 --- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 +++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -139,21 +139,11 @@ namespace sandbox {
+@@ -127,21 +127,11 @@ namespace sandbox {
  // present (as in newer versions of posix_spawn).
  ResultExpr RestrictCloneToThreadsAndEPERMFork() {
    const Arg<unsigned long> flags(0);
@@ -29,7 +29,7 @@ index 348ab6e8c..2eac6ef82 100644
  
    // The following two flags are the two important flags in any vfork-emulating
    // clone call. EPERM any clone call that contains both of them.
-@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+@@ -151,7 +141,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
        AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
              (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
  
@@ -79,8 +79,8 @@ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_sysc
 index 59d0eab8e..7ae700213 100644
 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
 +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
-@@ -1063,4 +1063,8 @@
- #define __NR_memfd_create 279
+@@ -1119,4 +1119,8 @@
+ #define __NR_rseq 293
  #endif
  
 +#if !defined(__NR_membarrier)
@@ -92,8 +92,8 @@ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscal
 index 1addd5384..d8811ce87 100644
 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
 +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,11 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
+@@ -1441,6 +1441,11 @@
+ #define __NR_io_pgetevents (__NR_SYSCALL_BASE+399)
  #endif
  
 +#if !defined(__NR_membarrier)
@@ -134,8 +134,8 @@ diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_sys
 index a6afc62d9..6ab7740de 100644
 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
 +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1422,5 +1422,10 @@
- #define __NR_memfd_create 356
+@@ -1710,5 +1710,10 @@
+ #define __NR_clone3 435
  #endif
  
 +#if !defined(__NR_membarrier)
@@ -145,12 +145,13 @@ index a6afc62d9..6ab7740de 100644
 +
  #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
  
+
 diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
 index 349504aee..6a6d4756f 100644
 --- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
 +++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,10 @@
- #define __NR_memfd_create 319
+@@ -1350,5 +1350,10 @@
+ #define __NR_rseq 334
  #endif
  
 +#if !defined(__NR_membarrier)
diff --git a/community/qt5-qtwebengine/nasm.patch b/community/qt5-qtwebengine/nasm.patch
index 05e7307540dc..1d58af613be1 100644
--- a/community/qt5-qtwebengine/nasm.patch
+++ b/community/qt5-qtwebengine/nasm.patch
@@ -2,7 +2,7 @@ diff --git a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h b/src/
 index 7eb7c20ff..3bdc2eb39 100644
 --- a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
 +++ b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
-@@ -117,7 +117,7 @@
+@@ -139,7 +139,7 @@
  #define HAVE_ACCESS 1
  
  /* Define to 1 if you have the `canonicalize_file_name' function. */
diff --git a/community/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch b/community/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch
index 1258d4f3c427..a58a688a4b55 100644
--- a/community/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch
+++ b/community/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch
@@ -1,15 +1,15 @@
---- qtwebengine/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
-+++ qtwebengine/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
-@@ -6,6 +6,7 @@
- 
+--- a/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
++++ b/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
+@@ -8,6 +8,7 @@
+ #include <dlfcn.h>
  #include <malloc.h>
  
 +#if defined(__GLIBC__)
  // This translation unit defines a default dispatch for the allocator shim which
  // routes allocations to libc functions.
  // The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
-@@ -73,3 +74,92 @@ const AllocatorDispatch AllocatorDispatch::default_dispatch = {
-     nullptr,               /* free_definite_size_function */
+@@ -87,3 +88,92 @@ const AllocatorDispatch AllocatorDispatc
+     nullptr,               /* aligned_free_function */
      nullptr,               /* next */
  };
 +
diff --git a/community/qt5-qtwebengine/qt-musl-elf-arm.patch b/community/qt5-qtwebengine/qt-musl-elf-arm.patch
index 0786539d3a1b..9253c413a205 100644
--- a/community/qt5-qtwebengine/qt-musl-elf-arm.patch
+++ b/community/qt5-qtwebengine/qt-musl-elf-arm.patch
@@ -2,7 +2,7 @@ diff --git a/src/3rdparty/chromium/v8/src/base/cpu.cc b/src/3rdparty/chromium/v8
 index f1c48fa13..ba8389c8c 100644
 --- a/src/3rdparty/chromium/v8/src/base/cpu.cc
 +++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
-@@ -16,7 +16,7 @@
+@@ -20,7 +20,7 @@
  #if V8_OS_QNX
  #include <sys/syspage.h>  // cpuinfo
  #endif
diff --git a/community/qt5-qtwebengine/qt-musl-execinfo.patch b/community/qt5-qtwebengine/qt-musl-execinfo.patch
index 7082f51aee78..01a5c94c4bee 100644
--- a/community/qt5-qtwebengine/qt-musl-execinfo.patch
+++ b/community/qt5-qtwebengine/qt-musl-execinfo.patch
@@ -2,7 +2,7 @@ diff --git a/src/3rdparty/chromium/base/debug/stack_trace.cc b/src/3rdparty/chro
 index d8ca822d9..f6f3d9c69 100644
 --- a/src/3rdparty/chromium/base/debug/stack_trace.cc
 +++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
-@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const {
+@@ -225,14 +225,14 @@ std::string StackTrace::ToString() const {
  }
  std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
    std::stringstream stream;
@@ -97,7 +97,7 @@ diff --git a/src/3rdparty/chromium/base/logging.cc b/src/3rdparty/chromium/base/
 index 4c4bfa6af..0ca5c2159 100644
 --- a/src/3rdparty/chromium/base/logging.cc
 +++ b/src/3rdparty/chromium/base/logging.cc
-@@ -618,7 +618,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity,
+@@ -548,7 +548,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity,
  
  LogMessage::~LogMessage() {
    size_t stack_start = stream_.tellp();
diff --git a/community/qt5-qtwebengine/qt-musl-off_t.patch b/community/qt5-qtwebengine/qt-musl-off_t.patch
index 52db3b9ebf46..6b44789f9100 100644
--- a/community/qt5-qtwebengine/qt-musl-off_t.patch
+++ b/community/qt5-qtwebengine/qt-musl-off_t.patch
@@ -1,10 +1,10 @@
---- qtwebengine/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h	2016-05-26 14:58:54.000000000 +0200
-+++ qtwebengine/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h	2016-10-01 14:31:30.885000000 +0200
-@@ -21,6 +21,7 @@
- #define htons(x) _byteswap_ushort (x)
+--- a/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h
++++ b/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h
+@@ -21,6 +21,7 @@ typedef unsigned __int64 uint64_t;
+ #define ots_htons(x) _byteswap_ushort (x)
  #else
  #include <arpa/inet.h>
 +#include <sys/types.h>
  #include <stdint.h>
- #endif
- 
+ #define ots_ntohl(x) ntohl (x)
+ #define ots_ntohs(x) ntohs (x)
diff --git a/community/qt5-qtwebengine/qt-musl-pread-pwrite.patch b/community/qt5-qtwebengine/qt-musl-pread-pwrite.patch
index c5dcfd812a27..623f6093814a 100644
--- a/community/qt5-qtwebengine/qt-musl-pread-pwrite.patch
+++ b/community/qt5-qtwebengine/qt-musl-pread-pwrite.patch
@@ -2,7 +2,7 @@ diff --git a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h b/src
 index 5d9c2e8..e81e7b4 100644
 --- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
 +++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
-@@ -1794,6 +1794,15 @@ struct kernel_statfs {
+@@ -1835,6 +1835,15 @@ struct kernel_statfs {
  /* End of s390/s390x definitions                                             */
  #endif
  
diff --git a/community/qt5-qtwebengine/qt-musl-resolve.patch b/community/qt5-qtwebengine/qt-musl-resolve.patch
index a481e50d26a0..386062e0b396 100644
--- a/community/qt5-qtwebengine/qt-musl-resolve.patch
+++ b/community/qt5-qtwebengine/qt-musl-resolve.patch
@@ -1,5 +1,5 @@
---- qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc	2016-11-07 15:46:18.000000000 +0100
-+++ qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc	2016-12-20 03:33:11.749059656 +0100
+--- a/src/3rdparty/chromium/net/dns/dns_reloader.cc
++++ b/src/3rdparty/chromium/net/dns/dns_reloader.cc
 @@ -9,6 +9,10 @@
  
  #include <resolv.h>
@@ -9,13 +9,13 @@
 +#endif
 +
  #include "base/lazy_instance.h"
- #include "base/logging.h"
  #include "base/macros.h"
---- qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc	2016-11-07 15:46:18.000000000 +0100
-+++ qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc	2016-12-20 03:40:07.671953098 +0100
-@@ -6,6 +6,10 @@
- 
+ #include "base/notreached.h"
+--- a/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
++++ b/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc
+@@ -8,6 +8,10 @@
  #include <string>
+ #include <type_traits>
  
 +#if !defined(__GLIBC__)
 +#include "resolv_compat.h"
diff --git a/community/qt5-qtwebengine/qt-musl-siginfo_t.patch b/community/qt5-qtwebengine/qt-musl-siginfo_t.patch
index fe760be16664..b071563ad67e 100644
--- a/community/qt5-qtwebengine/qt-musl-siginfo_t.patch
+++ b/community/qt5-qtwebengine/qt-musl-siginfo_t.patch
@@ -2,17 +2,17 @@ There's a subtle difference in the internal name of siginfo_t fields
 between glibc and musl. The structure itself is equivalent, so it
 should suffice to add a macro to rename the field.
 
---- qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc	2015-02-17 05:57:43.000000000 +0100
-+++ qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc	2015-06-03 08:20:25.032716427 +0200
-@@ -22,6 +22,11 @@
- #include "sandbox/linux/services/android_ucontext.h"
- #endif
-
+--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
++++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc
+@@ -25,6 +25,11 @@
+ #include "sandbox/linux/system_headers/linux_seccomp.h"
+ #include "sandbox/linux/system_headers/linux_signal.h"
+ 
 +// musl libc defines siginfo_t __si_fields instead of _sifields
 +#if !defined(__GLIBC__)
 +#define _sifields __si_fields
 +#endif
 +
  namespace {
-
- const int kCapacityIncrement = 20;
+ 
+ struct arch_sigsys {
diff --git a/community/qt5-qtwebengine/qt-musl-stackstart.patch b/community/qt5-qtwebengine/qt-musl-stackstart.patch
index a3c6efbee1f9..2214af4f2387 100644
--- a/community/qt5-qtwebengine/qt-musl-stackstart.patch
+++ b/community/qt5-qtwebengine/qt-musl-stackstart.patch
@@ -2,7 +2,7 @@ diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack
 index 1aaaa1c60..f49152fa6 100644
 --- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
 +++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() {
+@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
  // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
  // correctly for the main thread.
  
@@ -11,7 +11,7 @@ index 1aaaa1c60..f49152fa6 100644
      defined(OS_FUCHSIA)
    // pthread_getattr_np() can fail if the thread is not invoked by
    // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -96,7 +96,7 @@ return Threading::ThreadStackSize();
+@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
  }
  
  void* GetStackStart() {
diff --git a/community/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch b/community/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch
index a8b74e40d730..de9377e87317 100644
--- a/community/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch
+++ b/community/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch
@@ -2,8 +2,8 @@ diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linu
 index d03c7a8..d43fda0 100644
 --- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
 +++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-@@ -36,6 +36,9 @@
- #include <elf.h>
+@@ -37,6 +37,9 @@
+ #include <limits.h>
  #include <link.h>
  #include <stddef.h>
 +#ifndef __GLIBC__
diff --git a/community/qt5-qtwebengine/qt-musl-thread-stacksize.patch b/community/qt5-qtwebengine/qt-musl-thread-stacksize.patch
index a5c59fe7d350..80c3d349add8 100644
--- a/community/qt5-qtwebengine/qt-musl-thread-stacksize.patch
+++ b/community/qt5-qtwebengine/qt-musl-thread-stacksize.patch
@@ -15,7 +15,7 @@ diff --git a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc b/src/
 index cf7f3ec..e06a5ce 100644
 --- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
 +++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
-@@ -761,7 +761,7 @@ void Thread::Start() {
+@@ -854,7 +854,7 @@ void Thread::Start() {
  #if V8_OS_MACOSX
      // Default on Mac OS X is 512kB -- bump up to 1MB
      stack_size = 1 * 1024 * 1024;
diff --git a/community/qt5-qtwebengine/remove-glibc-check.patch b/community/qt5-qtwebengine/remove-glibc-check.patch
index ba10c3b8981c..70baa245905c 100644
--- a/community/qt5-qtwebengine/remove-glibc-check.patch
+++ b/community/qt5-qtwebengine/remove-glibc-check.patch
@@ -6,8 +6,8 @@ diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
 index 1ca6214a..3783c223 100644
 --- a/src/buildtools/configure.json
 +++ b/src/buildtools/configure.json
-@@ -375,8 +375,7 @@
-                          && features.webengine-python2
+@@ -372,8 +372,7 @@
+                          && features.webengine-nodejs
                           && (!config.sanitizer || features.webengine-sanitizer)
                           && (!config.linux || features.pkg-config)
 -                         && (!config.linux || features.webengine-host-pkg-config)
@@ -16,3 +16,4 @@ index 1ca6214a..3783c223 100644
                           && (!config.linux || features.webengine-system-khr)
                           && (!config.linux || features.webengine-system-nss)
                           && (!config.linux || features.webengine-system-dbus)
+
-- 
GitLab