pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

chromium: fix in ConnectionInfo



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Fri Dec 12 20:12:06 2025 +0100
Changeset:	034938ada6b781026a9700eb8558cf2ee6e69917

Modified Files:
	chromium/distinfo
	chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h
	chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
Added Files:
	chromium/patches/patch-chrome_enterprise__companion_ipc__security__linux.cc
	chromium/patches/patch-chrome_updater_ipc_ipc__security__linux.cc

Log Message:
chromium: fix in ConnectionInfo

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=034938ada6b781026a9700eb8558cf2ee6e69917

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 chromium/distinfo                                        |  6 ++++--
 ...-chrome_enterprise__companion_ipc__security__linux.cc | 16 ++++++++++++++++
 .../patch-chrome_updater_ipc_ipc__security__linux.cc     | 16 ++++++++++++++++
 ...omponents_named__mojo__ipc__server_connection__info.h |  7 +++----
 ...er_named__mojo__server__endpoint__connector__linux.cc |  6 +++++-
 5 files changed, 44 insertions(+), 7 deletions(-)

diffs:
diff --git a/chromium/distinfo b/chromium/distinfo
index 45f9a84dc8..1b18864224 100644
--- a/chromium/distinfo
+++ b/chromium/distinfo
@@ -529,6 +529,7 @@ SHA1 (patch-chrome_common_webui__url__constants.cc) = 238835423238b8ebf97ef22d6e
 SHA1 (patch-chrome_common_webui__url__constants.h) = 928a58082263c9f307b833962e5d077f0479c1ab
 SHA1 (patch-chrome_enterprise__companion_enterprise__companion__client.cc) = a82aa460d8258c21d0c326f2ddcc46981637e2a4
 SHA1 (patch-chrome_enterprise__companion_event__logger.cc) = 8c27a814ed762bf03558ec84b240b758dae49605
+SHA1 (patch-chrome_enterprise__companion_ipc__security__linux.cc) = c3ca88bd771f87d1b64ae29d975b3a186684753d
 SHA1 (patch-chrome_enterprise__companion_lock.cc) = 574a5b8fc42aa0f6fbebe6e800ebbe3767e877f7
 SHA1 (patch-chrome_renderer_chrome__content__renderer__client.cc) = b499a07d0ce083c57348c0b7d98f376f7093da24
 SHA1 (patch-chrome_services_printing_print__backend__service__impl.cc) = 0072dfd1fbf8b06053252be82eb7288ef2991ea2
@@ -541,6 +542,7 @@ SHA1 (patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc) = 8
 SHA1 (patch-chrome_test_supervised__user_google__auth__state__waiter__mixin.cc) = 23110b787b0d053986affd5a2b847b6ff03fc122
 SHA1 (patch-chrome_updater_app_app__uninstall.cc) = 53e787b1036f37c30441ddc77ef58ab3811670f0
 SHA1 (patch-chrome_updater_configurator.cc) = e1c35da3c2f9352a7efa0a302bd535a4d5d59906
+SHA1 (patch-chrome_updater_ipc_ipc__security__linux.cc) = 37b981f122cbc94ac9bec3cba6fa2cf285917bbe
 SHA1 (patch-chrome_updater_lock.cc) = b618129aa9f9f58c9066e12b046b2e48c6e81429
 SHA1 (patch-chrome_updater_util_posix__util.cc) = 38f04ec3979304108188ea6718d562097c5961a2
 SHA1 (patch-chrome_utility_services.cc) = dc46c3e067f3943962693b3b87300c7db9167edc
@@ -619,9 +621,9 @@ SHA1 (patch-components_metrics_drive__metrics__provider.cc) = a357a0d1300b111dd9
 SHA1 (patch-components_metrics_dwa_dwa__service.cc) = abd5bf905dd7c6cec44c8b53851d618b45ba07d8
 SHA1 (patch-components_metrics_metrics__log.cc) = 1c1ab15ecab538ed44dfedb4e813a61746a42344
 SHA1 (patch-components_metrics_motherboard.cc) = eb64d8d298fa85481ea1646dbbe64d781498fb13
-SHA1 (patch-components_named__mojo__ipc__server_connection__info.h) = c1c2a6e198c5bebd9a3a86830bbb9e21fcb94bd6
+SHA1 (patch-components_named__mojo__ipc__server_connection__info.h) = 362c5e31f6638a261a4d4a4d491187f5498ecf99
 SHA1 (patch-components_named__mojo__ipc__server_named__mojo__ipc__server__client__util.cc) = 056e483b67dfd5aa60c8567199cf0b7163c68f20
-SHA1 (patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc) = e61a51dd09c2287a3f85b2af6928de12f7eb7b0b
+SHA1 (patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc) = 87624c0345f18deeaa77358c0980bc931efd3abb
 SHA1 (patch-components_named__system__lock_BUILD.gn) = 0e21a545aa0390eacda04d09bdd7f078e64ab9ac
 SHA1 (patch-components_named__system__lock_lock.h) = 32202068c40a0bd6a47adbed88be5d456ff65e85
 SHA1 (patch-components_named__system__lock_lock__unittest.cc) = fe0a8da5873f3f7fdd7299b950fa4228dd224b5c
diff --git a/chromium/patches/patch-chrome_enterprise__companion_ipc__security__linux.cc b/chromium/patches/patch-chrome_enterprise__companion_ipc__security__linux.cc
new file mode 100644
index 0000000000..b1f371b757
--- /dev/null
+++ b/chromium/patches/patch-chrome_enterprise__companion_ipc__security__linux.cc
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- chrome/enterprise_companion/ipc_security_linux.cc.orig	2025-12-12 14:50:20.711039985 +0000
++++ chrome/enterprise_companion/ipc_security_linux.cc
+@@ -15,7 +15,11 @@ namespace enterprise_companion {
+ IpcTrustDecider CreateIpcTrustDecider() {
+   return base::BindRepeating(
+       [](const named_mojo_ipc_server::ConnectionInfo& connector) {
++#if BUILDFLAG(IS_NETBSD)
++        return connector.credentials.unp_euid == geteuid();
++#else
+         return connector.credentials.uid == geteuid();
++#endif
+       });
+ }
+ 
diff --git a/chromium/patches/patch-chrome_updater_ipc_ipc__security__linux.cc b/chromium/patches/patch-chrome_updater_ipc_ipc__security__linux.cc
new file mode 100644
index 0000000000..6ad676eba0
--- /dev/null
+++ b/chromium/patches/patch-chrome_updater_ipc_ipc__security__linux.cc
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- chrome/updater/ipc/ipc_security_linux.cc.orig	2025-12-12 14:44:01.507108814 +0000
++++ chrome/updater/ipc/ipc_security_linux.cc
+@@ -13,7 +13,11 @@ namespace updater {
+ 
+ bool IsConnectionTrusted(
+     const named_mojo_ipc_server::ConnectionInfo& connector) {
++#if BUILDFLAG(IS_NETBSD)
++  return connector.credentials.unp_euid == geteuid();
++#else
+   return connector.credentials.uid == geteuid();
++#endif
+ }
+ 
+ }  // namespace updater
diff --git a/chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h b/chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h
index 6c0ecc9586..b2822d77bc 100644
--- a/chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h
+++ b/chromium/patches/patch-components_named__mojo__ipc__server_connection__info.h
@@ -6,7 +6,7 @@ $NetBSD$
 
 --- components/named_mojo_ipc_server/connection_info.h.orig	2025-11-19 21:40:05.000000000 +0000
 +++ components/named_mojo_ipc_server/connection_info.h
-@@ -12,8 +12,17 @@
+@@ -12,8 +12,16 @@
  #include "base/win/scoped_handle.h"
  #elif BUILDFLAG(IS_MAC)
  #include <bsm/libbsm.h>
@@ -20,17 +20,16 @@ $NetBSD$
 +#include <sys/un.h>
 +#define ucred unpcbid
 +#define SO_PEERCRED LOCAL_PEEREID
-+#define pid unp_pid
 +#endif
  #endif
  
  namespace named_mojo_ipc_server {
-@@ -29,7 +38,7 @@ struct ConnectionInfo {
+@@ -29,7 +37,7 @@ struct ConnectionInfo {
    base::ProcessId pid{};
  #if BUILDFLAG(IS_MAC)
    audit_token_t audit_token{};
 -#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_NETBSD)
    ucred credentials{};
  #endif
  };
diff --git a/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc b/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
index c7caef7c84..f13c83c131 100644
--- a/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
+++ b/chromium/patches/patch-components_named__mojo__ipc__server_named__mojo__server__endpoint__connector__linux.cc
@@ -6,12 +6,16 @@ $NetBSD$
 
 --- components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc.orig	2025-11-19 21:40:05.000000000 +0000
 +++ components/named_mojo_ipc_server/named_mojo_server_endpoint_connector_linux.cc
-@@ -89,7 +89,9 @@ void NamedMojoServerEndpointConnectorLin
+@@ -89,7 +89,13 @@ void NamedMojoServerEndpointConnectorLin
      PLOG(ERROR) << "getsockopt failed.";
      return;
    }
 +#if !BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_NETBSD)
++  info->pid = info->credentials.unp_pid;
++#else
    info->pid = info->credentials.pid;
++#endif
 +#endif
  
    mojo::PlatformChannelEndpoint endpoint(


Home | Main Index | Thread Index | Old Index