bump(sys-fs/e2fsprogs): sync with upstream

This commit is contained in:
Brandon Philips 2013-12-09 17:36:01 -08:00
parent c6d0d0df45
commit 4beb4388ad
6 changed files with 401 additions and 21 deletions

View File

@ -1,6 +1,60 @@
# 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.255 2012/10/07 16:22:17 vapier Exp $
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.270 2013/10/08 12:57:33 chainsaw Exp $
*e2fsprogs-1.42.8 (08 Oct 2013)
08 Oct 2013; Tony Vroon <chainsaw@gentoo.org> +e2fsprogs-1.42.8.ebuild:
Version bump, as requested by Laurent Bachelier in bug #476670. Stability &
safety fixes, including the patch for bug #467986 being applied upstream.
20 May 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for s390, wrt bug #467008
07 May 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for ppc64, wrt bug #467008
07 May 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for ia64, wrt bug #467008
05 May 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for alpha, wrt bug #467008
05 May 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for arm, wrt bug #467008
04 May 2013; Mike Frysinger <vapier@gentoo.org>
+files/e2fsprogs-1.42.7-libext2fs-fix-return-value.patch,
e2fsprogs-1.42.7.ebuild:
Fix return value in gen_bitmap64.c that breaks w/clang #467986 by Vicente
Olivert Riera.
01 May 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for sh, wrt bug #467008
26 Apr 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for ppc, wrt bug #467008
26 Apr 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for sparc, wrt bug #467008
25 Apr 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for x86, wrt bug #467008
25 Apr 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for amd64, wrt bug #467008
25 Apr 2013; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.42.7.ebuild:
Stable for HPPA (bug #467008).
*e2fsprogs-1.42.7 (07 Mar 2013)
07 Mar 2013; Lars Wendler <polynomial-c@gentoo.org> +e2fsprogs-1.42.7.ebuild:
Non-maintainer commit: Version bump with kind permission from Chainsaw (bug
#454532).
22 Feb 2013; Zac Medico <zmedico@gentoo.org> e2fsprogs-1.42.6.ebuild:
Add ~arm-linux keyword.
*e2fsprogs-1.42.6 (07 Oct 2012)

View File

@ -19,6 +19,7 @@ AUX e2fsprogs-1.42.1-libext2fs-gettimeofday.patch 988 SHA256 a445e3e2806d11d8571
AUX e2fsprogs-1.42.3-quota-time.patch 787 SHA256 75f9d148d7c7f5debfac78873f275b4d017b390b86c5dc5996ade784d622d19b SHA512 6a87f327de653af6998783ff3bd4401125ea5149b1f29821a557e613b23731db9d367c47e02d6324ad156494381a703f17d37c45ad370d10313fd292ce91aa25 WHIRLPOOL 0ac096a266f5f9d3852d31ed3fb83eb8b15752f4f8974b33816b10a3c7e615eca41f0c171aeeb56d33ca09e3ec2a0ef15a9457d1fe7d51c8b9be068fd2cf58a9
AUX e2fsprogs-1.42.3-quotactl.patch 972 SHA256 5a7c22259678de68229cf5f95ab64434f345cc0cb78e291c233353dc6f896276 SHA512 87d69a10eb44036727d9cf370ed64cb2bf678f4dc14c8d168bc401dcd4332da1409b0afe65ba5a29221aeeab9403bbe3f53dbe60a205ab6ce6cdeaf84ad1afe2 WHIRLPOOL 01044a1dc776f15a3c465f8b320f31e6515e331e436ec85122ab31f9f1997b2d826aaa1bc65c1328a9cdaac37a515bd68bef741c1a08cee0df2f4605b2844473
AUX e2fsprogs-1.42.5-ldflags.patch 1812 SHA256 909210a62600b71c1b1e6ae96b69cf9bbde72d7ac756a4ba61a4e8a22d4d9e82 SHA512 8f779e48049c9c9b93d5501d7d896db16dc5e6b8dddd1a43cb688ae7fa30b3eb2866c77efd7ddf43549b57a752be171c3e75b3774cbef1c8b62dff4769e298ce WHIRLPOOL 776fac0500f7b7dde2962ccebdcfb81b152c5b318f07d9a67c6fcd2f7cf009231bcfc48b7857c24de5bb26351f58c9c0a7829adb92e81a92144afc33deb122a2
AUX e2fsprogs-1.42.7-libext2fs-fix-return-value.patch 1082 SHA256 8cabc57993ef8c03636a645c1415db7ed0e56a24cca261dae2aec5be91940940 SHA512 f2874dcccfdbd4604b178920e839fe66d63a5d3f433d5bacf0ccfbbcbc0c64eced2a861c7e024fcfaf86d15f6ef6e12edeb27af1b4eb8670ad0b9281e563e472 WHIRLPOOL c74b28d1351c8309398704a22c4dec167a3a9569da293e04198171eba637e846e8f3a3073d571ffc2f985e4ee23ad03a48ed55c3f6da7d20cd063187ae9ab05c
AUX fsck_ext2fs.8 3806 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0 SHA512 eacd1968267f320587e01f75a66ceaa5a9b899f368686df893b6335c25ce8f304ebb5852df6f1b22a125642720ab110fc3b0878bc3560c628e8beb3a4583ef08 WHIRLPOOL e8343c2ae959075b043998894486fa5a33d36e339e511ae22102b60c2c482900d73f3322dd2b8daf91b5009b3da0639aa192d3ff1183d31db748a1143af97a94
AUX fsck_ext2fs.c 2797 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22 SHA512 525c88a3dd9178ef2dca056db9226a2bebf537b9a333cce32f2ef82d6d7a6a56a59dfc2ebf9aa3e891d9690fde13588cf619f89d6b806405810de5dcfcf08040 WHIRLPOOL d71a13f80694a39ae2faf4fafaaf0ce342a0963ca2fb5b4bce279c9a9816139fedeefb5a3c565b6c6829a237e39b7e4dcab54aacea8b72fc3f1ab0122c667ab0
DIST e2fsprogs-1.41.12.tar.gz 4496194 SHA256 9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20 SHA512 9ca618ae21574cf25e9249b445cc8e89a4ddc9d717ba650af084979f95771e42026395148d7f38a9489402a81a8fbeb60524eb9cf8e9eec3b309fee7e6469bab WHIRLPOOL 24faf2a8cb8292f588d69f3e94c606df51fb16d05368ca3444b22472a613368809b3ecad6e519b2010753431da371e9d21eaf08e63c3d22fa5d107681de5c28a
@ -29,6 +30,8 @@ DIST e2fsprogs-1.42.3.tar.gz 5817248 SHA256 ad6a41be876fab94c2bd5d10f7a0871a5601
DIST e2fsprogs-1.42.4.tar.gz 5873284 SHA256 3946f347842a7b892b23476e231da21e572f9db828cb02a38bc57beb25db905e SHA512 2392e52b206775e7b799d53febb42eb351ccaee2435ab0bc456b4953468e6309d19019059d83aa1c0162b8342fc566072abd39f88f37adf0a246025bf767fa01 WHIRLPOOL aaccb3116d9e01d404ef1761e6c96f4f0faec63e0107f1535bbd88bdbab18faa35083d0fdd2e9d11d73dd8a864c43485f2d0f5a663115d7b8e6083c4a85651d7
DIST e2fsprogs-1.42.5.tar.gz 5918892 SHA256 76edaad8eb7464356e1317d60eb19952728091dad358f1f939239874cc1871ce SHA512 536fa81071c828ae62b2238a33fa7a60d0a731ef7f4b51022e99d50cf4946509b4dd8d94b5c200759c69895879ac985587b40010af4282ff5196193c9926274f WHIRLPOOL a8a2c5869ea9db8df8a5942c42c4d9a4994a58e589d8831598cfa66db2e440b56aa535516bbe8a2a585309d2abd8f4c27f72e77ea647f46ad7d3825207b932ae
DIST e2fsprogs-1.42.6.tar.gz 5920183 SHA256 726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5 SHA512 365178e2fc7cbb0e85da23dcfdc33c43c225640573e3d44c135193391985fe0c1263bac1f074ddba9668859d4522dbff1c6584bc8d380d2879c1e3d8c6f04acb WHIRLPOOL 0c2a775104b1accc1ee7d501d402411bcb7fffd96f1bdd8323dcee404c9fdcfee1d4e70525fcd86e2b1b48ca2d085dc1e9b85e0d99aa9478c4c5adad67a661c8
DIST e2fsprogs-1.42.7.tar.gz 5981006 SHA256 dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 SHA512 954dbb832c2614d20cfaa5233033b469f16bf96612cf25074a66da79a5b3abf5eb1b340781e351bde06daf13bbbf5db4643774858aa494b8a8394ea742b6f07b WHIRLPOOL dd48dd13acb485eb8b8646bf4198e45e3ad8e8c6bd53b8186011a1cd2ee4a8ae7db75b6de982fd0d2f9d252f480645bd882cc95d76e614bd8bc10a36755d679c
DIST e2fsprogs-1.42.8.tar.gz 5990116 SHA256 b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97 SHA512 69447105cbfec6099a8b7686d7cb8f4727d8c7c3f438acd0ec065ece70c225ce2c5e72e22ba16d88ef6dac81112b7571083d0cadd2fd1c82415c959ae632e61c WHIRLPOOL fa4b4ea66c41778364ef29589ce76951b22b22fa704b47904d754584966082c3520d9bba93271a4e393018d5f724379a771f189b70b995a10e301ce86b452b07
DIST e2fsprogs-1.42.tar.gz 5709827 SHA256 55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46 SHA512 4db3d59187ff31d4d8e1f2b355fcba5dd2e60343f759b41a02545bb3aedc50ab079e21bf15240208442a1f6192e420ef391ccb9f20690f5f19d37b6fdb6f15c5 WHIRLPOOL d01a58e2c3cb653694f13033fc22256823ab4d0b9f39f626652d29b804b7e7d33efd76a3c640dd8c15e45e619d0c977611ef0271cfe78363b677f5efae6d501a
EBUILD e2fsprogs-1.41.12-r1.ebuild 4301 SHA256 c521fff426f2e36a898023bfdb3b93425f1acb3a4fddcd06f3330afe6c4896b3 SHA512 aca89df269e8601779b67c0853b9885addf143d05cfad3524d0ef9c90db42aa3f1f8e4b04862ad77de57868fc26b392f00cecc26a3a4a6af8269e2ada2552e97 WHIRLPOOL bb12236cb8d6483f0817eee7198c9fbcb93484287fa49bc0f878726b9797c2d719093992a9e03d340922d7850e4ca1e6af73b5f276e0eb462679373e41a95630
EBUILD e2fsprogs-1.41.12.ebuild 3899 SHA256 c3d88a35d192cb544a41959f6fd9061bee699e0285775adf77a060d2b664f92a SHA512 e828b606c70c92c9706777ab02bad24b79599129395c4e3b098b38210c82254611f1cfebaadb0903163b71614c031d6fe6589ae007ba19a6428a27a850bcb54e WHIRLPOOL ee175a7a95eba313563cc9a9f1368b1c850f6f2631de17f02a06415d03bcf0bd87d1c13d69b547e96e2d04b5cfe169776e7233c78c103ef07948a58b84766001
@ -38,24 +41,16 @@ EBUILD e2fsprogs-1.42.1.ebuild 4677 SHA256 1a0cce002b78b2cd1c93947b1cfde1b184b95
EBUILD e2fsprogs-1.42.3.ebuild 4431 SHA256 c7d6a2dd48218a10866f32c39a2cb7840c9846d9dafe9691c2f5c7f6e7947f9c SHA512 498c6f720b1bc745a02c3fbbe6df09357a4ba1cff45c78b1c8a2c1015aac7f0f9a2b07f4cb3b7169b50327d42b247897a533af3f60369fa8ddad4d74eb353e6b WHIRLPOOL 74a3ff4e1e4446bf33de5b13b6a1d9807a87be51661aa4699705dd4d801611882f64cf67fed5f25713861510baa8b4497d4b15a130e113af93ac9f9928d9e0cf
EBUILD e2fsprogs-1.42.4.ebuild 4329 SHA256 f9840190bdf5fd375a75032936629ac8bbe37e0ae5dbc085948d37158561c7f8 SHA512 f48129d0693fb8a553a07186aa68d9f6a0781995dab0b6a587fcf083e1adf84375d1dd125b81bcc02ee77985bc389ae04d0be122b1b82a84d2423cd19cb51514 WHIRLPOOL 35105adf9d46ff9496ec8867301b77e14b01cf01e4829e6fd010838d2ec44baf2f87252544acf5a1eec9fff84076d361dfc6a44cf630095c28ce035de27a3878
EBUILD e2fsprogs-1.42.5.ebuild 4327 SHA256 49c96b22e90e135da3df1f53a1fa645db6535fe0bac81a5094b275ddc9497fec SHA512 fc24fe21824977515276b1f3bcb9b43e2b55f8e728e8b583ef596e84ff8b053601d341dddc434290dfa707ddd5602df1489e88e541a5384d7f77f80e89cb1287 WHIRLPOOL 9d9046025e25b1cfb5717e0e06a998458e27e3d4d8150c623ef23470e942a6bbbf2fc054227736fbc8e7868cb7254dcbe6035ce121b15c51ffd00c340ccbd827
EBUILD e2fsprogs-1.42.6.ebuild 4270 SHA256 4074263272bcd406dcd6391d42668ad5c750deb19d165b59fae6dc5af022a8f8 SHA512 d31baad91092711b314655e9d8661d8e4d525d4e34692914458a93c3999d3c66e5d2b2e5376dec63c05396059b6ca3761e48928e786bb68efa8513e813aa641a WHIRLPOOL cbd7b42a5e84869b446f49eecc3beab33db98ca2752d6ab94e72b69a62ac6061bde31c8d0300f54fd18384af349e1288391a58e09cb531345a38a73063d1e5cf
EBUILD e2fsprogs-1.42.6.ebuild 4282 SHA256 83377430341860f723ee9268df9f4cc700d14c32cb86b1e7d7188992e1105a94 SHA512 1e44fe9d158204224acadd21b4d405d35ac9410b56d2cbee10e7b0b5670e31a625168b9c4d0dcd55e1af9bdeb6128719d2acdfc365f0e58db94c49823c454ce1 WHIRLPOOL 316a8b4d15b55529881a495fc6f921dcb0841e8e3b5691c583eb35fe3ab7ea4c9564842601731734a09ab0ccac7da30d4389ed1723504415ceef705c8be9feb3
EBUILD e2fsprogs-1.42.7.ebuild 4344 SHA256 571bc0b822ccfbea6391752d75a42f4d90672591c3b6e54b876a9d6b5e677ac9 SHA512 ed4868b7115374bb898b636fc935190fee6b0c55e4077f588eaca85db007d06079a626ac44a47f2068928c45c9ce7b38e21d02bdbe86d3a44e19d33a62811f8e WHIRLPOOL 483a549738a46b7eb422cb5f9faac6e72037702ef54bf0cba713b7ffadacb2cf76bde76ee930b63eaef77bbe3510b0b3db0b76bf8660a16fb0cb07232ac36d34
EBUILD e2fsprogs-1.42.8.ebuild 4283 SHA256 3f0d179fd3579dfc089ea5805cdcf8da1b9c19097a5a1d6c398183f9a5f136ef SHA512 44e5c0bf8169b21962a7d60921564f5bf995f14d46347cc0bfb7f134706d1e0139c29c9cd28de2971aa20e0021211da62977a1f7e35cd991d7aae43487ed980d WHIRLPOOL 1a710a3bb41d53a97c544d6d0b71cf705ea0807b9be3059ca186eb4632b577ce38aac62bac53741385fe9dfb706501e5a90a6ad7616047dc9510ecfd2fca0fe9
EBUILD e2fsprogs-1.42.ebuild 4523 SHA256 aebb33bbb1d0f0b27e83503ac1fb8dc83aea140d2af77b34aece290ea5aa33b7 SHA512 0a2e7c9bb1942a3e754dfb5645ab84a54529f7e3fddc2147ca7ac28652110bcb35f06208c40d9ae301bd0647b6e817589f5f129fdcb56c2e75134dc478d1a7ce WHIRLPOOL 42ddae6fcd1b1bfcbdfc2a261d07925ef5a18d8903f1738f5ef6e8216befe97e1d20a3351a81cfaa18a44a24d299e72d32acb3216d058337443364a62dc77348
MISC ChangeLog 38074 SHA256 f7018812dd3ac74b670299b62e7c0514a557133ba59362e84864e9e0933d7685 SHA512 c666564bf46790a97f1a685b043936010dd1c2e87df51f11414160fa199b4c74bc3f6f13a05a62d65fd10595b791745acc928085c85292efb8e17526381f88b9 WHIRLPOOL 96583959684f85543845105a39e07910b9f0e6fdfb69a6dc26223d90032627c0e739dd4c832d0b79194805184e78c4aa92e45abd9018c19c5d029d5834467716
MISC ChangeLog 40077 SHA256 91b6dd7c2076a6d5ab6f4c4dc64e2bdc6cd07a9c3c324b4ac2939f09f486fb05 SHA512 3162cc491463478438478c272a025328e55ef986917c7ed25595b70403d6edfe72bec16aba15a488d9545037c6176199bf554891f3eb8810531f92481fb05b88 WHIRLPOOL c6f19e14f6294b81670d6e279610e21b81677215ffe19d5b22af83a74f820669450edef1a541b3333d1c12a113ed7a185a4b5347c4bd88d74f3ec8dba560125c
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Version: GnuPG v2.0.21 (GNU/Linux)
iQIcBAEBCAAGBQJQcaxJAAoJELEHsLL7fEFWZNAP/RDnDx7H2gNRid1h9sJgyQBU
XeR2HE06zgVcsYWMBT96hd7kDCywbtpxC9GtlIj8pE6nR6b1a483BbmMTs3vbhj/
RQu6uMdyqQRxYz2zXim6QHVEr22w/KaptIW9srCNbIfEZzkoVsYJgRNhptd5tIfu
DIuoV78qaVQeFGHTobDUju3dq65v52/lE9nIQ8CZ/ddgtnvu2VM+3BxqumwDjrfQ
kng4ZekvzLoGxTUbIFfTncX6Zkgl2n7+cKV8ViVQmYZyDJ4Tt8dMgVNoIygacKpI
GXBr9Kw/g14poap9lwjwQhagg/NtQjcecY3NRJms1pHdxVEX0IsOrELYwijj/qfG
30gIKO5n5cJ09PRwBjEwtwI/uzmq0EyQxPLuwvXQAhfass2b6AItGg3TDiuALh51
rMEEC4csCfKqdDINcLcZOXALuCJP/4esLgHdqg0ZACOO+hPLF7fnyt/Ir0RzYQBH
JJ2fyZuNz3GsuGzAAOl5wiZ39avcEmC8G4GC6e04ztYw2eR6zK4w++EXtVV++Ojv
Y0Dr7c3nkQ69AF8I1YHaWgbyriBFQXHoKhz2aox17N+n1tG4YcGnNqKqtDnpX//J
7jjucsd8JZP2/wjnmCNkqG0H1lvbkj6KNf8cKDk7I0dpE1SiuHgc/PtRgW7UfnMk
gp50ti7loVJ8RfR607uM
=JQWP
iEYEAREIAAYFAlJUAT8ACgkQp5vW4rUFj5osNACeLq6qrKKTWZruiSdd7hZrnHay
SVUAoLqFV9kiwr5YG0n2cSIIRyDIbCif
=BG/t
-----END PGP SIGNATURE-----

View File

@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild,v 1.1 2012/10/07 16:22:17 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild,v 1.2 2013/02/22 15:43:21 zmedico Exp $
EAPI=3
@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}

View File

@ -0,0 +1,150 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.7.ebuild,v 1.13 2013/05/20 17:42:41 ago Exp $
EAPI=3
case ${PV} in
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
*) UP_PV=${PV} ;;
esac
inherit eutils flag-o-matic multilib toolchain-funcs
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
>=sys-apps/util-linux-2.16
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig
sys-apps/texinfo"
S=${WORKDIR}/${P%_pre*}
pkg_setup() {
if [[ ! -e ${EROOT}/etc/mtab ]] ; then
# add some crap to deal with missing /etc/mtab #217719
ewarn "No /etc/mtab file, creating one temporarily"
echo "${PN} crap for src_test" > "${EROOT}"/etc/mtab
fi
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
epatch "${FILESDIR}"/${PN}-1.42.7-libext2fs-fix-return-value.patch #467986
if [[ ${CHOST} == *-mint* ]] ; then
epatch "${FILESDIR}"/${PN}-1.41-mint.patch
epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
fi
# blargh ... trick e2fsprogs into using e2fsprogs-libs
rm -rf doc
sed -i -r \
-e 's:@LIBINTL@:@LTLIBINTL@:' \
-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
MCONFIG.in || die "muck libs" #122368
sed -i -r \
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
Makefile.in || die "remove subdirs"
# Avoid rebuild
touch lib/ss/ss_err.h
}
src_configure() {
# Keep the package from doing silly things #261411
export VARTEXFONTS=${T}/fonts
# needs open64() prototypes and friends
append-cppflags -D_GNU_SOURCE
# We want to use the "bsd" libraries while building on Darwin, but while
# building on other Gentoo/*BSD we prefer elf-naming scheme.
local libtype
case ${CHOST} in
*-darwin*) libtype=--enable-bsd-shlibs ;;
*-mint*) libtype= ;;
*) libtype=--enable-elf-shlibs ;;
esac
ac_cv_path_LDCONFIG=: \
econf \
--with-root-prefix="${EPREFIX}/" \
--enable-symlink-install \
${libtype} \
$(tc-has-tls || echo --disable-tls) \
--without-included-gettext \
$(use_enable nls) \
--disable-libblkid \
--disable-libuuid \
--disable-quota \
--disable-fsck \
--disable-uuidd
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
eerror "INTL sanity check failed, aborting build."
eerror "Please post your ${S}/config.log file as an"
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
die "Preventing included intl cruft from building"
fi
}
src_compile() {
emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
# Build the FreeBSD helper
if use elibc_FreeBSD ; then
cp "${FILESDIR}"/fsck_ext2fs.c .
emake fsck_ext2fs || die
fi
}
pkg_preinst() {
if [[ -r ${EROOT}/etc/mtab ]] ; then
if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
rm -f "${EROOT}"/etc/mtab
fi
fi
}
src_install() {
# need to set root_libdir= manually as any --libdir options in the
# econf above (i.e. multilib) will screw up the default #276465
emake \
STRIP=: \
root_libdir="${EPREFIX}/usr/$(get_libdir)" \
DESTDIR="${D}" \
install install-libs || die
dodoc README RELEASE-NOTES
insinto /etc
doins "${FILESDIR}"/e2fsck.conf || die
# Move shared libraries to /lib/, install static libraries to
# /usr/lib/, and install linker scripts to /usr/lib/.
gen_usr_ldscript -a e2p ext2fs
# configure doesn't have an option to disable static libs :/
use static-libs || find "${D}" -name '*.a' -delete
if use elibc_FreeBSD ; then
# Install helpers for us
into /
dosbin "${S}"/fsck_ext2fs || die
doman "${FILESDIR}"/fsck_ext2fs.8 || die
# filefrag is linux only
rm \
"${ED}"/usr/sbin/filefrag \
"${ED}"/usr/share/man/man8/filefrag.8 || die
fi
}

