From 402a5b2ab8f4621fcb88c1e52d2b0fad843c44a9 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@buglabs.net>
Date: Fri, 31 Jul 2009 11:27:43 +0200
Subject: e2fsprogs: fix build on Ubuntu 9.04

---
 meta/packages/e2fsprogs/e2fsprogs.inc             |  3 ++-
 meta/packages/e2fsprogs/e2fsprogs/ubuntu904.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 meta/packages/e2fsprogs/e2fsprogs/ubuntu904.patch

diff --git a/meta/packages/e2fsprogs/e2fsprogs.inc b/meta/packages/e2fsprogs/e2fsprogs.inc
index 3505789cf3..998b5796d9 100644
--- a/meta/packages/e2fsprogs/e2fsprogs.inc
+++ b/meta/packages/e2fsprogs/e2fsprogs.inc
@@ -4,7 +4,8 @@ LICENSE = "GPL"
 SECTION = "base"
 DEPENDS = "gettext"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
+           file://ubuntu904.patch;patch=1"
 
 inherit autotools
 
diff --git a/meta/packages/e2fsprogs/e2fsprogs/ubuntu904.patch b/meta/packages/e2fsprogs/e2fsprogs/ubuntu904.patch
new file mode 100644
index 0000000000..760fc42b3e
--- /dev/null
+++ b/meta/packages/e2fsprogs/e2fsprogs/ubuntu904.patch
@@ -0,0 +1,13 @@
+Index: e2fsprogs-1.38/lib/ext2fs/ismounted.c
+===================================================================
+--- e2fsprogs-1.38.orig/lib/ext2fs/ismounted.c	2009-07-28 13:48:34.000000000 +0200
++++ e2fsprogs-1.38/lib/ext2fs/ismounted.c	2009-07-28 13:49:10.000000000 +0200
+@@ -147,7 +147,7 @@
+ is_root:
+ #define TEST_FILE "/.ismount-test-file"		
+ 		*mount_flags |= EXT2_MF_ISROOT;
+-		fd = open(TEST_FILE, O_RDWR|O_CREAT);
++		fd = open(TEST_FILE, O_RDWR|O_CREAT, 0600);
+ 		if (fd < 0) {
+ 			if (errno == EROFS)
+ 				*mount_flags |= EXT2_MF_READONLY;
-- 
cgit v1.2.3-54-g00ecf