Date: Tue, 17 Dec 2013 22:17:14 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r336784 - in branches/2014Q1/devel/glib20: . files Message-ID: <201312172217.rBHMHEOk072557@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Dec 17 22:17:14 2013 New Revision: 336784 URL: http://svnweb.freebsd.org/changeset/ports/336784 Log: MFH r336732: 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. Modified: branches/2014Q1/devel/glib20/Makefile branches/2014Q1/devel/glib20/files/patch-gio_gunixmounts.c Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/devel/glib20/Makefile ============================================================================== --- branches/2014Q1/devel/glib20/Makefile Tue Dec 17 22:14:05 2013 (r336783) +++ branches/2014Q1/devel/glib20/Makefile Tue Dec 17 22:17:14 2013 (r336784) @@ -4,7 +4,7 @@ PORTNAME= glib PORTVERSION= 2.36.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Modified: branches/2014Q1/devel/glib20/files/patch-gio_gunixmounts.c ============================================================================== --- branches/2014Q1/devel/glib20/files/patch-gio_gunixmounts.c Tue Dec 17 22:14:05 2013 (r336783) +++ branches/2014Q1/devel/glib20/files/patch-gio_gunixmounts.c Tue Dec 17 22:17:14 2013 (r336784) @@ -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); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312172217.rBHMHEOk072557>