git a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc index 812d727d75df..e38a491b3a88 100644 --- a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc +++ b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace.cc.orig 2025-04-15 08:30:07 UTC +--- base/debug/stack_trace.cc.orig 2025-10-21 16:57:35 UTC +++ base/debug/stack_trace.cc -@@ -268,7 +268,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { +@@ -271,7 +271,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { // Symbols are not expected to be reliable when gn args specifies // symbol_level=0. return false; @@ -9,7 +9,7 @@ // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // See https://crbug.com/706728 return false; -@@ -321,7 +321,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream +@@ -324,7 +324,9 @@ void StackTrace::OutputToStreamWithPrefix(std::ostream } return; } @@ -19,7 +19,7 @@ } std::string StackTrace::ToString() const { -@@ -330,7 +332,7 @@ std::string StackTrace::ToString() const { +@@ -333,7 +335,7 @@ std::string StackTrace::ToString() const { std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; @@ -28,7 +28,7 @@ OutputToStreamWithPrefix(&stream, prefix_string); #endif return stream.str(); -@@ -354,7 +356,7 @@ bool StackTrace::ShouldSuppressOutput() { +@@ -357,7 +359,7 @@ bool StackTrace::ShouldSuppressOutput() { } std::ostream& operator<<(std::ostream& os, const StackTrace& s) { diff --git a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc index bcc75bd80f87..89f86bf4b5dd 100644 --- a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2025-09-10 13:22:16 UTC +--- base/files/file_util_unittest.cc.orig 2025-10-21 16:57:35 UTC +++ base/files/file_util_unittest.cc -@@ -4101,7 +4101,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -4123,7 +4123,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4686,6 +4686,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnlyCheckMissingSu +@@ -4708,6 +4708,19 @@ TEST_F(FileUtilTest, CreateDirectoryOnlyCheckMissingSu #endif // BUILDFLAG(IS_ANDROID) @@ -29,7 +29,7 @@ #if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING) && \ defined(ARCH_CPU_32_BITS) // TODO(crbug.com/327582285): Re-enable these tests. They may be failing due to -@@ -4852,7 +4865,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4874,7 +4887,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc b/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc index ad99e3008eab..c55de3b40c86 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc @@ -1,15 +1,15 @@ ---- base/memory/discardable_memory.cc.orig 2025-03-09 21:38:10 UTC +--- base/memory/discardable_memory.cc.orig 2025-10-21 16:57:35 UTC +++ base/memory/discardable_memory.cc -@@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -24,7 +24,7 @@ namespace features { + BASE_FEATURE(MadvFreeDiscardableMemory, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_POSIX) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kDiscardableMemoryBackingTrial, - "DiscardableMemoryBackingTrial", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -44,7 +44,7 @@ BASE_FEATURE_ENUM_PARAM(DiscardableMemoryTrialGroup, + BASE_FEATURE(DiscardableMemoryBackingTrial, base::FEATURE_DISABLED_BY_DEFAULT); + + BASE_FEATURE_ENUM_PARAM(DiscardableMemoryTrialGroup, +@@ -40,7 +40,7 @@ BASE_FEATURE_ENUM_PARAM(DiscardableMemoryTrialGroup, namespace { @@ -18,7 +18,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -63,7 +63,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -59,7 +59,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -95,7 +95,7 @@ DiscardableMemory::DiscardableMemory() = default; +@@ -91,7 +91,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { diff --git a/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 040aa40a8ef7..1f4d4863a4e4 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2025-09-10 13:22:16 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2025-10-21 16:57:35 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -298,6 +298,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -297,6 +297,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_APPLE) std::vector vec(allocated_pages_); #else -@@ -314,6 +318,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons +@@ -313,6 +317,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons } } return true; diff --git a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h index 21cf141c798f..6c92d7a5ae7c 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,24 +1,6 @@ ---- base/memory/platform_shared_memory_region.h.orig 2025-09-10 13:22:16 UTC +--- base/memory/platform_shared_memory_region.h.orig 2025-10-21 16:57:35 UTC +++ base/memory/platform_shared_memory_region.h -@@ -19,7 +19,7 @@ - #include "base/unguessable_token.h" - #include "build/build_config.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - namespace content { - class SandboxIPCHandler; - } -@@ -86,7 +86,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { - kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE - }; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Structure to limit access to executable region creation. - struct ExecutableRegion { - private: -@@ -125,7 +125,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -99,7 +99,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { #if BUILDFLAG(IS_FUCHSIA) kNotVmo, #endif @@ -27,7 +9,7 @@ kFcntlFailed, kReadOnlyFdNotReadOnly, kUnexpectedReadOnlyFd, -@@ -256,7 +256,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -230,7 +230,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size diff --git a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 79b98ea67e3d..cbe3ccbc12f5 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,15 +1,6 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2025-09-10 13:22:16 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2025-10-21 16:57:35 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -59,7 +59,7 @@ std::optional CheckFDAccessMode(int - - } // namespace - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // static - ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { - PlatformSharedMemoryRegion region = -@@ -184,7 +184,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { +@@ -172,7 +172,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +9,7 @@ , bool executable #endif -@@ -209,7 +209,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -197,7 +197,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__epoll.cc b/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__epoll.cc index 0946ed2a0e47..cc3a86a0f71c 100644 --- a/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__epoll.cc +++ b/www/ungoogled-chromium/files/patch-base_message__loop_message__pump__epoll.cc @@ -1,6 +1,6 @@ ---- base/message_loop/message_pump_epoll.cc.orig 2025-09-10 13:22:16 UTC +--- base/message_loop/message_pump_epoll.cc.orig 2025-10-21 16:57:35 UTC +++ base/message_loop/message_pump_epoll.cc -@@ -49,7 +49,7 @@ std::atomic_bool g_use_batched_version = false; +@@ -44,7 +44,7 @@ std::atomic_bool g_use_batched_version = false; std::atomic_bool g_use_poll = false; constexpr std::pair kEpollToPollEvents[] = { diff --git a/www/ungoogled-chromium/files/patch-base_native__library__posix.cc b/www/ungoogled-chromium/files/patch-base_native__library__posix.cc deleted file mode 100644 index 52699dcd0b3b..000000000000 --- a/www/ungoogled-chromium/files/patch-base_native__library__posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/native_library_posix.cc.orig 2024-08-26 14:40:28 UTC -+++ base/native_library_posix.cc -@@ -34,7 +34,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP - // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, - // and http://crbug.com/40794. - int flags = RTLD_LAZY; --#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND) -+#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND) || BUILDFLAG(IS_BSD) - // Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires - // further investigation, as it might vary across versions. Crash here to - // warn developers that they're trying to rely on uncertain behavior. diff --git a/www/ungoogled-chromium/files/patch-base_native__library__unittest.cc b/www/ungoogled-chromium/files/patch-base_native__library__unittest.cc deleted file mode 100644 index e0e5fc7a0054..000000000000 --- a/www/ungoogled-chromium/files/patch-base_native__library__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/native_library_unittest.cc.orig 2024-10-27 06:40:35 UTC -+++ base/native_library_unittest.cc -@@ -135,7 +135,7 @@ TEST(NativeLibraryTest, LoadLibrary) { - // versions with respect to symbol resolution scope. - // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255 - #if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \ -- !defined(MEMORY_SANITIZER) -+ !defined(MEMORY_SANITIZER) && !BUILDFLAG(IS_BSD) - - // Verifies that the |prefer_own_symbols| option satisfies its guarantee that - // a loaded library will always prefer local symbol resolution before diff --git a/www/ungoogled-chromium/files/patch-base_process_process__metrics.h b/www/ungoogled-chromium/files/patch-base_process_process__metrics.h index 9a963d2579d6..edb18110d4c5 100644 --- a/www/ungoogled-chromium/files/patch-base_process_process__metrics.h +++ b/www/ungoogled-chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2025-09-10 13:22:16 UTC +--- base/process/process_metrics.h.orig 2025-10-21 16:57:35 UTC +++ base/process/process_metrics.h -@@ -39,7 +39,7 @@ +@@ -40,7 +40,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -9,7 +9,7 @@ #include #include #include -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ namespace base { @@ -18,7 +18,16 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -179,7 +179,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -88,7 +88,7 @@ struct ProcessMemoryInfo { + #endif // BUILDFLAG(IS_APPLE) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + uint64_t rss_anon_bytes = 0; + uint64_t vm_swap_bytes = 0; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || +@@ -180,7 +180,7 @@ class BASE_EXPORT ProcessMetrics { base::expected GetCumulativeCPUUsage(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -27,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -224,7 +224,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -225,7 +225,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -36,7 +45,7 @@ // Minor and major page fault count as reported by /proc/[pid]/stat. // Returns true for success. bool GetPageFaultCounts(PageFaultCounts* counts) const; -@@ -242,7 +242,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -243,7 +243,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -45,13 +54,14 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -264,12 +264,10 @@ class BASE_EXPORT ProcessMetrics { +@@ -265,12 +265,12 @@ class BASE_EXPORT ProcessMetrics { // Used to store the previous times and CPU usage counts so we can // compute the CPU usage between calls. TimeTicks last_cpu_time_; -#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) ++#if BUILDFLAG(IS_POSIX) TimeDelta last_cumulative_cpu_; --#endif + #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) @@ -59,16 +69,16 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -310,7 +308,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -311,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de *** 11670 LINES SKIPPED ***