Skip to content

Commit adfd4fe

Browse files
vcunatvcunat
committedSep 16, 2017
Merge #29335: chromium: 60.0.3112.90 -> 61.0.3163.79 [security]
(cherry picked from commit b82b23b)
·
17.09
1 parent bf75da2 commit adfd4fe

8 files changed

+132
-25
lines changed
 

‎pkgs/applications/networking/browsers/chromium/browser.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ mkChromiumDerivation (base: rec {
1212
sandboxExecutableName = "__chromium-suid-sandbox";
1313

1414
installPhase = ''
15-
mkdir -p "$libExecPath/swiftshader"
15+
mkdir -p "$libExecPath"
1616
cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
1717
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
1818
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
19-
cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/"
2019
cp -v "$buildPath/chrome" "$libExecPath/$packageName"
2120
2221
if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then

‎pkgs/applications/networking/browsers/chromium/common.nix

+4-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ let
117117

118118
patches = [
119119
./patches/nix_plugin_paths_52.patch
120-
./patches/chromium-gn-bootstrap-r8.patch
120+
./patches/chromium-gn-bootstrap-r14.patch
121+
./patches/chromium-gcc-r1.patch
122+
./patches/chromium-atk-r1.patch
123+
./patches/chromium-gcc5-r1.patch
121124
# To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
122125
# Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
123126
./patches/fix_network_api_crash.patch

‎pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000
2+
+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000
3+
@@ -571,7 +571,7 @@
4+
// it's best to leave this out rather than break people's builds:
5+
#if defined(ATK_CHECK_VERSION)
6+
#if ATK_CHECK_VERSION(2, 16, 0)
7+
- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY);
8+
+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
9+
#endif
10+
#endif
11+
break;

‎pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
2+
index 99f230ce7e9a..de2415d402f5 100644
3+
--- a/base/numerics/safe_math_shared_impl.h
4+
+++ b/base/numerics/safe_math_shared_impl.h
5+
@@ -21,8 +21,7 @@
6+
#if !defined(__native_client__) && \
7+
((defined(__clang__) && \
8+
((__clang_major__ > 3) || \
9+
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
10+
- (defined(__GNUC__) && __GNUC__ >= 5))
11+
+ (__clang_major__ == 3 && __clang_minor__ >= 4))))
12+
#include "base/numerics/safe_math_clang_gcc_impl.h"
13+
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
14+
#else

‎pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
--- a/chrome/browser/devtools/devtools_file_system_indexer.cc
2+
+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc
3+
@@ -34,7 +34,6 @@ using base::TimeDelta;
4+
using base::TimeTicks;
5+
using content::BrowserThread;
6+
using std::map;
7+
-using std::set;
8+
using std::string;
9+
using std::vector;
10+
11+
@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const string& query) {
12+
if (trigram != kUndefinedTrigram)
13+
trigrams.push_back(trigram);
14+
}
15+
- set<FileId> file_ids;
16+
+ std::set<FileId> file_ids;
17+
bool first = true;
18+
vector<Trigram>::const_iterator it = trigrams.begin();
19+
for (; it != trigrams.end(); ++it) {
20+
@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const string& query) {
21+
first = false;
22+
continue;
23+
}
24+
- set<FileId> intersection = base::STLSetIntersection<set<FileId> >(
25+
+ std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >(
26+
file_ids, index_[trigram]);
27+
file_ids.swap(intersection);
28+
}
29+
diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
30+
index 94bb9161ec85..e40c6387f72e 100644
31+
--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
32+
+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
33+
@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
34+
allocation_length_(0),
35+
data_(data),
36+
data_length_(0),
37+
- kind_(AllocationKind::kNormal),
38+
+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
39+
deleter_(deleter) {}
40+
DataHandle(void* allocation_base,
41+
size_t allocation_length,
42+
@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
43+
reinterpret_cast<uintptr_t>(allocation_base_) +
44+
allocation_length_);
45+
switch (kind_) {
46+
- case AllocationKind::kNormal:
47+
+ case WTF::ArrayBufferContents::AllocationKind::kNormal:
48+
DCHECK(deleter_);
49+
deleter_(data_);
50+
return;
51+
- case AllocationKind::kReservation:
52+
+ case WTF::ArrayBufferContents::AllocationKind::kReservation:
53+
ReleaseReservedMemory(allocation_base_, allocation_length_);
54+
return;
55+
}
56+
--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
57+
+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
58+
@@ -10,7 +10,7 @@
59+
60+
#include "webrtc/modules/audio_processing/aec3/aec_state.h"
61+
62+
-#include <math.h>
63+
+#include <cmath>
64+
#include <numeric>
65+
#include <vector>
66+

