MFH: r538100

www/chromium: Update to version 83.0.4103.97

Submitted by:	Matthias Wolf <freebsd@rheinwolf.de> via [1]
Approved by:	portmgr (blanket security fix), chromium@ (rene)
Security:	https://chromereleases.googleblog.com/2020/06/stable-channel-update-for-desktop.html

[1] https://github.com/gliaskos/freebsd-chromium

6 files changed, 28 insertions, 28 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index dfd9ad13e5dd..ea5d3c34ecf4 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	81.0.4044.138
+PORTVERSION=	83.0.4103.97
 CATEGORIES?=	www java
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		LOCAL/cpm/chromium/:fonts
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index f779df2b9aa1..ec1088a754b9 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1590142056
-SHA256 (chromium-83.0.4103.61.tar.xz) = 4961f20c4ee6a94490e823f1b1c4128147068f1ce9cfc509e81815f2101405bc
-SIZE (chromium-83.0.4103.61.tar.xz) = 802558244
-SHA256 (chromium-83.0.4103.61-testdata.tar.xz) = 06096007d6fd1a4adce3b9940a653086e380d0f2be3cf9e36d39956ba2f7363e
-SIZE (chromium-83.0.4103.61-testdata.tar.xz) = 257159920
+TIMESTAMP = 1591262286
+SHA256 (chromium-83.0.4103.97.tar.xz) = 12c405f61284cfc78f8c2b6600f3c1ae61a83b639c41087bb4f74fcaab036f83
+SIZE (chromium-83.0.4103.97.tar.xz) = 802603824
+SHA256 (chromium-83.0.4103.97-testdata.tar.xz) = b8787a82efe64d12b0ca7ee0af9eb0e27aa1a85bc75649ab6aef1f5e9ea9f6f4
+SIZE (chromium-83.0.4103.97-testdata.tar.xz) = 257142948
 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1
 SIZE (test_fonts.tar.xz) = 200040
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 2d039eeec9c0..3c0c75115693 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig	2020-05-13 18:40:15 UTC
+--- BUILD.gn.orig	2020-06-03 18:40:09 UTC
 +++ BUILD.gn
 @@ -418,7 +418,7 @@ group("gn_all") {
      ]
