www/ungoogled-chromium: update to 118.0.5993.70

Security:	https://vuxml.freebsd.org/freebsd/07ee8c14-68f1-11ee-8290-a8a1599412c6.html

www/ungoogled-chromium/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	ungoogled-chromium
-PORTVERSION=	117.0.5938.149
-PORTREVISION=	1
+PORTVERSION=	118.0.5993.70
 UGVERSION=	${DISTVERSION}-1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \

www/ungoogled-chromium/distinfo

@@ -1,9 +1,9 @@
-TIMESTAMP = 1696501863
-SHA256 (chromium-117.0.5938.149.tar.xz) = ddd7c852bd191c0917ab800655da341e7583c2377ca220ae077fc5de7fc7d9df
-SIZE (chromium-117.0.5938.149.tar.xz) = 3141300340
-SHA256 (ungoogled-chromium-117.0.5938.149-1.tar.gz) = 0afcc1fef6e18c612e7a25c65f08b98d0db3e621c80ff855cbfd5a791b6ad03a
-SIZE (ungoogled-chromium-117.0.5938.149-1.tar.gz) = 651923
-SHA256 (chromium-117.0.5938.149-testdata.tar.xz) = 385aeae97e66a66ef0adab0397538a99d9ac59c3bb4c715f63ae1431cfb89248
-SIZE (chromium-117.0.5938.149-testdata.tar.xz) = 264315044
+TIMESTAMP = 1697203259
+SHA256 (chromium-118.0.5993.70.tar.xz) = 49ee00a734de3dae7c421eb3c974e8d451b4de6f5b4e34b603fd6435eab6993d
+SIZE (chromium-118.0.5993.70.tar.xz) = 3236238920
+SHA256 (ungoogled-chromium-118.0.5993.70-1.tar.gz) = d95a02dc7bad01302ed42c9f50daee53c998149f14ba6a4023198e7b1c6f5a36
+SIZE (ungoogled-chromium-118.0.5993.70-1.tar.gz) = 659633
+SHA256 (chromium-118.0.5993.70-testdata.tar.xz) = f02faeaa1dbc06ba8dbb61caddb9015e213fa548fc27b18533d75ce5cae08ee0
+SIZE (chromium-118.0.5993.70-testdata.tar.xz) = 267730908
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734

www/ungoogled-chromium/files/patch-BUILD.gn

@@ -1,4 +1,4 @@
---- BUILD.gn.orig	2023-09-17 07:59:53 UTC
+--- BUILD.gn.orig	2023-10-13 13:20:35 UTC
 +++ BUILD.gn
 @@ -61,7 +61,7 @@ declare_args() {
    root_extra_deps = []
@@ -17,7 +17,7 @@
        "//net:net_unittests",
        "//sandbox:sandbox_unittests",
        "//services:services_unittests",
-@@ -422,7 +421,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",
-@@ -614,6 +613,15 @@ group("gn_all") {
+@@ -609,6 +608,15 @@ group("gn_all") {
        }
      }
 
@@ -42,7 +42,7 @@
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms",
-@@ -663,7 +671,7 @@ group("gn_all") {
+@@ -658,7 +666,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)" ]
      }
 
-@@ -1087,7 +1095,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1086,7 +1094,7 @@ if (use_blink && !is_cronet_build) {
      ]
    }
 
@@ -60,7 +60,7 @@
      script_test("webdriver_wpt_tests") {
        script = "//third_party/blink/tools/run_wpt_tests.py"
        args = [
-@@ -1177,7 +1185,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1176,7 +1184,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)" ]
      }
-@@ -1186,7 +1194,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1185,7 +1193,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)" ]
      }
 
-@@ -1646,7 +1654,7 @@ group("chromium_builder_perf") {
+@@ -1645,7 +1653,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
 

www/ungoogled-chromium/files/patch-base_BUILD.gn

@@ -1,4 +1,4 @@
---- base/BUILD.gn.orig	2023-09-17 07:59:53 UTC
+--- base/BUILD.gn.orig	2023-10-13 13:20:35 UTC
 +++ base/BUILD.gn
 @@ -198,7 +198,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"
-@@ -1112,11 +1112,23 @@ component("base") {
+@@ -1111,11 +1111,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.
@@ -33,8 +33,8 @@
 +
    if (use_allocator_shim) {
      if (is_apple) {
-       sources += [ "allocator/early_zone_registration_mac.h" ]
-@@ -1133,7 +1145,7 @@ component("base") {
+       sources += [ "allocator/early_zone_registration_apple.h" ]
+@@ -1135,7 +1147,7 @@ component("base") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -43,7 +43,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -2075,6 +2087,22 @@ component("base") {
+@@ -2080,6 +2092,22 @@ component("base") {
      ]
    }
 
@@ -66,7 +66,7 @@
    # iOS
    if (is_ios) {
      sources += [
-@@ -2207,6 +2235,29 @@ component("base") {
+@@ -2212,6 +2240,29 @@ component("base") {
      }
    }
 
@@ -96,7 +96,7 @@
    if (use_blink) {
      sources += [
        "files/file_path_watcher.cc",
-@@ -2217,7 +2268,7 @@ component("base") {
+@@ -2222,7 +2273,7 @@ component("base") {
    }
 
    if (dep_libevent) {
@@ -105,7 +105,7 @@
    }
 
    if (use_libevent) {
-@@ -3587,7 +3638,7 @@ test("base_unittests") {
+@@ -3596,7 +3647,7 @@ test("base_unittests") {
      ]
    }
 
@@ -114,7 +114,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3608,7 +3659,7 @@ test("base_unittests") {
+@@ -3617,7 +3668,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",
-@@ -3619,7 +3670,7 @@ test("base_unittests") {
+@@ -3628,7 +3679,7 @@ test("base_unittests") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -132,7 +132,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -3871,7 +3922,7 @@ test("base_unittests") {
+@@ -3884,7 +3935,7 @@ test("base_unittests") {
      }
    }
 

www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_BUILD.gn

@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/BUILD.gn.orig	2023-09-17 07:59:53 UTC
+--- base/allocator/partition_allocator/BUILD.gn.orig	2023-10-13 13:20:35 UTC
 +++ base/allocator/partition_allocator/BUILD.gn
-@@ -541,7 +541,7 @@ source_set("allocator_shim") {
+@@ -562,7 +562,7 @@ source_set("allocator_shim") {
        ]
        configs += [ ":mac_no_default_new_delete_symbols" ]
      }

www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni

@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2023-09-17 07:59:53 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2023-10-13 13:20:35 UTC
 +++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -332,7 +332,7 @@ declare_args() {
+@@ -328,7 +328,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/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc

@@ -0,0 +1,34 @@
+--- base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig	2023-10-13 13:20:35 UTC
++++ base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc
+@@ -12,11 +12,11 @@
+ #include <string.h>
+ #include <unistd.h>
+
+-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
+ #include <link.h>  // For ElfW() macro.
+ #endif
+
+-#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 {
+
+ namespace {
+
+-#if !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
+
+ constexpr size_t kBufferSize = 4096u;
+
+@@ -359,7 +359,7 @@ void PrintStackTraceInternal(void* const* trace, size_
+ }
+ #endif  // !BUILDFLAG(IS_APPLE)
+
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+ // Since /proc/self/maps is not available, use dladdr() to obtain module
+ // names and offsets inside the modules from the given addresses.
+ void PrintStackTraceInternal(void* const* trace, size_t size) {

www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h

@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_alloc_config.h.orig	2023-09-17 07:59:53 UTC
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig	2023-10-13 13:20:35 UTC
 +++ base/allocator/partition_allocator/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
@@ -9,7 +9,7 @@
 
  // On some platforms, we implement locking by spinning in userspace, then going
  // into the kernel only if there is contention. This requires platform support,
-@@ -236,7 +236,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -237,7 +237,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,7 +18,7 @@
 
  // PartitionAlloc uses PartitionRootEnumerator to acquire all
  // PartitionRoots at BeforeFork and to release at AfterFork.
-@@ -283,7 +283,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -284,7 +284,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() \

www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__root.cc

@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_root.cc.orig	2023-09-17 07:59:53 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig	2023-10-13 13:20:35 UTC
 +++ base/allocator/partition_allocator/partition_root.cc
-@@ -46,7 +46,7 @@
+@@ -47,7 +47,7 @@
  #include "wow64apiset.h"
  #endif
 
@@ -9,7 +9,7 @@
  #include <pthread.h>
  #endif
 
-@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -281,7 +281,7 @@ void PartitionAllocMallocInitOnce() {
      return;
    }
 
@@ -18,7 +18,7 @@
    // When fork() is called, only the current thread continues to execute in the
    // child process. If the lock is held, but *not* by this thread when fork() is
    // called, we have a deadlock.
-@@ -372,7 +372,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa
+@@ -379,7 +379,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro
    constexpr size_t kMaxSlotCount =
        (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
        MinPurgeableSlotSize();
@@ -27,7 +27,7 @@
    // It's better for slot_usage to be stack-allocated and fixed-size, which
    // demands that its size be constexpr. On IS_APPLE and Linux on arm64,
    // PartitionPageSize() is always SystemPageSize() << 2, so regardless of
-@@ -849,7 +849,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
+@@ -948,7 +948,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
      // apple OSes.
      PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
               (internal::SystemPageSize() == (size_t{1} << 14)));

www/ungoogled-chromium/files/patch-base_base__switches.cc

@@ -1,7 +1,7 @@
---- base/base_switches.cc.orig	2023-09-17 07:59:53 UTC
+--- base/base_switches.cc.orig	2023-10-13 13:20:35 UTC
 +++ base/base_switches.cc
-@@ -162,7 +162,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
- 
+@@ -180,7 +180,7 @@ const char kPackageVersionName[] = "package-version-na
+ const char kPackageVersionCode[] = "package-version-code";
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)

www/ungoogled-chromium/files/patch-base_base__switches.h

@@ -1,7 +1,7 @@
---- base/base_switches.h.orig	2023-09-17 07:59:53 UTC
+--- base/base_switches.h.orig	2023-10-13 13:20:35 UTC
 +++ base/base_switches.h
-@@ -56,7 +56,7 @@ extern const char kEnableIdleTracing[];
- extern const char kForceFieldTrialParams[];
+@@ -62,7 +62,7 @@ extern const char kPackageVersionName[];
+ extern const char kPackageVersionCode[];
  #endif
 
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)

www/ungoogled-chromium/files/patch-base_system_sys__info.h

@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig	2023-09-17 07:59:53 UTC
+--- base/system/sys_info.h.orig	2023-10-13 13:20:35 UTC
 +++ base/system/sys_info.h
-@@ -264,6 +264,8 @@ class BASE_EXPORT SysInfo {
+@@ -266,6 +266,8 @@ class BASE_EXPORT SysInfo {
    static void ResetCpuSecurityMitigationsEnabledForTesting();
  #endif
 
@@ -9,7 +9,7 @@
   private:
    friend class test::ScopedAmountOfPhysicalMemoryOverride;
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-@@ -276,7 +278,7 @@ class BASE_EXPORT SysInfo {
+@@ -278,7 +280,7 @@ class BASE_EXPORT SysInfo {
    static HardwareInfo GetHardwareInfoSync();
 
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

www/ungoogled-chromium/files/patch-base_test_launcher_test__launcher.cc

@@ -1,7 +1,7 @@
---- base/test/launcher/test_launcher.cc.orig	2023-06-05 19:39:05 UTC
+--- base/test/launcher/test_launcher.cc.orig	2023-10-13 13:20:35 UTC
 +++ base/test/launcher/test_launcher.cc
-@@ -69,6 +69,7 @@
- #include "third_party/libxml/chromium/libxml_utils.h"
+@@ -68,6 +68,7 @@
+ #include "testing/gtest/include/gtest/gtest.h"
 
  #if BUILDFLAG(IS_POSIX)
 +#include <signal.h>

www/ungoogled-chromium/files/patch-base_threading_hang__watcher.cc

@@ -0,0 +1,11 @@
+--- base/threading/hang_watcher.cc.orig	2023-10-13 13:20:35 UTC
++++ base/threading/hang_watcher.cc
+@@ -331,7 +331,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
+
+   bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher);
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
+   if (is_zygote_child) {
+     enable_hang_watcher =
+         enable_hang_watcher &&

www/ungoogled-chromium/files/patch-base_trace__event_trace__log.cc

@@ -1,6 +1,6 @@
---- base/trace_event/trace_log.cc.orig	2023-09-17 07:59:53 UTC
+--- base/trace_event/trace_log.cc.orig	2023-10-13 13:20:35 UTC
 +++ base/trace_event/trace_log.cc
-@@ -2187,8 +2187,13 @@ void TraceLog::SetTraceBufferForTesting(
+@@ -2190,8 +2190,13 @@ void TraceLog::SetTraceBufferForTesting(
  #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
  void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
    AutoLock lock(track_event_lock_);