Fix building on older glibcs w/out fallocate #406609 by Ortwin Glueck.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

4 files changed, 42 insertions, 3 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index da7f93e4e530..cba826dc22d9 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.246 2012/03/03 15:08:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.247 2012/03/05 05:40:58 vapier Exp $
+
+  05 Mar 2012; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.ebuild,
+  e2fsprogs-1.42.1.ebuild, +files/e2fsprogs-1.42-no-fallocate.patch:
+  Fix building on older glibcs w/out fallocate #406609 by Ortwin Glueck.
 
   03 Mar 2012; Markus Meier <maekke@gentoo.org> e2fsprogs-1.42.ebuild:
   arm stable, bug #403405
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
index 80ce6ae70b1b..b7925e7aa9fe 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild,v 1.2 2012/02/27 20:54:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild,v 1.3 2012/03/05 05:40:58 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -43,6 +43,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
 	epatch "${FILESDIR}"/${PN}-1.42-no-quota.patch
+	epatch "${FILESDIR}"/${PN}-1.42-no-fallocate.patch #406609
 	epatch "${FILESDIR}"/${PN}-1.42.1-libext2fs-gettimeofday.patch
 	epatch "${FILESDIR}"/${PN}-1.42.1-libext2fs-config.patch
 	# use symlinks rather than hardlinks
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
index af76f275155d..edca5ffccced 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.8 2012/03/03 15:08:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.9 2012/03/05 05:40:58 vapier Exp $
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
@@ -44,6 +44,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.41.12-getpagesize.patch
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
 	epatch "${FILESDIR}"/${PN}-1.42-no-quota.patch
+	epatch "${FILESDIR}"/${PN}-1.42-no-fallocate.patch #406609
 	# use symlinks rather than hardlinks
 	sed -i \
 		-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-fallocate.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-fallocate.patch
new file mode 100644
index 000000000000..17594e47e87e
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-fallocate.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/406609
+
+From 1a36d2ead2f45a21f74ccc332a534c1b788d6029 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 5 Mar 2012 00:35:21 -0500
+Subject: [PATCH] libext2fs: check for fallocate symbol before using it
+
+If we have newer kernel headers which define FALLOC_FL_PUNCH_HOLE, but we
+are on an older glibc which lacks fallocate, we end up trying to use the
+func anyways.  Check the ifdef that autoconf already set up for us.
+
+Reported-by: Ortwin Glueck <odi@odi.ch>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/ext2fs/unix_io.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
+index 9f0613a..da3f8fd 100644
+--- a/lib/ext2fs/unix_io.c
++++ b/lib/ext2fs/unix_io.c
+@@ -905,7 +905,7 @@ static errcode_t unix_discard(io_channel channel, unsigned long long block,
+ 		goto unimplemented;
+ #endif
+ 	} else {
+-#ifdef FALLOC_FL_PUNCH_HOLE
++#if defined(HAVE_FALLOCATE) && defined(FALLOC_FL_PUNCH_HOLE)
+ 		/*
+ 		 * If we are not on block device, try to use punch hole
+ 		 * to reclaim free space.
+-- 
+1.7.8.4
+