diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2022-02-20 11:35:15 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-02-20 11:42:02 +0000 |
| commit | a23dfd214ae04e8b4d116ca6411570b684eb5ed6 (patch) | |
| tree | a42703b6563673398eee97ae6ad4d01eafd77738 /www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc | |
| parent | 9341f0aca4ecea11124957da5ea6384640745e43 (diff) | |
| download | ports-a23dfd214ae04e8b4d116ca6411570b684eb5ed6.tar.gz ports-a23dfd214ae04e8b4d116ca6411570b684eb5ed6.zip | |
www/chromium: update to 98.0.4758.102
- The port now uses the combined patch set for OpenBSD and FreeBSD
maintained by Robert Nagy.
- Fix build on i386 again.
Obtained from: Robert Nagy <robert@openbsd.org>
Security: https://vuxml.freebsd.org/freebsd/e12432af-8e73-11ec-8bc4-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/e852f43c-846e-11ec-b043-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc b/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc index 735a1c6e504f..f3b66083b6c1 100644 --- a/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc +++ b/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- chrome/updater/device_management/cloud_policy_util.cc.orig 2021-12-14 11:45:01 UTC +--- chrome/updater/device_management/cloud_policy_util.cc.orig 2022-02-07 13:39:41 UTC +++ chrome/updater/device_management/cloud_policy_util.cc @@ -22,7 +22,7 @@ #include <wincred.h> @@ -27,19 +27,16 @@ #include "base/system/sys_info.h" #endif -@@ -116,6 +116,11 @@ std::string GetMachineName() { +@@ -111,7 +111,7 @@ std::string GetPolicyVerificationKey() { + std::string GetMachineName() { + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; - return std::string(); -+#elif defined(OS_BSD) -+ char hostname[MAXHOSTNAMELEN]; -+ if (gethostname(hostname, MAXHOSTNAMELEN) == 0) // Success. -+ return hostname; -+ return std::string(); - #elif defined(OS_MAC) - // Do not use NSHost currentHost, as it's very slow. http://crbug.com/138570 - SCDynamicStoreContext context = {0, NULL, NULL, NULL}; -@@ -161,7 +166,7 @@ std::string GetMachineName() { +@@ -161,7 +161,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { |