From 01e212d00ce4a040b4209419609afceb08424e9a Mon Sep 17 00:00:00 2001 From: jmmv Date: Sat, 26 Feb 2005 17:23:01 +0000 Subject: Updated gnome-vfs2, gnome-vfs2-cdda and gnome-vfs2-smb to 2.8.4: * Bugs fixed: + Never return NULL on gnome_vfs_uri_extract_short_name calls + sftp-method: always check for the gnome_vfs_unescape_string return value + sftp-method: honor the force_replace flag on moves + gzip-method: correctly return GNOME_VFS_ERROR_EOF + Plug some memory leaks + Fix bogus warnings with later gcc versions + Various translation updates --- sysutils/gnome-vfs2/Makefile | 4 +- sysutils/gnome-vfs2/Makefile.common | 4 +- sysutils/gnome-vfs2/PLIST | 5 +- sysutils/gnome-vfs2/distinfo | 12 +- sysutils/gnome-vfs2/patches/patch-au | 214 +---------------------------------- sysutils/gnome-vfs2/patches/patch-av | 15 --- sysutils/gnome-vfs2/patches/patch-aw | 16 --- 7 files changed, 15 insertions(+), 255 deletions(-) delete mode 100644 sysutils/gnome-vfs2/patches/patch-av delete mode 100644 sysutils/gnome-vfs2/patches/patch-aw (limited to 'sysutils') diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index b560cf80c2e..bfb4a853c66 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.45 2005/01/21 20:32:23 recht Exp $ +# $NetBSD: Makefile,v 1.46 2005/02/26 17:23:01 jmmv Exp $ # -PKGREVISION= 3 - PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index 62eedac6e9c..b820e508f1f 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.9 2005/02/14 07:02:08 uebayasi Exp $ +# $NetBSD: Makefile.common,v 1.10 2005/02/26 17:23:01 jmmv Exp $ # -DISTNAME= gnome-vfs-2.8.3 +DISTNAME= gnome-vfs-2.8.4 PKGNAME= ${DISTNAME:S/vfs/vfs2/} CATEGORIES?= sysutils CATEGORIES+= gnome diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST index 1e03d6d3589..7f77acf9389 100644 --- a/sysutils/gnome-vfs2/PLIST +++ b/sysutils/gnome-vfs2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2004/09/22 08:09:53 jlam Exp $ +@comment $NetBSD: PLIST,v 1.14 2005/02/26 17:23:01 jmmv Exp $ bin/gnomevfs-cat bin/gnomevfs-copy bin/gnomevfs-info @@ -129,7 +129,6 @@ share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html share/doc/gnome-vfs-2.0/networking.html share/doc/gnome-vfs-2.0/right.png -share/doc/gnome-vfs-2.0/style.css share/doc/gnome-vfs-2.0/up.png share/doc/gnome-vfs-2.0/volumes.html share/examples/gnome-vfs-2.0/modules/default-modules.conf @@ -194,6 +193,7 @@ ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo @@ -216,6 +216,7 @@ ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo +${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @comment in GConf2: @dirrm share/gconf/schemas @dirrm share/examples/gnome-vfs-2.0/vfolders @dirrm share/examples/gnome-vfs-2.0/modules diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index f77bd33ff72..de8ee4ba937 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.32 2005/02/24 13:40:53 agc Exp $ +$NetBSD: distinfo,v 1.33 2005/02/26 17:23:01 jmmv Exp $ -SHA1 (gnome-vfs-2.8.3.tar.bz2) = 263dc88bfb18ac5bb917124bbc8278b3f5352688 -RMD160 (gnome-vfs-2.8.3.tar.bz2) = 423074f5d28a4b4636a095b1a83f44eb74606c97 -Size (gnome-vfs-2.8.3.tar.bz2) = 1907154 bytes +SHA1 (gnome-vfs-2.8.4.tar.bz2) = cb88f0c828f0750cc64336f314c84fe32bd21842 +RMD160 (gnome-vfs-2.8.4.tar.bz2) = c1037fca36955adaece9a1a78958d87217fcaf15 +Size (gnome-vfs-2.8.4.tar.bz2) = 1892413 bytes SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06 @@ -18,6 +18,4 @@ SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b SHA1 (patch-ar) = 99c99d0d90ed7a0d804b349f532d3a17c780d506 SHA1 (patch-as) = 1ac0cc66541c1e7ce62d205a05cc6cb446cec39d SHA1 (patch-at) = b75ad2f2accb0ca8986f8c4e2771028fceca41b4 -SHA1 (patch-au) = 12cbe2cc02b436f8f1c4afed5be34bddc23e7e8f -SHA1 (patch-av) = 689114a36fa78dc2216a763eee597e5c61d269a5 -SHA1 (patch-aw) = 80c551981b3a37b202ed8d5876ffb472cd08e679 +SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c diff --git a/sysutils/gnome-vfs2/patches/patch-au b/sysutils/gnome-vfs2/patches/patch-au index a152347281b..cae8b6e7b1a 100644 --- a/sysutils/gnome-vfs2/patches/patch-au +++ b/sysutils/gnome-vfs2/patches/patch-au @@ -1,161 +1,8 @@ -$NetBSD: patch-au,v 1.1 2005/01/20 21:32:11 recht Exp $ +$NetBSD: patch-au,v 1.2 2005/02/26 17:23:01 jmmv Exp $ ---- modules/sftp-method.c.orig Tue Sep 21 14:58:00 2004 -+++ modules/sftp-method.c Thu Jan 20 20:30:05 2005 -@@ -162,7 +162,6 @@ - GnomeVFSResult *status); - - -- - static guint inited_buffers = 0; - - typedef struct -@@ -647,8 +646,6 @@ - } - } - -- -- - static GnomeVFSResult - sftp_status_to_vfs_result (guint status) - { -@@ -677,7 +674,6 @@ - } - - -- - /* Derived from OpenSSH, sftp-client.c:get_status */ - - static GnomeVFSResult -@@ -844,8 +840,6 @@ - buffer_free (&msg); - } - -- -- - static char* - get_user_from_uri_or_password_line (const GnomeVFSURI *uri, - const char *password_line) -@@ -904,8 +898,6 @@ - return g_strdup ("password"); - } - -- -- - static gboolean - invoke_fill_auth (const GnomeVFSURI *uri, - const char *password_line, -@@ -1702,8 +1694,6 @@ - } - } - -- -- - /* Portions of the below functions inspired by functions in OpenSSH sftp-client.c */ - - static GnomeVFSResult -@@ -1769,8 +1759,6 @@ - return GNOME_VFS_OK; - } - -- -- - static GnomeVFSResult - do_open (GnomeVFSMethod *method, - GnomeVFSMethodHandle **method_handle, -@@ -1796,6 +1784,8 @@ - if (res != GNOME_VFS_OK) return res; - - path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri), NULL); -+ if (path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; - - id = sftp_connection_get_id (conn); - -@@ -1872,6 +1862,8 @@ - if (res != GNOME_VFS_OK) return res; - - path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri), NULL); -+ if (path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; - - id = sftp_connection_get_id (conn); - -@@ -2326,6 +2318,8 @@ - if (res != GNOME_VFS_OK) return res; - - path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri), NULL); -+ if (path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; - - if (options & GNOME_VFS_FILE_INFO_FOLLOW_LINKS) { - res = get_real_path (conn, path, &real_path); -@@ -2434,6 +2428,8 @@ - id = sftp_connection_get_id (conn); - - path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri), NULL); -+ if (path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; - - /* If the path is empty (i.e. root directory), then give it the root directory explicitly */ - if (!strcmp (path, "")) { -@@ -2673,6 +2669,9 @@ - id = sftp_connection_get_id (conn); - - path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri), NULL); -+ if (path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; -+ - memset (&info, 0, sizeof (GnomeVFSFileInfo)); - iobuf_send_string_request_with_file_info (conn->out_fd, id, SSH2_FXP_MKDIR, - path, strlen (path), &info, -@@ -2688,7 +2687,6 @@ - return res; - } - -- - static GnomeVFSResult - do_remove_directory (GnomeVFSMethod *method, - GnomeVFSURI *uri, -@@ -2705,6 +2703,9 @@ - id = sftp_connection_get_id (conn); - - path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri), NULL); -+ if (path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; -+ - iobuf_send_string_request (conn->out_fd, id, SSH2_FXP_RMDIR, path, strlen (path)); - - g_free (path); -@@ -2738,10 +2739,27 @@ - buffer_init (&msg); - - old_path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (old_uri), NULL); -+ if (old_path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; -+ - new_path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (new_uri), NULL); -+ if (new_path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; - - id = sftp_connection_get_id (conn); - -+ /* if force_replace is specified, try to remove new_uri */ -+ if (force_replace) { -+ iobuf_send_string_request (conn->out_fd, -+ id, -+ SSH2_FXP_REMOVE, -+ new_path, -+ strlen (new_path)); -+ res = iobuf_read_result (conn->in_fd, id); -+ if (res != GNOME_VFS_OK && res != GNOME_VFS_ERROR_NOT_FOUND) -+ goto bail; -+ } -+ - buffer_write_gchar (&msg, SSH2_FXP_RENAME); - buffer_write_gint32 (&msg, id); - buffer_write_string (&msg, old_path); -@@ -2749,11 +2767,12 @@ +--- modules/sftp-method.c.orig 2005-01-16 15:50:32.000000000 +0100 ++++ modules/sftp-method.c +@@ -2820,11 +2820,12 @@ do_rename (GnomeVFSMethod *method, buffer_send (&msg, conn->out_fd); buffer_free (&msg); @@ -170,56 +17,3 @@ $NetBSD: patch-au,v 1.1 2005/01/20 21:32:11 recht Exp $ sftp_connection_unref (conn); sftp_connection_unlock (conn); -@@ -2781,8 +2800,15 @@ - buffer_init (&msg); - - old_path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (old_uri), NULL); -+ if (old_path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; -+ - old_dirname = g_path_get_dirname (old_path); -+ - new_path = g_build_filename (old_dirname, new_name, NULL); -+ if (new_path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; -+ - g_free (old_dirname); - - id = sftp_connection_get_id (conn); -@@ -2821,6 +2847,9 @@ - id = sftp_connection_get_id (conn); - - path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri), NULL); -+ if (path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; -+ - iobuf_send_string_request (conn->out_fd, id, SSH2_FXP_REMOVE, path, strlen (path)); - - g_free (path); -@@ -2890,6 +2919,9 @@ - id = sftp_connection_get_id (conn); - - path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri), NULL); -+ if (path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; -+ - iobuf_send_string_request_with_file_info (conn->out_fd, id, SSH2_FXP_SETSTAT, - path, strlen (path), info, mask); - -@@ -2933,6 +2965,8 @@ - buffer_init (&msg); - - path = gnome_vfs_unescape_string (gnome_vfs_uri_get_path (uri), NULL); -+ if (path == NULL) -+ return GNOME_VFS_ERROR_INVALID_URI; - - id = sftp_connection_get_id (conn); - -@@ -2953,7 +2987,6 @@ - return res; - } - -- - - static GnomeVFSMethod method = { - sizeof (GnomeVFSMethod), diff --git a/sysutils/gnome-vfs2/patches/patch-av b/sysutils/gnome-vfs2/patches/patch-av deleted file mode 100644 index 5711f2fd5a6..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-av +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-av,v 1.1 2005/01/20 21:32:11 recht Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=157275 - ---- modules/gzip-method.c.orig Thu Jan 20 21:33:30 2005 -+++ modules/gzip-method.c Thu Jan 20 21:33:36 2005 -@@ -621,7 +621,7 @@ - if (gzip_handle->last_z_result != Z_OK) { - if (gzip_handle->last_z_result == Z_STREAM_END) { - *bytes_read = 0; -- return GNOME_VFS_OK; -+ return GNOME_VFS_ERROR_EOF; - } else - return result_from_z_result (gzip_handle->last_z_result); - } else if (gzip_handle->last_vfs_result != GNOME_VFS_OK) { diff --git a/sysutils/gnome-vfs2/patches/patch-aw b/sysutils/gnome-vfs2/patches/patch-aw deleted file mode 100644 index 385e0cbcccf..00000000000 --- a/sysutils/gnome-vfs2/patches/patch-aw +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2005/01/21 20:32:23 recht Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=159823 - ---- libgnomevfs/gnome-vfs-mime-info-cache.c.orig Tue Oct 26 15:37:05 2004 -+++ libgnomevfs/gnome-vfs-mime-info-cache.c Fri Jan 21 20:06:07 2005 -@@ -769,6 +769,9 @@ - - G_UNLOCK (mime_info_cache); - -+ g_list_foreach (mime_types, (GFunc)g_free, NULL); -+ g_list_free (mime_types); -+ - desktop_entries = g_list_reverse (desktop_entries); - - return desktop_entries; -- cgit v1.2.3