diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-10-22 14:16:43 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-10-22 14:16:43 +0800 |
| commit | 8614b0515a091e2214f9559e3aa7e01d4c056bb1 (patch) | |
| tree | 977858fb09ed60436aa1b0f544ed9d696ee048ce | |
| parent | 928ef270d349024b3ab268f602ea1655aca9068c (diff) | |
| download | marcuscom-ports-8614b0515a091e2214f9559e3aa7e01d4c056bb1.tar marcuscom-ports-8614b0515a091e2214f9559e3aa7e01d4c056bb1.tar.gz marcuscom-ports-8614b0515a091e2214f9559e3aa7e01d4c056bb1.tar.bz2 marcuscom-ports-8614b0515a091e2214f9559e3aa7e01d4c056bb1.tar.lz marcuscom-ports-8614b0515a091e2214f9559e3aa7e01d4c056bb1.tar.xz marcuscom-ports-8614b0515a091e2214f9559e3aa7e01d4c056bb1.tar.zst marcuscom-ports-8614b0515a091e2214f9559e3aa7e01d4c056bb1.zip | |
Fix a crash that can occur when trying to resolve nested symlinks. See
http://bugzilla.gnome.org/show_bug.cgi?id=318457 for more details.
Obtained from: GNOME CVS
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4963 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/gnome-vfs/Makefile | 3 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c | 20 | ||||
| -rw-r--r-- | devel/gnomevfs2/Makefile | 3 | ||||
| -rw-r--r-- | devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c | 20 |
4 files changed, 40 insertions, 6 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index bf9d1070a..f6c843f8d 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,11 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/Makefile,v 1.112 2005/10/03 16:07:15 marcus Exp $ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.113 2005/10/05 13:56:16 marcus Exp $ # PORTNAME= gnomevfs2 PORTVERSION= 2.12.1.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12 diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c index 97c617b85..9c558eefd 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,5 +1,5 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Wed Jun 8 03:19:54 2005 -+++ libgnomevfs/gnome-vfs-utils.c Tue Sep 20 01:39:33 2005 +--- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005 ++++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005 @@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { full_filename = g_build_filename (*temp_paths, @@ -8,3 +8,19 @@ "pixmaps", relative_filename, NULL); +@@ -1991,9 +1992,14 @@ _gnome_vfs_uri_resolve_all_symlinks_uri + resolved_uri = gnome_vfs_uri_resolve_relative (new_uri, + info->symlink_name); + if (*p != 0) { ++ gnome_vfs_uri_unref (new_uri); ++ ++ new_uri = gnome_vfs_uri_append_string (resolved_uri, p); ++ + gnome_vfs_uri_unref (uri); +- uri = gnome_vfs_uri_append_string (resolved_uri, p); + gnome_vfs_uri_unref (resolved_uri); ++ ++ uri = gnome_vfs_uri_ref (new_uri); + } else { + gnome_vfs_uri_unref (uri); + uri = resolved_uri; diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index bf9d1070a..f6c843f8d 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -3,11 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gnomevfs2/Makefile,v 1.112 2005/10/03 16:07:15 marcus Exp $ +# $MCom: ports/devel/gnomevfs2/Makefile,v 1.113 2005/10/05 13:56:16 marcus Exp $ # PORTNAME= gnomevfs2 PORTVERSION= 2.12.1.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.12 diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c index 97c617b85..9c558eefd 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,5 +1,5 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Wed Jun 8 03:19:54 2005 -+++ libgnomevfs/gnome-vfs-utils.c Tue Sep 20 01:39:33 2005 +--- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005 ++++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005 @@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { full_filename = g_build_filename (*temp_paths, @@ -8,3 +8,19 @@ "pixmaps", relative_filename, NULL); +@@ -1991,9 +1992,14 @@ _gnome_vfs_uri_resolve_all_symlinks_uri + resolved_uri = gnome_vfs_uri_resolve_relative (new_uri, + info->symlink_name); + if (*p != 0) { ++ gnome_vfs_uri_unref (new_uri); ++ ++ new_uri = gnome_vfs_uri_append_string (resolved_uri, p); ++ + gnome_vfs_uri_unref (uri); +- uri = gnome_vfs_uri_append_string (resolved_uri, p); + gnome_vfs_uri_unref (resolved_uri); ++ ++ uri = gnome_vfs_uri_ref (new_uri); + } else { + gnome_vfs_uri_unref (uri); + uri = resolved_uri; |