From 6612c4da9bed54cfa01ac7fdc39526c743c60900 Mon Sep 17 00:00:00 2001 From: jylefort Date: Mon, 28 Nov 2005 14:28:30 +0000 Subject: 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 --- devel/gnome-vfs/Makefile | 4 ++-- devel/gnome-vfs/files/patch-modules_bzip2-method.c | 11 +++++++++++ devel/gnomevfs2/Makefile | 4 ++-- devel/gnomevfs2/files/patch-modules_bzip2-method.c | 11 +++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 devel/gnome-vfs/files/patch-modules_bzip2-method.c create mode 100644 devel/gnomevfs2/files/patch-modules_bzip2-method.c 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 # # $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) { diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 7c5c671af..3438cbc8e 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett # # $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/gnomevfs2/files/patch-modules_bzip2-method.c b/devel/gnomevfs2/files/patch-modules_bzip2-method.c new file mode 100644 index 000000000..a1fd982c2 --- /dev/null +++ b/devel/gnomevfs2/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) { -- cgit v1.2.3