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

chromium: 87.0.4280.141 -> 88.0.4324.96 #110010

Merged
merged 2 commits into from Jan 20, 2021
Merged

chromium: 87.0.4280.141 -> 88.0.4324.96 #110010

merged 2 commits into from Jan 20, 2021

Conversation

primeos
Copy link
Member

@primeos primeos commented Jan 19, 2021

https://chromereleases.googleblog.com/2021/01/stable-channel-update-for-desktop_19.html

This update includes 36 security fixes.

CVEs:
CVE-2021-21117 CVE-2021-21118 CVE-2021-21119 CVE-2021-21120
CVE-2021-21121 CVE-2021-21122 CVE-2021-21123 CVE-2021-21124
CVE-2021-21125 CVE-2020-16044 CVE-2021-21126 CVE-2021-21127
CVE-2021-21128 CVE-2021-21129 CVE-2021-21130 CVE-2021-21131
CVE-2021-21132 CVE-2021-21133 CVE-2021-21134 CVE-2021-21135
CVE-2021-21136 CVE-2021-21137 CVE-2021-21138 CVE-2021-21139
CVE-2021-21140 CVE-2021-21141

Motivation for this change

cc @danielfullmer @thefloweringash

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@danielfullmer
Copy link
Contributor

chromium builds and briefly tested working fine for me on x86_64-linux.

However, nixosTests.chromium fails with the following error:

AssertionError: new window did not appear within 60 seconds

Chromium seems to run fine but the VM test fails and prints errors like:
machine # There are no windows in the stack
machine # Invalid window '%1'
machine # Usage: windowfocus [window=%1]
machine # --sync    - only exit once the window has focus

This could be due to changes in Chromium's X11 code (or maybe some
changes for Ozone/X11). I'll investigate this but let's temporarily
remove the Chromium test from the tested jobset until I find a proper
solution/fix.
@primeos primeos merged commit 2053744 into NixOS:master Jan 20, 2021
primeos added a commit that referenced this pull request Jan 20, 2021
Only execute Ctrl+w to close the currently active window if the
new/secondary window (title: "New Tab") could be selected. This fixes a
test failure since the update to Chromium M88 (cc PR #110010).
Without this additional check the main window (title: "startup done")
could still be selected (and thus will be closed) and the script would
close both windows (i.e. terminate Chromium completely).
@primeos
Copy link
Member Author

primeos commented Jan 20, 2021

Ok, so the NixOS VM test for Chromium was definitely no fun to read/debug (also because running the tests interactively via driverInteractive apparently doesn't work due to the defined Python functions and I had some other issues while transferring chromiumBeta from my headless builder to my test PC). I've pushed a fix for nixosTests.chromium (8a7a844 - interesting that we never ran into this before btw) but I'll likely refactor the test before I revert 2dbd08d.

@danielfullmer as always, thanks a lot for your testing!

primeos added a commit to primeos/nixpkgs that referenced this pull request Jan 21, 2021
Only execute Ctrl+w to close the currently active window if the
new/secondary window (title: "New Tab") could be selected. This fixes a
test failure since the update to Chromium M88 (cc PR NixOS#110010).
Without this additional check the main window (title: "startup done")
could still be selected (and thus will be closed) and the script would
close both windows (i.e. terminate Chromium completely).

(cherry picked from commit 8a7a844)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants