qt5: fix webengine on musl
Also add dependency on libvpx>=1.7.0 Closes: #12800 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
parent
5275a7f8df
commit
409fb48696
2 changed files with 73 additions and 3 deletions
srcpkgs/qt5
70
srcpkgs/qt5/files/musl-sandbox.patch
Normal file
70
srcpkgs/qt5/files/musl-sandbox.patch
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
--- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||||
|
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||||
|
@@ -114,23 +114,13 @@
|
||||||
|
// CLONE_VM, nor CLONE_THREAD, which includes all fork() implementations.
|
||||||
|
ResultExpr RestrictCloneToThreadsAndEPERMFork() {
|
||||||
|
const Arg<unsigned long> flags(0);
|
||||||
|
+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
|
||||||
|
+ CLONE_THREAD | CLONE_SYSVSEM;
|
||||||
|
+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
|
||||||
|
+ CLONE_DETACHED;
|
||||||
|
+ const BoolExpr thread_clone_ok = (flags&~safe)==required;
|
||||||
|
|
||||||
|
- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
|
||||||
|
- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
|
||||||
|
- CLONE_SIGHAND | CLONE_THREAD |
|
||||||
|
- CLONE_SYSVSEM;
|
||||||
|
- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
|
||||||
|
-
|
||||||
|
- const uint64_t kGlibcPthreadFlags =
|
||||||
|
- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
|
||||||
|
- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
|
||||||
|
- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
|
||||||
|
-
|
||||||
|
- const BoolExpr android_test =
|
||||||
|
- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
|
||||||
|
- flags == kGlibcPthreadFlags);
|
||||||
|
-
|
||||||
|
- return If(IsAndroid() ? android_test : glibc_test, Allow())
|
||||||
|
+ return If(thread_clone_ok, Allow())
|
||||||
|
.ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
|
||||||
|
.Else(CrashSIGSYSClone());
|
||||||
|
}
|
||||||
|
--- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.orig
|
||||||
|
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
@@ -494,6 +494,7 @@
|
||||||
|
case __NR_mlock:
|
||||||
|
case __NR_munlock:
|
||||||
|
case __NR_munmap:
|
||||||
|
+ case __NR_mremap:
|
||||||
|
return true;
|
||||||
|
case __NR_madvise:
|
||||||
|
case __NR_mincore:
|
||||||
|
@@ -509,7 +510,6 @@
|
||||||
|
case __NR_modify_ldt:
|
||||||
|
#endif
|
||||||
|
case __NR_mprotect:
|
||||||
|
- case __NR_mremap:
|
||||||
|
case __NR_msync:
|
||||||
|
case __NR_munlockall:
|
||||||
|
case __NR_readahead:
|
||||||
|
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
index 80f02c0..21fbe21 100644
|
||||||
|
--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
+++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
@@ -373,6 +373,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
|
||||||
|
#if defined(__i386__)
|
||||||
|
case __NR_waitpid:
|
||||||
|
#endif
|
||||||
|
+ case __NR_set_tid_address:
|
||||||
|
return true;
|
||||||
|
case __NR_clone: // Should be parameter-restricted.
|
||||||
|
case __NR_setns: // Privileged.
|
||||||
|
@@ -385,7 +386,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
case __NR_set_thread_area:
|
||||||
|
#endif
|
||||||
|
- case __NR_set_tid_address:
|
||||||
|
case __NR_unshare:
|
||||||
|
#if !defined(__mips__) && !defined(__aarch64__)
|
||||||
|
case __NR_vfork:
|
|
@ -1,18 +1,17 @@
|
||||||
# Template file for 'qt5'
|
# Template file for 'qt5'
|
||||||
pkgname=qt5
|
pkgname=qt5
|
||||||
version=5.10.1
|
version=5.10.1
|
||||||
revision=6
|
revision=7
|
||||||
wrksrc="qt-everywhere-src-${version}"
|
wrksrc="qt-everywhere-src-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
hostmakedepends="flex ruby gperf git python perl pkg-config protobuf re2c ninja"
|
hostmakedepends="flex ruby gperf git python perl pkg-config protobuf re2c ninja"
|
||||||
# XXX: requires libvpx>=1.7.0
|
|
||||||
makedepends="libressl-devel libpng-devel MesaLib-devel libXrender-devel unixodbc-devel
|
makedepends="libressl-devel libpng-devel MesaLib-devel libXrender-devel unixodbc-devel
|
||||||
fontconfig-devel libXi-devel libXv-devel libXinerama-devel libXrandr-devel
|
fontconfig-devel libXi-devel libXv-devel libXinerama-devel libXrandr-devel
|
||||||
libXcursor-devel libXScrnSaver-devel dbus-devel glib-devel icu-devel
|
libXcursor-devel libXScrnSaver-devel dbus-devel glib-devel icu-devel
|
||||||
cups-devel libjpeg-turbo-devel sqlite-devel alsa-lib-devel tiff-devel SDL2-devel
|
cups-devel libjpeg-turbo-devel sqlite-devel alsa-lib-devel tiff-devel SDL2-devel
|
||||||
pcre2-devel libmng-devel libevent-devel ffmpeg-devel jsoncpp-devel
|
pcre2-devel libmng-devel libevent-devel ffmpeg-devel jsoncpp-devel
|
||||||
libsrtp-devel libvpx-devel protobuf-devel snappy-devel minizip-devel
|
libsrtp-devel libvpx-devel protobuf-devel snappy-devel minizip-devel
|
||||||
libxshmfence-devel libSM-devel xcb-util-keysyms-devel
|
libxshmfence-devel libSM-devel xcb-util-keysyms-devel libvpx-devel
|
||||||
xcb-util-image-devel xcb-util-renderutil-devel xcb-util-wm-devel
|
xcb-util-image-devel xcb-util-renderutil-devel xcb-util-wm-devel
|
||||||
libXcomposite-devel libwebp-devel libxkbcommon-devel harfbuzz-devel gtk+3-devel
|
libXcomposite-devel libwebp-devel libxkbcommon-devel harfbuzz-devel gtk+3-devel
|
||||||
mtdev-devel freetds-devel libmysqlclient-devel postgresql-libs-devel
|
mtdev-devel freetds-devel libmysqlclient-devel postgresql-libs-devel
|
||||||
|
@ -200,6 +199,7 @@ do_configure() {
|
||||||
# Do not use experimental allocator shim (incompatible with musl libc)
|
# Do not use experimental allocator shim (incompatible with musl libc)
|
||||||
sed -i qtwebengine/src/3rdparty/chromium/build/common.gypi \
|
sed -i qtwebengine/src/3rdparty/chromium/build/common.gypi \
|
||||||
-e"s;\('use_experimental_allocator_shim%':\) 1,;\1 0,;"
|
-e"s;\('use_experimental_allocator_shim%':\) 1,;\1 0,;"
|
||||||
|
patch -Np0 -d "${wrksrc}/qtwebengine/src/3rdparty/chromium" -i "${FILESDIR}/musl-sandbox.patch"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue