Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
4 changed files
with
66 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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', | ||
|
34 changes: 34 additions & 0 deletions
34
pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|
18 changes: 9 additions & 9 deletions
18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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"; | ||
}; | ||
} |