www/ungoogled-chromium: update to 117.0.5938.88

Security: https://vuxml.freebsd.org/freebsd/88754d55-521a-11ee-8290-a8a1599412c6.html
freebsd · Sep 17, 2023 · e427079 · e427079
1 parent a31acf0
commit e427079
Show file tree

Hide file tree

Showing 476 changed files with 3,023 additions and 2,739 deletions.
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ungoogled-chromium
-PORTVERSION=	116.0.5845.179
-PORTREVISION=	1
+PORTVERSION=	117.0.5938.88
 UGVERSION=	${DISTVERSION}-1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
@@ -268,7 +267,7 @@ PLIST_SUB+=	NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
-FFMPEG_BDIR=	${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
+FFMPEG_BDIR=	${WRKSRC}/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
 FFMPEG_CDIR=	${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
 
 # Allow relocations against read-only segments (override lld default)

diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1694019777
-SHA256 (chromium-116.0.5845.179.tar.xz) = 8bf9b56381bfeb960a2d8c0dd130253820701fb49c12e52fa4d697ac11896025
-SIZE (chromium-116.0.5845.179.tar.xz) = 1599723164
-SHA256 (ungoogled-chromium-116.0.5845.179-1.tar.gz) = 084c826dd62b008cdaef0c4bccb1403341715b62f0ef14fd9b37f10e1230654f
-SIZE (ungoogled-chromium-116.0.5845.179-1.tar.gz) = 673676
-SHA256 (chromium-116.0.5845.179-testdata.tar.xz) = e34c14e0aa04ce5870bf0345e9f117913c432cb671f7c0e18258b8b00a9972cd
-SIZE (chromium-116.0.5845.179-testdata.tar.xz) = 266266312
+TIMESTAMP = 1694973055
+SHA256 (chromium-117.0.5938.88.tar.xz) = 4691d80039e4155d1a3c4676ee68a1e526ddad61a3cf59f65d596a1a2d56c906
+SIZE (chromium-117.0.5938.88.tar.xz) = 3131921384
+SHA256 (ungoogled-chromium-117.0.5938.88-1.tar.gz) = 97d67f4783702537355cdfcaad67024413102478ec5a431b2d51b454e8baea33
+SIZE (ungoogled-chromium-117.0.5938.88-1.tar.gz) = 651903
+SHA256 (chromium-117.0.5938.88-testdata.tar.xz) = c5256997647bcb05a4b829d99e9efcfa7e1bc46b44a9feceb67a91856ed54085
+SIZE (chromium-117.0.5938.88-testdata.tar.xz) = 269473360
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig	2023-08-18 10:26:52 UTC
+--- BUILD.gn.orig	2023-09-17 07:59:53 UTC
 +++ BUILD.gn
 @@ -61,7 +61,7 @@ declare_args() {
    root_extra_deps = []
@@ -42,7 +42,7 @@
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms",
-@@ -660,7 +668,7 @@ group("gn_all") {
+@@ -663,7 +671,7 @@ group("gn_all") {
            host_os == "win") {
          deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
        }
@@ -51,16 +51,16 @@
        deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
      }
 
-@@ -1084,7 +1092,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1087,7 +1095,7 @@ if (!is_ios && !is_cronet_build) {
      ]
    }
 
 -  if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) {
 +  if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
-     # WPT Webdriver tests runner
-     # chrome/test/chromedriver/test/run_webdriver_tests.py
      script_test("webdriver_wpt_tests") {
-@@ -1188,7 +1196,7 @@ if (!is_ios && !is_cronet_build) {
+       script = "//third_party/blink/tools/run_wpt_tests.py"
+       args = [
+@@ -1177,7 +1185,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)" ]
      }
-@@ -1197,7 +1205,7 @@ if (!is_ios && !is_cronet_build) {
+@@ -1186,7 +1194,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)" ]
      }
 
-@@ -1671,7 +1679,7 @@ group("chromium_builder_perf") {
+@@ -1646,7 +1654,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
 

diff --git a/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc b/www/ungoogled-chromium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig	2023-08-18 10:26:52 UTC
+--- ash/display/mirror_window_controller.cc.orig	2023-09-17 07:59:53 UTC
 +++ ash/display/mirror_window_controller.cc
-@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -294,7 +294,11 @@ void MirrorWindowController::UpdateWindow(
        if (!base::Contains(display_info_list, iter->first,
                            &display::ManagedDisplayInfo::id)) {
          CloseAndDeleteHost(iter->second, true);

diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn
@@ -1,4 +1,4 @@
---- base/BUILD.gn.orig	2023-08-18 10:26:52 UTC
+--- base/BUILD.gn.orig	2023-09-17 07:59:53 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"
-@@ -1150,11 +1150,23 @@ component("base") {
+@@ -1112,11 +1112,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.
@@ -32,18 +32,9 @@
 +  }
 +
    if (use_allocator_shim) {
-     sources += [
-       "allocator/partition_allocator/shim/allocator_shim.cc",
-@@ -1185,7 +1197,7 @@ component("base") {
-       ]
-       configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
-     }
--    if (is_chromeos || is_linux) {
-+    if (is_chromeos || (is_linux && !is_bsd)) {
-       sources += [
-         "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
-         "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1226,7 +1238,7 @@ component("base") {
+     if (is_apple) {
+       sources += [ "allocator/early_zone_registration_mac.h" ]
+@@ -1133,7 +1145,7 @@ component("base") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -52,51 +43,60 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -2185,6 +2197,43 @@ component("base") {
+@@ -2075,6 +2087,22 @@ component("base") {
+     ]
+   }
+
++  if (is_openbsd) {
++    sources += [
++      "process/process_handle_openbsd.cc",
++      "process/process_iterator_openbsd.cc",
++      "process/process_metrics_openbsd.cc",
++      "system/sys_info_openbsd.cc",
++    ]
++  } else if (is_freebsd) {
++    sources += [
++      "process/process_handle_freebsd.cc",
++      "process/process_iterator_freebsd.cc",
++      "process/process_metrics_freebsd.cc",
++      "system/sys_info_freebsd.cc",
++    ]
++  }
++
+   # iOS
+   if (is_ios) {
+     sources += [
+@@ -2207,6 +2235,29 @@ component("base") {
      }
    }
 
 +  if (is_bsd) {
 +    sources -= [
 +      "files/file_path_watcher_inotify.cc",
 +      "files/scoped_file_linux.cc",
-+      "process/process_linux.cc",
 +      "system/sys_info_linux.cc",
 +      "process/process_iterator_linux.cc",
++      "process/process_linux.cc",
 +      "process/process_metrics_linux.cc",
 +      "process/process_handle_linux.cc",
 +      "profiler/stack_copier_signal.cc",
 +      "profiler/stack_copier_signal.h",
 +      "profiler/thread_delegate_posix.cc",
 +      "profiler/thread_delegate_posix.h",
++      "threading/platform_thread_linux.cc",
 +    ]
 +    sources += [
 +      "files/file_path_watcher_kqueue.cc",
 +      "files/file_path_watcher_kqueue.h",
 +      "files/file_path_watcher_bsd.cc",
++      "threading/platform_thread_bsd.cc",
 +    ]
 +  }
 +
-+  if (is_openbsd) {
-+    sources += [
-+      "process/process_handle_openbsd.cc",
-+      "process/process_iterator_openbsd.cc",
-+      "process/process_metrics_openbsd.cc",
-+      "system/sys_info_openbsd.cc",
-+    ]
-+  } else if (is_freebsd) {
-+    sources += [
-+      "process/process_handle_freebsd.cc",
-+      "process/process_iterator_freebsd.cc",
-+      "process/process_metrics_freebsd.cc",
-+      "system/sys_info_freebsd.cc",
-+    ]
-+  }
-+
-   # iOS
-   if (is_ios) {
+   if (use_blink) {
      sources += [
-@@ -2285,7 +2334,7 @@ component("base") {
+       "files/file_path_watcher.cc",
+@@ -2217,7 +2268,7 @@ component("base") {
    }
 
    if (dep_libevent) {
@@ -105,7 +105,7 @@
    }
 
    if (use_libevent) {
-@@ -3619,7 +3668,7 @@ test("base_unittests") {
+@@ -3587,7 +3638,7 @@ test("base_unittests") {
      ]
    }
 
@@ -114,7 +114,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3640,7 +3689,7 @@ test("base_unittests") {
+@@ -3608,7 +3659,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 +3700,7 @@ test("base_unittests") {
+@@ -3619,7 +3670,7 @@ test("base_unittests") {
 
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -132,7 +132,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
 
-@@ -3907,7 +3956,7 @@ test("base_unittests") {
+@@ -3871,7 +3922,7 @@ test("base_unittests") {
      }
    }
 

diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_BUILD.gn b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_BUILD.gn
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/BUILD.gn.orig	2023-09-17 07:59:53 UTC
++++ base/allocator/partition_allocator/BUILD.gn
+@@ -541,7 +541,7 @@ source_set("allocator_shim") {
+       ]
+       configs += [ ":mac_no_default_new_delete_symbols" ]
+     }
+-    if (is_chromeos || is_linux) {
++    if ((is_chromeos || is_linux) && !is_bsd) {
+       sources += [
+         "shim/allocator_shim_override_cpp_symbols.h",
+         "shim/allocator_shim_override_glibc_weak_symbols.h",
diff --git a/...-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/...-chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/address_space_randomization.h.orig	2023-03-10 11:01:21 UTC
+--- base/allocator/partition_allocator/address_space_randomization.h.orig	2023-09-17 07:59:53 UTC
 +++ base/allocator/partition_allocator/address_space_randomization.h
 @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
 
  #if defined(ARCH_CPU_64_BITS)
 
 -  #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
-+  #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !defined(OS_BSD)
++  #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !BUILDFLAG(IS_BSD)
 
      // We shouldn't allocate system pages at all for sanitizer builds. However,
      // we do, and if random hint addresses interfere with address ranges

diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/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-08-18 10:26:52 UTC
+--- base/allocator/partition_allocator/page_allocator.h.orig	2023-09-17 07:59:53 UTC
 +++ base/allocator/partition_allocator/page_allocator.h
-@@ -245,7 +245,7 @@ void DecommitAndZeroSystemPages(void* address, size_t 
+@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address,
  // recommitted. Do not assume that this will not change over time.
  constexpr PA_COMPONENT_EXPORT(
      PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {

diff --git a/...led-chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h b/...led-chromium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/page_allocator_constants.h.orig	2023-05-05 12:12:41 UTC
+--- base/allocator/partition_allocator/page_allocator_constants.h.orig	2023-09-17 07:59:53 UTC
 +++ base/allocator/partition_allocator/page_allocator_constants.h
 @@ -25,7 +25,7 @@
  // elimination.
@@ -9,7 +9,7 @@
  // This should work for all POSIX (if needed), but currently all other
  // supported OS/architecture combinations use either hard-coded values
  // (such as x86) or have means to determine these values without needing
-@@ -81,7 +81,7 @@ PageAllocationGranularityShift() {
+@@ -92,7 +92,7 @@ PageAllocationGranularityShift() {
    return 14;  // 16kB
  #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
    return static_cast<size_t>(vm_page_shift);
@@ -18,7 +18,7 @@
    // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
    // page sizes. Retrieve from or initialize cache.
    size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
-@@ -102,7 +102,7 @@ PageAllocationGranularity() {
+@@ -113,7 +113,7 @@ PageAllocationGranularity() {
    // This is literally equivalent to |1 << PageAllocationGranularityShift()|
    // below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
    return vm_page_size;
@@ -27,7 +27,7 @@
    // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
    // initialize cache.
    size_t size = page_characteristics.size.load(std::memory_order_relaxed);
-@@ -141,7 +141,7 @@ SystemPageShift() {
+@@ -152,7 +152,7 @@ SystemPageShift() {
  PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
  SystemPageSize() {
  #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \

diff --git a/...omium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/...omium/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-08-18 10:26:52 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2023-09-17 07:59:53 UTC
 +++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -396,8 +396,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal(
 
  void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
    void* ptr = reinterpret_cast<void*>(address);

diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/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-08-18 10:26:52 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2023-09-17 07:59:53 UTC
 +++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -317,7 +317,7 @@ declare_args() {
+@@ -332,7 +332,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.

diff --git a/...les/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/...les/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig	2022-10-01 07:40:07 UTC
+--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig	2023-09-17 07:59:53 UTC
 +++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
-@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) {
+@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) {
    if (getentropy(output, output_length) == 0) {
      return;
    }
@@ -9,5 +9,5 @@
 +    return;
 +  }
  #endif
-
-   // If the OS-specific mechanisms didn't work, fall through to reading from
+   // If getrandom(2) above returned with an error and the /dev/urandom fallback
+   // took place on Linux/ChromeOS bots, they would fail with a CHECK in
diff --git a/...ogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/...ogled-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-07-21 09:49:17 UTC
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig	2023-09-17 07:59:53 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,
-@@ -234,7 +234,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -236,7 +236,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.
-@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -283,7 +283,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() \

diff --git a/...ed-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/...ed-chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc_constants.h.orig	2023-07-21 09:49:17 UTC
+--- base/allocator/partition_allocator/partition_alloc_constants.h.orig	2023-09-17 07:59:53 UTC
 +++ base/allocator/partition_allocator/partition_alloc_constants.h
-@@ -92,7 +92,7 @@ PartitionPageShift() {
+@@ -95,7 +95,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;
-@@ -294,7 +294,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
+@@ -297,7 +297,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) || \