Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 20 insertions, 0 deletions

diff --git a/devel/electron39/files/patch-chrome_browser_webauthn_enclave__manager.cc b/devel/electron39/files/patch-chrome_browser_webauthn_enclave__manager.cc
new file mode 100644
index 000000000000..8fc1e6568be4
--- /dev/null
+++ b/devel/electron39/files/patch-chrome_browser_webauthn_enclave__manager.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/webauthn/enclave_manager.cc.orig	2025-10-21 20:19:54 UTC
++++ chrome/browser/webauthn/enclave_manager.cc
+@@ -779,7 +779,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer
+ 
+ std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return label;
+ #else
+   return std::string("placeholder");
+@@ -789,7 +789,7 @@ std::optional<crypto::UserVerifyingKeyLabel> UserVerif
+ std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString(
+     std::string saved_label) {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return saved_label;
+ #else
+   return std::nullopt;