@@ -57,7 +57,7 @@
      ]
      if (is_desktop_linux && use_ozone) {
        deps += [ "//chrome/browser/vr/testapp:vr_testapp" ]
-@@ -1071,7 +1060,7 @@ if (!is_ios) {
+@@ -1072,7 +1061,7 @@ if (!is_ios) {
        ]
      }
  
@@ -66,7 +66,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1080,7 +1069,7 @@ if (!is_ios) {
+@@ -1081,7 +1070,7 @@ if (!is_ios) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -75,7 +75,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -1273,9 +1262,6 @@ group("chromium_builder_perf") {
+@@ -1274,9 +1263,6 @@ group("chromium_builder_perf") {
  
      if (is_win) {
        data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 940adc0febf5..1b96d312f328 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig	2020-05-13 18:40:16 UTC
+--- build/config/compiler/BUILD.gn.orig	2020-06-03 18:40:10 UTC
 +++ build/config/compiler/BUILD.gn
 @@ -138,7 +138,7 @@ declare_args() {
    # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel.
@@ -6,10 +6,10 @@
    init_stack_vars =
 -      !is_android && !use_xcode_clang && (!is_official_build || is_linux)
 +      !is_android && !use_xcode_clang && (!is_official_build || is_linux) && !is_bsd
- }
  
- declare_args() {
-@@ -298,7 +298,7 @@ config("compiler") {
+   # This argument is to control whether enabling text section splitting in the
+   # final binary. When enabled, the separated text sections with prefix
+@@ -307,7 +307,7 @@ config("compiler") {
      }
  
      # Linker warnings.
@@ -18,7 +18,7 @@
        ldflags += [ "-Wl,--fatal-warnings" ]
      }
      if (fatal_linker_warnings && (is_mac || is_ios)) {
-@@ -392,7 +392,7 @@ config("compiler") {
+@@ -401,7 +401,7 @@ config("compiler") {
  
      # Compiler instrumentation can introduce dependencies in DSOs to symbols in
      # the executable they are loaded into, so they are unresolved at link-time.
@@ -27,8 +27,8 @@
        ldflags += [
          "-Wl,-z,defs",
          "-Wl,--as-needed",
-@@ -485,7 +485,7 @@ config("compiler") {
-     }
+@@ -500,7 +500,7 @@ config("compiler") {
+     ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
 -  if (is_clang && !is_nacl && !use_xcode_clang) {
@@ -36,7 +36,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" +
                  rebase_path("//tools/clang/crashreports", root_build_dir) ]
  
-@@ -755,7 +755,7 @@ config("compiler_cpu_abi") {
+@@ -770,7 +770,7 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -45,7 +45,7 @@
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
        }
-@@ -1105,7 +1105,7 @@ config("compiler_deterministic") {
+@@ -1120,7 +1120,7 @@ config("compiler_deterministic") {
        "-Xclang",
        ".",
      ]
@@ -54,7 +54,7 @@
        # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
        asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
      }
-@@ -1488,7 +1488,7 @@ config("default_warnings") {
+@@ -1503,7 +1503,7 @@ config("default_warnings") {
          cflags += [ "-Wno-nonportable-include-path" ]
        }
  
@@ -63,7 +63,7 @@
          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
          # recognize.
          cflags += [
-@@ -1738,7 +1738,7 @@ config("thin_archive") {
+@@ -1753,7 +1753,7 @@ config("thin_archive") {
    # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
    # have a "thin archive" mode (it does accept -T, but it means truncating
    # archive names to 16 characters, which is not what we want).
@@ -72,7 +72,7 @@
      arflags = [ "-T" ]
    } else if (is_win && use_lld) {
      arflags = [ "/llvmlibthin" ]
-@@ -2262,7 +2262,7 @@ config("symbols") {
+@@ -2277,7 +2277,7 @@ config("symbols") {
      # flag, so we can use use -g1 for pnacl and nacl-clang compiles.
      # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
      if (!is_nacl || is_clang) {
@@ -81,7 +81,7 @@
      }
  
      if (is_clang && !is_nacl && !use_xcode_clang) {
-@@ -2290,7 +2290,7 @@ config("symbols") {
+@@ -2305,7 +2305,7 @@ config("symbols") {
      # DWARF info may be corrupt; offsets in a range list entry are in different
      # sections" there.  Maybe just a bug in nacl_switch_32.S.
      if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index 0c55648ee2b6..aa93dd0dd814 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig	2020-05-13 18:40:32 UTC
+--- content/public/common/content_features.cc.orig	2020-06-03 18:40:24 UTC
 +++ content/public/common/content_features.cc
 @@ -48,7 +48,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
  const base::Feature kAudioServiceOutOfProcess {
@@ -9,7 +9,7 @@
        base::FEATURE_ENABLED_BY_DEFAULT
  #else
        base::FEATURE_DISABLED_BY_DEFAULT
-@@ -707,7 +707,7 @@ const base::Feature kWebAssemblyThreads {
+@@ -711,7 +711,7 @@ const base::Feature kWebAssemblyThreads {
  };
  
  // Enable WebAssembly trap handler.
@@ -18,7 +18,7 @@
      defined(ARCH_CPU_X86_64)
  const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
                                              base::FEATURE_ENABLED_BY_DEFAULT};
-@@ -737,7 +737,7 @@ const base::Feature kWebAuth{"WebAuthentication",
+@@ -741,7 +741,7 @@ const base::Feature kWebAuth{"WebAuthentication",
  // https://w3c.github.io/webauthn
  const base::Feature kWebAuthCable {
    "WebAuthenticationCable",
diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
index e23051d78497..8abba04b185d 100644
--- a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
+++ b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc
@@ -1,6 +1,6 @@
---- net/nqe/network_quality_estimator.cc.orig	2020-03-16 18:40:33 UTC
+--- net/nqe/network_quality_estimator.cc.orig	2020-06-03 18:40:27 UTC
 +++ net/nqe/network_quality_estimator.cc
-@@ -100,7 +100,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() {
+@@ -104,7 +104,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID(
        case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET:
          break;
        case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: