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

1 files changed, 0 insertions, 39 deletions

diff --git a/devel/electron35/files/patch-net_socket_udp__socket__posix.cc b/devel/electron35/files/patch-net_socket_udp__socket__posix.cc
deleted file mode 100644
index 67602a1cdd08..000000000000
--- a/devel/electron35/files/patch-net_socket_udp__socket__posix.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- net/socket/udp_socket_posix.cc.orig	2025-03-24 20:50:14 UTC
-+++ net/socket/udp_socket_posix.cc
-@@ -528,12 +528,17 @@ int UDPSocketPosix::SetRecvTos() {
- #endif  // BUILDFLAG(IS_APPLE)
-   }
- 
-+#ifdef IP_RECVTOS
-   int rv = setsockopt(socket_, IPPROTO_IP, IP_RECVTOS, &ecn, sizeof(ecn));
-+#else
-+  int rv = -1;
-+  errno = EOPNOTSUPP;
-+#endif
-   return rv == 0 ? OK : MapSystemError(errno);
- }
- 
- void UDPSocketPosix::SetMsgConfirm(bool confirm) {
--#if !BUILDFLAG(IS_APPLE)
-+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
-   if (confirm) {
-     sendto_flags_ |= MSG_CONFIRM;
-   } else {
-@@ -554,7 +559,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
-   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-   int value = broadcast ? 1 : 0;
-   int rv;
--#if BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   // SO_REUSEPORT on OSX permits multiple processes to each receive
-   // UDP multicast or broadcast datagrams destined for the bound
-   // port.
-@@ -892,7 +897,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) 
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   if (last_error == EINVAL)
-     return ERR_ADDRESS_IN_USE;
--#elif BUILDFLAG(IS_APPLE)
-+#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
-   if (last_error == EADDRNOTAVAIL)
-     return ERR_ADDRESS_IN_USE;
- #endif