git: 2db36f8df57a - main - www/ungoogled-chromium: go back to using our own config directories
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 12 Dec 2025 07:46:41 UTC
The branch main has been updated by rnagy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2db36f8df57a86abe7306455e7921704d40cd9af
commit 2db36f8df57a86abe7306455e7921704d40cd9af
Author: Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2025-12-12 07:44:56 +0000
Commit: Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2025-12-12 07:46:35 +0000
www/ungoogled-chromium: go back to using our own config directories
i've accidentally removed these patches in the previous update so
let's put them back so that ungoogled-chromium can use its own
directories
---
www/ungoogled-chromium/Makefile | 1 +
.../files/patch-base_base__paths__posix.cc | 4 ++--
.../files/patch-chrome_common_chrome__paths.cc | 16 ++++++++++------
.../patch-chrome_common_chrome__paths__linux.cc | 11 +++++++++++
...atch-sandbox_policy_freebsd_sandbox__freebsd.cc | 4 ++--
...atch-sandbox_policy_openbsd_sandbox__openbsd.cc | 22 +++++++++++-----------
6 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 238cb9468325..484289f10e6b 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 143.0.7499.40
+PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
UGVERSION= ${DISTVERSION}-1
diff --git a/www/ungoogled-chromium/files/patch-base_base__paths__posix.cc b/www/ungoogled-chromium/files/patch-base_base__paths__posix.cc
index cf91d4eaf304..5f08ff6b3b50 100644
--- a/www/ungoogled-chromium/files/patch-base_base__paths__posix.cc
+++ b/www/ungoogled-chromium/files/patch-base_base__paths__posix.cc
@@ -1,4 +1,4 @@
---- base/base_paths_posix.cc.orig 2025-12-06 13:30:52 UTC
+--- base/base_paths_posix.cc.orig 2025-12-12 07:44:27 UTC
+++ base/base_paths_posix.cc
@@ -15,6 +15,7 @@
#include <ostream>
@@ -97,7 +97,7 @@
+ if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
+ *result = FilePath(cpath);
+ else
-+ *result = FilePath("/usr/local/chrome/chrome");
++ *result = FilePath("/usr/local/ungoogled-chromium/ungoogled-chromium");
+ return true;
+#if !BUILDFLAG(IS_AIX)
+ }
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc
index a71275379258..ac0d74e93d83 100644
--- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.cc.orig 2025-12-06 13:30:52 UTC
+--- chrome/common/chrome_paths.cc.orig 2025-12-12 07:44:27 UTC
+++ chrome/common/chrome_paths.cc
@@ -31,7 +31,7 @@
#include "base/apple/foundation_util.h"
@@ -20,10 +20,10 @@
const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
-+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
++ FILE_PATH_LITERAL("/usr/local/share/ungoogled-chromium/extensions");
#else
- FILE_PATH_LITERAL("/usr/share/chromium/extensions");
-+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
++ FILE_PATH_LITERAL("/usr/local/share/ungoogled-chromium/extensions");
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -70,13 +70,17 @@
case chrome::DIR_NATIVE_MESSAGING:
#if BUILDFLAG(IS_MAC)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -474,6 +474,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -474,9 +474,12 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(
FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
+#elif BUILDFLAG(IS_FREEBSD)
+ cur = base::FilePath(FILE_PATH_LITERAL(
-+ "/usr/local/etc/chromium/native-messaging-hosts"));
++ "/usr/local/etc/ungoogled-chromium/native-messaging-hosts"));
#else
cur = base::FilePath(
- FILE_PATH_LITERAL("/etc/chromium/native-messaging-hosts"));
+- FILE_PATH_LITERAL("/etc/chromium/native-messaging-hosts"));
++ FILE_PATH_LITERAL("/etc/ungoogled-chromium/native-messaging-hosts"));
+ #endif
+ #endif // !BUILDFLAG(IS_MAC)
+ break;
diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__linux.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__linux.cc
new file mode 100644
index 000000000000..c7de7bb3f3f0
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__paths__linux.cc
@@ -0,0 +1,11 @@
+--- chrome/common/chrome_paths_linux.cc.orig 2025-12-12 07:44:27 UTC
++++ chrome/common/chrome_paths_linux.cc
+@@ -95,7 +95,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul
+ #elif BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ std::string data_dir_basename = "google-chrome";
+ #else
+- std::string data_dir_basename = "chromium";
++ std::string data_dir_basename = "ungoogled-chromium";
+ #endif
+ *result = config_dir.Append(data_dir_basename + GetChannelSuffixForDataDir());
+ return true;
diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
index 42479024f255..6864b9168a18 100644
--- a/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
+++ b/www/ungoogled-chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2025-12-06 13:30:52 UTC
+--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2025-12-12 07:44:27 UTC
+++ sandbox/policy/freebsd/sandbox_freebsd.cc
@@ -0,0 +1,210 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -121,7 +121,7 @@
+ base::PathService::Get(base::DIR_CACHE, &cache_directory);
+ base::PathService::Get(base::DIR_HOME, &local_directory);
+
-+ cache_directory = cache_directory.AppendASCII("chromium");
++ cache_directory = cache_directory.AppendASCII("ungoogled-chromium");
+ local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
+
+ if (!base::CreateDirectory(cache_directory)) {
diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
index cd7b127314c6..3f4b52f31051 100644
--- a/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
+++ b/www/ungoogled-chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2025-12-06 13:30:52 UTC
+--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2025-12-12 07:44:27 UTC
+++ sandbox/policy/openbsd/sandbox_openbsd.cc
@@ -0,0 +1,396 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
@@ -68,11 +68,11 @@
+
+#define MAXTOKENS 3
+
-+#define _UNVEIL_MAIN "/etc/chromium/unveil.main";
-+#define _UNVEIL_GPU "/etc/chromium/unveil.gpu";
-+#define _UNVEIL_UTILITY_NETWORK "/etc/chromium/unveil.utility_network";
-+#define _UNVEIL_UTILITY_AUDIO "/etc/chromium/unveil.utility_audio";
-+#define _UNVEIL_UTILITY_VIDEO "/etc/chromium/unveil.utility_video";
++#define _UNVEIL_MAIN "/etc/ungoogled-chromium/unveil.main";
++#define _UNVEIL_GPU "/etc/ungoogled-chromium/unveil.gpu";
++#define _UNVEIL_UTILITY_NETWORK "/etc/ungoogled-chromium/unveil.utility_network";
++#define _UNVEIL_UTILITY_AUDIO "/etc/ungoogled-chromium/unveil.utility_audio";
++#define _UNVEIL_UTILITY_VIDEO "/etc/ungoogled-chromium/unveil.utility_video";
+
+namespace sandbox {
+namespace policy {
@@ -135,7 +135,7 @@
+ base::PathService::Get(base::DIR_CACHE, &cache_directory);
+ base::PathService::Get(base::DIR_HOME, &local_directory);
+
-+ cache_directory = cache_directory.AppendASCII("chromium");
++ cache_directory = cache_directory.AppendASCII("ungoogled-chromium");
+ local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
+
+ if (!base::CreateDirectory(cache_directory)) {
@@ -334,7 +334,7 @@
+
+ switch(sandbox_type) {
+ case sandbox::mojom::Sandbox::kNoSandbox:
-+ SetPledge(NULL, "/etc/chromium/pledge.main");
++ SetPledge(NULL, "/etc/ungoogled-chromium/pledge.main");
+ break;
+ case sandbox::mojom::Sandbox::kRenderer:
+ // prot_exec needed by v8
@@ -346,13 +346,13 @@
+ SetPledge("stdio drm inet rpath flock cpath wpath prot_exec recvfd sendfd tmppath unix", NULL);
+ break;
+ case sandbox::mojom::Sandbox::kAudio:
-+ SetPledge(NULL, "/etc/chromium/pledge.utility_audio");
++ SetPledge(NULL, "/etc/ungoogled-chromium/pledge.utility_audio");
+ break;
+ case sandbox::mojom::Sandbox::kNetwork:
-+ SetPledge(NULL, "/etc/chromium/pledge.utility_network");
++ SetPledge(NULL, "/etc/ungoogled-chromium/pledge.utility_network");
+ break;
+ case sandbox::mojom::Sandbox::kVideoCapture:
-+ SetPledge(NULL, "/etc/chromium/pledge.utility_video");
++ SetPledge(NULL, "/etc/ungoogled-chromium/pledge.utility_video");
+ break;
+ case sandbox::mojom::Sandbox::kUtility:
+ case sandbox::mojom::Sandbox::kService: