www/ungoogled-chromium: update to 116.0.5845.96

Security:	https://vuxml.freebsd.org/freebsd/5666688f-803b-4cf0-9cb1-08c088f2225a.html

www/ungoogled-chromium/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	ungoogled-chromium
-PORTVERSION=	115.0.5790.170
-PORTREVISION=	1
+PORTVERSION=	116.0.5845.96
 UGVERSION=	${DISTVERSION}-1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
@@ -109,7 +108,6 @@ GN_ARGS+=	fatal_linker_warnings=false \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_custom_libcxx=false \
-		use_gnome_keyring=false \
 		use_lld=true \
 		use_partition_alloc=true \
 		use_partition_alloc_as_malloc=false \

www/ungoogled-chromium/distinfo

@@ -1,9 +1,9 @@
-TIMESTAMP = 1691150820
-SHA256 (chromium-115.0.5790.170.tar.xz) = ff9862d2e748c56940ffc222c2e6b2066a19ea1de0bc3fd99ed81c0b231172c0
-SIZE (chromium-115.0.5790.170.tar.xz) = 1595419840
-SHA256 (ungoogled-chromium-115.0.5790.170-1.tar.gz) = aa5aab1b7f8b72f43a2971a3147c552f2dd32bf4cfcff009e847b65785bff9ac
-SIZE (ungoogled-chromium-115.0.5790.170-1.tar.gz) = 665517
-SHA256 (chromium-115.0.5790.170-testdata.tar.xz) = a939490b5087ddffa47ae46bbd73edff33bc19e5cd7e7139040b9f31a7f4bc9c
-SIZE (chromium-115.0.5790.170-testdata.tar.xz) = 258994144
+TIMESTAMP = 1692354461
+SHA256 (chromium-116.0.5845.96.tar.xz) = 1ec1052a959abced9642b36482549bc2ebefa428ed136289d8e0c54b4ccd1c81
+SIZE (chromium-116.0.5845.96.tar.xz) = 1599788748
+SHA256 (ungoogled-chromium-116.0.5845.96-1.tar.gz) = 262ffd7551b76c7d527c95a1c3e11e0431ef8627ebcb1d5c2f0d60fb902b82d8
+SIZE (ungoogled-chromium-116.0.5845.96-1.tar.gz) = 672233
+SHA256 (chromium-116.0.5845.96-testdata.tar.xz) = f626b0fb34dbf528df11830b9d1d7f5e56832d6770ccd3fad07cee31e9825606
+SIZE (chromium-116.0.5845.96-testdata.tar.xz) = 269310352
 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-07-21 09:49:17 UTC
+--- BUILD.gn.orig	2023-08-18 10:26:52 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",
-@@ -419,7 +418,7 @@ group("gn_all") {
+@@ -422,7 +421,7 @@ group("gn_all") {
        }
      }
 
@@ -26,7 +26,7 @@
        deps += [
          "//third_party/breakpad:breakpad_unittests",
          "//third_party/breakpad:core-2-minidump",
-@@ -611,6 +610,15 @@ group("gn_all") {
+@@ -614,6 +613,15 @@ group("gn_all") {
        }
      }
 
@@ -42,7 +42,7 @@
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms",
-@@ -657,7 +665,7 @@ group("gn_all") {
+@@ -660,7 +668,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)" ]
      }
 
-@@ -1086,7 +1094,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1084,7 +1092,7 @@ if (!is_ios && !is_cronet_build) {
      ]
    }
 
@@ -60,7 +60,7 @@
      # WPT Webdriver tests runner
      # chrome/test/chromedriver/test/run_webdriver_tests.py
      script_test("webdriver_wpt_tests") {
-@@ -1186,7 +1194,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1188,7 +1196,7 @@ if (!is_ios && !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)" ]
      }
-@@ -1195,7 +1203,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1197,7 +1205,7 @@ if (!is_ios && !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)" ]
      }
 
-@@ -1663,7 +1671,7 @@ group("chromium_builder_perf") {
+@@ -1671,7 +1679,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
 

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

@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig	2023-06-05 19:39:05 UTC
+--- ash/display/mirror_window_controller.cc.orig	2023-08-18 10:26:52 UTC
 +++ ash/display/mirror_window_controller.cc
-@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
        if (!base::Contains(display_info_list, iter->first,
                            &display::ManagedDisplayInfo::id)) {
          CloseAndDeleteHost(iter->second, true);

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

@@ -1,4 +1,4 @@
---- base/BUILD.gn.orig	2023-07-21 09:49:17 UTC
+--- base/BUILD.gn.orig	2023-08-18 10:26:52 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"
-@@ -1099,11 +1099,23 @@ component("base") {
+@@ -1150,11 +1150,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) {
      sources += [
        "allocator/partition_allocator/shim/allocator_shim.cc",
-@@ -1131,7 +1143,7 @@ component("base") {
+@@ -1185,7 +1197,7 @@ component("base") {
        ]
        configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
      }
@@ -43,7 +43,7 @@
        sources += [
          "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
          "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1172,7 +1184,7 @@ component("base") {
+@@ -1226,7 +1238,7 @@ component("base") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -52,7 +52,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -2130,6 +2142,43 @@ component("base") {
+@@ -2185,6 +2197,43 @@ component("base") {
      }
    }
 
@@ -96,7 +96,7 @@
    # iOS
    if (is_ios) {
      sources += [
-@@ -2238,7 +2287,7 @@ component("base") {
+@@ -2285,7 +2334,7 @@ component("base") {
    }
 
    if (dep_libevent) {
@@ -105,7 +105,7 @@
    }
 
    if (use_libevent) {
-@@ -3552,7 +3601,7 @@ test("base_unittests") {
+@@ -3619,7 +3668,7 @@ test("base_unittests") {
      ]
    }
 
@@ -114,7 +114,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3601,7 +3650,7 @@ test("base_unittests") {
+@@ -3640,7 +3689,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",
-@@ -3612,7 +3661,7 @@ test("base_unittests") {
+@@ -3651,7 +3700,7 @@ test("base_unittests") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -132,7 +132,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -3837,7 +3886,7 @@ test("base_unittests") {
+@@ -3907,7 +3956,7 @@ test("base_unittests") {
      }
    }
 

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

@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator.h.orig	2023-07-21 09:49:17 UTC
+--- base/allocator/partition_allocator/page_allocator.h.orig	2023-08-18 10:26:52 UTC
 +++ base/allocator/partition_allocator/page_allocator.h
-@@ -241,7 +241,7 @@ void DecommitAndZeroSystemPages(void* address, size_t 
+@@ -245,7 +245,7 @@ void DecommitAndZeroSystemPages(void* address, size_t 
  // recommitted. Do not assume that this will not change over time.
  constexpr PA_COMPONENT_EXPORT(
      PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {

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

@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2023-07-21 09:49:17 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2023-08-18 10:26:52 UTC
 +++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -394,8 +394,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -396,8 +396,12 @@ bool TryRecommitSystemPagesInternal(
 
  void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
    void* ptr = reinterpret_cast<void*>(address);

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

@@ -1,9 +1,9 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2023-07-21 09:49:17 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2023-08-18 10:26:52 UTC
 +++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -291,7 +291,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.
+@@ -317,7 +317,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.
 -  enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build
 +  enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build
  }

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

@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc_forward.h.orig	2023-03-10 11:01:21 UTC
+--- base/allocator/partition_allocator/partition_alloc_forward.h.orig	2023-08-18 10:26:52 UTC
 +++ base/allocator/partition_allocator/partition_alloc_forward.h
-@@ -27,9 +27,13 @@ namespace internal {
+@@ -28,9 +28,13 @@ namespace internal {
  // the second one 16. We could technically return something different for
  // malloc() and operator new(), but this would complicate things, and most of
  // our allocations are presumably coming from operator new() anyway.

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

@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/partition_page_constants.h.orig	2023-08-18 10:26:52 UTC
++++ base/allocator/partition_allocator/partition_page_constants.h
+@@ -16,7 +16,7 @@ namespace partition_alloc::internal {
+ // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
+ // PartitionPageSize() is 4 times the OS page size.
+ static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
+-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+ // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
+ // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
+ // so we use the 16 kiB maximum (64 kiB will crash).

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

@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_root.cc.orig	2023-07-21 09:49:17 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig	2023-08-18 10:26:52 UTC
 +++ base/allocator/partition_allocator/partition_root.cc
 @@ -46,7 +46,7 @@
  #include "wow64apiset.h"
@@ -9,7 +9,7 @@
  #include <pthread.h>
  #endif
 
-@@ -286,7 +286,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -284,7 +284,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.
-@@ -380,7 +380,7 @@ static size_t PartitionPurgeSlotSpan(
+@@ -376,7 +376,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa
    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
-@@ -880,7 +880,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -853,7 +853,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_system_sys__info.h

@@ -1,15 +1,15 @@
---- base/system/sys_info.h.orig	2023-07-21 09:49:17 UTC
+--- base/system/sys_info.h.orig	2023-08-18 10:26:52 UTC
 +++ base/system/sys_info.h
-@@ -258,6 +258,8 @@ class BASE_EXPORT SysInfo {
-   static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled);
+@@ -261,6 +261,8 @@ class BASE_EXPORT SysInfo {
+   static void ResetCpuSecurityMitigationsEnabledForTesting();
  #endif
 
 +  static uint64_t MaxSharedMemorySize();
 +
   private:
    friend class test::ScopedAmountOfPhysicalMemoryOverride;
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-@@ -270,7 +272,7 @@ class BASE_EXPORT SysInfo {
+@@ -273,7 +275,7 @@ class BASE_EXPORT SysInfo {
    static HardwareInfo GetHardwareInfoSync();
 
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \

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

@@ -1,21 +1,24 @@
---- base/system/sys_info_posix.cc.orig	2023-03-10 11:01:21 UTC
+--- base/system/sys_info_posix.cc.orig	2023-08-18 10:26:52 UTC
 +++ base/system/sys_info_posix.cc
-@@ -165,12 +165,12 @@ int NumberOfProcessors() {
+@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
 
- }  // namespace internal
+ namespace base {
 
 -#if !BUILDFLAG(IS_OPENBSD)
 +#if !BUILDFLAG(IS_BSD)
  int SysInfo::NumberOfProcessors() {
-   static int number_of_processors = internal::NumberOfProcessors();
-   return number_of_processors;
+ #if BUILDFLAG(IS_MAC)
+   absl::optional<int> number_of_physical_cores =
+@@ -161,7 +161,7 @@ int SysInfo::NumberOfProcessors() {
+
+   return num_cpus;
  }
 -#endif  // !BUILDFLAG(IS_OPENBSD)
 +#endif  // !BUILDFLAG(IS_BSD)
 
  // static
  uint64_t SysInfo::AmountOfVirtualMemory() {
-@@ -260,6 +260,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -251,6 +251,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
      arch = "x86";
    } else if (arch == "amd64") {
      arch = "x86_64";

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

@@ -1,6 +1,6 @@
---- base/system/sys_info_unittest.cc.orig	2023-02-11 09:11:04 UTC
+--- base/system/sys_info_unittest.cc.orig	2023-08-18 10:26:52 UTC
 +++ base/system/sys_info_unittest.cc
-@@ -259,12 +259,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
+@@ -263,12 +263,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
    EXPECT_TRUE(IsStringUTF8(hardware_info->model));
    bool empty_result_expected =
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \

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

@@ -1,4 +1,4 @@
---- base/trace_event/malloc_dump_provider.cc.orig	2023-02-11 09:11:04 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig	2023-08-18 10:26:52 UTC
 +++ base/trace_event/malloc_dump_provider.cc
 @@ -25,6 +25,8 @@
 
@@ -9,7 +9,7 @@
  #else
  #include <malloc.h>
  #endif
-@@ -187,7 +189,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
+@@ -188,7 +190,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
 
  #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
      (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) &&    \
@@ -18,7 +18,7 @@
  void ReportMallinfoStats(ProcessMemoryDump* pmd,
                           size_t* total_virtual_size,
                           size_t* resident_size,
-@@ -358,6 +360,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -359,6 +361,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
                       &allocated_objects_count);
  #elif BUILDFLAG(IS_FUCHSIA)
  // TODO(fuchsia): Port, see https://crbug.com/706592.