diff --git a/ChangeLog b/ChangeLog index 1652e96..8faffc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 13 Jan 2012; Sebastian Pipping + +patches/e2fsprogs/1.42/e2fsprogs-1.41.12-getpagesize.patch: + Add a patch for e2fsprogs/1.42 from main tree + 13 Jan 2012; Sebastian Pipping +patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch: Copy patch from lvm/2.02.74 to lvm/2.02.88 diff --git a/patches/e2fsprogs/1.42/e2fsprogs-1.41.12-getpagesize.patch b/patches/e2fsprogs/1.42/e2fsprogs-1.41.12-getpagesize.patch new file mode 100644 index 0000000..5b042d3 --- /dev/null +++ b/patches/e2fsprogs/1.42/e2fsprogs-1.41.12-getpagesize.patch @@ -0,0 +1,42 @@ +From 81c81f5421cb9b85e793c591595a0a4d6ee04e99 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +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 +--- + 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 +