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: 71.0.3578.98 -> 72.0.3626.81 #54960

Closed
wants to merge 2 commits into from
Closed

chromium: 71.0.3578.98 -> 72.0.3626.81 #54960

wants to merge 2 commits into from

Conversation

ivan
Copy link
Member

@ivan ivan commented Jan 30, 2019

Motivation for this change

https://chromereleases.googleblog.com/2019/01/stable-channel-update-for-desktop.html

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

The updated chromium is working fine here, I did not test chromiumDev.

@dtzWill
Copy link
Member

dtzWill commented Jan 30, 2019

Finally a stable update! \o/

@ivan
Copy link
Member Author

ivan commented Jan 30, 2019

Do not merge, I am not hearing any sound output with ALSA in Chromium 72:

ALSA lib conf.c:3943:(snd_config_update_r) Cannot access file /nix/store/z6xww8cyf59sld729qinzh6ji51kq6ap-alsa-lib-1.1.7/share/alsa/alsa.conf
ALSA lib conf.c:3943:(snd_config_update_r) Cannot access file /nix/store/z6xww8cyf59sld729qinzh6ji51kq6ap-alsa-lib-1.1.7/share/alsa/alsa.conf
[...]
ALSA lib conf.c:3943:(snd_config_update_r) Cannot access file /nix/store/z6xww8cyf59sld729qinzh6ji51kq6ap-alsa-lib-1.1.7/share/alsa/alsa.conf
ALSA lib pcm.c:2636:(snd_pcm_open_noupdate) Unknown PCM default
ALSA lib conf.c:3943:(snd_config_update_r) Cannot access file /nix/store/z6xww8cyf59sld729qinzh6ji51kq6ap-alsa-lib-1.1.7/share/alsa/alsa.conf
ALSA lib pcm.c:2636:(snd_pcm_open_noupdate) Unknown PCM plug:default

71 works fine.

@ivan
Copy link
Member Author

ivan commented Jan 30, 2019 •
edited

https://chromium.googlesource.com/chromium/src/+/f2fc90bb74a05cffde6b4363ee575fcca7c45197

https://github.com/chromium/chromium/blob/master/services/audio/audio_sandbox_hook_linux.cc might need to be patched

I am currently testing

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 5af8fa60cec..1748387787c 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -12,6 +12,7 @@
 , utillinux, alsaLib
 , bison, gperf
 , glib, gtk2, gtk3, dbus-glib
+, glibc
 , libXScrnSaver, libXcursor, libXtst, libGLU_combined
 , protobuf, speechd, libXdamage, cups
 , ffmpeg, libxslt, libxml2, at-spi2-core
@@ -169,6 +170,17 @@ let
           'return sandbox_binary;' \
           'return base::FilePath(GetDevelSandboxPath());'

+      substituteInPlace services/audio/audio_sandbox_hook_linux.cc \
+        --replace \
+          '/usr/share/alsa/' \
+          '${alsaLib}/share/alsa/' \
+        --replace \
+          '/usr/lib/x86_64-linux-gnu/gconv/' \
+          '${glibc}/lib/gconv/' \
+        --replace \
+          '/usr/share/locale/' \
+          '${glibc}/share/locale/'
+
       sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
         chrome/browser/shell_integration_linux.cc

@dtzWill
Copy link
Member

dtzWill commented Jan 31, 2019

6b27008 FWIW

@ivan
Copy link
Member Author

ivan commented Jan 31, 2019 •
edited

I added a new commit to make audio output work again with ALSA, @bendlas want to cherry-pick 33375dc to master or should I make a new PR? no need I guess, since no conflicts

@ivan
Copy link
Member Author

ivan commented Jan 31, 2019

Also, I haven't tested with pulseaudio, if someone uses it, please test.

ivan referenced this pull request Jan 31, 2019
@bendlas
chromium: 71.0.3578.98 -> 72.0.3626.81
6b27008 
CVE-2019-5754 CVE-2019-5782 CVE-2019-5755 CVE-2019-5756 CVE-2019-5757
CVE-2019-5758 CVE-2019-5759 CVE-2019-5760 CVE-2019-5761 CVE-2019-5762
CVE-2019-5763 CVE-2019-5764 CVE-2019-5765 CVE-2019-5766 CVE-2019-5767
CVE-2019-5768 CVE-2019-5769 CVE-2019-5770 CVE-2019-5771 CVE-2019-5772
CVE-2019-5773 CVE-2019-5774 CVE-2019-5775 CVE-2019-5776 CVE-2019-5777
CVE-2019-5778 CVE-2019-5779 CVE-2019-5780 CVE-2019-5781
@pbogdan
Copy link
Member

pbogdan commented Jan 31, 2019

FWIW tested with master @ 6b27008 and 33375dc cherry-picked on top and sound output works for me with pulseaudio.

@bendlas
Copy link
Contributor

bendlas commented Jan 31, 2019

Oh, I didn't even check for a PR, before updating chromium, sorry. I'll pick your change as soon as I get home.

bendlas pushed a commit that referenced this pull request Jan 31, 2019
@ivan @bendlas
chromium: make the new audio sandbox NixOS-compatible
e1271ae 
Deal with https://chromium.googlesource.com/chromium/src/+/f2fc90bb74a05cffde6b4363ee575fcca7c45197
which landed https://github.com/chromium/chromium/blob/master/services/audio/audio_sandbox_hook_linux.cc
containing /usr/share and /usr/lib/x86_64-linux-gnu paths.

closes #54960

(cherry picked from commit 03960a3)
@ivan ivan closed this Jan 31, 2019
bendlas pushed a commit that referenced this pull request Jan 31, 2019
@ivan @bendlas
chromium: make the new audio sandbox NixOS-compatible
03960a3 
Deal with https://chromium.googlesource.com/chromium/src/+/f2fc90bb74a05cffde6b4363ee575fcca7c45197
which landed https://github.com/chromium/chromium/blob/master/services/audio/audio_sandbox_hook_linux.cc
containing /usr/share and /usr/lib/x86_64-linux-gnu paths.

closes #54960
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtzWill dtzWill dtzWill approved these changes

Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ivan @dtzWill @pbogdan @bendlas @GrahamcOfBorg