From dc7e178bc0f0ab47af72de8d0bb29fd16c831f3d Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Sat, 9 Jul 2011 17:22:43 +0000
Subject: Remove work arounds for a crash under NetBSD which are no longer
 necessary after the latest bug fix for "librefuse":

http://mail-index.netbsd.org/source-changes/2011/07/09/msg024440.html
---
 filesystems/fuse-ext2/Makefile         |  3 ++-
 filesystems/fuse-ext2/distinfo         |  4 +---
 filesystems/fuse-ext2/patches/patch-ad | 25 -------------------------
 filesystems/fuse-ext2/patches/patch-ae | 17 -----------------
 4 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 filesystems/fuse-ext2/patches/patch-ad
 delete mode 100644 filesystems/fuse-ext2/patches/patch-ae

(limited to 'filesystems/fuse-ext2')

diff --git a/filesystems/fuse-ext2/Makefile b/filesystems/fuse-ext2/Makefile
index 49d3772d581..b4b474b7a41 100644
--- a/filesystems/fuse-ext2/Makefile
+++ b/filesystems/fuse-ext2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/09 17:22:43 tron Exp $
 
 DISTNAME=	fuse-ext2-0.0.7
+PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuse-ext2/fuse-ext2/${DISTNAME}/}
 
diff --git a/filesystems/fuse-ext2/distinfo b/filesystems/fuse-ext2/distinfo
index 0c08cf0a172..7dfb4864c7a 100644
--- a/filesystems/fuse-ext2/distinfo
+++ b/filesystems/fuse-ext2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $
+$NetBSD: distinfo,v 1.2 2011/07/09 17:22:43 tron Exp $
 
 SHA1 (fuse-ext2-0.0.7.tar.gz) = cdfef525838d2de07a4da6d60b65efce5a1cffa0
 RMD160 (fuse-ext2-0.0.7.tar.gz) = 29cb85f033b65fba4d82d14de907dd4458173c2b
@@ -6,7 +6,5 @@ Size (fuse-ext2-0.0.7.tar.gz) = 570156 bytes
 SHA1 (patch-aa) = e8dc764411ea62f2c714df71bee7ea06a84c337b
 SHA1 (patch-ab) = 830bc968c55b13125700a6fbeff9808610d065f0
 SHA1 (patch-ac) = 253561f1e6a67b5d66d7409af3bf26477ad57b2c
-SHA1 (patch-ad) = 9aa1100f461b2afa72239a5a8f31311e18b77e7e
-SHA1 (patch-ae) = eddbe86f5f9541a62cbd9614e7d847f4a25fc6f5
 SHA1 (patch-af) = ced88c0a278c4924ee9fb6585271093742f0eb09
 SHA1 (patch-ag) = 93c6b2f3d0be517a3bfb4e5aaf198fbf782ab10c
diff --git a/filesystems/fuse-ext2/patches/patch-ad b/filesystems/fuse-ext2/patches/patch-ad
deleted file mode 100644
index 35106a9dd68..00000000000
--- a/filesystems/fuse-ext2/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $
-
-Avoid NULL pointer access with "librefuse" under NetBSD.
-
---- fuse-ext2/fuse-ext2.h.orig	2009-11-09 16:31:37.000000000 +0000
-+++ fuse-ext2/fuse-ext2.h	2011-07-09 16:15:41.000000000 +0100
-@@ -71,12 +71,17 @@
- {
- 	struct fuse_context *mycontext=fuse_get_context();
- 	struct extfs_data *e2data=mycontext->private_data;
-+	ext2_filsys e2fs = e2data->e2fs;
-+	if (e2fs == NULL) {
-+		return NULL;
-+	}
-+
- 	time_t now=time(NULL);
- 	if ((now - e2data->last_flush) > FLUSH_BITMAPS_TIMEOUT) {
- 		ext2fs_write_bitmaps(e2data->e2fs);
- 		e2data->last_flush=now;
- 	}
--	return (ext2_filsys) e2data->e2fs;
-+	return e2fs;
- }
- 
- #if ENABLE_DEBUG
diff --git a/filesystems/fuse-ext2/patches/patch-ae b/filesystems/fuse-ext2/patches/patch-ae
deleted file mode 100644
index 4afc6b2a319..00000000000
--- a/filesystems/fuse-ext2/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2011/07/09 15:27:11 tron Exp $
-
-Avoid NULL pointer access with "librefuse" under NetBSD.
-
---- fuse-ext2/op_getattr.c.orig	2009-10-19 20:19:42.000000000 +0100
-+++ fuse-ext2/op_getattr.c	2011-07-09 16:12:35.000000000 +0100
-@@ -27,6 +27,10 @@
- 	struct ext2_vnode *vnode;
- 	ext2_filsys e2fs = current_ext2fs();
- 
-+	if (e2fs == NULL) {
-+		return -EIO;
-+	}
-+
- 	debugf("enter");
- 	debugf("path = %s", path);
- 
-- 
cgit v1.2.3