Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Chromium 125.0.6422.60 #2852

Merged
merged 1 commit into from May 17, 2024

Conversation

Ahrotahn
Copy link
Contributor

@Ahrotahn Ahrotahn commented May 10, 2024

This PR updates to Chromium 125.0.6422.60

Notes:


Change log
Blog post

@clickot
Copy link

clickot commented May 13, 2024

on portable linux, linking fails at the end of the build (and I don't know how to fix this):

`[60241/60241] LINK ./chrome
FAILED: chrome
"python3" "../../build/toolchain/gcc_link_wrapper.py" --output="./chrome" -- /repo/build/src/third_party/llvm-build/Release+Asserts/bin/clang++ -Wl,--version-script=../../build/linux/chrome.map -fuse-ld=lld -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -Wl,-mllvm,-split-threshold-for-reg-with-hint=0 -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10%:cache_size_bytes=40g:cache_size_files=100000 -flto=thin -Wl,--thinlto-jobs=all -Wl,-mllvm,-import-instr-limit=30 -Wl,-mllvm,-disable-auto-upgrade-debug-info -fwhole-program-vtables -Wl,--undefined-version -Wl,--no-call-graph-profile-sort -m64 -no-canonical-prefixes -Wl,-O2 -Wl,--gc-sections -Wl,-z,defs -Wl,--as-needed -nostdlib++ --sysroot=../../build/linux/debian_bullseye_amd64-sysroot -fsanitize=cfi-vcall -fsanitize=cfi-icall -rdynamic -pie -Wl,--disable-new-dtags -Wl,--lto-O2 -o "./chrome" -Wl,--start-group @"./chrome.rsp" -Wl,--end-group ../../third_party/llvm-build/Release+Asserts/lib/clang/19/lib/x86_64-unknown-linux-gnu/libclang_rt.builtins.a -ldl -lpthread -lrt -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lnss3 -lnssutil3 -lsmime3 -lplds4 -lplc4 -lnspr4 -ldbus-1 -latk-1.0 -latk-bridge-2.0 -lcups -lgio-2.0 -ldrm -latspi -lresolv -lexpat -luuid -lm -lz -lX11 -lXcomposite -lXdamage -lXext -lXfixes -lXrender -lXrandr -lXtst -lgbm -lEGL -lxcb -lxkbcommon -lXi -lpci -lffi_pic -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -lcairo -lasound -lxshmfence -lstdc++ obj/third_party/rust/cxx/v1/lib/libcxx_lib.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_std.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc_alloc.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins_compiler_builtins.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core_rustc_std_workspace_core.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore_core.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins_profiler_builtins.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if_cfg_if.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown_hashbrown.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc_rustc_std_workspace_alloc.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc_libc.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort_panic_abort.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind_panic_unwind.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind_unwind.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle_rustc_demangle.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect_std_detect.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line_addr2line.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli_gimli.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide_miniz_oxide.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler_adler.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject_object.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr_memchr.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts_getopts.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std_rustc_std_workspace_std.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width_unicode_width.rlib local_rustc_sysroot/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest_test.rlib obj/skia/libskia_cbridge_urust_uside.rlib obj/third_party/rust/font_types/v0_4/lib/libfont_types_lib.rlib obj/third_party/rust/read_fonts/v0_15/lib/libread_fonts_lib.rlib obj/third_party/rust/skrifa/v0_15/lib/libskrifa_lib.rlib obj/build/rust/chromium_prelude/libchromium.rlib obj/third_party/blink/common/rust_crash/libthird_uparty_sblink_scommon_srust_ucrash_crs.rlib obj/components/qr_code_generator/libcomponents_sqr_ucode_ugenerator_cqr_ucode_ugenerator_uffi_uglue.rlib obj/third_party/rust/qr_code/v2/lib/libqr_code_lib.rlib
ld.lld: error: undefined symbol: data_controls::RulesServiceFactory::GetForBrowserContext(content::BrowserContext*)

referenced by data_protection_navigation_observer.cc
obj/chrome/browser/chrome.lto.libbrowser.a(data_protection_navigation_observer.o at 7463946).o:(enterprise_data_protection::DataProtectionNavigationObserver::GetDataProtectionSettings(Profile*, content::WebContents*, base::OnceCallback<void (enterprise_data_protection::UrlSettings const&)>))

ld.lld: error: undefined symbol: data_controls::RulesService::BlockScreenshots(GURL const&) const

referenced by data_protection_navigation_observer.cc
obj/chrome/browser/chrome.lto.libbrowser.a(data_protection_navigation_observer.o at 7463946).o:(enterprise_data_protection::DataProtectionNavigationObserver::GetDataProtectionSettings(Profile*, content::WebContents*, base::OnceCallback<void (enterprise_data_protection::UrlSettings const&)>))
clang++: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.
`

@teeminus
Copy link
Contributor

The same link error occured on windows. I updated the windows safebrowsing patch which fixed the error:

--- a/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
+++ b/chrome/browser/enterprise/data_protection/data_protection_navigation_observer.cc
@@ -155,9 +155,7 @@ void LogVerdictSource(
 
 bool IsScreenshotAllowedByDataControls(content::BrowserContext* context,
                                        const GURL& url) {
-  auto* rules =
-      data_controls::RulesServiceFactory::GetForBrowserContext(context);
-  return rules ? !rules->BlockScreenshots(url) : true;
+  return true;
 }
 
 }  // namespace

@clickot
Copy link

clickot commented May 13, 2024

since linux and windows is affected, shouldn't this code snipped go to
ungoogled-chromium/patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
file?

@Ahrotahn
Copy link
Contributor Author

Yes, thanks! I've updated the PR with that fix along with one for #2659

@Ahrotahn Ahrotahn linked an issue May 13, 2024 that may be closed by this pull request
3 tasks
@clickot
Copy link

clickot commented May 14, 2024

portable linux builds and links fine now, result runs on manjaro and ubuntu 20.04/24.04

@Ahrotahn Ahrotahn changed the title Update to Chromium 125.0.6422.41 Update to Chromium 125.0.6422.60 May 15, 2024
@Ahrotahn Ahrotahn linked an issue May 15, 2024 that may be closed by this pull request
@Ahrotahn Ahrotahn marked this pull request as ready for review May 15, 2024 22:28
@Ahrotahn Ahrotahn requested a review from a team as a code owner May 15, 2024 22:28
@rany2
Copy link
Member

rany2 commented May 16, 2024

FYI, from the blog post:

Google is aware that an exploit for CVE-2024-4947 exists in the wild.

@clickot
Copy link

clickot commented May 16, 2024

also 125.0.6422.60 builds and runs fine for portable linux

@networkException
Copy link
Member

will merge this in a bit, given the severity of the fixes and positive signals from platform maintainers

@networkException networkException merged commit 168c744 into ungoogled-software:master May 17, 2024
3 checks passed
@Cubik65536
Copy link
Member

I encountered this error:

[199/199] LINK gn
+ ./out/Default/gn gen out/Default --fail-on-unused-args
ERROR at //chrome/browser/extensions/BUILD.gn:751:34: Label not in deps.
  allow_circular_includes_from = [
                                 ^
The label "//chrome/browser/safe_browsing:safe_browsing"
was not in the deps of this target. allow_circular_includes_from only allows
targets present in the deps.
See //chrome/browser/extensions/BUILD.gn:24:1: whence it was called.
static_library("extensions") {
^-----------------------------
See //chrome/test/BUILD.gn:612:9: which caused the file to be included.
        "//chrome/browser/extensions:test_support",
        ^-----------------------------------------

when building for macOS, might be Ninja 1.12 again, any idea for how to fix it? Didn't find any info related to this one in recent PRs...

@Cubik65536
Copy link
Member

I encountered this error:

[199/199] LINK gn
+ ./out/Default/gn gen out/Default --fail-on-unused-args
ERROR at //chrome/browser/extensions/BUILD.gn:751:34: Label not in deps.
  allow_circular_includes_from = [
                                 ^
The label "//chrome/browser/safe_browsing:safe_browsing"
was not in the deps of this target. allow_circular_includes_from only allows
targets present in the deps.
See //chrome/browser/extensions/BUILD.gn:24:1: whence it was called.
static_library("extensions") {
^-----------------------------
See //chrome/test/BUILD.gn:612:9: which caused the file to be included.
        "//chrome/browser/extensions:test_support",
        ^-----------------------------------------

when building for macOS, might be Ninja 1.12 again, any idea for how to fix it? Didn't find any info related to this one in recent PRs...

Never mind, I fixed it 🫡

@PF4Public
Copy link
Contributor

Never mind, I fixed it 🫡

What was the problem? Perhaps it might help someone later.

@Cubik65536
Copy link
Member

Cubik65536 commented May 18, 2024

Never mind, I fixed it 🫡

What was the problem? Perhaps it might help someone later.

It is a macOS platform-specific issue, so I didn't say too much. But in a nutshell:

  • A safe browsing component was removed
  • There's a circular dependency on that safe browsing component, which was removed in an older platform-specific patch.
  • The patch was gone after a refresh for some reason (maybe it's because the auto refresh failed, but I didn't notice it and basically "removed" the patch by not touching anything related).

I just added a new patch removing the dependency to fix it.

@Cubik65536
Copy link
Member

However, another issue is there: ungoogled-software/ungoogled-chromium-macos#168 (comment)

And still have no clue on how to fix it...

@Ahrotahn
Copy link
Contributor Author

@Cubik65536 See if this change helps:

--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -285,20 +285,7 @@
 std::unique_ptr<net::ClientCertStore> GetWrappedCertStore(
     Profile* profile,
     std::unique_ptr<net::ClientCertStore> platform_store) {
-  if (!profile || !client_certificates::features::
-                      IsManagedClientCertificateForUserEnabled()) {
-    return platform_store;
-  }
-
-  auto* provisioning_service =
-      client_certificates::CertificateProvisioningServiceFactory::GetForProfile(
-          profile);
-  if (!provisioning_service) {
-    return platform_store;
-  }
-
-  return client_certificates::ClientCertificatesService::Create(
-      provisioning_service, std::move(platform_store));
+  return nullptr;
 }
 #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 

If that works then its something that we should add to the core repo since it affects more than one platform now.

@teeminus
Copy link
Contributor

Should work for windows as well 👍

@Cubik65536
Copy link
Member

Thanks, @Ahrotahn @teeminus the patch works.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Updating to Chromium 125.0.6422.60 on Linux Search engine collection still sends requests
7 participants