community/chromium: upgrade to 89.0.4389.72

7 files changed, 138 insertions, 121 deletions

diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index a407b300bb9..f7779ec5562 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=chromium
-pkgver=88.0.4324.182
+pkgver=89.0.4389.72
 pkgrel=0
 pkgdesc="Chromium web browser"
 url="https://www.chromium.org/Home"
@@ -107,12 +107,48 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom
 	aarch64-fixes.patch
 	elf-arm.patch
 
-	broken-dcheck.patch
 	llvm10-compat.patch
+	broken-dcheck.patch
+	unbundled-opus.patch
 	missing-includes.patch
 	"
 
 # secfixes:
+#   89.0.4389.72-r0:
+#     - CVE-2021-21158
+#     - CVE-2021-21159
+#     - CVE-2021-21160
+#     - CVE-2021-21161
+#     - CVE-2021-21162
+#     - CVE-2021-21163
+#     - CVE-2021-21164
+#     - CVE-2021-21165
+#     - CVE-2021-21166
+#     - CVE-2021-21167
+#     - CVE-2021-21168
+#     - CVE-2021-21169
+#     - CVE-2021-21170
+#     - CVE-2021-21171
+#     - CVE-2021-21172
+#     - CVE-2021-21173
+#     - CVE-2021-21174
+#     - CVE-2021-21175
+#     - CVE-2021-21176
+#     - CVE-2021-21177
+#     - CVE-2021-21178
+#     - CVE-2021-21179
+#     - CVE-2021-21180
+#     - CVE-2020-27844
+#     - CVE-2021-21181
+#     - CVE-2021-21182
+#     - CVE-2021-21183
+#     - CVE-2021-21184
+#     - CVE-2021-21185
+#     - CVE-2021-21186
+#     - CVE-2021-21187
+#     - CVE-2021-21188
+#     - CVE-2021-21189
+#     - CVE-2021-21190
 #   83.0.4103.116-r0:
 #     - CVE-2020-6505
 #     - CVE-2020-6506
