diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-12-17 23:01:57 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-12-17 23:01:57 +0800 |
| commit | dedc9016ded26c1f8b75c3c15f218c5cd79bb5fd (patch) | |
| tree | 50a30a0cae7cad25a4fa104031cb9a033544486b /devel | |
| parent | ff8e3414f658cf43a8634e30f6fd3d2ad6004bd4 (diff) | |
| download | marcuscom-ports-dedc9016ded26c1f8b75c3c15f218c5cd79bb5fd.tar marcuscom-ports-dedc9016ded26c1f8b75c3c15f218c5cd79bb5fd.tar.gz marcuscom-ports-dedc9016ded26c1f8b75c3c15f218c5cd79bb5fd.tar.bz2 marcuscom-ports-dedc9016ded26c1f8b75c3c15f218c5cd79bb5fd.tar.lz marcuscom-ports-dedc9016ded26c1f8b75c3c15f218c5cd79bb5fd.tar.xz marcuscom-ports-dedc9016ded26c1f8b75c3c15f218c5cd79bb5fd.tar.zst marcuscom-ports-dedc9016ded26c1f8b75c3c15f218c5cd79bb5fd.zip | |
Add "nullfs" to the list of system internal file system types. This
prevents gvfs-trashd from latching on to jail mounts and preventing them
from being unmounted.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18963 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib20/Makefile | 2 | ||||
| -rw-r--r-- | devel/glib20/files/patch-gio_gunixmounts.c | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 85c272f37..15b775432 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -4,7 +4,7 @@ PORTNAME= glib PORTVERSION= 2.38.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c index 608bd95a3..debd8a926 100644 --- a/devel/glib20/files/patch-gio_gunixmounts.c +++ b/devel/glib20/files/patch-gio_gunixmounts.c @@ -1,6 +1,6 @@ ---- gio/gunixmounts.c.orig 2012-05-02 22:02:54.000000000 -0500 -+++ gio/gunixmounts.c 2012-05-02 22:15:35.000000000 -0500 -@@ -155,6 +155,9 @@ +--- gio/gunixmounts.c.orig 2013-06-09 18:03:17.000000000 -0400 ++++ gio/gunixmounts.c 2013-12-14 11:45:36.749181267 -0500 +@@ -155,6 +155,9 @@ struct _GUnixMountMonitor { GFileMonitor *fstab_monitor; GFileMonitor *mtab_monitor; @@ -10,7 +10,7 @@ GSource *proc_mounts_watch_source; }; -@@ -167,6 +170,8 @@ +@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni static GList *_g_get_unix_mounts (void); static GList *_g_get_unix_mount_points (void); @@ -19,7 +19,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); #define MOUNT_POLL_INTERVAL 4000 -@@ -193,6 +198,7 @@ +@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix #endif #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) @@ -27,7 +27,7 @@ #include <sys/ucred.h> #include <sys/mount.h> #include <fstab.h> -@@ -243,22 +249,29 @@ +@@ -243,22 +249,29 @@ g_unix_is_mount_path_system_internal (co "/", /* we already have "Filesystem root" in Nautilus */ "/bin", "/boot", @@ -57,15 +57,18 @@ "/var", "/var/crash", "/var/local", -@@ -299,6 +312,7 @@ +@@ -299,8 +312,10 @@ guess_system_internal (const char *mount "devfs", "devpts", "ecryptfs", + "fdescfs", "kernfs", "linprocfs", ++ "nullfs", "proc", -@@ -1122,6 +1136,10 @@ + "procfs", + "ptyfs", +@@ -1126,6 +1141,10 @@ get_mounts_timestamp (void) if (stat (monitor_file, &buf) == 0) return (guint64)buf.st_mtime; } @@ -76,7 +79,7 @@ return 0; } -@@ -1267,6 +1285,13 @@ +@@ -1271,6 +1290,13 @@ g_unix_mount_monitor_finalize (GObject * g_object_unref (monitor->mtab_monitor); } @@ -90,7 +93,7 @@ the_mount_monitor = NULL; G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object); -@@ -1348,6 +1373,52 @@ +@@ -1352,6 +1378,52 @@ mtab_file_changed (GFileMonitor *mo } static gboolean @@ -143,7 +146,7 @@ proc_mounts_changed (GIOChannel *channel, GIOCondition cond, gpointer user_data) -@@ -1412,6 +1483,12 @@ +@@ -1416,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); } } |