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

4
devel/desktop-file-utils/Makefile
View file

@ -1,6 +1,6 @@
COMMENT= utilities for dot.desktop entries
DISTNAME= desktop-file-utils-0.26
DISTNAME= desktop-file-utils-0.27
EXTRACT_SUFX= .tar.xz
@ -13,7 +13,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE= Yes
# uses pledge()
# uses pledge() and unveil()
WANTLIB += c glib-2.0 intl
SITES= https://freedesktop.org/software/desktop-file-utils/releases/

4
devel/desktop-file-utils/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (desktop-file-utils-0.26.tar.xz) = sm29556nLIyE+3+dhw/9hXOB0EmobSXgA4xM70x0cwk=
SIZE (desktop-file-utils-0.26.tar.xz) = 83132
SHA256 (desktop-file-utils-0.27.tar.xz) = oIF985zjhbZiGIBAfFbx8pgWjAQMIDLO34jVt2r/6DY=
SIZE (desktop-file-utils-0.27.tar.xz) = 80808

39
devel/desktop-file-utils/patches/patch-src_install_c
View file

@ -1,39 +0,0 @@
From 1926ae7021a2f8e842ad566a49f3a947c02cec92 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Fri, 19 Jun 2020 10:12:04 +0200
Subject: [PATCH] pledge: add support to remaining utilities
Index: src/install.c
--- src/install.c.orig
+++ src/install.c
@@ -839,6 +839,13 @@ main (int argc, char **argv)
setlocale (LC_ALL, "");
+#ifdef HAVE_PLEDGE
+ if (pledge ("stdio rpath wpath cpath fattr", NULL) == -1) {
+ g_printerr ("pledge\n");
+ return 1;
+ }
+#endif
+
basename = g_path_get_basename (argv[0]);
if (g_strcmp0 (basename, "desktop-file-edit") == 0)
edit_mode = TRUE;
@@ -854,6 +861,16 @@ main (int argc, char **argv)
g_option_group_add_entries (group, install_options);
g_option_context_add_group (context, group);
}
+#ifdef HAVE_PLEDGE
+ else
+ {
+ /* In edit mode we can drop the fattr pledge. */
+ if (pledge ("stdio rpath wpath cpath", NULL) == -1) {
+ g_printerr ("pledge in edit_mode\n");
+ return 1;
+ }
+ }
+#endif
group = g_option_group_new ("edit", _("Edition options for desktop file"), _("Show desktop file edition options"), NULL, NULL);
g_option_group_add_entries (group, edit_options);

12
devel/desktop-file-utils/patches/patch-src_update-desktop-database_c
View file

@ -4,18 +4,16 @@ to be written out to.
Index: src/update-desktop-database.c
--- src/update-desktop-database.c.orig
+++ src/update-desktop-database.c
@@ -451,8 +451,8 @@ main (int argc,
{ NULL }
@@ -456,7 +456,7 @@ main (int argc,
};
-#if HAVE_PLEDGE
- if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
+#ifdef HAVE_PLEDGE
#ifdef HAVE_PLEDGE
- if (pledge ("stdio rpath wpath cpath fattr", NULL) == -1) {
+ if (pledge ("stdio rpath wpath cpath fattr unveil", NULL) == -1) {
g_printerr ("pledge\n");
return 1;
}
@@ -478,9 +478,15 @@ main (int argc,
@@ -487,9 +487,15 @@ main (int argc,
print_desktop_dirs (desktop_dirs);
@ -31,7 +29,7 @@ Index: src/update-desktop-database.c
error = NULL;
update_database (desktop_dirs[i], &error);
@@ -495,6 +501,10 @@ main (int argc,
@@ -504,6 +510,10 @@ main (int argc,
found_processable_dir = TRUE;
}
g_option_context_free (context);

32
devel/desktop-file-utils/patches/patch-src_validator_c
View file

@ -1,32 +0,0 @@
From 1926ae7021a2f8e842ad566a49f3a947c02cec92 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Fri, 19 Jun 2020 10:12:04 +0200
Subject: [PATCH] pledge: add support to remaining utilities
Index: src/validator.c
--- src/validator.c.orig
+++ src/validator.c
@@ -28,6 +28,9 @@
#include <locale.h>
+#ifdef HAVE_PLEDGE
+#include <unistd.h>
+#endif
#include "validate.h"
static gboolean warn_kde = FALSE;
@@ -50,6 +53,13 @@ main (int argc, char *argv[])
GError *error;
int i;
gboolean all_valid;
+
+#ifdef HAVE_PLEDGE
+ if (pledge ("stdio rpath", NULL) == -1) {
+ g_printerr ("pledge\n");
+ return 1;
+ }
+#endif
setlocale (LC_ALL, "");