git: 4fd9620ae253 - main - www/*chromium: update to 118.0.5993.117
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 27 Oct 2023 18:39:54 UTC
The branch main has been updated by rnagy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4fd9620ae253e35362b65f411408fc3fc1eaccde
commit 4fd9620ae253e35362b65f411408fc3fc1eaccde
Author: Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2023-10-27 18:35:46 +0000
Commit: Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2023-10-27 18:39:45 +0000
www/*chromium: update to 118.0.5993.117
Security: https://vuxml.freebsd.org/freebsd/db33e250-74f7-11ee-8290-a8a1599412c6.html
---
www/chromium/Makefile | 2 +-
www/chromium/distinfo | 14 ++++-----
...ger_core_browser_features_password__features.cc | 11 +++++++
...ssword__manager_core_browser_login__database.cc | 29 -----------------
...nager_core_browser_login__database__unittest.cc | 36 ++++++----------------
...ger_core_browser_sync_password__sync__bridge.cc | 13 ++------
...ager_core_common_password__manager__features.cc | 11 +------
...nager_core_common_password__manager__features.h | 11 +------
www/ungoogled-chromium/Makefile | 2 +-
www/ungoogled-chromium/distinfo | 14 ++++-----
...ger_core_browser_features_password__features.cc | 11 +++++++
...ssword__manager_core_browser_login__database.cc | 29 -----------------
...nager_core_browser_login__database__unittest.cc | 36 ++++++----------------
...ger_core_browser_sync_password__sync__bridge.cc | 13 ++------
...ager_core_common_password__manager__features.cc | 11 +------
...nager_core_common_password__manager__features.h | 11 +------
16 files changed, 64 insertions(+), 190 deletions(-)
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 19cff62ec9c8..1d92b08e3650 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 118.0.5993.88
+PORTVERSION= 118.0.5993.117
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 51cface9cc3f..2d9c09331347 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1697662254
-SHA256 (chromium-118.0.5993.88.tar.xz) = f2c0748f815cc4b5c5007788836cee3f07c505b6e74e2e1cd8ab4808e0ac8e59
-SIZE (chromium-118.0.5993.88.tar.xz) = 3245581816
-SHA256 (chrome-linux-118.0.5993.88-llvm13.profdata.tar.xz) = 4f8de8da69c7965f4b383033afedbc84553ad44cea6c62e5d364e2add8378b98
-SIZE (chrome-linux-118.0.5993.88-llvm13.profdata.tar.xz) = 28955676
-SHA256 (chromium-118.0.5993.88-testdata.tar.xz) = 8f22c6b7e78b912509aeceb86ecc82fb35fc96db6c6b34b6f9fb1e05ba2b82a5
-SIZE (chromium-118.0.5993.88-testdata.tar.xz) = 270308544
+TIMESTAMP = 1698385214
+SHA256 (chromium-118.0.5993.117.tar.xz) = 7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786
+SIZE (chromium-118.0.5993.117.tar.xz) = 3249866084
+SHA256 (chrome-linux-118.0.5993.117-llvm13.profdata.tar.xz) = 92a3d1a40c29cd661197f305304377cfa5c89af65945216a16d61f44e999d79e
+SIZE (chrome-linux-118.0.5993.117-llvm13.profdata.tar.xz) = 28953832
+SHA256 (chromium-118.0.5993.117-testdata.tar.xz) = cc7eb88774d2b6ab3c0c6c280526cab1c92319d57bfb42575dc0858b2ef09079
+SIZE (chromium-118.0.5993.117-testdata.tar.xz) = 267124300
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
new file mode 100644
index 000000000000..eccf62bc24b5
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/features/password_features.cc.orig 2023-10-27 05:38:38 UTC
++++ components/password_manager/core/browser/features/password_features.cc
+@@ -27,7 +27,7 @@ BASE_FEATURE(kBiometricTouchToFill,
+ // Delete undecryptable passwords from the store when Sync is active.
+ BASE_FEATURE(kClearUndecryptablePasswordsOnSync,
+ "ClearUndecryptablePasswordsInSync",
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
deleted file mode 100644
index f77a06b15130..000000000000
--- a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- components/password_manager/core/browser/login_database.cc.orig 2023-10-11 18:22:24 UTC
-+++ components/password_manager/core/browser/login_database.cc
-@@ -1050,7 +1050,7 @@ std::string GeneratePlaceholders(size_t count) {
- return result;
- }
-
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Fills |form| with necessary data required to be removed from the database
- // and returns it.
- PasswordForm GetFormForRemoval(sql::Statement& statement) {
-@@ -1067,7 +1067,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
- // Whether we should try to return the decryptable passwords while the
- // encryption service fails for some passwords.
- bool ShouldReturnPartialPasswords() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
- #else
- return false;
-@@ -1959,7 +1959,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
- }
-
- DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- TRACE_EVENT0("passwords", "LoginDatabase::DeleteUndecryptableLogins");
- // If the Keychain in MacOS or the real secret key in Linux is unavailable,
- // don't delete any logins.
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
index c396e8c75cbb..8c5946a11121 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
@@ -1,29 +1,11 @@
---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-10-11 18:22:24 UTC
+--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-10-27 05:38:38 UTC
+++ components/password_manager/core/browser/login_database_unittest.cc
-@@ -2222,7 +2222,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
- base::HistogramTester histogram_tester;
- ASSERT_TRUE(db.Init());
+@@ -2120,7 +2120,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent,
+ LoginDatabaseMigrationTestBroken,
+ testing::Values(1, 2, 3, 24));
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
- // Make sure that we can't get any logins when database is corrupted.
- // Disabling the checks in chromecast because encryption is unavailable.
- std::vector<std::unique_ptr<PasswordForm>> result;
-@@ -2249,7 +2249,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
- #endif
-
- // Check histograms.
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
- histogram_tester.ExpectUniqueSample(
- "PasswordManager.DeleteUndecryptableLoginsReturnValue",
- metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted,
-@@ -2292,7 +2292,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL
- }
- #endif // BUILDFLAG(IS_MAC)
-
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Test getting auto sign in logins when there are undecryptable ones
- TEST_F(LoginDatabaseUndecryptableLoginsTest, GetAutoSignInLogins) {
- std::vector<std::unique_ptr<PasswordForm>> forms;
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ class LoginDatabaseUndecryptableLoginsTest : public testing::Test {
+ protected:
+ LoginDatabaseUndecryptableLoginsTest() = default;
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
index 1ab2ad292ed6..8eef36579ea9 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
@@ -1,15 +1,6 @@
---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-09-13 12:11:42 UTC
+--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-10-27 05:38:38 UTC
+++ components/password_manager/core/browser/sync/password_sync_bridge.cc
-@@ -191,7 +191,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif
- // merge.
- bool ShouldRecoverPasswordsDuringMerge() {
- // Delete the local undecryptable copy when this is MacOS or Linux only.
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return true;
- #else
- return false;
-@@ -199,7 +199,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -197,7 +197,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
}
bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() {
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
index e0d46304b6a6..969ecb439ebe 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_features.cc.orig 2023-10-11 18:22:24 UTC
+--- components/password_manager/core/common/password_manager_features.cc.orig 2023-10-27 05:38:38 UTC
+++ components/password_manager/core/common/password_manager_features.cc
@@ -18,7 +18,7 @@ BASE_FEATURE(kEnableOverwritingPlaceholderUsernames,
"EnableOverwritingPlaceholderUsernames",
@@ -9,12 +9,3 @@
// When enabled, initial sync will be forced during startup if the password
// store has encryption service failures.
BASE_FEATURE(kForceInitialSyncWhenDecryptionFails,
-@@ -99,7 +99,7 @@ BASE_FEATURE(kRecoverFromNeverSaveAndroid,
- "RecoverFromNeverSaveAndroid_LAUNCHED",
- base::FEATURE_ENABLED_BY_DEFAULT);
-
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Displays at least the decryptable and never saved logins in the password
- // manager
- BASE_FEATURE(kSkipUndecryptablePasswords,
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
index f4a84d948fbe..6cd1e06da6a5 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_features.h.orig 2023-10-11 18:22:24 UTC
+--- components/password_manager/core/common/password_manager_features.h.orig 2023-10-27 05:38:38 UTC
+++ components/password_manager/core/common/password_manager_features.h
@@ -24,7 +24,7 @@ namespace password_manager::features {
// alongside the definition of their values in the .cc file.
@@ -9,12 +9,3 @@
BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails);
#endif
BASE_DECLARE_FEATURE(kForgotPasswordFormSupport);
-@@ -43,7 +43,7 @@ BASE_DECLARE_FEATURE(kPasswordGenerationExperiment);
- #endif
- BASE_DECLARE_FEATURE(kPasswordsImportM2);
- BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kSkipUndecryptablePasswords);
- #endif
- #if BUILDFLAG(IS_ANDROID)
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 03d30dbbb719..8c5877eb30a2 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
-PORTVERSION= 118.0.5993.88
+PORTVERSION= 118.0.5993.117
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
index 1c78eccc080b..a6ff4524face 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1697715826
-SHA256 (chromium-118.0.5993.88.tar.xz) = f2c0748f815cc4b5c5007788836cee3f07c505b6e74e2e1cd8ab4808e0ac8e59
-SIZE (chromium-118.0.5993.88.tar.xz) = 3245581816
-SHA256 (ungoogled-chromium-118.0.5993.88-1.tar.gz) = df94ef2aed0fe9ac442a142a22b2b4aef858bfcfbe3da25795849299ac8558f6
-SIZE (ungoogled-chromium-118.0.5993.88-1.tar.gz) = 659930
-SHA256 (chromium-118.0.5993.88-testdata.tar.xz) = 8f22c6b7e78b912509aeceb86ecc82fb35fc96db6c6b34b6f9fb1e05ba2b82a5
-SIZE (chromium-118.0.5993.88-testdata.tar.xz) = 270308544
+TIMESTAMP = 1698422936
+SHA256 (chromium-118.0.5993.117.tar.xz) = 7029d851e4a2e8d5a145a6f6ba76f18f5c3043f57b2c750b35d96e92f3453786
+SIZE (chromium-118.0.5993.117.tar.xz) = 3249866084
+SHA256 (ungoogled-chromium-118.0.5993.117-1.tar.gz) = 41afb5933668b67059d48613c136c4535ed7a5a3387361cd118aff38593ae4e3
+SIZE (ungoogled-chromium-118.0.5993.117-1.tar.gz) = 660283
+SHA256 (chromium-118.0.5993.117-testdata.tar.xz) = cc7eb88774d2b6ab3c0c6c280526cab1c92319d57bfb42575dc0858b2ef09079
+SIZE (chromium-118.0.5993.117-testdata.tar.xz) = 267124300
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
new file mode 100644
index 000000000000..eccf62bc24b5
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/features/password_features.cc.orig 2023-10-27 05:38:38 UTC
++++ components/password_manager/core/browser/features/password_features.cc
+@@ -27,7 +27,7 @@ BASE_FEATURE(kBiometricTouchToFill,
+ // Delete undecryptable passwords from the store when Sync is active.
+ BASE_FEATURE(kClearUndecryptablePasswordsOnSync,
+ "ClearUndecryptablePasswordsInSync",
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc
deleted file mode 100644
index 29f74b191845..000000000000
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- components/password_manager/core/browser/login_database.cc.orig 2023-10-13 13:20:35 UTC
-+++ components/password_manager/core/browser/login_database.cc
-@@ -1050,7 +1050,7 @@ std::string GeneratePlaceholders(size_t count) {
- return result;
- }
-
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Fills |form| with necessary data required to be removed from the database
- // and returns it.
- PasswordForm GetFormForRemoval(sql::Statement& statement) {
-@@ -1067,7 +1067,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
- // Whether we should try to return the decryptable passwords while the
- // encryption service fails for some passwords.
- bool ShouldReturnPartialPasswords() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
- #else
- return false;
-@@ -1959,7 +1959,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
- }
-
- DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- TRACE_EVENT0("passwords", "LoginDatabase::DeleteUndecryptableLogins");
- // If the Keychain in MacOS or the real secret key in Linux is unavailable,
- // don't delete any logins.
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
index cf3f72d8bb03..8c5946a11121 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
@@ -1,29 +1,11 @@
---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-10-13 13:20:35 UTC
+--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-10-27 05:38:38 UTC
+++ components/password_manager/core/browser/login_database_unittest.cc
-@@ -2222,7 +2222,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
- base::HistogramTester histogram_tester;
- ASSERT_TRUE(db.Init());
+@@ -2120,7 +2120,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent,
+ LoginDatabaseMigrationTestBroken,
+ testing::Values(1, 2, 3, 24));
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
- // Make sure that we can't get any logins when database is corrupted.
- // Disabling the checks in chromecast because encryption is unavailable.
- std::vector<std::unique_ptr<PasswordForm>> result;
-@@ -2249,7 +2249,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
- #endif
-
- // Check histograms.
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
- histogram_tester.ExpectUniqueSample(
- "PasswordManager.DeleteUndecryptableLoginsReturnValue",
- metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted,
-@@ -2292,7 +2292,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL
- }
- #endif // BUILDFLAG(IS_MAC)
-
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Test getting auto sign in logins when there are undecryptable ones
- TEST_F(LoginDatabaseUndecryptableLoginsTest, GetAutoSignInLogins) {
- std::vector<std::unique_ptr<PasswordForm>> forms;
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+ class LoginDatabaseUndecryptableLoginsTest : public testing::Test {
+ protected:
+ LoginDatabaseUndecryptableLoginsTest() = default;
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
index 75d555871bf8..8eef36579ea9 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
@@ -1,15 +1,6 @@
---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-09-17 07:59:53 UTC
+--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-10-27 05:38:38 UTC
+++ components/password_manager/core/browser/sync/password_sync_bridge.cc
-@@ -191,7 +191,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif
- // merge.
- bool ShouldRecoverPasswordsDuringMerge() {
- // Delete the local undecryptable copy when this is MacOS or Linux only.
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return true;
- #else
- return false;
-@@ -199,7 +199,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -197,7 +197,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
}
bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() {
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
index e5f24414bf30..969ecb439ebe 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_features.cc.orig 2023-10-13 13:20:35 UTC
+--- components/password_manager/core/common/password_manager_features.cc.orig 2023-10-27 05:38:38 UTC
+++ components/password_manager/core/common/password_manager_features.cc
@@ -18,7 +18,7 @@ BASE_FEATURE(kEnableOverwritingPlaceholderUsernames,
"EnableOverwritingPlaceholderUsernames",
@@ -9,12 +9,3 @@
// When enabled, initial sync will be forced during startup if the password
// store has encryption service failures.
BASE_FEATURE(kForceInitialSyncWhenDecryptionFails,
-@@ -99,7 +99,7 @@ BASE_FEATURE(kRecoverFromNeverSaveAndroid,
- "RecoverFromNeverSaveAndroid_LAUNCHED",
- base::FEATURE_ENABLED_BY_DEFAULT);
-
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Displays at least the decryptable and never saved logins in the password
- // manager
- BASE_FEATURE(kSkipUndecryptablePasswords,
diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h
index 7ae17d44e8ad..6cd1e06da6a5 100644
--- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h
+++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__features.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_features.h.orig 2023-10-13 13:20:35 UTC
+--- components/password_manager/core/common/password_manager_features.h.orig 2023-10-27 05:38:38 UTC
+++ components/password_manager/core/common/password_manager_features.h
@@ -24,7 +24,7 @@ namespace password_manager::features {
// alongside the definition of their values in the .cc file.
@@ -9,12 +9,3 @@
BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails);
#endif
BASE_DECLARE_FEATURE(kForgotPasswordFormSupport);
-@@ -43,7 +43,7 @@ BASE_DECLARE_FEATURE(kPasswordGenerationExperiment);
- #endif
- BASE_DECLARE_FEATURE(kPasswordsImportM2);
- BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kSkipUndecryptablePasswords);
- #endif
- #if BUILDFLAG(IS_ANDROID)