pledge three programs that get run on (nearly every) pkg_add using arbitrary

intput files.

prompted by bentley@
ok aja@ sthen@
This commit is contained in:
jasper 2017-11-03 10:32:52 +00:00
parent 94a4635531
commit 3c4a42e202
6 changed files with 61 additions and 3 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.41 2016/06/20 08:11:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.42 2017/11/03 10:32:52 jasper Exp $
COMMENT= utilities for dot.desktop entries
DISTNAME= desktop-file-utils-0.23
REVISION = 0
EXTRACT_SUFX= .tar.xz
CATEGORIES= devel
@ -14,6 +15,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
# uses pledge()
WANTLIB += c glib-2.0 intl
MASTER_SITES= http://freedesktop.org/software/desktop-file-utils/releases/

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_update-desktop-database_c,v 1.12 2017/11/03 10:32:53 jasper Exp $
Index: src/update-desktop-database.c
--- src/update-desktop-database.c.orig
+++ src/update-desktop-database.c
@@ -450,6 +450,11 @@ main (int argc,
{ NULL }
};
+ if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
+ g_printerr ("pledge\n");
+ return 1;
+ }
+
context = g_option_context_new ("");
g_option_context_set_summary (context, _("Build cache database of MIME types handled by desktop files."));
g_option_context_add_main_entries (context, options, NULL);

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.56 2017/09/19 05:58:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.57 2017/11/03 10:32:53 jasper Exp $
COMMENT= shared mime database for desktops
DISTNAME= shared-mime-info-1.9
REVISION= 0
CATEGORIES= misc
HOMEPAGE= http://www.freedesktop.org/wiki/Software/shared-mime-info
@ -12,6 +13,7 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
# uses pledge()
WANTLIB += c glib-2.0 intl xml2
MASTER_SITES= http://people.freedesktop.org/~hadess/

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-update-mime-database_c,v 1.3 2017/11/03 10:32:53 jasper Exp $
Index: update-mime-database.c
--- update-mime-database.c.orig
+++ update-mime-database.c
@@ -3674,6 +3674,11 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
+ if (pledge("stdio rpath wpath cpath getpw", NULL) == -1) {
+ g_warning(_("pledge"));
+ return EXIT_FAILURE;
+ }
+
LIBXML_TEST_VERSION;
mime_dir = argv[optind];

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.186 2017/11/02 21:41:57 naddy Exp $
# $OpenBSD: Makefile,v 1.187 2017/11/03 10:32:53 jasper Exp $
# XXX add support for libcloudproviders (subpackage?)
@ -24,6 +24,7 @@ PKGNAME-guic= gtk-update-icon-cache-${GNOME_VERSION}
REVISION-main= 0
REVISION-cups= 0
REVISION-cloudprint= 0
REVISION-guic= 0
CATEGORIES= x11 devel
@ -96,6 +97,8 @@ WANTLIB-cloudprint += sqlite3 xml2 lzma xcb-shm
LIB_DEPENDS-guic= graphics/gdk-pixbuf2
RUN_DEPENDS-guic= x11/hicolor-icon-theme
# uses pledge()
WANTLIB-guic += ${WANTLIB} c
MODGNOME_TOOLS= docbook gobject-introspection gtk-update-icon-cache \

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-gtk_updateiconcache_c,v 1.1 2017/11/03 10:32:53 jasper Exp $
Index: gtk/updateiconcache.c
--- gtk/updateiconcache.c.orig
+++ gtk/updateiconcache.c
@@ -1717,6 +1717,11 @@ main (int argc, char **argv)
path = g_locale_to_utf8 (path, -1, NULL, NULL, NULL);
#endif
+ if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
+ g_printerr (_("pledge\n"));
+ exit (1);
+ }
+
if (validate)
{
gchar *file = g_build_filename (path, CACHE_NAME, NULL);