cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/toad is coming back, teach glib to use pkexec(1).

Browse Source
This commit is contained in:
ajacoutot 2019-01-23 03:37:09 +00:00
parent 3d969613ea
commit a88625b0b2
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/glib2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.290 2019/01/21 21:52:58 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.291 2019/01/23 03:37:09 ajacoutot Exp $
# Everything is a Freaking GLib/GTK+ problem
CFLAGS += -g
@ -9,6 +9,7 @@ COMMENT= general-purpose utility library
GNOME_PROJECT= glib
GNOME_VERSION= 2.58.3
PKGNAME= ${DISTNAME:S/glib/glib2/}
REVISION= 0
CATEGORIES= devel

33
devel/glib2/patches/patch-gio_gunixmount_c
View File

@ -1,23 +1,46 @@
$OpenBSD: patch-gio_gunixmount_c,v 1.14 2016/10/28 13:40:04 ajacoutot Exp $
$OpenBSD: patch-gio_gunixmount_c,v 1.15 2019/01/23 03:37:10 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=653555
--- gio/gunixmount.c.orig Fri Jul 1 21:54:29 2016
+++ gio/gunixmount.c Wed Oct 26 11:37:25 2016
Index: gio/gunixmount.c
--- gio/gunixmount.c.orig
+++ gio/gunixmount.c
@@ -27,6 +27,12 @@
#include <sys/wait.h>
#include <unistd.h>
+#ifdef __OpenBSD__
+#include <errno.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#endif
+
#include <glib.h>
#include "gsubprocess.h"
#include "gioenums.h"
@@ -358,12 +364,20 @@ g_unix_mount_eject (GMount *mount,
@@ -337,6 +343,21 @@ g_unix_mount_unmount (GMount *mount,
else
argv[1] = unix_mount->device_path;
+/* sysutils/toad */
+#ifdef __OpenBSD__
+ if (getuid() != 0)
+ {
+ char *argv[] = {"umount", NULL, NULL, NULL};
+ gchar *pkexec;
+ if ((pkexec = g_find_program_in_path ("pkexec")) != NULL)
+ {
+ argv[0] = pkexec;
+ argv[2] = argv[1];
+ argv[1] = "/sbin/umount";
+ }
+ }
+#endif
+
eject_unmount_do (mount, cancellable, callback, user_data, argv);
}
@@ -358,12 +379,20 @@ g_unix_mount_eject (GMount *mount,
GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
char *argv[] = {"eject", NULL, NULL};