Undo some useless changes from the prefix merge, and fix implicit getpagesize() warnings.

Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64

2 files changed, 42 insertions, 32 deletions

diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-getpagesize.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-getpagesize.patch
new file mode 100644
index 000000000000..5b042d3690e7
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-getpagesize.patch
@@ -0,0 +1,42 @@
+From 81c81f5421cb9b85e793c591595a0a4d6ee04e99 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 4 Dec 2010 17:10:53 -0500
+Subject: [PATCH] libext2fs: change getpagesize to sysconf
+
+Newer versions of glibc no longer export the getpagesize() prototype when
+using recent versions of POSIX (_XOPEN_SOURCE).  So building tdb.c gives
+use implicit function declaration warnings.  Fix the issue by using the
+portable sysconf() function which returns the same answer.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/ext2fs/tdb.c |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
+index 0c82a24..43c5d44 100644
+--- a/lib/ext2fs/tdb.c
++++ b/lib/ext2fs/tdb.c
+@@ -111,10 +111,6 @@ typedef int bool;
+ #define u32 unsigned
+ #endif
+ 
+-#ifndef HAVE_GETPAGESIZE
+-#define getpagesize() 0x2000
+-#endif
+-
+ typedef u32 tdb_len_t;
+ typedef u32 tdb_off_t;
+ 
+@@ -3838,7 +3834,7 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
+ 	tdb->hash_fn = hash_fn ? hash_fn : default_tdb_hash;
+ 
+ 	/* cache the page size */
+-	tdb->page_size = getpagesize();
++	tdb->page_size = sysconf(_SC_PAGESIZE);
+ 	if (tdb->page_size <= 0) {
+ 		tdb->page_size = 0x2000;
+ 	}
+-- 
+1.7.3.1
+
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.4-darwin-no-mntent.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.4-darwin-no-mntent.patch
deleted file mode 100644
index e48d0c208934..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.4-darwin-no-mntent.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Dirk Tilger <dirk@miriup.de>:
-  For the mntent.patch: e2fsprogs is using a GNU libc specific
-  operation: setmntent and endmntent. Both operate on /etc/mtab, which
-  doesn't exist on MacOSX, thus they are simply not called on Darwin.
-
-http://bugs.gentoo.org/show_bug.cgi?id=263841
-
---- misc/ismounted.c	2008-05-05 21:00:01 +0400
-+++ misc/ismounted.c	2008-05-05 21:00:16 +0400
-@@ -86,8 +86,10 @@
- 	if ((f = fopen(mtab_file, "r")) == NULL)
- 		return errno;
- 
-+	#ifndef __APPLE__
-	if ((f = setmntent (mtab_file, "r")) == NULL)
-		return errno;
-+	#endif
- 	if (stat(file, &st_buf) == 0) {
- 		if (S_ISBLK(st_buf.st_mode)) {
- #ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
-@@ -177,7 +173,11 @@
- 
- 	retval = 0;
- errout:
-+	#ifdef __APPLE__
-+	fclose (f);
-+	#else
-	endmntent (f);
-+	#endif
- 	return retval;
- }
-