1 files changed, 103 insertions, 0 deletions

diff --git a/www/chromium-uc/patches/patch-base_system_sys_info_openbsd_cc b/www/chromium-uc/patches/patch-base_system_sys_info_openbsd_cc
new file mode 100644
index 0000000..d8987cf
--- /dev/null
+++ b/www/chromium-uc/patches/patch-base_system_sys_info_openbsd_cc
@@ -0,0 +1,103 @@
+$OpenBSD: patch-base_system_sys_info_openbsd_cc,v 1.7 2021/09/01 16:54:38 robert Exp $
+
+Index: base/system/sys_info_openbsd.cc
+--- base/system/sys_info_openbsd.cc.orig
++++ base/system/sys_info_openbsd.cc
+@@ -12,6 +12,7 @@
+ 
+ #include "base/cxx17_backports.h"
+ #include "base/notreached.h"
++#include "base/strings/string_util.h"
+ 
+ namespace {
+ 
+@@ -29,9 +30,14 @@ int64_t AmountOfMemory(int pages_name) {
+ 
+ namespace base {
+ 
++// pledge(2)
++int64_t aofpmem = 0;
++int64_t aofapmem = 0;
++int64_t shmmax = 0;
++
+ // static
+ int SysInfo::NumberOfProcessors() {
+-  int mib[] = {CTL_HW, HW_NCPU};
++  int mib[] = {CTL_HW, HW_NCPUONLINE};
+   int ncpu;
+   size_t size = sizeof(ncpu);
+   if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) {
+@@ -43,38 +49,61 @@ int SysInfo::NumberOfProcessors() {
+ 
+ // static
+ int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
+-  return AmountOfMemory(_SC_PHYS_PAGES);
++  // pledge(2)
++  if (!aofpmem)
++    aofpmem = AmountOfMemory(_SC_PHYS_PAGES);
++  return aofpmem;
+ }
+ 
+ // static
+ int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
+   // We should add inactive file-backed memory also but there is no such
+   // information from OpenBSD unfortunately.
+-  return AmountOfMemory(_SC_AVPHYS_PAGES);
++  // pledge(2)
++  if (!aofapmem)
++    aofapmem = AmountOfMemory(_SC_AVPHYS_PAGES);
++  return aofapmem;
+ }
+ 
+ // static
++std::string SysInfo::CPUModelName() {
++  int mib[] = {CTL_HW, HW_MODEL};
++  char name[256];
++  size_t len = base::size(name);
++  if (sysctl(mib, base::size(mib), name, &len, NULL, 0) < 0) {
++    NOTREACHED();
++    return std::string();
++  }
++  return name;
++}
++
++// static
+ uint64_t SysInfo::MaxSharedMemorySize() {
+   int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX};
+   size_t limit;
+   size_t size = sizeof(limit);
++  // pledge(2)
++  if (shmmax)
++    goto out;
+   if (sysctl(mib, base::size(mib), &limit, &size, NULL, 0) < 0) {
+     NOTREACHED();
+     return 0;
+   }
+-  return static_cast<uint64_t>(limit);
++  shmmax = static_cast<uint64_t>(limit);
++out:
++  return shmmax;
+ }
+ 
+ // static
+-std::string SysInfo::CPUModelName() {
+-  int mib[] = {CTL_HW, HW_MODEL};
+-  char name[256];
+-  size_t len = base::size(name);
+-  if (sysctl(mib, base::size(mib), name, &len, NULL, 0) < 0) {
+-    NOTREACHED();
+-    return std::string();
+-  }
+-  return name;
++SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
++  HardwareInfo info;
++  // Set the manufacturer to "OpenBSD" and the model to
++  // an empty string.
++  info.manufacturer = "OpenBSD";
++  info.model = HardwareModelName();
++  DCHECK(IsStringUTF8(info.manufacturer));
++  DCHECK(IsStringUTF8(info.model));
++  return info;
+ }
+ 
+ }  // namespace base