From d23da8229b31385ab1d6b5fd5177f5ff7e7eacf0 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Wed, 13 Jun 2018 16:28:18 +0400 Subject: [PATCH] chromium: 67.0.3396.62 -> 67.0.3396.87 Contains fixes for CVE-2018-6148 [0] and CVE-2018-6149 [1]. Also add a patch to fix one problem with 68 (Beta) build. I'm still working on fixing Beta. [0] https://chromereleases.googleblog.com/2018/06/stable-channel-update-for-desktop.html [1] https://chromereleases.googleblog.com/2018/06/stable-channel-update-for-desktop_12.html --- .../networking/browsers/chromium/common.nix | 1 + .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a2d8a24ec5e..7803a530a92 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -149,6 +149,7 @@ let ./patches/nix_plugin_paths_52.patch ] ++ optionals (versionAtLeast version "68") [ ./patches/nix_plugin_paths_68.patch + (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs") ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 2113b9cdbed..a1aba0da2d6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm"; - sha256bin64 = "06gmn0clhll91pmph07db043006gf2x6nfgxlir4qwqsj2qgdch0"; - version = "67.0.3396.62"; + sha256 = "1jfhdisp4j6rrb8zxj2am7vlkjfbwvq1si7cacjwfy624hlhxpxz"; + sha256bin64 = "0j3aw4zyg0alizgh73dp3fz8f6y71srdkycnzjm037p3p8m364j1"; + version = "68.0.3440.17"; }; dev = { - sha256 = "0hy36r938k6c89alam4a8yy2wynnlcc0zqhhb0jgy3qlnqrksvrc"; - sha256bin64 = "0liqgz8sip5fz5mxb54zagz3p8s24j96p26i5dql935bic7p3lhw"; - version = "68.0.3440.7"; + sha256 = "0acgpi7slwvq5lxaagmn57a6jpz508hwa690ypny8zlhsiaqlxaz"; + sha256bin64 = "1vjmi9lm8xrkhmzv9sqnln867sm4b80y2z3djz7mj05hkzsb0zr9"; + version = "69.0.3452.0"; }; stable = { - sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm"; - sha256bin64 = "16fljvrq2gcpjpyhf1w8s3rv805mknmy2i88n43v2cg7hl35241c"; - version = "67.0.3396.62"; + sha256 = "07fvfarlzl4dcr0vbklzbg08iwvzfkczsqsg0d1p695q1hpsf9sx"; + sha256bin64 = "1c2xn84vs1v7gph7l4s408ml6l6c7lnlg4z2vcx20phxmlsgs1xg"; + version = "67.0.3396.87"; }; }