‎pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685
2+
Author: Pawel Hajdan, Jr <phajdan.jr@chromium.org>
3+
Date: Wed Jul 26 21:51:54 2017 +0000
4+
5+
wip
6+
7+
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
8+
index 1390560f8e37..ff2ae57c46b0 100755
9+
--- a/tools/gn/bootstrap/bootstrap.py
10+
+++ b/tools/gn/bootstrap/bootstrap.py
11+
@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):
12+
'base/metrics/histogram_base.cc',
13+
'base/metrics/histogram_functions.cc',
14+
'base/metrics/histogram_samples.cc',
15+
+ 'base/metrics/histogram_snapshot_manager.cc',
16+
'base/metrics/metrics_hashes.cc',
17+
'base/metrics/persistent_histogram_allocator.cc',
18+
'base/metrics/persistent_memory_allocator.cc',
19+
@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
20+
'base/trace_event/heap_profiler_allocation_context_tracker.cc',
21+
'base/trace_event/heap_profiler_allocation_register.cc',
22+
'base/trace_event/heap_profiler_event_filter.cc',
23+
- 'base/trace_event/heap_profiler_event_writer.cc',
24+
+ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
25+
'base/trace_event/heap_profiler_serialization_state.cc',
26+
'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
27+
'base/trace_event/heap_profiler_type_name_deduplicator.cc',

‎pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch

-13
This file was deleted.

‎pkgs/applications/networking/browsers/chromium/upstream-info.nix

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# This file is autogenerated from update.sh in the same directory.
22
{
33
beta = {
4-
sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8";
5-
sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m";
6-
version = "60.0.3112.78";
4+
sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x";
5+
sha256bin64 = "12z6z8gjxl4mx8j6db8nnlzrj03rh4qwyrvcf4hqcsv7b1armg6j";
6+
version = "61.0.3163.79";
77
};
88
dev = {
9-
sha256 = "0yan2dzx1854f3xslif5682rkb82a1li6vxj12z5s5fxqijhj1jq";
10-
sha256bin64 = "0ddva2rqnid2gcx3qh72p41wc15869w2w9n0rbdpn662rpl041v1";
11-
version = "61.0.3163.25";
9+
sha256 = "168i6dcdl13an3vlr2m83q8fcprgckmclkmzwj70jdkp84qx80fq";
10+
sha256bin64 = "116vddp01m2ls337zj6r4h1nvybphvldlk9bs8czypx5skn29vbz";
11+
version = "62.0.3202.9";
1212
};
1313
stable = {
14-
sha256 = "1rirhwvccidza4q4z1gqdwcd9v1bymh1m9r2cq8jhiabfrjpjbxl";
15-
sha256bin64 = "1lw349ips0sgyls3arv864yq5xykfn9jilwkalvllaq6yvdvcvlk";
16-
version = "60.0.3112.90";
14+
sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x";
15+
sha256bin64 = "0a0wd06c0v061lnmb8x20gqgsg9zqafp2kq1fl3cjm0ldg9rwayw";
16+
version = "61.0.3163.79";
1717
};
1818
}

0 commit comments

Comments
 (0)
Please sign in to comment.