www/chromium: update to 121.0.6167.139

Security:	https://vuxml.freebsd.org/freebsd/dc9e5237-c197-11ee-86bb-a8a1599412c6.html

www/chromium/Makefile

@@ -1,10 +1,10 @@
 PORTNAME=	chromium
-PORTVERSION=	120.0.6099.224
+PORTVERSION=	121.0.6167.85
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
 		https://nerd.hu/distfiles/:external
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		chrome-linux-${PORTVERSION}-llvm16.profdata${EXTRACT_SUFX}:external
+		chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external
 
 MAINTAINER=	chromium@FreeBSD.org
 COMMENT=	Google web browser based on WebKit
@@ -33,7 +33,6 @@ BUILD_DEPENDS=	bash:shells/bash \
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libspeechd.so:accessibility/speech-dispatcher \
-		libsnappy.so:archivers/snappy \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libspeex.so:audio/speex \
@@ -99,6 +98,7 @@ BINARY_ALIAS=	python3=${PYTHON_CMD} \
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_backup_ref_ptr_support=false \
 		enable_hangout_services_extension=true \
+		enable_log_error_not_reached=true \
 		enable_nacl=false \
 		enable_remoting=false \
 		enable_rust=false \
@@ -111,7 +111,8 @@ GN_ARGS+=	clang_use_chrome_plugins=false \
 		treat_warnings_as_errors=false \
 		use_allocator_shim=false \
 		use_aura=true \
-		use_custom_libcxx=false \
+		use_custom_libcxx=true \
+		use_custom_libunwind=true \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \
@@ -228,8 +229,8 @@ TEST_ALL_TARGET=	${TEST_TARGETS}
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
-.if ${COMPILER_VERSION} < 160
-LLVM_DEFAULT=		16
+.if ${COMPILER_VERSION} < 170
+LLVM_DEFAULT=		17
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
@@ -286,7 +287,7 @@ pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
-		libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
+		libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
 	cd ${WRKSRC}/third_party/ffmpeg && \
 		${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \

www/chromium/distinfo

@@ -1,9 +1,9 @@
-TIMESTAMP = 1705481301
-SHA256 (chromium-120.0.6099.224.tar.xz) = 850a85c8d8a01041a07dfaaea8289fa5f8294b4e375e6b77997b61434e0a2f1a
-SIZE (chromium-120.0.6099.224.tar.xz) = 3299542904
-SHA256 (chrome-linux-120.0.6099.224-llvm16.profdata.tar.xz) = 8db4e511d77dde051f65e2ff504d2f49409dd68fc1e765c6baed42b88f2f79bc
-SIZE (chrome-linux-120.0.6099.224-llvm16.profdata.tar.xz) = 29505568
-SHA256 (chromium-120.0.6099.224-testdata.tar.xz) = db8ef8f50dd759f548fd269202f9d084e3d1bb92b587bd5e0023707ac29518ea
-SIZE (chromium-120.0.6099.224-testdata.tar.xz) = 268575524
+TIMESTAMP = 1706600849
+SHA256 (chromium-121.0.6167.85.tar.xz) = a2f46c5266681126ea9e15c1c3067560d84f3e5d902e1ace934a3813c84e7152
+SIZE (chromium-121.0.6167.85.tar.xz) = 3332417624
+SHA256 (chrome-linux-121.0.6167.85-llvm17.profdata.tar.xz) = 28245236d28b1c14675fd2466626a4f388c23c7ab646076a144fb0f0ff1f366f
+SIZE (chrome-linux-121.0.6167.85-llvm17.profdata.tar.xz) = 29862496
+SHA256 (chromium-121.0.6167.85-testdata.tar.xz) = e0926e33dc1f1205b0bad5964b4f87ae31f4b4d186f9fb303b6da3e46ff4e197
+SIZE (chromium-121.0.6167.85-testdata.tar.xz) = 271771004
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

www/chromium/files/patch-BUILD.gn

@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2023-12-10 06:10:27 UTC
+--- BUILD.gn.orig	2024-01-30 07:53:34 UTC
 +++ BUILD.gn
-@@ -61,7 +61,7 @@ declare_args() {
+@@ -62,7 +62,7 @@ declare_args() {
    root_extra_deps = []
  }
 
@@ -9,15 +9,15 @@
    # An official (maximally optimized!) component (optimized for build times)
    # build doesn't make sense and usually doesn't work.
    assert(!is_component_build)
-@@ -95,7 +95,6 @@ group("gn_all") {
+@@ -94,7 +94,6 @@ group("gn_all") {
        "//codelabs",
        "//components:components_unittests",
        "//components/gwp_asan:gwp_asan_unittests",
 -      "//infra/orchestrator:orchestrator_all",
        "//net:net_unittests",
        "//sandbox:sandbox_unittests",
        "//services:services_unittests",
-@@ -415,7 +414,7 @@ group("gn_all") {
+@@ -417,7 +416,7 @@ group("gn_all") {
        }
      }
 
@@ -26,7 +26,7 @@
        deps += [
          "//third_party/breakpad:breakpad_unittests",
          "//third_party/breakpad:core-2-minidump",
-@@ -615,6 +614,15 @@ group("gn_all") {
+@@ -617,6 +616,15 @@ group("gn_all") {
        }
      }
 
@@ -42,7 +42,7 @@
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms",
-@@ -664,7 +672,7 @@ group("gn_all") {
+@@ -663,7 +671,7 @@ group("gn_all") {
            host_os == "win") {
          deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
        }
@@ -51,7 +51,7 @@
        deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
      }
 
-@@ -1085,7 +1093,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1084,7 +1092,7 @@ if (use_blink && !is_cronet_build) {
      ]
    }
 
@@ -60,7 +60,7 @@
      script_test("chrome_wpt_tests") {
        script = "//third_party/blink/tools/run_wpt_tests.py"
        args = [
-@@ -1158,7 +1166,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1174,7 +1182,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
 
@@ -69,7 +69,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1167,7 +1175,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1183,7 +1191,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
 
@@ -78,7 +78,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
 
-@@ -1632,7 +1640,7 @@ group("chromium_builder_perf") {
+@@ -1624,7 +1632,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
 

www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc

@@ -1,6 +1,6 @@
---- apps/ui/views/app_window_frame_view.cc.orig	2023-12-10 06:10:27 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig	2024-01-30 07:53:34 UTC
 +++ apps/ui/views/app_window_frame_view.cc
-@@ -149,7 +149,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
+@@ -148,7 +148,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
    gfx::Rect window_bounds = client_bounds;
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.

www/chromium/files/patch-base_BUILD.gn

@@ -1,4 +1,4 @@
---- base/BUILD.gn.orig	2023-12-10 06:10:27 UTC
+--- base/BUILD.gn.orig	2024-01-30 07:53:34 UTC
 +++ base/BUILD.gn
 @@ -186,7 +186,7 @@ buildflag_header("ios_cronet_buildflags") {
    flags = [ "CRONET_BUILD=$is_cronet_build" ]
@@ -9,7 +9,7 @@
  buildflag_header("message_pump_buildflags") {
    header = "message_pump_buildflags.h"
    header_dir = "base/message_loop"
-@@ -1105,11 +1105,23 @@ component("base") {
+@@ -1098,11 +1098,23 @@ component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -34,7 +34,7 @@
    if (use_allocator_shim) {
      if (is_apple) {
        sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1129,7 +1141,7 @@ component("base") {
+@@ -1122,7 +1134,7 @@ component("base") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -43,7 +43,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -2088,6 +2100,22 @@ component("base") {
+@@ -2077,6 +2089,22 @@ component("base") {
      ]
    }
 
@@ -66,7 +66,7 @@
    # iOS
    if (is_ios) {
      sources += [
-@@ -2220,6 +2248,29 @@ component("base") {
+@@ -2207,6 +2235,29 @@ component("base") {
      }
    }
 
@@ -96,7 +96,7 @@
    if (use_blink) {
      sources += [
        "files/file_path_watcher.cc",
-@@ -2230,7 +2281,7 @@ component("base") {
+@@ -2217,7 +2268,7 @@ component("base") {
    }
 
    if (dep_libevent) {
@@ -105,7 +105,7 @@
    }
 
    if (use_libevent) {
-@@ -3619,7 +3670,7 @@ test("base_unittests") {
+@@ -3615,7 +3666,7 @@ test("base_unittests") {
      ]
    }
 
@@ -114,7 +114,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3640,7 +3691,7 @@ test("base_unittests") {
+@@ -3637,7 +3688,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -123,7 +123,7 @@
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3651,7 +3702,7 @@ test("base_unittests") {
+@@ -3648,7 +3699,7 @@ test("base_unittests") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -132,7 +132,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -3913,7 +3964,7 @@ test("base_unittests") {
+@@ -3909,7 +3960,7 @@ test("base_unittests") {
      }
    }
 

www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni

@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2023-11-03 10:09:45 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2024-01-30 07:53:34 UTC
 +++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -319,7 +319,7 @@ declare_args() {
+@@ -333,7 +333,7 @@ declare_args() {
    # pkeys support is explicitly disabled in all Cronet builds, as some test
    # dependencies that use partition_allocator are compiled in AOSP against a
    # version of glibc that does not include pkeys syscall numbers.

www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn

@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2024-01-30 07:53:34 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -582,7 +582,7 @@ source_set("allocator_shim") {
-       ]
-       configs += [ ":mac_no_default_new_delete_symbols" ]
+@@ -855,7 +855,7 @@ if (is_clang_or_gcc) {
+         configs -= [ "//build/config/compiler:enable_arc" ]
+       }
      }
 -    if (is_chromeos || is_linux) {
 +    if ((is_chromeos || is_linux) && !is_bsd) {
-       sources += [
+       shim_headers += [
          "shim/allocator_shim_override_cpp_symbols.h",
          "shim/allocator_shim_override_glibc_weak_symbols.h",

www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_stack__trace__posix.cc

@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig	2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc.orig	2024-01-30 07:53:34 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_posix.cc
 @@ -12,11 +12,11 @@
  #include <string.h>
@@ -11,10 +11,10 @@
 
 -#if BUILDFLAG(IS_APPLE)
 +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
- #define HAVE_DLADDR
  #include <dlfcn.h>
  #endif
-@@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug {
+
+@@ -24,7 +24,7 @@ namespace partition_alloc::internal::base::debug {
 
  namespace {
 
@@ -23,7 +23,7 @@
 
  constexpr size_t kBufferSize = 4096u;
 
-@@ -359,7 +359,7 @@ void PrintStackTraceInternal(const void** trace, size_
+@@ -358,7 +358,7 @@ void PrintStackTraceInternal(const void** trace, size_
  }
  #endif  // !BUILDFLAG(IS_APPLE)
 

www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_threading_platform__thread__posix.cc

@@ -1,8 +1,8 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc.orig	2024-01-30 07:53:34 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_posix.cc
 @@ -17,7 +17,7 @@
- #include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h"
- #include "build/build_config.h"
+ #include "partition_alloc/partition_alloc_base/logging.h"
+ #include "partition_alloc/partition_alloc_base/threading/platform_thread_internal_posix.h"
 
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)

www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h

@@ -1,15 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2024-01-30 07:53:34 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
-@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, "");
- // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
- // features such as futex(2).
- #define PA_CONFIG_HAS_LINUX_KERNEL() \
--  (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID))
-+  (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD))
-
- // On some platforms, we implement locking by spinning in userspace, then going
- // into the kernel only if there is contention. This requires platform support,
-@@ -241,7 +241,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -255,7 +255,7 @@ constexpr bool kUseLazyCommit = false;
  // On these platforms, lock all the partitions before fork(), and unlock after.
  // This may be required on more platforms in the future.
  #define PA_CONFIG_HAS_ATFORK_HANDLER() \
@@ -18,12 +9,12 @@
 
  // PartitionAlloc uses PartitionRootEnumerator to acquire all
  // PartitionRoots at BeforeFork and to release at AfterFork.
-@@ -288,7 +288,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -301,7 +301,7 @@ constexpr bool kUseLazyCommit = false;
+ //
  // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
  // larger slot spans.
- #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \
--  (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)))
-+  (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD))
-
- // Enable shadow metadata.
- //
+-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
++#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)
+ #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 1
+ #else
+ #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() 0

www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h

@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig	2023-12-10 06:10:27 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig	2024-01-30 07:53:34 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
-@@ -107,7 +107,7 @@ PartitionPageShift() {
+@@ -111,7 +111,7 @@ PartitionPageShift() {
    return 18;  // 256 KiB
  }
  #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
@@ -9,7 +9,7 @@
  PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
  PartitionPageShift() {
    return PageAllocationGranularityShift() + 2;
-@@ -309,7 +309,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
+@@ -313,7 +313,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
  // 8GB for each of the glued pools).
  #if BUILDFLAG(HAS_64_BIT_POINTERS)
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \