Skip to content

Commit

Permalink
www/ungoogled-chromium: update to 119.0.6045.105
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Nagy authored and Robert Nagy committed Nov 4, 2023
1 parent b1f86e1 commit 1f299cb
Show file tree
Hide file tree
Showing 333 changed files with 1,642 additions and 1,622 deletions.
2 changes: 1 addition & 1 deletion www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 118.0.5993.117
PORTVERSION= 119.0.6045.105
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
Expand Down
14 changes: 7 additions & 7 deletions www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
TIMESTAMP = 1698422936
SHA256 (chromium-118.0.5993.117.tar.xz) = 7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786
SIZE (chromium-118.0.5993.117.tar.xz) = 3249866084
SHA256 (ungoogled-chromium-118.0.5993.117-1.tar.gz) = 41afb5933668b67059d48613c136c4535ed7a5a3387361cd118aff38593ae4e3
SIZE (ungoogled-chromium-118.0.5993.117-1.tar.gz) = 660283
SHA256 (chromium-118.0.5993.117-testdata.tar.xz) = cc7eb88774d2b6ab3c0c6c280526cab1c92319d57bfb42575dc0858b2ef09079
SIZE (chromium-118.0.5993.117-testdata.tar.xz) = 267124300
TIMESTAMP = 1699083208
SHA256 (chromium-119.0.6045.105.tar.xz) = 73cb8c39e928f8c627d747d37a3b020f08913ef5508f893758d70bdbd545dbcf
SIZE (chromium-119.0.6045.105.tar.xz) = 3299629128
SHA256 (ungoogled-chromium-119.0.6045.105-1.tar.gz) = e5d74a46cd79b79a3f2f8f8fadce8329ad50f4a4facd76365d28e0761173aa26
SIZE (ungoogled-chromium-119.0.6045.105-1.tar.gz) = 659861
SHA256 (chromium-119.0.6045.105-testdata.tar.xz) = 7b8e9f51677e64e2ad653aa5b915b74545299a259238ca1ffd24f1e677470f78
SIZE (chromium-119.0.6045.105-testdata.tar.xz) = 271101180
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
10 changes: 5 additions & 5 deletions www/ungoogled-chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
--- BUILD.gn.orig 2023-10-13 13:20:35 UTC
--- BUILD.gn.orig 2023-11-04 07:08:51 UTC
+++ BUILD.gn
@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
Expand Down Expand Up @@ -57,10 +57,10 @@

