View | Details | Raw Unified | Return to bug 247175
Collapse All | Expand All

(-)www/chromium/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	chromium
4
PORTNAME=	chromium
5
PORTVERSION=	83.0.4103.97
5
PORTVERSION=	83.0.4103.97
6
PORTREVISION=	1
6
CATEGORIES?=	www java
7
CATEGORIES?=	www java
7
MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
8
MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
8
		LOCAL/cpm/chromium/:fonts
9
		LOCAL/cpm/chromium/:fonts
(-)www/chromium/files/patch-chrome_browser_policy_browser__dm__token__storage__linux.cc (+30 lines)
Line 0 Link Here
1
--- chrome/browser/policy/browser_dm_token_storage_linux.cc.orig	2020-06-11 14:15:56 UTC
2
+++ chrome/browser/policy/browser_dm_token_storage_linux.cc
3
@@ -35,7 +35,7 @@ namespace {
4
 const char kDmTokenBaseDir[] = FILE_PATH_LITERAL("Policy/Enrollment/");
5
 const char kEnrollmentTokenFilename[] =
6
     FILE_PATH_LITERAL("enrollment/CloudManagementEnrollmentToken");
7
-const char kMachineIdFilename[] = FILE_PATH_LITERAL("/etc/machine-id");
8
+const char kMachineIdFilename[] = FILE_PATH_LITERAL("/var/lib/dbus/machine-id");
9
 
10
 // Enrollment Mandatory Option.
11
 const char kEnrollmentOptionsFilePath[] =
12
@@ -86,7 +86,8 @@ BrowserDMTokenStorageLinux::BrowserDMTokenStorageLinux
13
 BrowserDMTokenStorageLinux::~BrowserDMTokenStorageLinux() {}
14
 
15
 std::string BrowserDMTokenStorageLinux::InitClientId() {
16
-  // The client ID is derived from /etc/machine-id
17
+  // The client ID is derived from /var/lib/dbus/machine-id (FreeBSD comment)
18
+  // The client ID is derived from /etc/machine-id          (upstream comment)
19
   // (https://www.freedesktop.org/software/systemd/man/machine-id.html). As per
20
   // guidelines, this ID must not be transmitted outside of the machine, which
21
   // is why we hash it first and then encode it in base64 before transmitting
22
@@ -97,7 +98,7 @@ std::string BrowserDMTokenStorageLinux::InitClientId()
23
   base::StringPiece machine_id_trimmed =
24
       base::TrimWhitespaceASCII(machine_id, base::TRIM_TRAILING);
25
   if (machine_id_trimmed.size() != machine_id_size) {
26
-    SYSLOG(ERROR) << "Error: /etc/machine-id contains "
27
+    SYSLOG(ERROR) << "Error: /var/lib/dbus/machine-id contains "
28
                   << machine_id_trimmed.size() << " characters ("
29
                   << machine_id_size << " were expected).";
30
     return std::string();

Return to bug 247175