community/chromium: upgrade to 56.0.2924.76

3 files changed, 74 insertions, 39 deletions

diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index 0b3fc87273..3aad6b4c3d 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=chromium
-pkgver=55.0.2883.87
-pkgrel=1
+pkgver=56.0.2924.76
+pkgrel=0
 pkgdesc="chromium web browser"
 url="http://www.chromium.org/"
 arch="x86_64"
@@ -92,7 +92,6 @@ 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
@@ -342,7 +341,7 @@ chromedriver() {
 	mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin || return 1
 }
 
-md5sums="c389ad65365d76b36cb56952e76835e4  chromium-55.0.2883.87.tar.xz
+md5sums="db1efe3e0c843e4237052432f2a46d58  chromium-56.0.2924.76.tar.xz
 b6d015c1da85aa65ee21bc974c7fc7d2  chromium-launcher.sh
 c5aa73a87d4b88cce9f1a680ca691bb6  chromium.conf
 2962ac6259e39a797d441daf43aa49c9  chromium.desktop
@@ -356,11 +355,10 @@ c5aa73a87d4b88cce9f1a680ca691bb6  chromium.conf
 c805e026abc748d9925fab8250760bcc  musl-sandbox.patch
 d232b8dcb4d4db9a868c89e3a48ee716  no-execinfo.patch
 886bc4ce1423a185b4d969ec2daa5933  no-getcontext.patch
-3dd580483ebf0a94db90d35288c0f340  no-mallinfo.patch
+69fa53e833ae7a4cd30fc387b781602a  no-mallinfo.patch
 f99a4572c0be2c2123acc2478905e01f  resolver.patch
-bff9e1de1e5fa119b41bf6705926cd9e  unset-madv_free.patch
-73c1b0c3c9d90eb2eb41d81a50ea306d  musl-fix-getrlimit-failed.patch"
-sha256sums="e81bd3140d9c84dfee04d9a94686dfe6a20ae79475d84f17154c5536dcb81a58  chromium-55.0.2883.87.tar.xz
+bff9e1de1e5fa119b41bf6705926cd9e  unset-madv_free.patch"
+sha256sums="cfb08e226b9c16ad887eb96d715a9cc4ab097d1a79e2e68c8749a7a4164b3c38  chromium-56.0.2924.76.tar.xz
 89f1eb19d1ed998a190045ea173959f01faee3490d58a6a34ca3fe21228e569f  chromium-launcher.sh
 b466559340a36998354a0577325fe533d9e6b74c24a15b7599671171506bf128  chromium.conf
 3ae90cea7503d0039de53448ed112b9bc0cb5a09f6b0045506eb777fc23517e5  chromium.desktop
@@ -374,11 +372,10 @@ ef7ff14f3e91a72d1d7437b5edf5d3cf1ac04e1c80cfb8c2f2fe5c93bc80bb27  gn_bootstrap.p
 3d0303f9ea04b2c24e16068ea2d423fce0e37ebb2b89dde342f9e8f9d0b149b4  musl-sandbox.patch
 18ee716e709da867d6e8b8dcf4c5e33dc9def31781ff40f2ec3fc2860705dd24  no-execinfo.patch
 855edf1062e199ceaa7619d5bb81ff6939cc5ee1c947dfd15b50e0cba18548e2  no-getcontext.patch
-3a5d4c8e38c6345eec21ed9d6f0b82aaddfca310fd7d5f57e7ec1c359f59ef2e  no-mallinfo.patch
+375473b274691ec565bee26ffbca4c917efc646df86051ea00402540c308223c  no-mallinfo.patch
 914c513bb54d4d97cd2a7622647f6af5cd0c8d29a0aa2962a60fdbed88f54429  resolver.patch
-e9c1f901c7bc8102a31ef2cc2235892671357362c04a4a1f009f54830449ef5f  unset-madv_free.patch
-d71e048e059e456912da90e6897d8356defd2e8091036a5dc47ab958b32aa8a2  musl-fix-getrlimit-failed.patch"
-sha512sums="b39b5a9e50d9406cc21db1f5972a02dfba74eb2d5f8b0accde4d2aeca07bcddc6bbdf44ea6f5414a755f8ed0b0852381cb1c7b4f0cb02742146db314e4a0c55e  chromium-55.0.2883.87.tar.xz
+e9c1f901c7bc8102a31ef2cc2235892671357362c04a4a1f009f54830449ef5f  unset-madv_free.patch"
+sha512sums="ddcb2f0c76bdad3b87dc9219367764cb9adb900d7581dc5a371184ebfe2581f6ecbfc9aae02115e87291a5b90587fc145dada2b0940ae60fc19d25f5c505022d  chromium-56.0.2924.76.tar.xz
 b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60  chromium-launcher.sh
 f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f  chromium.conf
 e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c  chromium.desktop
@@ -392,7 +389,6 @@ e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b3
 ce8276bb35a8d72cf58868a6331e85286b350a1aad694525ebf637499819219dd4d87ab67dd3b938830a6bd3e7172fc9bcd9c8971820d0ed95c0d141867a24fe  musl-sandbox.patch
 fef119b4e23269cc6252e940e23029a312c9852b8d2115ee155ef9a4f5788b6b7dc8c1cab2e32fb4f25c2956a4dd2305375cbd1847c58d7159d15907d6b17a5d  no-execinfo.patch
 a57858e45cfbb7e97f77b3b308502e377543d61d3d0085798ed73bc53da456828f5e010308d0de05fee4fe52071362d074f5af205f98f41d67222d997857d626  no-getcontext.patch
-0d2e4b64f5bcb0ece5cf0cace493b07e900b14d9da5e4173a3034322ff264ab1978364000442c83240983ac0aa5f2b18f941bb5121b043a1e8e28e7de94fa44b  no-mallinfo.patch
+7eac76f78b734404510d6e850b3eb55d10ae74ed48072dd318a751cc6fd806363eb82544602f5b6724548a34b418658b9fb0941c88ced0dc4f0ee77cfb172d0d  no-mallinfo.patch
 d60407a8faadfd2a8294570163b4d1b1112c8a70a6f8e778fc3aff25d20613a2e26c66cd87e69c54953cc1b984e4038015ad04797b0495df13932541b05398fe  resolver.patch
-5eafc0b92d6aa3a4a94bce544461d57121a9405784e2687b9ed382371a7c10e4db5fd6325057344a66b7df32dca963bc12b7f67b256f1f1295bf6519400b0b8e  unset-madv_free.patch
-7e0c11ad6cc0ead28750401b4ac6569bb86f740547859e27d6f123787eaec59cb99107fb86ab42ff62a9314a546fe3f8a43a9b119e222df5db98bc1212db6212  musl-fix-getrlimit-failed.patch"
+5eafc0b92d6aa3a4a94bce544461d57121a9405784e2687b9ed382371a7c10e4db5fd6325057344a66b7df32dca963bc12b7f67b256f1f1295bf6519400b0b8e  unset-madv_free.patch"
diff --git a/community/chromium/musl-fix-getrlimit-failed.patch b/community/chromium/musl-fix-getrlimit-failed.patch
deleted file mode 100644
index 08692abf16..0000000000
--- a/community/chromium/musl-fix-getrlimit-failed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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);
diff --git a/community/chromium/no-mallinfo.patch b/community/chromium/no-mallinfo.patch
index 3ea66e475d..ceaf009295 100644
--- a/community/chromium/no-mallinfo.patch
+++ b/community/chromium/no-mallinfo.patch
@@ -20,3 +20,66 @@
  size_t GetMemoryUsageKB() {
    struct mallinfo minfo = mallinfo();
    uint64_t mem_usage =
+diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
+index d569350..6edcffe 100644
+--- content/renderer/render_thread_impl.cc
++++ content/renderer/render_thread_impl.cc
+@@ -1821,6 +1821,49 @@ static size_t GetMallocUsage() {
+ }
+ 
+ }  // namespace
++#elif defined(OS_LINUX) && !defined(__GLIBC__)
++namespace {
++
++static size_t GetMallocUsage() {
++  char *line=NULL;
++  size_t n,usage=0;
++  FILE *f = fopen("/proc/self/maps", "r");
++  char *path, *perm;
++  if (f == NULL) {
++    perror("/proc/self/maps");
++    return 0;
++  }
++  path = (char *)malloc(PATH_MAX+16);
++  if (path == NULL)
++    goto out;
++  perm = path + PATH_MAX;
++
++  while (getline(&line, &n, f) >=0) {
++    size_t start,end,offset,inode;
++    int devmaj, devmin, items;
++
++    items = sscanf(line, "%zx-%zx %s %zx %x:%x %zu %s",
++                   &start, &end, perm, &offset,
++                   &devmaj, &devmin, &inode, path);
++
++    if (items < 7)
++      continue;
++
++    if (items < 8)
++      path[0] = '\0';
++
++    if ((strcmp(perm, "rw-p") == 0 && devmaj+devmin == 0)
++        && (path[0] == '\0' || strcmp(path, "[heap]") == 0))
++      usage += end-start;
++  }
++  free(line);
++  free(path);
++out:
++  fclose(f);
++  return usage;
++}
++
++}  // namespace
+ #endif
+ 
+ // TODO(tasak): Once it is possible to use memory-infra without tracing,
+@@ -1839,7 +1882,7 @@ void RenderThreadImpl::RecordPurgeAndSuspendMetrics() const {
+                           blink_stats.partitionAllocTotalAllocatedBytes / 1024);
+   UMA_HISTOGRAM_MEMORY_KB("PurgeAndSuspend.Memory.BlinkGCKB",
+                           blink_stats.blinkGCTotalAllocatedBytes / 1024);
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
+   struct mallinfo minfo = mallinfo();
+ #if defined(USE_TCMALLOC)
+   size_t malloc_usage = minfo.uordblks;