Borrow patches from OpenBSD ports to fix build, adding pledge() and
unveil() support while we're at it. NFCI for other platforms.


(schmonz)

$NetBSD: patch-src_install.c,v 1.1 2020/09/01 10:21:55 schmonz Exp $

From OpenBSD ports, add pledge() support.

--- src/install.c.orig	Thu Jan  1 00:00:00 1970
+++ 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);

$NetBSD: patch-src_update-desktop-database.c,v 1.1 2020/09/01 10:21:55 schmonz Exp $

From OpenBSD ports, "Unveil the required directory with .desktop
files and where the cache file needs to be written out to."

--- src/update-desktop-database.c.orig	Thu Jan  1 00:00:00 1970
+++ src/update-desktop-database.c
@@ -451,8 +451,8 @@ main (int    argc,
      { NULL }
    };
 
-#if HAVE_PLEDGE
-  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
+#ifdef HAVE_PLEDGE
+  if (pledge ("stdio rpath wpath cpath fattr unveil", NULL) == -1) {
     g_printerr ("pledge\n");
     return 1;
   }
@@ -478,9 +478,19 @@ main (int    argc,
 
   print_desktop_dirs (desktop_dirs);
 
+#ifdef HAVE_PLEDGE
+  if (unveil ("@LOCALBASE@/share/locale/locale.alias", "r") == -1) {
+    g_printerr ("Can't unveil '@LOCALBASE@/share/locale/locale.alias': %s\n", g_strerror(errno));
+  }
+#endif
   found_processable_dir = FALSE;
   for (i = 0; desktop_dirs[i] != NULL; i++)
     {
+#ifdef HAVE_PLEDGE
+      if (unveil (desktop_dirs[i], "rwc") == -1) {
+        g_printerr ("Can't unveil '%s' directory: %s\n", desktop_dirs[i], g_strerror(errno));
+      }
+#endif
       error = NULL;
       update_database (desktop_dirs[i], &error);
 
@@ -495,6 +505,12 @@ main (int    argc,
         found_processable_dir = TRUE;
     }
   g_option_context_free (context);
+
+#ifdef HAVE_PLEDGE
+  if (unveil (NULL, NULL) == -1) {
+    g_printerr ("unveil\n");
+  }
+#endif
 
   if (!found_processable_dir)
     {

$NetBSD: patch-src_validator.c,v 1.1 2020/09/01 10:21:55 schmonz Exp $

From OpenBSD ports, add pledge() support.

--- src/validator.c.orig	Thu Jan  1 00:00:00 1970
+++ 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, "");