View File

@ -0,0 +1,149 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.8.ebuild,v 1.1 2013/10/08 12:57:33 chainsaw Exp $
EAPI=3
case ${PV} in
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
*) UP_PV=${PV} ;;
esac
inherit eutils flag-o-matic multilib toolchain-funcs
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
>=sys-apps/util-linux-2.16
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig
sys-apps/texinfo"
S=${WORKDIR}/${P%_pre*}
pkg_setup() {
if [[ ! -e ${EROOT}/etc/mtab ]] ; then
# add some crap to deal with missing /etc/mtab #217719
ewarn "No /etc/mtab file, creating one temporarily"
echo "${PN} crap for src_test" > "${EROOT}"/etc/mtab
fi
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
if [[ ${CHOST} == *-mint* ]] ; then
epatch "${FILESDIR}"/${PN}-1.41-mint.patch
epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
fi
# blargh ... trick e2fsprogs into using e2fsprogs-libs
rm -rf doc
sed -i -r \
-e 's:@LIBINTL@:@LTLIBINTL@:' \
-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
MCONFIG.in || die "muck libs" #122368
sed -i -r \
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
Makefile.in || die "remove subdirs"
# Avoid rebuild
touch lib/ss/ss_err.h
}
src_configure() {
# Keep the package from doing silly things #261411
export VARTEXFONTS=${T}/fonts
# needs open64() prototypes and friends
append-cppflags -D_GNU_SOURCE
# We want to use the "bsd" libraries while building on Darwin, but while
# building on other Gentoo/*BSD we prefer elf-naming scheme.
local libtype
case ${CHOST} in
*-darwin*) libtype=--enable-bsd-shlibs ;;
*-mint*) libtype= ;;
*) libtype=--enable-elf-shlibs ;;
esac
ac_cv_path_LDCONFIG=: \
econf \
--with-root-prefix="${EPREFIX}/" \
--enable-symlink-install \
${libtype} \
$(tc-has-tls || echo --disable-tls) \
--without-included-gettext \
$(use_enable nls) \
--disable-libblkid \
--disable-libuuid \
--disable-quota \
--disable-fsck \
--disable-uuidd
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
eerror "INTL sanity check failed, aborting build."
eerror "Please post your ${S}/config.log file as an"
eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
die "Preventing included intl cruft from building"
fi
}
src_compile() {
emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
# Build the FreeBSD helper
if use elibc_FreeBSD ; then
cp "${FILESDIR}"/fsck_ext2fs.c .
emake fsck_ext2fs || die
fi
}
pkg_preinst() {
if [[ -r ${EROOT}/etc/mtab ]] ; then
if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
rm -f "${EROOT}"/etc/mtab
fi
fi
}
src_install() {
# need to set root_libdir= manually as any --libdir options in the
# econf above (i.e. multilib) will screw up the default #276465
emake \
STRIP=: \
root_libdir="${EPREFIX}/usr/$(get_libdir)" \
DESTDIR="${D}" \
install install-libs || die
dodoc README RELEASE-NOTES
insinto /etc
doins "${FILESDIR}"/e2fsck.conf || die
# Move shared libraries to /lib/, install static libraries to
# /usr/lib/, and install linker scripts to /usr/lib/.
gen_usr_ldscript -a e2p ext2fs
# configure doesn't have an option to disable static libs :/
use static-libs || find "${D}" -name '*.a' -delete
if use elibc_FreeBSD ; then
# Install helpers for us
into /
dosbin "${S}"/fsck_ext2fs || die
doman "${FILESDIR}"/fsck_ext2fs.8 || die
# filefrag is linux only
rm \
"${ED}"/usr/sbin/filefrag \
"${ED}"/usr/share/man/man8/filefrag.8 || die
fi
}

View File

@ -0,0 +1,32 @@
From 266eb87990025e82a8884e30993ce93c00d19db3 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 4 May 2013 01:00:58 -0400
Subject: [PATCH] libext2fs: fix return value
The ext2fs_test_block_bitmap_range2 func is not a void, so make sure we
return a value. I picked EINVAL as it looks like what other things in
this func use.
URL: http://bugs.gentoo.org/467986
Reported-by: Vicente Olivert Riera <vincent@gentoo.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
lib/ext2fs/gen_bitmap64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/ext2fs/gen_bitmap64.c b/lib/ext2fs/gen_bitmap64.c
index 42a97d4..44ac499 100644
--- a/lib/ext2fs/gen_bitmap64.c
+++ b/lib/ext2fs/gen_bitmap64.c
@@ -658,7 +658,7 @@ int ext2fs_test_block_bitmap_range2(ext2fs_block_bitmap bmap,
if ((block < bmap->start) || (block+num-1 > bmap->end)) {
ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST, block,
bmap->description);
- return;
+ return EINVAL;
}
return bmap->bitmap_ops->test_clear_bmap_extent(bmap, block, num);
--
1.8.2.1