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

Jump to bottom

Upgrade from Chromium 120.0.6099.199 to Chromium 120.0.6099.217 (1.61.x). #21531

Merged
merged 3 commits into from
Jan 10, 2024
Merged

Upgrade from Chromium 120.0.6099.199 to Chromium 120.0.6099.217 (1.61.x). #21531

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
212f213
Upgrade from Chromium 120.0.6099.199 to Chromium 120.0.6099.217
brave-builds Jan 10, 2024
dda58a2
Upgrade patches from Chromium 120.0.6099.199 to Chromium 120.0.6099.217
brave-builds Jan 10, 2024
5c180c1
Update pins list timestamp
brave-builds Jan 10, 2024
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 @@ -549,9 +549,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
constexpr std::string_view brave_certs = R"brave_certs(
# Last updated: Wed Jan 3 19:28:00 UTC 2024
# Last updated: Wed Jan 10 01:03:25 UTC 2024
PinsListTimestamp
1704310080
1704848605

# =====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 @@ -267,7 +267,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "120.0.6099.199",
"tag": "120.0.6099.217",
"repository": {
"url": "https://github.com/brave/chromium"
}
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 e367ce9d906cfc2b4038b7d64689710d3b16bac5..cdb2cf3eab0a59c59afe23051ff13c37153d1272 100644
index ccda865eec7a241cd03ec48fa97a1be0f4094d00..667398a509c80156fba151aba76e255954da1845 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=120
-MINOR=0
-BUILD=6099
-PATCH=199
-PATCH=217
+MINOR=1
+BUILD=61
+PATCH=115
4 changes: 2 additions & 2 deletions patches/components-crx_file-crx_verifier.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/components/crx_file/crx_verifier.cc b/components/crx_file/crx_verifier.cc
index 2378aa5a95159926c798281080f4e02a158c616a..e6df055145b916459f02e8b9204649fede4a8b47 100644
index cf038c50bdbe4167d446cc6bea6adbb8ae8c1894..73465d7892ec4abca564dd184c51dc0427ddfbe1 100644
--- a/components/crx_file/crx_verifier.cc
+++ b/components/crx_file/crx_verifier.cc
@@ -181,6 +181,7 @@ VerifierResult VerifyCrx3(
@@ -197,6 +197,7 @@ VerifierResult VerifyCrx3(
found_publisher_key =
found_publisher_key || key_hash == publisher_key ||
(accept_publisher_test_key && key_hash == *publisher_test_key);
Expand Down