summaryrefslogtreecommitdiffstats
path: root/devel/gnome-vfs
diff options
context:
space:
mode:
authorjylefort <jylefort@df743ca5-7f9a-e211-a948-0013205c9059>2005-11-28 22:28:30 +0800
committerjylefort <jylefort@df743ca5-7f9a-e211-a948-0013205c9059>2005-11-28 22:28:30 +0800
commit6612c4da9bed54cfa01ac7fdc39526c743c60900 (patch)
treee2e01ebdf922813496bc5d387638323aff585252 /devel/gnome-vfs
parent2e814acfbed45213eaa4907ee5134bd09874a0af (diff)
downloadmarcuscom-ports-6612c4da9bed54cfa01ac7fdc39526c743c60900.tar
marcuscom-ports-6612c4da9bed54cfa01ac7fdc39526c743c60900.tar.gz
marcuscom-ports-6612c4da9bed54cfa01ac7fdc39526c743c60900.tar.bz2
marcuscom-ports-6612c4da9bed54cfa01ac7fdc39526c743c60900.tar.lz
marcuscom-ports-6612c4da9bed54cfa01ac7fdc39526c743c60900.tar.xz
marcuscom-ports-6612c4da9bed54cfa01ac7fdc39526c743c60900.tar.zst
marcuscom-ports-6612c4da9bed54cfa01ac7fdc39526c743c60900.zip
Fix an infinite loop in the bzip2 method.
Reference: http://bugzilla.gnome.org/show_bug.cgi?id=322652 git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5233 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gnome-vfs')
-rw-r--r--devel/gnome-vfs/Makefile4
-rw-r--r--devel/gnome-vfs/files/patch-modules_bzip2-method.c11
2 files changed, 13 insertions, 2 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 7c5c671af..3438cbc8e 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD: ports/devel/gnomevfs2/Makefile,v 1.102 2005/11/05 04:53:17 marcus Exp $
-# $MCom: ports/devel/gnomevfs2/Makefile,v 1.117 2005/11/15 06:12:28 marcus Exp $
+# $MCom: ports/devel/gnomevfs2/Makefile,v 1.118 2005/11/28 12:54:44 jylefort Exp $
#
PORTNAME= gnomevfs2
PORTVERSION= 2.13.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-vfs/2.13
diff --git a/devel/gnome-vfs/files/patch-modules_bzip2-method.c b/devel/gnome-vfs/files/patch-modules_bzip2-method.c
new file mode 100644
index 000000000..a1fd982c2
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_bzip2-method.c
@@ -0,0 +1,11 @@
+--- modules/bzip2-method.c.orig Wed Apr 13 21:58:54 2005
++++ modules/bzip2-method.c Mon Nov 28 15:09:59 2005
+@@ -435,7 +435,7 @@
+
+ if (bzip2_handle->last_bz_result != BZ_OK) {
+ if (bzip2_handle->last_bz_result == BZ_STREAM_END)
+- return GNOME_VFS_OK;
++ return GNOME_VFS_ERROR_EOF;
+ else
+ return result_from_bz_result (bzip2_handle->last_bz_result);
+ } else if (bzip2_handle->last_vfs_result != GNOME_VFS_OK) {