summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:42:26 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:57:32 +0200
commitf6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch)
treed0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
parent9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
parent1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff)
downloadmeta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits) qtbase: Use pcre packages by default qt5: use PACKAGECONFIG to disable tests and examples qtlocation: use geoclue 2 qtbase: use offscreen platform plugin for tools qtbase: add openssl PACKAGECONFIG for native nativesdk qtbase-native: disable vulkan support maliit-framework-qt5: fix test installations qtenginio: remove obsolete module ogl-runtime: update to v2.5.0 release qtquick3d: add recipe qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance qt5: Update to Qt 5.14.0 qtbase: Fix patch fuzz detected with devtool qtbase: Backport the patch from upstream gerrit qt5-creator: Update musl patch to link qmldesigner with -lexecinfo qtwebengine: Move CharAllocator definition to header qt5-creator: Add missing dep on libz.so qt5-creator: Make clang-format patch work with multiple clang versions qtwebengine: Include cstddef for size_t definition ... Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
new file mode 100644
index 00000000..3e595591
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -0,0 +1,33 @@
1From d38a63908f5c49705abd85bd9c2aee0ec334221d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:01:12 -0700
4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
5 defined
6
7Musl does not define this Macro
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 chromium/sandbox/linux/suid/sandbox.c | 9 +++++++++
12 1 file changed, 9 insertions(+)
13
14diff --git a/chromium/sandbox/linux/suid/sandbox.c b/chromium/sandbox/linux/suid/sandbox.c
15index 854819bfbb4..a99d32741d0 100644
16--- a/chromium/sandbox/linux/suid/sandbox.c
17+++ b/chromium/sandbox/linux/suid/sandbox.c
18@@ -46,6 +46,15 @@ static bool DropRoot();
19
20 #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)
21
22+#ifndef TEMP_FAILURE_RETRY
23+# define TEMP_FAILURE_RETRY(expression) \
24+ (__extension__ \
25+ ({ long int __result; \
26+ do __result = (long int) (expression); \
27+ while (__result == -1L && errno == EINTR); \
28+ __result; }))
29+#endif
30+
31 static void FatalError(const char* msg, ...)
32 __attribute__((noreturn, format(printf, 1, 2)));
33