@@ -130,7 +166,6 @@ else
 fi
 
 prepare() {
-	cd "$srcdir"
 	patch_args="-p0"
 	default_prepare
 
@@ -338,19 +373,19 @@ chromedriver() {
 	mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin
 }
 
-sha512sums="ce8d507645e937107847199b55287ec5522e778851367a19c4cfa4ff5fae18e7c7ea999aa7b0ad0758fab68a003f201bf38ae51e3642388705de2ada9be87730  chromium-88.0.4324.182.tar.xz
+sha512sums="b5e3693bc104ff857a2ef4de9b0a9265d44c26e5b94c44e5054bfa810c24dbb1933f1f4a626dda4d74ba6cb13fe5045c4ea9d7ea43e1b0e4057e01428d645fb7  chromium-89.0.4389.72.tar.xz
 a3bb959c65944ae2fb765725cedcffd743a58bc0c2cd1f1999d15fe79801d00f3474b08b4ed7b48859ed921eb57093d0ad09d90f201d729ed9b8a419a591ed29  pstables-2.8.h
 b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60  chromium-launcher.sh
 f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f  chromium.conf
 be4cf2c37fe0ae7bbab53aacb1d3956c22f2b94671879ff4a6c9fa65e021345f168befe3e159704c0c2d281de5c66859d24be4016beec3090f7ef752a93376f3  chromium.desktop
 2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac  google-api.keys
 b726ef2ecfe7d471e60d67de1e05847d214df6093b41bb2055652a9028327af19a8b10e7175467240f4dfec9e3ae97a6c4666bfd2cd6cb436c54656a085653ae  default-pthread-stacksize.patch
-a5969b1e71d141521fe2b9848660580ce93f6b5d51271bc287e6f98ea8bf55501d73e01b1adc9327d316498d4e7f82f53eda67a2561a59e5c26388957904f1e7  musl-fixes.patch
+47668aaab2b6ce71adc5475ccd070c585c9b6d82ef2d070085cca9d57516b6ea5c02881d3396ecefa283591dbcf7c0e646cefd6dbf58b4f0cbb60fcda559b88b  musl-fixes.patch
 e8675aff9fccd8b58cc839ef1d9e0e022d66aa94f72baa72e7acf92ceb2691f6a7907cc60ec3a87f894efdd639a3dec7fe702c97d446fcdea99452caec57e002  musl-fixes-breakpad.patch
 2d27aa2ee872fb9667215e0bbf0b0c7714d87cf632ca888926765509c3a5cfc5a615cc8a39cdb47b2928a2734dc16cccbbf8f83b95f72e05dfc034dbf08db9e9  musl-hacks.patch
 919f13a2cd65673f267321cf95c5410e65bc5264d6704d0791b25d39111282bedb425bd9824dde3b67422cfb874c86a9383ded686e39cfd4aac239edaf41cfc8  musl-libc++.patch
 ef43fa90b05e2407b6daa822193121cdeef6ee9068175572f0928f156f186be9c77539dfa06863adfaa25afd498ec1b5081f9e476543616f9472b9033fd921dc  musl-sandbox.patch
-883dfae96f42a4b4182e280dfb3309faabd3c593aaa4e0814d887b585024e00a49b20fc8268f482a44ec7f524005796542aacb5fdeff8ede2f9a1f738d2dd4f2  no-execinfo.patch
+7c40818a919d0dd0fe57c3af3be59ad8b2726167b4f6bca152c24a5c2bf8fe8a063dcb63cc6685a8f38eea4a2e8c5fe9170150fcb9875c116fa975838cc9593c  no-execinfo.patch
 f4b3f8bf93201f6053cae2a824d011c205e8882c9ef560b5ed4b727c2fc27e8e38aa18f606308f09b1dc14ee4b6e9fecdde728c20a5796a4fc7c77c214d636a3  no-mallinfo.patch
 f60c89076bbc458e2e38d9dad26027f9604179fd59e0c2b988a86340b9ef78a4c346c84ac3e7e4e70badaff69d71edf49d7b9030e5fadb96afde4f977a98c412  resolver.patch
 f4265df7532625070c51ac43466e3e0f21e696f90c3b6040ef62a21defa7666203ff8219d9c9a5bebc011024aff300fbcbd941cebd0df59c4bc068d8f290221e  swiftshader.patch
@@ -363,6 +398,7 @@ cf9970ef403ff7a68bf08c0ba5e681eec459fcb1afb6859e5a80f4874f1b9a656377b4540eeb5208
 ad4ddc25df7aa1de2038b7adb86d27679ecdb7e3e16c0eec994e947a08c41504b6fb41166f7868ff5f58ce8191c78800cbb91d259c864840fa5af1d7ba5d43a1  gcc-arm.patch
 cc67d2a77910663e5a1ad5f66606ee2544867aa1fef25e1a1bc355a8db765d5928edb72f158e6a2ece4195c9b62b875dcdcab4e4055e7611edab405e8cfd658e  aarch64-fixes.patch
 9b1441fe42421ef9ead86a5143bf997d989bd53a8969cdfdf4e0c45f847efc8c1d127e15fb05e2ef5dbefbb228cbdc2849404d74997ca56265599e12e5efd6e4  elf-arm.patch
-e54adfc8c48a47591cf329882167d16180701ec0703162c8691378d59199364b1cdcf9248f1ebd33d4873dd15bda44eeb67c20185b6fd0e9d4c9b08152ad912a  broken-dcheck.patch
-f53d955ef5035012801bd8706b05385de1bc5f3ee56878951583c6af688c2ecd9411dd6bf91e648ab0a1ce7fe6429afb0be1a3c2fee6dc29fa8b499c65276fba  llvm10-compat.patch
-765337d20fc6d805df896ec49c26c63b9d97810b474514c7c9d67739441fc57d5376f71338dac124e1fc7fc7d9fc8d2fff63bfebad8a6ed99d8e5991da7ea1a1  missing-includes.patch"
+b1c1a04d85ed673106ca70f387b42bcfb8cff704ed6bbef48aaab421eb1b636b71e3ab7e3a325276ff4639c8de75f511c89cdd1cd2ae9cc7823482f67e98692a  llvm10-compat.patch
+9b1431fbc94db1d10ef4f26db3329cd1c1c02e957df5e3e9a5e4fa5393e116da5712e2d8e4953fab6d699f94e511a783b5b6ef28120136e1525611c219248cfa  broken-dcheck.patch
+be62fdc26f4ece2c41e0bbcb97ae1e5ae8400c1dcfa9d80ff5eac6725cabb83cc283666fda08d0da33d73df6faa066418b22f65de497c80a2f412430508bebef  unbundled-opus.patch
+18127e70bbe0756eea638d8405797b5399695c649bed4d970384d2633461114e1b3d63a768e2e53c1fbeda5a5919b41ebe3e85f6913622ce6d5ceafaa92a687b  missing-includes.patch"
diff --git a/community/chromium/broken-dcheck.patch b/community/chromium/broken-dcheck.patch
index 68160b2ec87..5f1643fefc6 100644
--- a/community/chromium/broken-dcheck.patch
+++ b/community/chromium/broken-dcheck.patch
@@ -1,11 +1,11 @@
---- cc/metrics/compositor_frame_reporter.cc.orig
-+++ cc/metrics/compositor_frame_reporter.cc
-@@ -671,7 +671,7 @@
- 
- void CompositorFrameReporter::ReportEventLatencyHistograms() const {
-   for (const auto& event_metrics : events_metrics_) {
--    DCHECK_NE(event_metrics, nullptr);
-+    DCHECK_EQ(event_metrics != nullptr, true);
-     const std::string histogram_base_name =
-         GetEventLatencyHistogramBaseName(*event_metrics);
-     const int event_type_index = static_cast<int>(event_metrics->type());
+--- net/third_party/quiche/src/quic/core/quic_path_validator.cc.orig
++++ net/third_party/quiche/src/quic/core/quic_path_validator.cc
+@@ -68,7 +68,7 @@
+ void QuicPathValidator::StartPathValidation(
+     std::unique_ptr<QuicPathValidationContext> context,
+     std::unique_ptr<ResultDelegate> result_delegate) {
+-  DCHECK_NE(nullptr, context);
++  DCHECK(context);
+   QUIC_DLOG(INFO) << "Start validating path " << *context
+                   << " via writer: " << context->WriterToUse();
+   if (path_context_ != nullptr) {
diff --git a/community/chromium/llvm10-compat.patch b/community/chromium/llvm10-compat.patch
index b39db0af2dd..7b83f43b049 100644
--- a/community/chromium/llvm10-compat.patch
+++ b/community/chromium/llvm10-compat.patch
@@ -1,34 +1,23 @@
 --- build/config/compiler/BUILD.gn.orig
 +++ build/config/compiler/BUILD.gn
-@@ -604,9 +604,6 @@
-         # Experimentally determined to yield a reasonable trade-off between
-         # build time, run-time performance, and binary size.
-         "-mllvm:-import-instr-limit=10",
--
--        # TODO(https://crbug.com/1127713): Investigate, remove.
--        "-mllvm:-enable-dse-memoryssa=false",
-       ]
-     } else {
-       ldflags += [ "-flto=thin" ]
-@@ -631,9 +628,6 @@
-         "-Wl,--thinlto-cache-policy,$cache_policy",
+@@ -652,7 +652,7 @@
        ]
  
--      # TODO(https://crbug.com/1127713): Investigate, remove.
+       # TODO(https://crbug.com/1127713): Investigate, remove.
 -      ldflags += [ "-Wl,-mllvm,-enable-dse-memoryssa=false" ]
--
++      ldflags += [ "-Wl" ]
+ 
        ldflags += [ "-Wl,--lto-O" + lto_opt_level ]
        if (thin_lto_enable_optimizations) {
-         # TODO(gbiv): We ideally shouldn't need to specify this; ThinLTO
-@@ -748,7 +742,6 @@
+@@ -767,7 +767,6 @@
      # simplicity we always explicitly set the architecture.
      if (current_cpu == "x64") {
        cflags += [
 -        "-m64",
          "-march=$x64_arch",
+         "-msse3",
        ]
-       ldflags += [ "-m64" ]
-@@ -1045,11 +1038,9 @@
+@@ -1064,11 +1063,9 @@
          cflags += [ "-maix64" ]
          ldflags += [ "-maix64" ]
        } else {
@@ -40,7 +29,20 @@
        ldflags += [ "-m64" ]
      }
    }
-@@ -1514,11 +1505,6 @@
+@@ -1450,12 +1447,6 @@
+       cflags += [ "-Wundeclared-selector" ]
+     }
+ 
+-    # Suppress warnings about ABI changes on ARM (Clang doesn't give this
+-    # warning).
+-    if (current_cpu == "arm" && !is_clang) {
+-      cflags += [ "-Wno-psabi" ]
+-    }
+-
+     if (!is_clang) {
+       cflags_cc += [
+         # See comment for -Wno-c++11-narrowing.
+@@ -1533,11 +1524,6 @@
          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
          # recognize.
          cflags += [
@@ -52,7 +54,7 @@
            # Ignore warnings about MSVC optimization pragmas.
            # TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
            "-Wno-ignored-pragma-optimize",
-@@ -1534,9 +1520,6 @@
+@@ -1553,9 +1539,6 @@
  
            # TODO(https://crbug.com/1028110): Evaluate and possible enable.
            "-Wno-deprecated-copy",
@@ -62,32 +64,12 @@
          ]
  
          cflags_c += [
-@@ -1550,7 +1533,7 @@
-         }
+@@ -1564,7 +1547,7 @@
+         ]
  
          if (enable_wmax_tokens) {
 -          cflags += [ "-Wmax-tokens" ]
-+          cflags += [  ]
++          cflags += [ ]
          } else {
            # TODO(https://crbug.com/1049569): Remove after Clang 87b235db.
            cflags += [ "-Wno-max-tokens" ]
---- third_party/openscreen/src/build/config/BUILD.gn
-+++ third_party/openscreen/src/build/config/BUILD.gn
-@@ -53,7 +53,6 @@
- 
-   if (current_cpu == "x64") {
-     # These are explicitly specified in case of cross-compiling.
--    cflags += [ "-m64" ]
-     ldflags += [ "-m64" ]
-   } else if (current_cpu == "x86") {
-     cflags += [ "-m32" ]
---- third_party/swiftshader/BUILD.gn
-+++ third_party/swiftshader/BUILD.gn
-@@ -94,7 +94,6 @@
- 
-     if (current_cpu == "x64") {  # 64 bit version
-       cflags += [
--        "-m64",
-         "-fPIC",
-         "-march=x86-64",
-         "-mtune=generic",
diff --git a/community/chromium/missing-includes.patch b/community/chromium/missing-includes.patch
index ee6d9732480..042f5ce9895 100644
--- a/community/chromium/missing-includes.patch
+++ b/community/chromium/missing-includes.patch
@@ -1,40 +1,10 @@
---- ui/accessibility/platform/inspect/tree_formatter.h.orig
-+++ ui/accessibility/platform/inspect/tree_formatter.h
-@@ -5,6 +5,9 @@
- #ifndef UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
- #define UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
- 
-+#include <vector>
-+#include <memory>
-+
- #include "ui/accessibility/platform/inspect/inspect.h"
- 
- #include "ui/gfx/native_widget_types.h"
---- third_party/openscreen/src/util/crypto/random_bytes.h.orig
-+++ third_party/openscreen/src/util/crypto/random_bytes.h
-@@ -5,6 +5,7 @@
- #ifndef UTIL_CRYPTO_RANDOM_BYTES_H_
- #define UTIL_CRYPTO_RANDOM_BYTES_H_
- 
-+#include <cstdint>
- #include <array>
- 
- namespace openscreen {
---- third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h.orig	2020-08-23 12:43:09.289768089 +0200
-+++ third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h	2020-08-23 12:43:39.386217911 +0200
-@@ -12,5 +12,6 @@
- #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
- 
-+#include <cstddef>
- #include <array>
- 
- namespace webrtc {
---- chrome/browser/search/background/ntp_backgrounds.h.orig	2020-08-23 14:35:40.788447650 +0200
-+++ chrome/browser/search/background/ntp_backgrounds.h	2020-08-23 14:36:16.414865836 +0200
-@@ -6,5 +6,6 @@
- #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
- 
-+#include <cstddef>
- #include <array>
- 
- class GURL;
+--- ui/accessibility/ax_tree_serializer.h.orig
++++ ui/accessibility/ax_tree_serializer.h
+@@ -8,6 +8,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
++#include <ctime>
+ #include <ostream>
+ #include <unordered_map>
+ #include <unordered_set>
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch
index 284c7d84af5..870dca23b90 100644
--- a/community/chromium/musl-fixes.patch
+++ b/community/chromium/musl-fixes.patch
@@ -75,28 +75,37 @@
  #endif
  #if HAVE_UNISTD_H
  #include <unistd.h>
-diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -39,7 +39,9 @@
- #endif  // defined(OS_ANDROID) && defined(__arm__)
- 
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+@@ -55,7 +55,9 @@
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+ #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if defined(__GLIBC__)
  #include <gnu/libc-version.h>
 +#endif
- 
+
  #include "base/linux_util.h"
  #include "base/strings/string_split.h"
-@@ -295,7 +297,7 @@ void RecordLinuxDistro() {
- #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
- 
+@@ -318,7 +318,7 @@
  void RecordLinuxGlibcVersion() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(__GLIBC__) && !defined(OS_CHROMEOS)
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if (defined(OS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS_LACROS)
    base::Version version(gnu_get_libc_version());
- 
+
    UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
+@@ -615,7 +617,9 @@
+
+ void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() {
+   RecordMemoryMetricsAfterDelay();
++#if defined(__GLIBC__)
+   RecordLinuxGlibcVersion();
++#endif
+ #if defined(USE_X11)
+   if (!features::IsUsingOzonePlatform()) {
+     // Ozone writes this histogram upon platform initialisation.
 diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h
 --- third_party/ots/include/opentype-sanitiser.h
 +++ third_party/ots/include/opentype-sanitiser.h
diff --git a/community/chromium/no-execinfo.patch b/community/chromium/no-execinfo.patch
index 89c0a8bf546..0f7f3b8283c 100644
--- a/community/chromium/no-execinfo.patch
+++ b/community/chromium/no-execinfo.patch
@@ -55,18 +55,18 @@
 --- v8/src/codegen/external-reference-table.cc.orig
 +++ v8/src/codegen/external-reference-table.cc
 @@ -11,7 +11,9 @@
- 
+
  #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
  #define SYMBOLIZE_FUNCTION
 +#if defined(__GLIBC__)
  #include <execinfo.h>
 +#endif
+
  #include <vector>
- #endif  // DEBUG && V8_OS_LINUX && !V8_OS_ANDROID
- 
-@@ -93,7 +95,7 @@
+
+@@ -96,7 +98,7 @@
  }
- 
+
  const char* ExternalReferenceTable::ResolveSymbol(void* address) {
 -#ifdef SYMBOLIZE_FUNCTION
 +#if defined(SYMBOLIZE_FUNCTION) && defined(__GLIBC__)
diff --git a/community/chromium/unbundled-opus.patch b/community/chromium/unbundled-opus.patch
new file mode 100644
index 00000000000..e4fd94102c8
--- /dev/null
+++ b/community/chromium/unbundled-opus.patch
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/modules/webcodecs/BUILD.gn.orig
++++ third_party/blink/renderer/modules/webcodecs/BUILD.gn
+@@ -63,6 +63,7 @@
+     "//media/mojo/clients",
+     "//media/mojo/mojom",
+     "//third_party/libyuv:libyuv",
++    "//third_party/opus",
+   ]
+   if (media_use_openh264) {
+     deps += [ "//third_party/openh264:encoder" ]
+--- third_party/blink/renderer/modules/webcodecs/DEPS.orig
++++ third_party/blink/renderer/modules/webcodecs/DEPS
+@@ -19,6 +19,7 @@
+ 
+     "+third_party/libyuv",
+     "+third_party/openh264",
++    "+third_party/opus",
+ 
+     "+ui/gfx/color_space.h",
+     "+ui/gfx/geometry/rect.h",