diff options
| -rw-r--r-- | community/chromium/APKBUILD | 12 | ||||
| -rw-r--r-- | community/chromium/musl-fix-getrlimit-failed.patch | 24 |
2 files changed, 32 insertions, 4 deletions
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD index ec4099abc6..0b3fc87273 100644 --- a/community/chromium/APKBUILD +++ b/community/chromium/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=chromium pkgver=55.0.2883.87 -pkgrel=0 +pkgrel=1 pkgdesc="chromium web browser" url="http://www.chromium.org/" arch="x86_64" @@ -92,6 +92,7 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn no-mallinfo.patch resolver.patch unset-madv_free.patch + musl-fix-getrlimit-failed.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -357,7 +358,8 @@ d232b8dcb4d4db9a868c89e3a48ee716 no-execinfo.patch 886bc4ce1423a185b4d969ec2daa5933 no-getcontext.patch 3dd580483ebf0a94db90d35288c0f340 no-mallinfo.patch f99a4572c0be2c2123acc2478905e01f resolver.patch -bff9e1de1e5fa119b41bf6705926cd9e unset-madv_free.patch" +bff9e1de1e5fa119b41bf6705926cd9e unset-madv_free.patch +73c1b0c3c9d90eb2eb41d81a50ea306d musl-fix-getrlimit-failed.patch" sha256sums="e81bd3140d9c84dfee04d9a94686dfe6a20ae79475d84f17154c5536dcb81a58 chromium-55.0.2883.87.tar.xz 89f1eb19d1ed998a190045ea173959f01faee3490d58a6a34ca3fe21228e569f chromium-launcher.sh b466559340a36998354a0577325fe533d9e6b74c24a15b7599671171506bf128 chromium.conf @@ -374,7 +376,8 @@ ef7ff14f3e91a72d1d7437b5edf5d3cf1ac04e1c80cfb8c2f2fe5c93bc80bb27 gn_bootstrap.p 855edf1062e199ceaa7619d5bb81ff6939cc5ee1c947dfd15b50e0cba18548e2 no-getcontext.patch 3a5d4c8e38c6345eec21ed9d6f0b82aaddfca310fd7d5f57e7ec1c359f59ef2e no-mallinfo.patch 914c513bb54d4d97cd2a7622647f6af5cd0c8d29a0aa2962a60fdbed88f54429 resolver.patch -e9c1f901c7bc8102a31ef2cc2235892671357362c04a4a1f009f54830449ef5f unset-madv_free.patch" +e9c1f901c7bc8102a31ef2cc2235892671357362c04a4a1f009f54830449ef5f unset-madv_free.patch +d71e048e059e456912da90e6897d8356defd2e8091036a5dc47ab958b32aa8a2 musl-fix-getrlimit-failed.patch" sha512sums="b39b5a9e50d9406cc21db1f5972a02dfba74eb2d5f8b0accde4d2aeca07bcddc6bbdf44ea6f5414a755f8ed0b0852381cb1c7b4f0cb02742146db314e4a0c55e chromium-55.0.2883.87.tar.xz b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf @@ -391,4 +394,5 @@ fef119b4e23269cc6252e940e23029a312c9852b8d2115ee155ef9a4f5788b6b7dc8c1cab2e32fb4 a57858e45cfbb7e97f77b3b308502e377543d61d3d0085798ed73bc53da456828f5e010308d0de05fee4fe52071362d074f5af205f98f41d67222d997857d626 no-getcontext.patch 0d2e4b64f5bcb0ece5cf0cace493b07e900b14d9da5e4173a3034322ff264ab1978364000442c83240983ac0aa5f2b18f941bb5121b043a1e8e28e7de94fa44b no-mallinfo.patch d60407a8faadfd2a8294570163b4d1b1112c8a70a6f8e778fc3aff25d20613a2e26c66cd87e69c54953cc1b984e4038015ad04797b0495df13932541b05398fe resolver.patch -5eafc0b92d6aa3a4a94bce544461d57121a9405784e2687b9ed382371a7c10e4db5fd6325057344a66b7df32dca963bc12b7f67b256f1f1295bf6519400b0b8e unset-madv_free.patch" +5eafc0b92d6aa3a4a94bce544461d57121a9405784e2687b9ed382371a7c10e4db5fd6325057344a66b7df32dca963bc12b7f67b256f1f1295bf6519400b0b8e unset-madv_free.patch +7e0c11ad6cc0ead28750401b4ac6569bb86f740547859e27d6f123787eaec59cb99107fb86ab42ff62a9314a546fe3f8a43a9b119e222df5db98bc1212db6212 musl-fix-getrlimit-failed.patch" diff --git a/community/chromium/musl-fix-getrlimit-failed.patch b/community/chromium/musl-fix-getrlimit-failed.patch new file mode 100644 index 0000000000..08692abf16 --- /dev/null +++ b/community/chromium/musl-fix-getrlimit-failed.patch @@ -0,0 +1,24 @@ +Date: Wed, 18 Jan 2017 09:51:29 -0600 +From: Samuel Holland <samuel@...lland.org> +Subject: Re: getrlimit failed (chromium on musl) + +> Running chromium on a musl system spams this message: +> +> getrlimit(RLIMIT_NOFILE) failed + +The problem is that the sandbox blocks prlimit64 with EPERM, but musl +only falls back to getrlimit on ENOSYS. The diff below will fix the +error. From the linked bug, the only reason it is blocked in the first +place is ChromeOS, and this change should be fine even there. + +--- content/common/sandbox_linux/bpf_renderer_policy_linux.cc.orig ++++ content/common/sandbox_linux/bpf_renderer_policy_linux.cc +@@ -88,7 +88,7 @@ + case __NR_sched_setscheduler: + return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno); + case __NR_prlimit64: +- return Error(EPERM); // See crbug.com/160157. ++ return Error(ENOSYS); // See crbug.com/160157. + default: + // Default on the content baseline policy. + return SandboxBPFBasePolicy::EvaluateSyscall(sysno); |