Index: www/chromium/Makefile =================================================================== --- www/chromium/Makefile (révision 538483) +++ www/chromium/Makefile (copie de travail) @@ -3,6 +3,7 @@ PORTNAME= chromium PORTVERSION= 83.0.4103.97 +PORTREVISION= 1 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts Index: www/chromium/files/patch-chrome_browser_policy_browser__dm__token__storage__linux.cc =================================================================== --- www/chromium/files/patch-chrome_browser_policy_browser__dm__token__storage__linux.cc (nonexistent) +++ www/chromium/files/patch-chrome_browser_policy_browser__dm__token__storage__linux.cc (copie de travail) @@ -0,0 +1,30 @@ +--- chrome/browser/policy/browser_dm_token_storage_linux.cc.orig 2020-06-11 14:15:56 UTC ++++ chrome/browser/policy/browser_dm_token_storage_linux.cc +@@ -35,7 +35,7 @@ namespace { + const char kDmTokenBaseDir[] = FILE_PATH_LITERAL("Policy/Enrollment/"); + const char kEnrollmentTokenFilename[] = + FILE_PATH_LITERAL("enrollment/CloudManagementEnrollmentToken"); +-const char kMachineIdFilename[] = FILE_PATH_LITERAL("/etc/machine-id"); ++const char kMachineIdFilename[] = FILE_PATH_LITERAL("/var/lib/dbus/machine-id"); + + // Enrollment Mandatory Option. + const char kEnrollmentOptionsFilePath[] = +@@ -86,7 +86,8 @@ BrowserDMTokenStorageLinux::BrowserDMTokenStorageLinux + BrowserDMTokenStorageLinux::~BrowserDMTokenStorageLinux() {} + + std::string BrowserDMTokenStorageLinux::InitClientId() { +- // The client ID is derived from /etc/machine-id ++ // The client ID is derived from /var/lib/dbus/machine-id (FreeBSD comment) ++ // The client ID is derived from /etc/machine-id (upstream comment) + // (https://www.freedesktop.org/software/systemd/man/machine-id.html). As per + // guidelines, this ID must not be transmitted outside of the machine, which + // is why we hash it first and then encode it in base64 before transmitting +@@ -97,7 +98,7 @@ std::string BrowserDMTokenStorageLinux::InitClientId() + base::StringPiece machine_id_trimmed = + base::TrimWhitespaceASCII(machine_id, base::TRIM_TRAILING); + if (machine_id_trimmed.size() != machine_id_size) { +- SYSLOG(ERROR) << "Error: /etc/machine-id contains " ++ SYSLOG(ERROR) << "Error: /var/lib/dbus/machine-id contains " + << machine_id_trimmed.size() << " characters (" + << machine_id_size << " were expected)."; + return std::string(); Property changes on: www/chromium/files/patch-chrome_browser_policy_browser__dm__token__storage__linux.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property