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

Jump to bottom

chromium: 80.0.3987.116 -> 80.0.3987.122 #81016

Merged
merged 2 commits into from Feb 26, 2020
Merged

chromium: 80.0.3987.116 -> 80.0.3987.122 #81016

merged 2 commits into from Feb 26, 2020

Conversation

primeos
Copy link
Member

@primeos primeos commented Feb 25, 2020 •
edited

https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html

This update includes 3 security fixes.

CVEs:
CVE-2020-6407 CVE-2020-6418

Status

platform attribute status tester
x86_64 chromium ✔️ @Frostman
x86_64 nixosTests.chromium ✔️ @Frostman
x86_64 google-chrome ✔️ @primeos
aarch64 chromium ✔️ @thefloweringash
Motivation for this change
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.

@Frostman
Copy link
Member

nixosTests.chromium passed on x86_64

@thefloweringash
Copy link
Member

LGTM on aarch64. Tested youtube, and general browsing.

While I've been focusing on keeping the stable branch working well, I've also been building the other branches. As of this update chromiumDev no longer builds on aarch64 (and possibly other platforms) with the error clang++: error: unknown argument: '-fintegrated-cc1'.

@primeos
chromium: 80.0.3987.116 -> 80.0.3987.122
8be566d 
https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html

This update includes 3 security fixes.

CVEs:
CVE-2020-6407 CVE-2020-6418
@primeos
chromiumDev: Fix the build
1d961a4 
Building Chromium 82 requires LLVM 10 for the new argument
"-fintegrated-cc1". LLVM 9 fails with:
clang++: error: unknown argument: '-fintegrated-cc1'
@primeos
Copy link
Member Author

primeos commented Feb 26, 2020 •
edited

@thefloweringash thanks, I've added a second commit to address the problem (luckily we already have LLVM 10 in Nixpkgs, though it was only added very recently which is why I had to do a rebase). My build is still running but I assume that it should be fine now.

Edit/Note: This also means that chromiumDev won't be available in 19.09 anymore. For 20.03 we'll have to backport LLVM 10 anyway (sooner or later).

Update: chromiumDev now fails during a Python script, I might be able to have a look during this weekend.

New error message:

python ../../third_party/blink/renderer/bindings/scripts/generate_bindings.py enumeration --web_idl_database gen/third_party/blink/renderer/bindings/web_idl_database.pickle --root_src_dir ../../ --root_gen_dir gen --output_core_reldir third_party/blink/renderer/bindings/core/v8/ --output_modules_reldir third_party/blink/renderer/bindings/modules/v8/
Traceback (most recent call last):
  File "../../third_party/blink/renderer/bindings/scripts/generate_bindings.py", line 75, in <module>
    main()
  File "../../third_party/blink/renderer/bindings/scripts/generate_bindings.py", line 71, in main
    dispatch_table[task](web_idl_database=web_idl_database)
  File "/build/chromium-82.0.4062.3/third_party/blink/renderer/bindings/scripts/bind_gen/enumeration.py", line 342, in generate_enumerations
    generate_enumeration(enumeration)
  File "/build/chromium-82.0.4062.3/third_party/blink/renderer/bindings/scripts/bind_gen/enumeration.py", line 336, in generate_enumeration
    write_code_node_to_file(header_node, path_manager.gen_path_to(header_path))
  File "/build/chromium-82.0.4062.3/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py", line 153, in write_code_node_to_file
    format_result = style_format.auto_format(rendered_text, filename=filepath)
  File "/build/chromium-82.0.4062.3/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py", line 53, in auto_format
    return clang_format(contents, filename)
  File "/build/chromium-82.0.4062.3/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py", line 61, in clang_format
    return _invoke_format_command(command_line, filename, contents)
  File "/build/chromium-82.0.4062.3/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py", line 74, in _invoke_format_command
    command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
  File "/nix/store/bh447min7f6vqdw3x1iywr1vxyx4ix8y-python-2.7.17/lib/python2.7/subprocess.py", line 394, in __init__
    errread, errwrite)
  File "/nix/store/bh447min7f6vqdw3x1iywr1vxyx4ix8y-python-2.7.17/lib/python2.7/subprocess.py", line 1047, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory

strace:

execve("/tmp/nix-build-chromium-unwrapped-82.0.4062.3.drv-0/chromium-82.0.4062.3/buildtools/linux64/clang-format", ["/tmp/nix-build-chromium-unwrappe"..., "-assume-filename=/tmp/nix-build-"...], 0x7fff04ac2108 /* 104 vars */) = -1 ENOENT (No such file or directory)

I.e. buildtools/linux64/clang-format is missing (see buildtools/clang_format/README.txt). Normally the clang-format executable is fetched before the build (due to buildtools/linux64/clang-format.sha1 this should at least be deterministic) but in Nixpkgs it might be better to use our clang-format instead (though this approach is most likely more fragile (breaks every time new executables are added and our version might diverge enough to be incompatible)).

Update: Fixed the second error in 02ca096 (building and testing went fine, didn't notice any regressions).

primeos added a commit that referenced this pull request Feb 26, 2020
@primeos
chromium: 80.0.3987.116 -> 80.0.3987.122
be346a1 
https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html

This update includes 3 security fixes.

CVEs:
CVE-2020-6407 CVE-2020-6418

(cherry picked from commit 8be566d)
Backport of #81016.
@primeos primeos merged commit 954d44f into NixOS:master Feb 26, 2020
@primeos primeos mentioned this pull request Feb 27, 2020
Merged
10 tasks
primeos added a commit that referenced this pull request Mar 1, 2020
@primeos
chromiumDev: Add the missing clang-format binary
02ca096 
The fix from 1d961a4 was unfortunately incomplete. This commit fixes
the second error [0] that occurs later during the build (the Python
script third_party/blink/renderer/bindings/scripts/generate_bindings.py
requires buildtools/linux64/clang-format).

[0]: #81016 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thefloweringash thefloweringash Awaiting requested review from thefloweringash

@bendlas bendlas Awaiting requested review from bendlas

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@primeos @Frostman @thefloweringash