SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync ports with The Matrix

Browse source
This commit is contained in:
purplerain 2023-10-12 04:10:54 +00:00
parent 74706e64f4
commit 77bea1694c
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
1060 changed files with 39921 additions and 2746 deletions
Download patch file Download diff file Expand all files Collapse all files

74
misc/shared-mime-info/patches/patch-src_update-mime-database_cpp Normal file
View file

@ -0,0 +1,74 @@
- unveil: unveil the provided mime_dir
- pledge: https://bugs.freedesktop.org/show_bug.cgi?id=104368
- 2nd chunk:
From 12a3a6b1141c704fc594379af1808bb9008d588c Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sun, 8 Oct 2023 00:11:49 +0200
Subject: [PATCH] Fix string literal concatenation
Index: src/update-mime-database.cpp
--- src/update-mime-database.cpp.orig
+++ src/update-mime-database.cpp
@@ -2149,6 +2149,11 @@ static void check_in_path_xdg_data(const char *mime_pa
path = g_path_get_dirname(mime_path);
+ if (unveil(path, "r") == -1) {
+ g_warning("Can't unveil '%s' directory: %s",
+ path, g_strerror(errno));
+ }
+
if (stat(path, &path_info))
{
g_warning("Can't stat '%s' directory: %s",
@@ -2158,7 +2163,7 @@ static void check_in_path_xdg_data(const char *mime_pa
env = getenv("XDG_DATA_DIRS");
if (!env)
- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
+ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/";
dirs = g_strsplit(env, PATH_SEPARATOR, 0);
g_return_if_fail(dirs != NULL);
for (n = 0; dirs[n]; n++)
@@ -2173,12 +2178,23 @@ static void check_in_path_xdg_data(const char *mime_pa
for (i = 0; i < n; i++)
{
+ if (unveil(dirs[i], "r") == -1) {
+ g_warning("Can't unveil '%s' directory: %s",
+ dirs[i], g_strerror(errno));
+ goto out;
+ }
+
if (stat(dirs[i], &dir_info) == 0 &&
dir_info.st_ino == path_info.st_ino &&
dir_info.st_dev == path_info.st_dev)
break;
}
+ if (unveil(NULL, NULL) == -1) {
+ g_warning(_("unveil"));
+ goto out;
+ }
+
if (i == n)
{
g_printerr(_("\nNote that '%s' is not in the search path\n"
@@ -3683,6 +3699,16 @@ int main(int argc, char **argv)
#endif
LIBXML_TEST_VERSION;
+
+ if (unveil(mime_dir, "rwc") == -1) {
+ g_warning(_("unveil"));
+ return EXIT_FAILURE;
+ }
+
+ if (pledge("stdio rpath wpath cpath getpw unveil", NULL) == -1) {
+ g_warning(_("pledge"));
+ return EXIT_FAILURE;
+ }
/* Strip trailing / characters */
{