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

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

5 files changed, 59 insertions, 9 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/Manifest b/sys-fs/e2fsprogs/Manifest
index f9684a777416..05ee9c033ffd 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -12,6 +12,7 @@ AUX e2fsprogs-1.41.12-mint-blkid.patch 1522 RMD160 735bc1f2fd604042589b7d521f0af
 AUX e2fsprogs-1.41.5-makefile.patch 3253 RMD160 822300273927fbdea60fc3dc747a9b6ba9c375dd SHA1 96855d5afb8d294ca57c06889d9a7ce5de29baef SHA256 7d2d075a475e47d90dd181fdaaf6554b80939802e7bf161fcd6b72d2b1510b10
 AUX e2fsprogs-1.41.7-mint-blkid.patch 1484 RMD160 3fc716efd32aca0c83be55813ca3951b0101c5f0 SHA1 a29f146bdf7a6d6300597f1179acc0771eb0ba74 SHA256 848080b7005bb1aabfcf05e4440951ab37ff3eec063fa4652954e3c14afdeb70
 AUX e2fsprogs-1.41.8-makefile.patch 317 RMD160 f07a8fdd75e8dd43bf6ff0b6b8dad5e12dec2f05 SHA1 5d95d5ef3c07a40617e453ff328c4195f9155dac SHA256 f8a4e2180f557c3bb9a50c38300e406420b3df296f50d6eab59d0b28cb65904d
+AUX e2fsprogs-1.42-no-fallocate.patch 1123 RMD160 dc8eacb6ee1c5544735c9d3bf0ba345f0e71b68d SHA1 64ad0efd2dfd9c6858e34e44bf17ffe909b970ff SHA256 c6e7356433c95c46dede2d4c34fd4bce17efb7867f3a776c99f25779f88cc9b2
 AUX e2fsprogs-1.42-no-quota.patch 1829 RMD160 f6cf3c225a7aec0c7651da1e992393ecb035e7b9 SHA1 678eed2526418a6a4b4f858bb44c2091c15551db SHA256 f2cc98da84595bce5eeac3c2c4115384a9e6ee9f2c3cf727e0b2c9c85e57bfc4
 AUX e2fsprogs-1.42.1-libext2fs-config.patch 751 RMD160 1051f0740c83fea39f079f43b7cf1e4ebe0178e3 SHA1 0bf5611818ed72f9410f1cd3f7c4bf6f901a62d9 SHA256 503c1b94b993c1a762a32efaf23f4dacf0fbebe064b5fe51acbea7b3826dcd73
 AUX e2fsprogs-1.42.1-libext2fs-gettimeofday.patch 988 RMD160 3f8670c3e54b9843a460cfcdf6164fea32d0eb14 SHA1 86ae75a3dcbc02a7a5587300319516ec340ab011 SHA256 a445e3e2806d11d8571ebcc5b1b3ec6f499b75f0e81cb34e8c9e4e914cff5c2a
@@ -26,14 +27,24 @@ EBUILD e2fsprogs-1.41.12-r1.ebuild 4303 RMD160 a1daa7568c42aa832e6feb4dc6193c25d
 EBUILD e2fsprogs-1.41.12.ebuild 3900 RMD160 a275d276a051a0498055b2ee6c4833e7dfa3f79c SHA1 f0bff43ac6e5e1369ab0dbb14fcb798ffa68a7b8 SHA256 2c6fca4ab9cd9d2d8341a470c58d470af0ee82367ddc649b50d9ff4c2a6f94dd
 EBUILD e2fsprogs-1.41.14.ebuild 4297 RMD160 62bbe44b692bfa92251e6cbdf1a03406c60cf2d5 SHA1 a7db3d59afcad75aaf9fa8139a984b4cb5df3aef SHA256 4006e230a2becdc55c2922c96d3b2d6bb474fd5f90389ea5801c7bc5003eb188
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4158 RMD160 13600b8acea0bc70338d6df1eb065a353ec254bc SHA1 bf42c33a7e7a55b2628d69269d140c29cfb66f02 SHA256 24defb5da08763aaf7d239c2b404a75f2182eefcbbc9193d817f77d3e63068d5
-EBUILD e2fsprogs-1.42.1.ebuild 4620 RMD160 fe0e761729c9ddd9949f5f7753d64921f749e908 SHA1 e000ad32de9606cc4c41c5b8c8707d32a2757643 SHA256 97efd739607363df0022d575a86c13b93601af7a35a8dd66c2198181e682cce6
-EBUILD e2fsprogs-1.42.ebuild 4471 RMD160 b739cc2a3b129d1310f1bd4b0646b8ee9f7e6ce6 SHA1 125a1a572f904a718d3ea0161493ecf4473c323e SHA256 72696432e457bfdc9ff70775df1761593490b534f5cbbda280ffd3152e8de722
-MISC ChangeLog 36439 RMD160 ccc67fbc673397f23200deef044e2a848f84b38d SHA1 b2c097521a73ceb2c9f913e9d9881b7b1500ecdb SHA256 e54b732dd8b642303eaf8b8beb32981cbc5769454ed6e91aeeca59bdfa8cc850
+EBUILD e2fsprogs-1.42.1.ebuild 4680 RMD160 e443bef6e65eb4b5bddf3b574081474e3593da0c SHA1 0ba503d91a2213ebdd16fef71a1dad6f61926498 SHA256 b5ed316669a8fa29496931a8987c03fc4bdaade78310b05f10dbffcbbd8b4332
+EBUILD e2fsprogs-1.42.ebuild 4531 RMD160 342204b6af3d017ced33a320edbadd0418e92239 SHA1 44d9fa155b0bff3be6473df8dab9316cc0d65f66 SHA256 9084dc04852ed6521b32e720a35b42870bb70f52ba390663838dafc150ee3c95
+MISC ChangeLog 36655 RMD160 e39b4c97a31808d63b121acc615b7e329cb78a67 SHA1 94c86ec47c0141646f2adf2f726b2a52871631ee SHA256 e303effdc5cb61c7ca472eb531998440d1444f635fd4b8016c3bd1eb2c7317a5
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9SNJYACgkQkKaRLQcq0GLIZgCeJRCY2bySvlaC9AQgvd7bo4wE
-gNcAoJFhtl0DbbGJLQc07ZA4mzhZxT9L
-=4N7X
+iQIcBAEBAgAGBQJPVFHzAAoJELEHsLL7fEFWOu4P/30V9Domd7v6KsnBfiP+hyu/
+JxFwbRqJe+JOMGbhkFqblgYguY1mjF37sjijHM7W7ezrllP/EmgmX0Z/vh20n8N9
+g9j5bOddnuOniV9W+R2cytAAUU1C/5cpMBuLSArrRVXxM4yQqKe9mBlVEbDim7nc
+CFjAIBwE53IegXSF0npDEeAizLD27ezG0PwcgdKXIDtjG9XhufyXffXVSKpaXZWN
+6yDIpdcaOg6vLZsKZBau66ww2EU1ZpCrpepCgeNqHikkMjluIJ8c607LdEcQWj+c
+MG9qf3qEvCLicrDVE6V716MjH3qbeCpwjfNH4Ys107d3htBhktYRgoBl28s3vHFq
+ZlXO2TnixPpQlolgrlUrKvmnitn9gAdlONyZLAzkWFsuTOtlnZ7Ox4KKmzD4zbDb
+lEpSx969BjcmKBHOIvVIOQGM+MF9sBxeL1Cs4syqJ1UKvrLCfebcKsvrf7xLpzVh
+E1Dont63VdZ89G26sLssDb+JaGNoiygF7f6WKUT93JOukZtUJwPEEfuagwLIfPc8
+68vIyDwvifZh+ctNwimP+dVNE4d25xDJqf46ZaYo5TVTPPbgXsam+6wQuU3r4/MZ
+9mhSJ6AauFTxlxGDmZWEd981oLZy6DOntymIzixePPOgKZvmxTM7OhXGZw4aCadm
+xO0ltBIFkBeEPa8vLDW7
+=w4Q7
 -----END PGP SIGNATURE-----
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
+