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.

Sign up for GitHub

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

Upgrade from Chromium 108.0.5359.48 to Chromium 108.0.5359.62 (1.47.x). #16119

Merged
merged 3 commits into from
Nov 29, 2022
Merged

Upgrade from Chromium 108.0.5359.48 to Chromium 108.0.5359.62 (1.47.x). #16119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
372a765
Upgrade from Chromium 108.0.5359.48 to Chromium 108.0.5359.62
brave-browser-releases Nov 28, 2022
6706afb
Upgrade patches from Chromium 108.0.5359.48 to Chromium 108.0.5359.62
brave-browser-releases Nov 28, 2022
f1e3735
Update pins list timestamp
brave-browser-releases Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
base::StringPiece brave_certs = R"brave_certs(
# Last updated: Wed Nov 16 19:47:05 UTC 2022
# Last updated: Mon Nov 28 18:58:34 UTC 2022
PinsListTimestamp
1668628025
1669661914

# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "108.0.5359.48",
"tag": "108.0.5359.62",
"repository": {
"url": "https://github.com/chromium/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/base-threading-thread_restrictions.h.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
index e15f87aaeecba4c77a70fdb39a8be1f1c4dd7a5a..27de8a3c3e7f3ae1891bd1e5fc66adca4793d801 100644
index 981370f9fffb6827a18d855b63bd1f50a4f2257b..0ad7320d3f2d922824f74a649b8e998649b410f0 100644
--- a/base/threading/thread_restrictions.h
+++ b/base/threading/thread_restrictions.h
@@ -556,6 +556,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
@@ -561,6 +561,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
ScopedAllowBaseSyncPrimitives& operator=(
const ScopedAllowBaseSyncPrimitives&) = delete;

Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 8f9389d0b9b18eaa6e8fc40b035962a6a0bc4582..055d86031393b2a397ca123231a2efa2e56f94c0 100644
index 50c943108e0842b5019a72da5b7835d6b8971d91..fc41600c436690c0855236d81bc014e02a2f7f28 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=108
-MINOR=0
-BUILD=5359
-PATCH=48
-PATCH=62
+MINOR=1
+BUILD=47
+PATCH=104
2 changes: 1 addition & 1 deletion patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 89ea1bf57ef43c9ab9544221dad09bf1d4112748..dcdccf291becb2709496edf2e412d8a95679d77d 100644
index b4d585985bf4c0b8b855651e10806b822afa9e1a..4c28eb1a19a61bd15ccb77408cc66eb9041e72aa 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -347,6 +347,7 @@ void ToolbarView::Init() {
Expand Down
2 changes: 1 addition & 1 deletion patches/tools-gritsettings-resource_ids.spec.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index 01f27f9eb13bd8fbd3f2d77dee16b29bdebc5a73..51f3c4f4abcd810370efb103b7dd71543a7471d2 100644
index 01f27f9eb13bd8fbd3f2d77dee16b29bdebc5a73..e5e63fc526acb624eba863c9f1836d120545a7d8 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -41,6 +41,9 @@
Expand Down