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 120.0.6099.116 to Chromium 120.0.6099.144 (1.61.x). #21434

Merged
merged 3 commits into from
Dec 20, 2023
Merged

Upgrade from Chromium 120.0.6099.116 to Chromium 120.0.6099.144 (1.61.x). #21434

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
621d2d5
Upgrade from Chromium 120.0.6099.115 to Chromium 120.0.6099.144
brave-builds Dec 20, 2023
239bbea
Upgrade patches from Chromium 120.0.6099.115 to Chromium 120.0.6099.144
brave-builds Dec 20, 2023
dfe5e8a
Update pins list timestamp
brave-builds Dec 20, 2023
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 Dec 13 00:55:44 UTC 2023
# Last updated: Wed Dec 20 18:48:48 UTC 2023
PinsListTimestamp
1702428944
1703098128

# =====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.115",
"tag": "120.0.6099.144",
"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 b5cb4d3d8ae188ace3f904bf61f7d058cf0464f4..e8a10123fbb4af24cf6bff155102ca45d927e6fd 100644
index 0d4502b1223541d0b3f3ed48e3e0dafe7f21015b..7a21012b6a41378a6038e40ac7f4ebd2e423ec79 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=120
-MINOR=0
-BUILD=6099
-PATCH=115
-PATCH=144
+MINOR=1
+BUILD=61
+PATCH=108