diff options
author | Yuriy Taraday <yorik.sar@gmail.com> | 2017-11-09 02:44:20 +0400 |
---|---|---|
committer | Herwig Hochleitner <hhochleitner@gmail.com> | 2017-11-10 01:19:23 +0100 |
commit | 7105bb68cc779038f159b1761503eb7e8e3241b2 (patch) | |
tree | 17c0c063c1347cf195eb42c651bddf22b287ea7e /pkgs/applications/networking/browsers | |
parent | 9725b0f195e2c778d068019f809066932ab5fd86 (diff) | |
download | nixlib-7105bb68cc779038f159b1761503eb7e8e3241b2.tar nixlib-7105bb68cc779038f159b1761503eb7e8e3241b2.tar.gz nixlib-7105bb68cc779038f159b1761503eb7e8e3241b2.tar.bz2 nixlib-7105bb68cc779038f159b1761503eb7e8e3241b2.tar.lz nixlib-7105bb68cc779038f159b1761503eb7e8e3241b2.tar.xz nixlib-7105bb68cc779038f159b1761503eb7e8e3241b2.tar.zst nixlib-7105bb68cc779038f159b1761503eb7e8e3241b2.zip |
chromium: 62.0.3202.75 -> 62.0.3202.89
Includes security fixes for CVE-2017-15398 and CVE-2017-15399. Also fixes builds for beta and dev branches: - backport https://webrtc-review.googlesource.com/9384 to fix build for new webrtc revision - for dev branch fix gn bootstrap, see https://chromium-review.googlesource.com/758584 - for 63+ manpage now is not generated during ninja build, it is processed with sed using packagers tools included in sources
Diffstat (limited to 'pkgs/applications/networking/browsers')
4 files changed, 66 insertions, 11 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 42d606ae2248..8fc7833fc95e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -144,9 +144,12 @@ let ./patches/chromium-gcc5-r3.patch ./patches/chromium-glibc2.26-r1.patch ] - ++ optionals (versionAtLeast version "63") [ + ++ optionals (versionRange "63" "64") [ ./patches/chromium-gcc5-r4.patch - ./patches/constexpr-fix.patch + ./patches/include-math-for-round.patch + ] + ++ optionals (versionAtLeast version "64") [ + ./patches/gn_bootstrap_observer.patch ] ++ optional enableWideVine ./patches/widevine.patch; @@ -265,6 +268,13 @@ let "${target}" '' + optionalString (target == "mksnapshot" || target == "chrome") '' paxmark m "${buildPath}/${target}" + '' + optionalString (versionAtLeast version "63") '' + ( + source chrome/installer/linux/common/installer.include + PACKAGE=$packageName + MENUNAME="Chromium" + process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1" + ) ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; diff --git a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch new file mode 100644 index 000000000000..f1207439bb4d --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch @@ -0,0 +1,11 @@ +--- a/tools/gn/bootstrap/bootstrap.py 2017-11-07 23:06:09.000000000 +0000 ++++ b/tools/gn/bootstrap/bootstrap.py 2017-11-08 12:17:16.569216182 +0000 +@@ -481,6 +481,7 @@ + 'base/metrics/sample_vector.cc', + 'base/metrics/sparse_histogram.cc', + 'base/metrics/statistics_recorder.cc', ++ 'base/observer_list_threadsafe.cc', + 'base/path_service.cc', + 'base/pending_task.cc', + 'base/pickle.cc', + diff --git a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch new file mode 100644 index 000000000000..530493dcd0f6 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch @@ -0,0 +1,34 @@ +From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Date: Fri, 13 Oct 2017 15:49:32 +0200 +Subject: [PATCH] IWYU: Include math.h for round(3). + +math.h was being implicitly included, which can break the build with +alternative libc implementations. + +Bug: None +Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952 +Reviewed-on: https://webrtc-review.googlesource.com/9384 +Reviewed-by: Tommi <tommi@webrtc.org> +Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com> +Cr-Commit-Position: refs/heads/master@{#20292} +--- + p2p/base/port.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/third_party/webrtc/p2p/base/port.cc b/third_party/webrtc/p2p/base/port.cc +index a1b478d11..81aa0aadb 100644 +--- a/third_party/webrtc/p2p/base/port.cc ++++ b/third_party/webrtc/p2p/base/port.cc +@@ -10,6 +10,8 @@ + + #include "p2p/base/port.h" + ++#include <math.h> ++ + #include <algorithm> + #include <vector> + +-- +2.15.0 + diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 0cf6df0e5cc6..8f87fe7ddddd 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 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; - sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q"; - version = "63.0.3239.18"; + sha256 = "068jaws7lqwlw3g62d2cv7i44p6zvdnizdqd56hfs4wj08k068db"; + sha256bin64 = "009ckf3gh039dwdf8rj494ra4qp0kijgzkrxianda1r7cqz1c3ys"; + version = "63.0.3239.30"; }; dev = { - sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj"; - sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k"; - version = "63.0.3239.18"; + sha256 = "0kpn5w1qvjlkxqhsc7lz269mxp7i0z9k92ay178kgsph3ygncm0x"; + sha256bin64 = "1pvnkhvks3yvpdh2qg9iqg6xmi5bxrl1n6mp9akywv1d5wsba7kg"; + version = "64.0.3260.2"; }; stable = { - sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9"; - sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x"; - version = "62.0.3202.75"; + sha256 = "0sclvs11kn60ibc66wfan0xdcsr2s8vkvbq759h86w9gq86pcycz"; + sha256bin64 = "05lbrzd37q57mx9rii995l9z42a4aa0jh55ia615sqmzr56a7fdr"; + version = "62.0.3202.89"; }; } |