- 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) {
script_test("webdriver_wpt_tests") {
script_test("chrome_wpt_tests") {
script = "//third_party/blink/tools/run_wpt_tests.py"
args = [
@@ -1176,7 +1184,7 @@ if (use_blink && !is_cronet_build) {
@@ -1159,7 +1167,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}

Expand All @@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1185,7 +1193,7 @@ if (use_blink && !is_cronet_build) {
@@ -1168,7 +1176,7 @@ if (use_blink && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}

Expand All @@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}

@@ -1645,7 +1653,7 @@ group("chromium_builder_perf") {
@@ -1629,7 +1637,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}

Expand Down
22 changes: 11 additions & 11 deletions www/ungoogled-chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2023-10-13 13:20:35 UTC
--- base/BUILD.gn.orig 2023-11-04 07:08:51 UTC
+++ base/BUILD.gn
@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
@@ -186,7 +186,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}

Expand All @@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
@@ -1111,11 +1111,23 @@ component("base") {
@@ -1101,11 +1101,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.
Expand All @@ -34,7 +34,7 @@
if (use_allocator_shim) {
if (is_apple) {
sources += [ "allocator/early_zone_registration_apple.h" ]
@@ -1135,7 +1147,7 @@ component("base") {
@@ -1125,7 +1137,7 @@ component("base") {

# Allow more direct string conversions on platforms with native utf8
# strings
Expand All @@ -43,7 +43,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -2080,6 +2092,22 @@ component("base") {
@@ -2077,6 +2089,22 @@ component("base") {
]
}

Expand All @@ -66,7 +66,7 @@
# iOS
if (is_ios) {
sources += [
@@ -2212,6 +2240,29 @@ component("base") {
@@ -2209,6 +2237,29 @@ component("base") {
}
}

Expand Down Expand Up @@ -96,7 +96,7 @@
if (use_blink) {
sources += [
"files/file_path_watcher.cc",
@@ -2222,7 +2273,7 @@ component("base") {
@@ -2219,7 +2270,7 @@ component("base") {
}

if (dep_libevent) {
Expand All @@ -105,7 +105,7 @@
}

if (use_libevent) {
@@ -3596,7 +3647,7 @@ test("base_unittests") {
@@ -3599,7 +3650,7 @@ test("base_unittests") {
]
}

Expand All @@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3617,7 +3668,7 @@ test("base_unittests") {
@@ -3620,7 +3671,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
Expand All @@ -123,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3628,7 +3679,7 @@ test("base_unittests") {
@@ -3631,7 +3682,7 @@ test("base_unittests") {

# Allow more direct string conversions on platforms with native utf8
# strings
Expand All @@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -3884,7 +3935,7 @@ test("base_unittests") {
@@ -3892,7 +3943,7 @@ test("base_unittests") {
}
}

Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/dispatcher/tls.h.orig 2023-06-05 19:39:05 UTC
--- base/allocator/dispatcher/tls.h.orig 2023-11-04 07:08:51 UTC
+++ base/allocator/dispatcher/tls.h
@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
@@ -74,7 +74,7 @@ struct BASE_EXPORT MMapAllocator {
partition_alloc::PartitionPageSize();
#elif BUILDFLAG(IS_APPLE)
constexpr static size_t AllocationChunkSize = 16384;
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/BUILD.gn.orig 2023-10-13 13:20:35 UTC
--- base/allocator/partition_allocator/BUILD.gn.orig 2023-11-04 07:08:51 UTC
+++ base/allocator/partition_allocator/BUILD.gn
@@ -562,7 +562,7 @@ source_set("allocator_shim") {
@@ -569,7 +569,7 @@ source_set("allocator_shim") {
]
configs += [ ":mac_no_default_new_delete_symbols" ]
}
Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-10-13 13:20:35 UTC
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-11-04 07:08:51 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
@@ -328,7 +328,7 @@ declare_args() {
@@ -319,7 +319,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.
Expand Down
@@ -1,4 +1,4 @@
--- 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.orig 2023-11-04 07:08:51 UTC
+++ base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc
@@ -12,11 +12,11 @@
#include <string.h>
Expand All @@ -23,12 +23,12 @@

constexpr size_t kBufferSize = 4096u;

@@ -359,7 +359,7 @@ void PrintStackTraceInternal(void* const* trace, size_
@@ -359,7 +359,7 @@ void PrintStackTraceInternal(const void** 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) {
void PrintStackTraceInternal(const void* const* trace, size_t size) {
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-09-17 07:59:53 UTC
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-11-04 07:08:51 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -95,7 +95,7 @@ PartitionPageShift() {
@@ -107,7 +107,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
Expand All @@ -9,7 +9,7 @@
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
@@ -297,7 +297,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
@@ -309,7 +309,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) || \
Expand Down
16 changes: 13 additions & 3 deletions www/ungoogled-chromium/files/patch-base_base__paths__posix.cc
@@ -1,4 +1,4 @@
--- base/base_paths_posix.cc.orig 2022-10-01 07:40:07 UTC
--- base/base_paths_posix.cc.orig 2023-11-04 07:08:51 UTC
+++ base/base_paths_posix.cc
@@ -15,6 +15,7 @@
#include <ostream>
Expand All @@ -8,7 +8,7 @@
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
@@ -25,9 +26,13 @@
@@ -26,9 +27,13 @@
#include "base/process/process_metrics.h"
#include "build/build_config.h"

Expand All @@ -23,7 +23,17 @@
#elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX)
#include <stdlib.h>
#endif
@@ -68,13 +73,65 @@ bool PathProviderPosix(int key, FilePath* result) {
@@ -48,8 +53,7 @@ bool PathProviderPosix(int key, FilePath* result) {
*result = bin_dir;
return true;
#elif BUILDFLAG(IS_FREEBSD)
- int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
- absl::optional<std::string> bin_dir = StringSysctl(name, std::size(name));
+ absl::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 });
if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
NOTREACHED() << "Unable to resolve path.";
return false;
@@ -65,13 +69,65 @@ bool PathProviderPosix(int key, FilePath* result) {
*result = FilePath(bin_dir);
return true;
#elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)
Expand Down
@@ -1,4 +1,4 @@
--- base/debug/stack_trace_posix.cc.orig 2023-09-17 07:59:53 UTC
--- base/debug/stack_trace_posix.cc.orig 2023-11-04 07:08:51 UTC
+++ base/debug/stack_trace_posix.cc
@@ -41,7 +41,7 @@
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
Expand All @@ -9,16 +9,19 @@
#define HAVE_BACKTRACE
#include <execinfo.h>
#endif
@@ -59,7 +59,7 @@
@@ -59,8 +59,10 @@
#include <AvailabilityMacros.h>
#endif

-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+#if !BUILDFLAG(IS_BSD)
#include <sys/prctl.h>
+#endif

#include "base/debug/proc_maps_linux.h"
#endif

@@ -300,7 +300,7 @@ void PrintToStderr(const char* output) {
@@ -302,7 +304,7 @@ void PrintToStderr(const char* output) {
std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
}

Expand All @@ -27,7 +30,7 @@
void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) {
// We have seen rare cases on AMD linux where the default signal handler
// either does not run or a thread (Probably an AMD driver thread) prevents
@@ -317,7 +317,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
@@ -319,7 +321,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
"Warning: Default signal handler failed to terminate process.\n");
PrintToStderr("Calling exit_group() directly to prevent timeout.\n");
// See: https://man7.org/linux/man-pages/man2/exit_group.2.html
Expand All @@ -39,7 +42,7 @@
}
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
// BUILDFLAG(IS_CHROMEOS)
@@ -534,7 +538,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -536,7 +542,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
_exit(EXIT_FAILURE);
}

Expand All @@ -48,23 +51,37 @@
// Set an alarm to trigger in case the default handler does not terminate
// the process. See 'AlarmSignalHandler' for more details.
struct sigaction action;
@@ -559,6 +563,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -561,6 +567,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
// signals that do not re-raise autonomously), such as signals delivered via
// kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
// otherwise be lost when re-raising the signal via raise().
+#if !BUILDFLAG(IS_BSD)
long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
info->si_signo, info);
if (retval == 0) {
@@ -573,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -575,6 +582,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
if (errno != EPERM) {
_exit(EXIT_FAILURE);
}
+#endif
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
// BUILDFLAG(IS_CHROMEOS)

@@ -821,6 +827,9 @@ class SandboxSymbolizeHelper {
@@ -764,6 +772,7 @@ class SandboxSymbolizeHelper {
return -1;
}

+#if !BUILDFLAG(IS_BSD)
// This class is copied from
// third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h.
// It aims at ensuring the process is dumpable before opening /proc/self/mem.
@@ -856,11 +865,15 @@ class SandboxSymbolizeHelper {
r.base = cur_base;
}
}
+#endif

// Parses /proc/self/maps in order to compile a list of all object file names
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
Expand All @@ -74,7 +91,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
@@ -838,6 +847,7 @@ class SandboxSymbolizeHelper {
@@ -878,6 +891,7 @@ class SandboxSymbolizeHelper {

is_initialized_ = true;
return true;
Expand Down
@@ -1,6 +1,6 @@
--- base/files/file_path_watcher_unittest.cc.orig 2023-09-17 07:59:53 UTC
--- base/files/file_path_watcher_unittest.cc.orig 2023-11-04 07:08:51 UTC
+++ base/files/file_path_watcher_unittest.cc
@@ -586,7 +586,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
@@ -705,7 +705,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
}
delegate.RunUntilEventsMatch(event_expecter);

Expand All @@ -9,7 +9,7 @@
ASSERT_TRUE(WriteFile(file1, "content v2"));
// Mac implementation does not detect files modified in a directory.
// TODO(https://crbug.com/1432064): Expect that no events are fired on Mac.
@@ -1525,7 +1525,7 @@ namespace {
@@ -1641,7 +1641,7 @@ namespace {

enum Permission { Read, Write, Execute };

Expand All @@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;

@@ -1559,7 +1559,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
@@ -1675,7 +1675,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi

} // namespace

Expand Down
@@ -1,6 +1,6 @@
--- base/files/file_util_posix.cc.orig 2023-05-05 12:12:41 UTC
--- base/files/file_util_posix.cc.orig 2023-11-04 07:08:51 UTC
+++ base/files/file_util_posix.cc
@@ -756,32 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
@@ -756,33 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
Expand Down Expand Up @@ -34,11 +34,12 @@
- if (!DirectoryExists(subpath)) {
- if (error)
- *error = File::OSErrorToFileError(saved_errno);
- errno = saved_errno;
- return false;
+ if (!PathExists(subpath)) {
+ if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
+ ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
+ int saved_errno = errno;
+ int saved_errno = errno;
+ if (error)
+ *error = File::OSErrorToFileError(saved_errno);
+ return false;
Expand Down

0 comments on commit 1f299cb

Please sign in to comment.