Skip to content

Commit

Permalink
www/chromium: update to 101.0.4951.41
Browse files Browse the repository at this point in the history
Security:	26f2123b-c6c6-11ec-b66f-3065ec8fd3ec
  • Loading branch information
rnagy authored and rene0 committed Apr 28, 2022
1 parent de6ddae commit 4eb083e
Show file tree
Hide file tree
Showing 282 changed files with 1,718 additions and 1,455 deletions.
2 changes: 1 addition & 1 deletion www/chromium/Makefile
@@ -1,7 +1,7 @@
# Created by: Florent Thoumie <flz@FreeBSD.org>

PORTNAME= chromium
PORTVERSION= 100.0.4896.127
PORTVERSION= 101.0.4951.41
CATEGORIES= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:fonts
Expand Down
10 changes: 5 additions & 5 deletions www/chromium/distinfo
@@ -1,7 +1,7 @@
TIMESTAMP = 1650025280
SHA256 (chromium-100.0.4896.127.tar.xz) = 4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d
SIZE (chromium-100.0.4896.127.tar.xz) = 1358426108
SHA256 (chromium-100.0.4896.127-testdata.tar.xz) = ad2d659c4850d9e48b298f192261c795be67e1393a3aecc42c062e6b751ca6a9
SIZE (chromium-100.0.4896.127-testdata.tar.xz) = 260013080
TIMESTAMP = 1650566380
SHA256 (chromium-101.0.4951.41.tar.xz) = 099863882e88b9a035fcb6b63dd5288554f6b27558e0ebce93e0d804465efa37
SIZE (chromium-101.0.4951.41.tar.xz) = 1414841332
SHA256 (chromium-101.0.4951.41-testdata.tar.xz) = f172a895533f618369176e04904b6d5eae7dce698b1358d53c985527c4805169
SIZE (chromium-101.0.4951.41-testdata.tar.xz) = 260727368
SHA256 (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
SIZE (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = 26759650
16 changes: 8 additions & 8 deletions www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
--- BUILD.gn.orig 2022-03-25 21:59:56 UTC
--- BUILD.gn.orig 2022-04-21 18:48:31 UTC
+++ BUILD.gn
@@ -53,7 +53,7 @@ declare_args() {
@@ -54,7 +54,7 @@ declare_args() {
root_extra_deps = []
}

Expand All @@ -9,7 +9,7 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
@@ -452,7 +452,7 @@ group("gn_all") {
@@ -436,7 +436,7 @@ group("gn_all") {
]
}

Expand All @@ -18,7 +18,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -636,6 +636,15 @@ group("gn_all") {
@@ -625,6 +625,15 @@ group("gn_all") {
}
}

Expand All @@ -34,7 +34,7 @@
if (is_mac) {
deps += [
"//third_party/breakpad:crash_inspector",
@@ -685,7 +694,7 @@ group("gn_all") {
@@ -674,7 +683,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
Expand All @@ -43,7 +43,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}

@@ -1147,7 +1156,7 @@ if (!is_ios) {
@@ -1141,7 +1150,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}

Expand All @@ -52,7 +52,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1156,7 +1165,7 @@ if (!is_ios) {
@@ -1150,7 +1159,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}

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

@@ -1531,7 +1540,7 @@ group("chromium_builder_perf") {
@@ -1540,7 +1549,7 @@ group("chromium_builder_perf") {

if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
Expand Down
34 changes: 17 additions & 17 deletions www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2022-03-25 21:59:56 UTC
--- base/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+++ base/BUILD.gn
@@ -999,7 +999,7 @@ mixed_component("base") {
@@ -1010,7 +1010,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]

Expand All @@ -9,7 +9,7 @@
sources += [
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
@@ -1010,6 +1010,12 @@ mixed_component("base") {
@@ -1021,6 +1021,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
Expand All @@ -22,7 +22,7 @@
}

if (is_win) {
@@ -1478,11 +1484,23 @@ mixed_component("base") {
@@ -1492,11 +1498,23 @@ mixed_component("base") {
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
if (!use_sysroot &&
Expand All @@ -47,7 +47,7 @@
if (use_allocator_shim) {
sources += [
"allocator/allocator_shim.cc",
@@ -1506,7 +1524,7 @@ mixed_component("base") {
@@ -1520,7 +1538,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
Expand All @@ -56,16 +56,16 @@
sources += [
"allocator/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
@@ -1563,7 +1581,7 @@ mixed_component("base") {
@@ -1576,7 +1594,7 @@ mixed_component("base") {

# Allow more direct string conversions on platforms with native utf8
# strings
# TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos
- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) {
+ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) {
- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) {
+ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) {
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -2243,6 +2261,42 @@ mixed_component("base") {
@@ -2255,6 +2273,42 @@ mixed_component("base") {
}
}

Expand Down Expand Up @@ -108,7 +108,7 @@
# iOS
if (is_ios) {
sources -= [
@@ -3495,7 +3549,7 @@ test("base_unittests") {
@@ -3537,7 +3591,7 @@ test("base_unittests") {
}
}

Expand All @@ -117,7 +117,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3543,7 +3597,7 @@ test("base_unittests") {
@@ -3585,7 +3639,7 @@ test("base_unittests") {
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
]
Expand All @@ -126,16 +126,16 @@
sources += [
"cpu_affinity_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
@@ -3555,7 +3609,7 @@ test("base_unittests") {
@@ -3596,7 +3650,7 @@ test("base_unittests") {

# Allow more direct string conversions on platforms with native utf8
# strings
# TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos
- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) {
+ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) {
- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) {
+ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) {
defines += [ "SYSTEM_NATIVE_UTF8" ]
}

@@ -3724,7 +3778,7 @@ test("base_unittests") {
@@ -3765,7 +3819,7 @@ test("base_unittests") {
}
}

Expand Down
@@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-03-25 21:59:56 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-04-21 18:48:31 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -59,7 +59,7 @@ static_assert(sizeof(void*) != 8, "");
@@ -66,7 +66,7 @@ static_assert(sizeof(void*) != 8, "");

// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
Expand All @@ -9,7 +9,7 @@
#define PA_HAS_LINUX_KERNEL
#endif

@@ -179,7 +179,7 @@ constexpr bool kUseLazyCommit = false;
@@ -186,7 +186,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.
Expand All @@ -18,3 +18,12 @@
#define PA_HAS_ATFORK_HANDLER
#endif

@@ -212,7 +212,7 @@ constexpr bool kUseLazyCommit = false;
//
// This is intended to roll out more broadly, but only enabled on Linux for now
// to get performance bot and real-world data pre-A/B experiment.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#define PA_PREFER_SMALLER_SLOT_SPANS
#endif // BUILDFLAG(IS_LINUX)

This file was deleted.

@@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-02-28 16:54:41 UTC
--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-04-21 18:48:31 UTC
+++ base/allocator/partition_allocator/spinning_mutex.cc
@@ -17,7 +17,15 @@

Expand All @@ -16,7 +16,7 @@
#include <sys/syscall.h>
#include <unistd.h>
#endif // defined(PA_HAS_LINUX_KERNEL)
@@ -85,8 +93,13 @@ void SpinningMutex::FutexWait() {
@@ -116,8 +124,13 @@ void SpinningMutex::FutexWait() {
// |kLockedContended| anymore. Note that even without spurious wakeups, the
// value of |state_| is not guaranteed when this returns, as another thread
// may get the lock before we get to run.
Expand All @@ -30,7 +30,7 @@

if (err) {
// These are programming error, check them.
@@ -98,8 +111,14 @@ void SpinningMutex::FutexWait() {
@@ -129,8 +142,14 @@ void SpinningMutex::FutexWait() {

void SpinningMutex::FutexWake() {
int saved_errno = errno;
Expand Down
12 changes: 6 additions & 6 deletions www/chromium/files/patch-base_debug_debugger__posix.cc
@@ -1,6 +1,6 @@
--- base/debug/debugger_posix.cc.orig 2022-02-28 16:54:41 UTC
--- base/debug/debugger_posix.cc.orig 2022-04-21 18:48:31 UTC
+++ base/debug/debugger_posix.cc
@@ -36,6 +36,10 @@
@@ -35,6 +35,10 @@
#include <sys/sysctl.h>
#endif

Expand All @@ -11,7 +11,7 @@
#if BUILDFLAG(IS_FREEBSD)
#include <sys/user.h>
#endif
@@ -96,32 +100,51 @@ bool BeingDebugged() {
@@ -95,32 +99,51 @@ bool BeingDebugged() {

// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
// binary interfaces may change.
Expand All @@ -24,7 +24,7 @@
+#endif

#if BUILDFLAG(IS_OPENBSD)
if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0)
if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
return -1;

mib[5] = (info_size / sizeof(struct kinfo_proc));
Expand All @@ -34,11 +34,11 @@
+ return being_debugged;
+ }
+
+ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0);
+ int sysctl_result = sysctl(mib, std::size(mib), info, &info_size, NULL, 0);
#endif

+#if !BUILDFLAG(IS_OPENBSD)
int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0);
int sysctl_result = sysctl(mib, std::size(mib), &info, &info_size, NULL, 0);
+#endif
DCHECK_EQ(sysctl_result, 0);
if (sysctl_result != 0) {
Expand Down
20 changes: 10 additions & 10 deletions www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,6 +1,6 @@
--- base/files/file_util_posix.cc.orig 2022-02-07 13:39:41 UTC
--- base/files/file_util_posix.cc.orig 2022-04-21 18:48:31 UTC
+++ base/files/file_util_posix.cc
@@ -694,32 +694,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
@@ -695,32 +695,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
Expand All @@ -21,29 +21,29 @@
}

// Iterate through the parents and create the missing ones.
for (auto i = subpaths.rbegin(); i != subpaths.rend(); ++i) {
- if (DirectoryExists(*i))
for (const FilePath& subpath : base::Reversed(subpaths)) {
- if (DirectoryExists(subpath))
- continue;
- if (mkdir(i->value().c_str(), 0700) == 0)
- if (mkdir(subpath.value().c_str(), 0700) == 0)
- continue;
- // Mkdir failed, but it might have failed with EEXIST, or some other error
- // due to the directory appearing out of thin air. This can occur if
- // two processes are trying to create the same file system tree at the same
- // time. Check to see if it exists and make sure it is a directory.
- int saved_errno = errno;
- if (!DirectoryExists(*i)) {
- if (!DirectoryExists(subpath)) {
- if (error)
- *error = File::OSErrorToFileError(saved_errno);
- return false;
+ if (!PathExists(*i)) {
+ if ((mkdir(i->value().c_str(), 0700) == -1) &&
+ ((full_path != *i) ? (errno != ENOENT) : (-1))) {
+ if (!PathExists(subpath)) {
+ if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
+ ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
+ int saved_errno = errno;
+ if (error)
+ *error = File::OSErrorToFileError(saved_errno);
+ return false;
+ }
+ } else if (!DirectoryExists(*i)) {
+ } else if (!DirectoryExists(subpath)) {
+ if (error)
+ *error = File::OSErrorToFileError(ENOTDIR);
+ return false;
Expand Down
6 changes: 3 additions & 3 deletions www/chromium/files/patch-base_files_file__util__unittest.cc
@@ -1,6 +1,6 @@
--- base/files/file_util_unittest.cc.orig 2022-02-28 16:54:41 UTC
--- base/files/file_util_unittest.cc.orig 2022-04-21 18:48:31 UTC
+++ base/files/file_util_unittest.cc
@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3523,7 +3523,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)

Expand All @@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
@@ -4240,7 +4240,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
@@ -4239,7 +4239,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =
Expand Down
4 changes: 2 additions & 2 deletions www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,4 +1,4 @@
--- base/i18n/icu_util.cc.orig 2022-02-28 16:54:41 UTC
--- base/i18n/icu_util.cc.orig 2022-04-21 18:48:31 UTC
+++ base/i18n/icu_util.cc
@@ -52,7 +52,7 @@
#endif
Expand All @@ -9,7 +9,7 @@
!BUILDFLAG(IS_CHROMECAST))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
@@ -346,7 +346,7 @@ void InitializeIcuTimeZone() {
@@ -345,7 +345,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
Expand Down

0 comments on commit 4eb083e

Please sign in to comment.