Bump to 2.24.0-r1.

 * Prevent showing duplicate volumes with UUID or LABEL, bug #193083.
 * Allow building with gnutls >= 2.7, bug #253729.
(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 82 insertions, 0 deletions

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch
new file mode 100644
index 000000000000..15483c681f3d
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-gnutls27.patch
@@ -0,0 +1,25 @@
+# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
+# Use pkg-config in place of gnutls own macro since it's not present anymore.
+--- a/configure.in	2009-03-07 19:59:53.805507753 +0100
++++ b/configure.in	2009-03-07 18:34:36.928169018 +0100
+@@ -686,14 +686,14 @@
+     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
+   else
+     AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
+-    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
+-			      have_ssl=true])
++    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
++    				 	   	  have_ssl = true])
+ 
+     if test "x${LIBGNUTLS_LIBS}" = "x"; then
+-      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
+-                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
+-				 have_ssl=true],
+-                                 AC_MSG_ERROR([Unable to find GNUTLS]))
++      PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
++      				   	     	    AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
++						    have_ssl=true],
++						    AC_MSG_ERROR([Unable to find GNUTLS]))
+     fi
+   fi
+ fi
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
new file mode 100644
index 000000000000..364834875fe9
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
@@ -0,0 +1,57 @@
+# Prevent gnome-vfs to show duplicate volumes due to LABEL and UUID in /etc/fstab
+#
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=357156
+# Gentoo: https://bugs.gentoo.org/attachment.cgi?id=131308
+# Similar to http://patches.ubuntu.com/by-release/extracted/ubuntu/g/gnome-vfs/1:2.24.0-1ubuntu2/15_uuid_mount.patch
+--- a/libgnomevfs/gnome-vfs-unix-mounts.c	2007-04-10 15:03:59.000000000 +0300
++++ b/libgnomevfs/gnome-vfs-unix-mounts.c	2007-09-18 17:48:49.000000000 +0300
+@@ -290,6 +290,15 @@ _gnome_vfs_get_current_unix_mounts (GLis
+ 
+ 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+ 		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
++
++		if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) {
++			char rpath[PATH_MAX];
++			if (realpath (mntent->mnt_fsname, rpath)) {
++				g_free (mount_entry->device_path);
++				mount_entry->device_path = g_strdup (rpath);
++			}
++		}
++
+ 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
+ 		
+ 		g_hash_table_insert (mounts_hash,
+@@ -571,9 +580,31 @@ _gnome_vfs_get_unix_mount_table (GList *
+ 		}
+ 		
+ 		mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
+-
++		
++		if(strlen(mntent->mnt_fsname) >= 5 && !strncmp (mntent->mnt_fsname, "UUID=", 5)) {
++			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mntent->mnt_fsname+5);
++		}
++		else if(strlen(mntent->mnt_fsname) >= 6 && !strncmp (mntent->mnt_fsname, "LABEL=", 6)) {
++			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-label/%s", mntent->mnt_fsname+6);
++		}
++		else {
++			mount_entry->device_path = g_strdup (mntent->mnt_fsname);
++		}
++		
++		if (g_file_test (mount_entry->device_path, G_FILE_TEST_IS_SYMLINK)) {
++			char rpath[PATH_MAX];
++			if (realpath (mount_entry->device_path, rpath)) {
++				g_free (mount_entry->device_path);
++				mount_entry->device_path = g_strdup (rpath);
++			}
++			else {
++				g_free (mount_entry->device_path);
++				g_free (mount_entry);
++				continue;
++			}
++		}
++		
+ 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
+-		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
+ 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
+ 
+ #ifdef HAVE_HASMNTOPT