From 212f2131928d0e885f534fab150fb8fe76cbd12a Mon Sep 17 00:00:00 2001 From: brave-builds Date: Wed, 10 Jan 2024 01:02:31 +0000 Subject: [PATCH 1/3] Upgrade from Chromium 120.0.6099.199 to Chromium 120.0.6099.217 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7b8351c5af44..5ef432e0f827 100644 --- a/package.json +++ b/package.json @@ -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" } From dda58a255a0f10a6a11a5715efba417ab73a5df2 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Wed, 10 Jan 2024 01:02:35 +0000 Subject: [PATCH 2/3] Upgrade patches from Chromium 120.0.6099.199 to Chromium 120.0.6099.217 --- patches/chrome-VERSION.patch | 4 ++-- patches/components-crx_file-crx_verifier.cc.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 24ec8c310f54..e0e284799cd6 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -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 diff --git a/patches/components-crx_file-crx_verifier.cc.patch b/patches/components-crx_file-crx_verifier.cc.patch index aa60ab7cac6f..3c2cc983f678 100644 --- a/patches/components-crx_file-crx_verifier.cc.patch +++ b/patches/components-crx_file-crx_verifier.cc.patch @@ -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); From 5c180c1e2c2247119fc8295ab1487f7845fb4f92 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Wed, 10 Jan 2024 01:03:27 +0000 Subject: [PATCH 3/3] Update pins list timestamp --- .../transport_security_state_generator/input_file_parsers.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index aa86518d8a8c..11e3de97a6d1 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -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/