diff options
-rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 799 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.40.11.ebuild | 136 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.40.9.ebuild | 130 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild | 133 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild | 131 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.41.4.ebuild | 128 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch | 26 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch | 72 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch | 11 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.40.5-libintl.patch | 15 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.41.0-makefile.patch | 87 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.41.2-makefile.patch | 80 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.41.3-tune2fs-opt.patch | 99 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/fsck_ext2fs.8 | 96 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/fsck_ext2fs.c | 147 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/verbose.diff | 22 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/metadata.xml | 5 |
17 files changed, 2117 insertions, 0 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog new file mode 100644 index 00000000..92c68f1d --- /dev/null +++ b/sys-fs/e2fsprogs/ChangeLog @@ -0,0 +1,799 @@ +# ChangeLog for sys-fs/e2fsprogs +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.184 2009/04/05 03:15:53 vapier Exp $ + + 05 Apr 2009; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.41.4.ebuild: + Move LDCONFIG/STRIP disabling to src_install #264469 by Nick Fortino. + + 17 Mar 2009; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.41.3-r1.ebuild: + alpha stable + + 14 Feb 2009; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.41.3-r1.ebuild: + arm/ia64/s390/sh/sparc/x86 stable wrt #258527 + + 14 Feb 2009; Jeremy Olexa <darkside@gentoo.org> + e2fsprogs-1.41.3-r1.ebuild: + amd64 stable, bug 258527 + + 12 Feb 2009; Brent Baude <ranger@gentoo.org> e2fsprogs-1.41.3-r1.ebuild: + stable ppc64, bug 258527 + + 12 Feb 2009; nixnut <nixnut@gentoo.org> e2fsprogs-1.41.3-r1.ebuild: + ppc stable #258527 + + 11 Feb 2009; Tobias Klausmann <klausman@gentoo.org> ChangeLog: + Stable on alpha, bug #258527 + + 11 Feb 2009; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.41.3-r1.ebuild: + Stable for HPPA (bug #258527). + +*e2fsprogs-1.41.4 (28 Jan 2009) + + 28 Jan 2009; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.41.4.ebuild: + Version bump. + +*e2fsprogs-1.41.3-r1 (04 Jan 2009) + + 04 Jan 2009; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.41.3-tune2fs-opt.patch, +e2fsprogs-1.41.3-r1.ebuild: + Add fix from upstream for slow tune2fs usage #253162 by candrews. + + 01 Jan 2009; Guy Martin <gmsoft@gentoo.org> e2fsprogs-1.41.3.ebuild: + hppa stable, #251808 + + 30 Dec 2008; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.41.3.ebuild: + Create temp /etc/mtab for random test failures #217719. + + 29 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> + e2fsprogs-1.41.3.ebuild: + ppc stable, bug #251808 + + 29 Dec 2008; Brent Baude <ranger@gentoo.org> e2fsprogs-1.41.3.ebuild: + Marking e2fsprogs-1.41.3 ppc64 for bug 251808 + + 29 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> + e2fsprogs-1.41.3.ebuild: + Stable on sparc, bug #251808 + + 27 Dec 2008; Jeremy Olexa <darkside@gentoo.org> e2fsprogs-1.41.3.ebuild: + amd64 stable, bug 251808 + + 26 Dec 2008; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.41.3.ebuild: + ia64/x86 stable wrt #251808 + + 26 Dec 2008; Tobias Klausmann <klausman@gentoo.org> + e2fsprogs-1.41.3.ebuild: + Stable on alpha, bug #251808 + + 08 Nov 2008; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.41.2.ebuild: + alpha/ia64 stable wrt #244511 + + 08 Nov 2008; nixnut <nixnut@gentoo.org> e2fsprogs-1.41.2.ebuild: + Stable on ppc wrt bug 244511 + + 28 Oct 2008; Brent Baude <ranger@gentoo.org> e2fsprogs-1.41.2.ebuild: + Marking e2fsprogs-1.41.2 ppc64 for bug 242740 + + 27 Oct 2008; Markus Meier <maekke@gentoo.org> e2fsprogs-1.41.2.ebuild: + amd64/x86 stable, bug #244511 + + 27 Oct 2008; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.41.2.ebuild: + Stable for HPPA (bug #244511). + +*e2fsprogs-1.41.3 (18 Oct 2008) + + 18 Oct 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.41.3.ebuild: + Version bump. + +*e2fsprogs-1.41.2 (02 Oct 2008) + + 02 Oct 2008; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.41.2-makefile.patch, +e2fsprogs-1.41.2.ebuild: + Version bump. + +*e2fsprogs-1.41.1 (01 Sep 2008) + + 01 Sep 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.41.1.ebuild: + Version bump. + + 16 Aug 2008; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.41.0.ebuild: + Drop USE=static since it just confuses people #232115 #178718. + + 16 Aug 2008; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.41.0.ebuild: + Punt the doc dir since the info files are installed by e2fsprogs-libs + #234885 by Lars Strojny. + +*e2fsprogs-1.41.0 (16 Aug 2008) + + 16 Aug 2008; Mike Frysinger <vapier@gentoo.org> + files/e2fsprogs-1.40-fbsd.patch, +files/e2fsprogs-1.41.0-makefile.patch, + +e2fsprogs-1.41.0.ebuild: + Version bump. + +*e2fsprogs-1.40.11 (18 Jun 2008) + + 18 Jun 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.11.ebuild: + Version bump. + + 14 Jun 2008; Samuli Suominen <drac@gentoo.org> e2fsprogs-1.40.10.ebuild: + Prevent sandbox violation. addwrite /var/cache/fonts; Font + \circle=lcircle10 not loadable: Metric (TFM) file not found. kpathsea: + Running mktextfm lcircle10. ACCESS DENIED mkdir: /var/cache/fonts/tfm. + VARTEXFONTS doesn't seem to help. + + 14 Jun 2008; Christoph Mende <angelos@gentoo.org> e2fsprogs-1.40.9.ebuild: + Stable on amd64, bug #225239 + + 12 Jun 2008; Tobias Klausmann <klausman@gentoo.org> + e2fsprogs-1.40.9.ebuild: + Stable on alpha, bug #225239, thanks to Matt Turner for testing + + 09 Jun 2008; Brent Baude <ranger@gentoo.org> e2fsprogs-1.40.9.ebuild: + Marking e2fsprogs-1.40.9 ppc64 for bug 225239 + + 09 Jun 2008; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.40.9.ebuild: + ia64/sparc/x86 stable wrt #225239 + + 08 Jun 2008; nixnut <nixnut@gentoo.org> e2fsprogs-1.40.9.ebuild: + Stable on ppc wrt bug 225239 + +*e2fsprogs-1.40.10 (07 Jun 2008) + + 07 Jun 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.10.ebuild: + Version bump #225161 by Krzysztof Olędzki and rework ldscripts. + + 07 Jun 2008; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.40.9.ebuild: + Stable for HPPA (bug #225239). + + 26 May 2008; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.40.8.ebuild: + ia64 stable wrt #213588 + + 01 May 2008; Markus Meier <maekke@gentoo.org> e2fsprogs-1.40.8.ebuild: + amd64/x86 stable, bug #213588 + + 30 Apr 2008; Tobias Klausmann <klausman@gentoo.org> + e2fsprogs-1.40.8.ebuild: + Stable on alpha, bug #213588 + + 27 Apr 2008; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.40.8.ebuild: + Stable for HPPA (bug #213588). + +*e2fsprogs-1.40.9 (27 Apr 2008) + + 27 Apr 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.9.ebuild: + Version bump. + + 28 Mar 2008; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.40.6.ebuild: + Stable for HPPA too. + + 17 Mar 2008; Christian Heim <phreak@gentoo.org> e2fsprogs-1.40.4.ebuild: + e2fsprogs-1.40.4 also needs tls disabled on uClibc. + + 16 Mar 2008; Samuli Suominen <drac@gentoo.org> e2fsprogs-1.40.6.ebuild: + amd64 stable + + 16 Mar 2008; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.40.6.ebuild: + alpha/ia64/sparc/x86 stable + +*e2fsprogs-1.40.8 (14 Mar 2008) + + 14 Mar 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.8.ebuild: + Version bump. + + 20 Feb 2008; <solar@gentoo.org> e2fsprogs-1.40.5-r1.ebuild, + e2fsprogs-1.40.6.ebuild: + - disable tls with uclibc. bug 204102 Natanael Copa + +*e2fsprogs-1.40.6 (10 Feb 2008) + + 10 Feb 2008; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.6.ebuild: + Version bump. + + 03 Feb 2008; Christoph Mende <angelos@gentoo.org> e2fsprogs-1.40.4.ebuild: + Stable on amd64, bug #207841 + + 31 Jan 2008; nixnut <nixnut@gentoo.org> e2fsprogs-1.40.4.ebuild: + Stable on ppc wrt bug 207841 + + 29 Jan 2008; Brent Baude <ranger@gentoo.org> e2fsprogs-1.40.4.ebuild: + Marking e2fsprogs-1.40.4 ppc64 for bug 207841 + + 28 Jan 2008; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.40.4.ebuild: + Stable for HPPA (bug #207841). + +*e2fsprogs-1.40.5-r1 (28 Jan 2008) + + 28 Jan 2008; Mike Frysinger <vapier@gentoo.org> + +e2fsprogs-1.40.5-r1.ebuild: + Make sure we dont install libss.a as well as pointed out by Jakub. + + 28 Jan 2008; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.40.4.ebuild: + alpha/ia64/sparc/x86 stable wrt #207841 + +*e2fsprogs-1.40.5 (28 Jan 2008) + + 28 Jan 2008; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.40.5-libintl.patch, +e2fsprogs-1.40.5.ebuild: + Version bump. + +*e2fsprogs-1.40.4 (01 Jan 2008) + + 01 Jan 2008; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.40.4-prototypes.patch, files/e2fsprogs-1.40-fbsd.patch, + +e2fsprogs-1.40.4.ebuild: + Version bump. + +*e2fsprogs-1.40.3-r1 (24 Dec 2007) + + 24 Dec 2007; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.40.3-fsck-fuse.patch, +e2fsprogs-1.40.3-r1.ebuild: + Add patch from upstream for fuse syntax which has inline # characters + #195405 by Thorsten Kampe. + + 12 Dec 2007; Brent Baude <ranger@gentoo.org> e2fsprogs-1.40.3.ebuild: + Marking e2fsprogs-1.40.3 ppc64 stable for 201546 + + 10 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org> + e2fsprogs-1.40.3.ebuild: + ppc stable, bug #201546 + + 10 Dec 2007; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.40.3.ebuild: + alpha/ia64/sparc stable wrt security #201546 + + 10 Dec 2007; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.40.3.ebuild: + Stable for HPPA (bug #201546). + + 10 Dec 2007; Andrej Kacian <ticho@gentoo.org> e2fsprogs-1.40.3.ebuild: + Stable on x86, bug #201546. + + 10 Dec 2007; Peter Weller <welp@gentoo.org> e2fsprogs-1.40.3.ebuild: + Stable on amd64; bug 201546 + + 09 Dec 2007; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.40.3.ebuild: + Update dodoc lines #201776 by Arfrever Frehtes Taifersar Arahesis. + +*e2fsprogs-1.40.3 (08 Dec 2007) + + 08 Dec 2007; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.3.ebuild: + Version bump. + + 26 Nov 2007; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.40.2.ebuild: + Stable for HPPA (bug #200192). + + 24 Nov 2007; Samuli Suominen <drac@gentoo.org> e2fsprogs-1.40.2.ebuild: + amd64 stable wrt #200192 + + 19 Nov 2007; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.40.2.ebuild: + Stable on mips. + + 11 Oct 2007; Tom Gall <tgall@gentoo.org> e2fsprogs-1.40.2.ebuild: + stable on ppc64 + + 01 Oct 2007; Christian Birchinger <joker@gentoo.org> + e2fsprogs-1.40.2.ebuild: + Added sparc stable keyword + + 17 Sep 2007; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.40.2.ebuild: + alpha/ia64/x86 stable + + 15 Sep 2007; Roy Marples <uberlord@gentoo.org> +files/fsck_ext2fs.8, + +files/e2fsprogs-1.40-fbsd.patch, +files/fsck_ext2fs.c, + e2fsprogs-1.40.2.ebuild: + Add the fsck_ext2fs helper and man page for FreeBSD and add a patch for + 1.40.2 to work on FreeBSD. + +*e2fsprogs-1.40.2 (14 Jul 2007) + + 14 Jul 2007; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.2.ebuild: + Version bump. + +*e2fsprogs-1.40.1 (09 Jul 2007) + + 09 Jul 2007; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.1.ebuild: + Version bump. + +*e2fsprogs-1.40 (30 Jun 2007) + + 30 Jun 2007; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.40.ebuild: + Version bump. + + 23 Jun 2007; Daniel Drake <dsd@gentoo.org> e2fsprogs-1.39.ebuild, + e2fsprogs-1.39-r1.ebuild, e2fsprogs-1.39-r2.ebuild, + e2fsprogs-1.40_pre20070411.ebuild: + Add BSD to LICENSE due to libuuid licensing (bug #174477) + + 21 Jun 2007; Raúl Porcel <armin76@gentoo.org> e2fsprogs-1.39-r2.ebuild: + alpha stable wrt #176841 + + 25 May 2007; Peter Weller <welp@gentoo.org> + e2fsprogs-1.40_pre20070411.ebuild: + Removed ~x86-fbsd keyword as it fails to build + + 11 May 2007; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.39-r2.ebuild: + Stable on mips, per #176841. + + 06 May 2007; Tobias Scherbaum <dertobi123@gentoo.org> + e2fsprogs-1.39-r2.ebuild: + ppc stable, bug #176841 + +*e2fsprogs-1.40_pre20070411 (05 May 2007) + + 05 May 2007; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.40-libintl.patch, +e2fsprogs-1.40_pre20070411.ebuild: + Version bump #175790 by Hanno Boeck. + + 03 May 2007; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.39-r2.ebuild: + Stable for HPPA (bug #176841). + + 02 May 2007; Andrej Kacian <ticho@gentoo.org> e2fsprogs-1.39-r2.ebuild: + Stable on x86, bug #176841. + + 02 May 2007; Markus Rothe <corsair@gentoo.org> e2fsprogs-1.39-r2.ebuild: + Stable on ppc64; bug #176841 + + 02 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> + e2fsprogs-1.39-r2.ebuild: + Stable on sparc wrt #176841 + + 02 May 2007; Steve Dibb <beandog@gentoo.org> e2fsprogs-1.39-r2.ebuild: + amd64 stable, bug 176841 + +*e2fsprogs-1.39-r2 (24 Mar 2007) + + 24 Mar 2007; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.39-blkid-memleak.patch, +e2fsprogs-1.39-r2.ebuild: + Grab fix from upstream for blkid memleak #171844 by Andrej Filipcic and drop + ext4 support #167562 by Maurice Volaski. + + 26 Jan 2007; Mike Frysinger <vapier@gentoo.org> + files/e2fsprogs-1.39-makefile.patch: + Dont compress info pages #163943 by Ian Abbott. + + 17 Jan 2007; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.39-ext4-prototypes.patch, + +files/e2fsprogs-1.39-util-strptime.patch, e2fsprogs-1.39-r1.ebuild: + Touchup source code. + +*e2fsprogs-1.39-r1 (30 Dec 2006) + + 30 Dec 2006; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.39-r1.ebuild: + Add support for ext4 #156697. + + 10 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> e2fsprogs-1.39.ebuild: + Add ~x86-fbsd keyword + + 11 Nov 2006; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.38-locale.patch, e2fsprogs-1.39.ebuild: + Fix building in some locales #131462 by Andres Toomsalu. + + 09 Sep 2006; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.39-parse-types.patch, e2fsprogs-1.39.ebuild: + Cleanup ugly build code #146903 by throw_away_2002. + +*e2fsprogs-1.39 (01 Aug 2006) + + 01 Aug 2006; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.39-libintl.patch, +files/e2fsprogs-1.39-makefile.patch, + +e2fsprogs-1.39.ebuild: + Version bump #141246 by David Brown. + + 27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest: + Fixing SHA256 digest, pass four + + 29 Apr 2006; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.38-r1.ebuild: + Marked stable on mips. + + 12 Apr 2006; Bryan Østergaard <kloeri@gentoo.org + e2fsprogs-1.38-r1.ebuild: + Stable on alpha, bug 125158. + + 11 Mar 2006; <nixnut@gentoo.org> e2fsprogs-1.38-r1.ebuild: + Stable on ppc. Bug #125158 + + 10 Mar 2006; Torsten Veller <tove@gentoo.org> e2fsprogs-1.38-r1.ebuild: + Stable on x86 (#125158) + + 09 Mar 2006; Patrick McLean <chutzpah@gentoo.org> + e2fsprogs-1.38-r1.ebuild: + Stable on amd64 (bug #125158). + + 06 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> + e2fsprogs-1.38-r1.ebuild: + Stable on sparc wrt #125158 + + 06 Mar 2006; Tom Gall <tgall@gentoo.org> + e2fsprogs-1.38-r1.ebuild: + stable on ppc64, bug #125158 + + 11 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/e2fsprogs-1.38-libintl.patch, e2fsprogs-1.38-r1.ebuild: + Add patch to fix libintl linkage on non-glibc systems. Bug #122368. + + 08 Feb 2006; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.38-tests-locale.patch, e2fsprogs-1.38-r1.ebuild: + Fix running tests in different locales #99766 by Attila Stehr. + +*e2fsprogs-1.38-r1 (19 Dec 2005) + + 19 Dec 2005; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.38-blkid-ext23.patch, + +files/e2fsprogs-1.38-blkid-swsuspend.patch, + +files/e2fsprogs-1.38-vfat-labels.patch, +e2fsprogs-1.38-r1.ebuild: + Add support for parsing of vfat labels #77692 by Evgeniy and some other + upstream fixes. + + 08 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> e2fsprogs-1.38.ebuild: + Stable on mips. + + 02 Sep 2005; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.38.ebuild: + Add support for FreeBSD #103388 by Diego Pettenò + + 28 Aug 2005; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.35-r1.ebuild, + e2fsprogs-1.36.ebuild, e2fsprogs-1.36-r2.ebuild, e2fsprogs-1.37.ebuild, + e2fsprogs-1.37-r1.ebuild, e2fsprogs-1.38.ebuild: + Punt USE=diet. + + 23 Aug 2005; Aron Griffis <agriffis@gentoo.org> e2fsprogs-1.38.ebuild: + stable on ia64 + + 07 Aug 2005; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.38-disconnected-inodes.patch, e2fsprogs-1.38.ebuild: + Add patch from upstream to fix segfault #91751 by Christopher Cowart / Ben + Schwartz. + + 25 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> e2fsprogs-1.38.ebuild: + Stable on hppa. + + 20 Jul 2005; Markus Rothe <corsair@gentoo.org> e2fsprogs-1.38.ebuild: + Stable on ppc64 + + 19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> e2fsprogs-1.38.ebuild: + Stable on alpha. + + 18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> e2fsprogs-1.38.ebuild: + Stable on sparc + + 18 Jul 2005; Joseph Jezak <josejx@gentoo.org> e2fsprogs-1.38.ebuild: + Marked ppc stable. + +*e2fsprogs-1.38 (09 Jul 2005) + + 09 Jul 2005; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.38.ebuild: + Version bump #98332 by Joshua. + + 08 Jul 2005; Markus Rothe <corsair@gentoo.org> e2fsprogs-1.37-r1.ebuild: + Stable on ppc64 + + 29 Jun 2005; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.37-r1.ebuild: + Marked stable on mips. + + 28 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> + e2fsprogs-1.37-r1.ebuild: + Stable on alpha. + + 27 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> + e2fsprogs-1.37-r1.ebuild: + Stable on hppa. + + 27 Jun 2005; Seemant Kulleen <seemant@gentoo.org> + e2fsprogs-1.37-r1.ebuild: + stable on x86 and amd64 + + 24 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> + e2fsprogs-1.37-r1.ebuild: + Stable on sparc wrt #96727 + + 22 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> + e2fsprogs-1.37-r1.ebuild: + Stable on ppc (#96727). + + 29 May 2005; <solar@gentoo.org> e2fsprogs-1.37.ebuild: + - update sys-fs/e2fsprogs to use libc expanded variable elibc_uclibc vs uclibc + so USE=-* works + + 23 May 2005; Herbie Hopkins <herbs@gentoo.org> e2fsprogs-1.37-r1.ebuild: + More get_libdir-ization, fixes compilation on amd64s no-lib32 profile. + + 30 Apr 2005; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.37-r1.ebuild: + Remove USE=diet since it causes stupid problems #81096. + + 27 Apr 2005; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.37-e2p-test.patch, e2fsprogs-1.37.ebuild, + e2fsprogs-1.37-r1.ebuild: + Fix make check in e2p on an empty install #88570. + +*e2fsprogs-1.37-r1 (24 Mar 2005) + + 24 Mar 2005; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.37-r1.ebuild: + Add version with split com_err/ss. + +*e2fsprogs-1.37 (22 Mar 2005) + + 22 Mar 2005; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.37.ebuild: + Version bump for security #86257. + + 22 Mar 2005; Aron Griffis <agriffis@gentoo.org> e2fsprogs-1.36-r2.ebuild: + Mark stable on ia64 to match version of fsck included in FC3. This is + important since currently ia64 users use a chroot for installation, then run + into bug 71159 + +*e2fsprogs-1.36-r2 (10 Mar 2005) + + 10 Mar 2005; Mike Frysinger <vapier@gentoo.org> + +files/e2fsprogs-1.36-makefile.patch, +e2fsprogs-1.36-r2.ebuild: + Fix header install and lib/bin symlinks. + +*e2fsprogs-1.36-r1 (08 Mar 2005) + + 08 Mar 2005; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.36-r1.ebuild: + Version bump to clean crap up. + +*e2fsprogs-1.36 (06 Feb 2005) + + 06 Feb 2005; Tony Vroon <chainsaw@gentoo.org> +e2fsprogs-1.36.ebuild: + Version bump, resolves bug #80567. Compiles on GCC 4. + + 18 Jan 2005; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.35-r1.ebuild: + Marked stable on mips. + + 03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> : + Change encoding to UTF-8 for GLEP 31 compliance + + 07 Dec 2004; Joseph Jezak <josejx@gentoo.org> e2fsprogs-1.35-r1.ebuild: + Marked ppc stable for bug #73605. + + 06 Dec 2004; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.35-r1.ebuild: + Make sure kernel defines dont clash with internal defines #48829. + + 23 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> + e2fsprogs-1.35-r1.ebuild: + Stable on alpha. + + 18 Nov 2004; Markus Rothe <corsair@gentoo.org> e2fsprogs-1.35-r1.ebuild: + Stable on ppc64; bug #70911 + + 12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> + e2fsprogs-1.35-r1.ebuild: + Stable on sparc + + 11 Nov 2004; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.35-r1.ebuild, + e2fsprogs-1.35.ebuild: + Set $LDCONFIG so stupid configure script doesnt try to run /sbin/ldconfig + for us. + + 03 Oct 2004; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.35-r1.ebuild: + Support dietlibc #36306 by Adam. + + 22 Sep 2004; Travis Tilley <lv@gentoo.org> e2fsprogs-1.35-r1.ebuild: + $(get_libdir)-ized and fixed a sandbox violation when libdir is set. marked + stable on amd64 for this fix. + +*e2fsprogs-1.35-r1 (13 Sep 2004) + + 13 Sep 2004; Guy Martin <gmsoft@gentoo.org> +e2fsprogs-1.35-r1.ebuild: + Use -fPIC compiled shared files in .a files. Fix kdelibs-3.3.0 compilation on + hppa => Stable on hppa. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + e2fsprogs-1.35.ebuild: + Masked e2fsprogs-1.35.ebuild stable for ppc + + 30 Jun 2004; Guy Martin <gmsoft@gentoo.org> e2fsprogs-1.35.ebuild: + Marked stable on hppa. + + 30 Jun 2004; Aron Griffis <agriffis@gentoo.org> e2fsprogs-1.35.ebuild: + stable on alpha + + 29 Jun 2004; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.35.ebuild: + Marked stable on sparc and mips. + + 24 Jun 2004; Martin Holzer <mholzer@gentoo.org> e2fsprogs-1.35.ebuild: + x86 stable + + 17 Jun 2004; Alexander Gabert <pappy@gentoo.org> e2fsprogs-1.35.ebuild: + building e2fsprogs on sparc results in silo failing because libext2 is linked + into a nostdlib executable + + 02 Jun 2004; Travis Tilley <lv@gentoo.org> e2fsprogs-1.35.ebuild: + stable on amd64 + + 17 May 2004; Bryan Østergaard <kloeri@gentoo.org> e2fsprogs-1.35.ebuild: + Add ~alpha. + + 27 Apr 2004; Michael McCabe <randy@gentoo.org> e2fsprogs-1.35.ebuild: + Marked stable on s390 + + 23 Apr 2004; Aron Griffis <agriffis@gentoo.org> e2fsprogs-1.34-r1.ebuild, + e2fsprogs-1.35.ebuild: + Mark 1.34-r1 stable on ia64, and simultaneously mark 1.35 -ia64 until bug + 48829 (e2fsprogs-1.35 doesn't build on ia64) is resolved + + 09 Apr 2004; Travis Tilley <lv@gentoo.org> e2fsprogs-1.34.ebuild: + stable on amd64 + +*e2fsprogs-1.35 (28 Mar 2004) + + 28 Mar 2004; Mike Frysinger <vapier@gentoo.org> : + Version bump #40624 by Nicolas Boichat. + + 03 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> + e2fsprogs-1.34-r1.ebuild: + set ppc in keywords + + 28 Jan 2004; Aron Griffis <agriffis@gentoo.org> e2fsprogs-1.34.ebuild: + stable on alpha and ia64 + + 15 Jan 2004; <gustavoz@gentoo.org> e2fsprogs-1.32-r2.ebuild, + e2fsprogs-1.33.ebuild, e2fsprogs-1.34-r1.ebuild, e2fsprogs-1.34.ebuild: + backed out restrict=nomirror since it's hardly justified in logs or bugs + +*e2fsprogs-1.34-r1 (14 Jan 2004) + + 14 Jan 2004; Chris PeBenito <pebenito@gentoo.org> e2fsprogs-1.34-r1.ebuild, + files/e2fsprogs-1.34-swap-symlink.diff: + Add fix to handle symlinks with extended attributes correctly on big endian + systems. + + 09 Jan 2004; <gustavoz@gentoo.org> e2fsprogs-1.34.ebuild: + marked stable for hppa + + 09 Jan 2004; Jason Wever <weeve@gentoo.org> e2fsprogs-1.34.ebuild: + Marked stable on sparc. + + 30 Dec 2003; Seemant Kulleen <seemant@gentoo.org> e2fsprogs-1.34.ebuild, + files/e2fsprogs-sed-locale.patch: + Added patch to make the sed expressions used in the configure script and other + sed scripts friendly to locales like ee_ET (estonian) + + 28 Dec 2003; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.34.ebuild: + Move to mips stable (~mips -> mips) + + 24 Dec 2003; <plasmaroo@gentoo.org> e2fsprogs-1.34.ebuild, + files/e2fsprogs-1.34-kernel-2.6-fix.patch: + Added a patch to get e2fsprogs to compile with 2.6 headers; closing bug #31419. + + 21 Dec 2003; Martin Holzer <mholzer@gentoo.org> e2fsprogs-1.34.ebuild: + x86 stable + + 21 Dec 2003; Martin Holzer <mholzer@gentoo.org> e2fsprogs-1.34.ebuild: + fixing userpriv. closes 27348 + + 21 Nov 2003; Martin Holzer <mholzer@gentoo.org> e2fsprogs-1.32-r2.ebuild, + e2fsprogs-1.33.ebuild, e2fsprogs-1.34.ebuild: + adding RESTRICT="nomirror" + + 22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> e2fsprogs-1.34.ebuild: + set ppc in keywords + +*e2fsprogs-1.34 (30 Jul 2003) + + 30 Sep 2003; Joshua Kinard <kumba@gentoo.org> e2fsprogs-1.34.ebuild: + Added ~sparc & ~mips to KEYWORDS + + 30 Jul 2003; Brandon Low <lostlogic@gentoo.org> e2fsprogs-1.34.ebuild: + Bump + + 31 May 2003; Daniel Robbins <drobbins@gentoo.org>: moving to x86 (stable.) + +*e2fsprogs-1.33 (21 Apr 2003) + + 23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> e2fsprogs-1.33.ebuild: + set ppc in keywords + + 19 Sep 2003; Seemant Kulleen <seemant@gentoo.org> e2fsprogs-1.33.ebuild, + e2fsprogs-1.34.ebuild: + add static support, thanks to: Sascha Silbe <sascha-gentoo-bugzilla@silbe.org> + in bug #29166 + + 15 Sep 2003; Seemant Kulleen <seemant@gentoo.org> e2fsprogs-1.32-r2.ebuild, + e2fsprogs-1.33.ebuild, e2fsprogs-1.34.ebuild, + files/e2fsprogs-1.27ea-0.8.21.diff, + files/e2fsprogs-1.32-mk_cmds-cosmetic.patch: + moved to sys-fs + + 21 Apr 2003; Daniel Robbins <drobbins@gentoo.org>: New upstream release. + Creation of locale stuff fails so commented out its creation in the ebuild. + Marked ~x86 only. + +*e2fsprogs-1.32-r2 (31 Dec 2002) + + 15 Mar 2003; Jan Seidel <tuxus@gentoo.org> : + Added mips to KEYWORDS + + 23 Feb 2003; Aron Griffis <agriffis@gentoo.org> e2fsprogs-1.32-r2.ebuild : + Fix minor error in the ebuild where "die" could be called from within + a subshell. + + 20 Feb 2003; Zach Welch <zwelch@gentoo.org> e2fsprogs-1.32-r2.ebuild : + Added arm to keywords. + + 09 Feb 2003; Guy Martin <gmsoft@gentoo.org> e2fsprogs-1.32-r2.ebuild : + Added hppa to keywords. + + 31 Dec 2002; Brandon Low <lostlogic@gentoo.org> e2fsprogs-1.32-r2.ebuild : + + Symlink the mkfs.ext3 to mke2fs as it should be. Marked stable. + +*e2fsprogs-1.32-r1 (26 Dec 2002) + + 26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> e2fsprogs-1.32-r1.ebuild : + + Fix trying to move lsattr, chattr and uuidgen to non existing directory + in src_install(). Move compile_et and mk_cmds to /usr/bin. Fix a cosmetic + error in mk_cmds help output. + + 10 Dec 2002; Martin Schlemmer <azarah@gentoo.org> e2fsprogs-1.32.ebuild : + + Mark stable. + + 06 Dec 2002; Rodney Rees <manson@gentoo.org> : + + Changed sparc ~sparc keywords + +*e2fsprogs-1.32 (11 Nov 2002) + + 25 Feb 2003; Brandon Low <lostlogic@gentoo.org> e2fsprogs-1.27-r1.ebuild e2fsprogs-1.27.ebuild e2fsprogs-1.29-r1.ebuild e2fsprogs-1.29.ebuild e2fsprogs-1.32-r1.ebuild e2fsprogs-1.32.ebuild : + Fix nesteddies + + 18 Jan 2003; Jan Seidel <tuxus@gentoo.org> : + Added mips to keywords + + 11 Nov 2002; Brandon Low <lostlogic@gentoo.org> e2fsprogs-1.32.ebuild : + + New version from upstream. + +*e2fsprogs-1.30 (01 Nov 2002) + + 01 Nov 2002; Brandon Low <lostlogic@gentoo.org> : + + New version, also updated the ebuild to use econf and einstall. + +*e2fsprogs-1.29-r1 (26 Oct 2002) + + 26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> : + Install linker scripts to fix bug #4411. + +*e2fsprogs-1.29 (25 Sep 2002) + + 25 Sep 2002; Martin Schlemmer <azarah@gentoo.org> : + Version update. Major bugfix release (curruption among things). + +*e2fsprogs-1.25-r1.ebuild (14 July 2002) + + 14 Jul 2002; phoen][x <phoenix@gentoo.org> e2fsprogs-1.25-r1.ebuild : + Added KEYWORDS, SLOT. + +*e2fsprogs-1.27-r1 (21 Jun 2002) + + 14 Jul 2002; phoen][x <phoenix@gentoo.org> e2fsprogs-1.27.ebuild : + Added KEYWORDS, SLOT. + + 14 Jul 2002; phoen][x <phoenix@gentoo.org> e2fsprogs-1.27-r1.ebuild : + Added KEYWORDS, SLOT. + + 21 Jun 2002; Joachim Blaabejrg <styx@gentoo.org> e2fsprogs-1.27-r1.ebuild : + Added ACL support. + + 03 Aug 2002; Nick Hadaway <raker@gentoo.org> e2fsprogs-1.27-r1.ebuild : + Updated ebuild to install /bin/compile_et's template files. Fixes a + cyrus-imapd compile problem. + +*e2fsprogs-1.27 (21 March 2002) + + 03 Aug 2002; Nick Hadaway <raker@gentoo.org> e2fsprogs-1.27.ebuild : + Updated ebuild to install /bin/compile_et's template files. Fixes a + cyrus-imapd compile problem. + + +*e2fsprogs-1.25-r3 (1 Feb 2002) + + 14 Jul 2002; phoen][x <phoenix@gentoo.org> e2fsprogs-1.25-r3.ebuild : + Added KEYWORDS, SLOT. + + 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.11.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.11.ebuild new file mode 100644 index 00000000..78d346c1 --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.11.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.11.ebuild,v 1.1 2008/06/18 09:33:56 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs multilib + +DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="nls static elibc_FreeBSD" + +RDEPEND="~sys-libs/com_err-${PV} + ~sys-libs/ss-${PV} + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + sys-apps/texinfo" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 + chmod u+w po/*.po # Userpriv fix #27348 + # Clean up makefile to suck less + epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch + epatch "${FILESDIR}"/${PN}-1.40.5-libintl.patch #122368 + epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch + + # kernel headers use the same defines as e2fsprogs and can cause issues #48829 + sed -i \ + -e 's:CONFIG_JBD_DEBUG:__CONFIG_JBD_DEBUG__E2FS:g' \ + $(grep -rl CONFIG_JBD_DEBUG *) \ + || die "sed jbd debug failed" + + # fake out files we forked into sep packages + sed -i \ + -e '/^LIB_SUBDIRS/s:lib/et::' \ + -e '/^LIB_SUBDIRS/s:lib/ss::' \ + Makefile.in || die "remove subdirs" + + # since we've split out com_err/ss into their own ebuilds, we + # need to fake out the local files. let the toolchain find them. + mkdir tc || die + echo "GROUP ( libcom_err.a )" > tc/libcom_err.a + echo "GROUP ( libcom_err.so )" > tc/libcom_err.so + echo "GROUP ( libss.a )" > tc/libss.a + echo "GROUP ( libss.so )" > tc/libss.so + sed -i \ + -e '/^LIB\(SS\|COM_ERR\)/s:$(LIB):$(top_builddir)/tc:' \ + MCONFIG.in || die + echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h + ln -s $(type -P mk_cmds) lib/ss/mk_cmds + ln -s $(type -P compile_et) lib/et/compile_et + + # sanity check for Bug 105304 + if [[ -z ${USERLAND} ]] ; then + eerror "You just hit Bug 105304, please post your 'emerge info' here:" + eerror "http://bugs.gentoo.org/105304" + die "Aborting to prevent screwing your system" + fi +} + +src_compile() { + # Keep the package from doing silly things + addwrite /var/cache/fonts + export LDCONFIG=: + export CC=$(tc-getCC) + export STRIP=: + + econf \ + --bindir=/bin \ + --sbindir=/sbin \ + --enable-elf-shlibs \ + --with-ldopts="${LDFLAGS}" \ + $(use_enable !static dynamic-e2fsck) \ + $(use_enable !elibc_uclibc tls) \ + --without-included-gettext \ + $(use_enable nls) \ + $(use_enable userland_GNU fsck) \ + || die + 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 + # Parallel make sometimes fails + emake -j1 COMPILE_ET=compile_et || die + + # Build the FreeBSD helper + if use elibc_FreeBSD ; then + cp "${FILESDIR}"/fsck_ext2fs.c . + emake fsck_ext2fs || die + fi +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc README RELEASE-NOTES + + # Move shared libraries to /lib/, install static libraries to /usr/lib/, + # and install linker scripts to /usr/lib/. + dodir /$(get_libdir) + mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ + dolib.a lib/*.a || die "dolib.a" + rm -f "${D}"/usr/$(get_libdir)/lib{com_err,ss}.a #125146 + local x + cd "${D}"/$(get_libdir) + for x in *.so ; do + gen_usr_ldscript ${x} || die "gen ldscript ${x}" + done + + # move 'useless' stuff to /usr/ + dosbin "${D}"/sbin/mklost+found + rm -f "${D}"/sbin/mklost+found + + if use elibc_FreeBSD ; then + # Install helpers for us + into / + dosbin "${S}"/fsck_ext2fs || die + doman "${FILESDIR}"/fsck_ext2fs.8 + + # these manpages are already provided by FreeBSD libc + # and filefrag is linux only + rm -f \ + "${D}"/sbin/filefrag \ + "${D}"/usr/share/man/man8/filefrag.8 \ + "${D}"/bin/uuidgen \ + "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ + "${D}"/usr/share/man/man1/uuidgen.1 || die + fi +} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.9.ebuild new file mode 100644 index 00000000..e0d790ce --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.9.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.40.9.ebuild,v 1.8 2008/06/18 09:23:58 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs multilib + +DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="nls static elibc_FreeBSD" + +RDEPEND="~sys-libs/com_err-${PV} + ~sys-libs/ss-${PV} + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + sys-apps/texinfo" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 + chmod u+w po/*.po # Userpriv fix #27348 + # Clean up makefile to suck less + epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch + epatch "${FILESDIR}"/${PN}-1.40.5-libintl.patch #122368 + epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch + + # kernel headers use the same defines as e2fsprogs and can cause issues #48829 + sed -i \ + -e 's:CONFIG_JBD_DEBUG:__CONFIG_JBD_DEBUG__E2FS:g' \ + $(grep -rl CONFIG_JBD_DEBUG *) \ + || die "sed jbd debug failed" + + # fake out files we forked into sep packages + sed -i \ + -e '/^LIB_SUBDIRS/s:lib/et::' \ + -e '/^LIB_SUBDIRS/s:lib/ss::' \ + Makefile.in || die "remove subdirs" + + # since we've split out com_err/ss into their own ebuilds, we + # need to fake out the local files. let the toolchain find them. + echo "GROUP ( /usr/$(get_libdir)/libcom_err.a )" > lib/libcom_err.a + echo "GROUP ( /usr/$(get_libdir)/libcom_err.so )" > lib/libcom_err.so + echo "GROUP ( /usr/$(get_libdir)/libss.a )" > lib/libss.a + echo "GROUP ( /usr/$(get_libdir)/libss.so )" > lib/libss.so + echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h + ln -s /usr/bin/mk_cmds lib/ss/mk_cmds + + # sanity check for Bug 105304 + if [[ -z ${USERLAND} ]] ; then + eerror "You just hit Bug 105304, please post your 'emerge info' here:" + eerror "http://bugs.gentoo.org/105304" + die "Aborting to prevent screwing your system" + fi +} + +src_compile() { + # Keep the package from doing silly things + export LDCONFIG=: + export CC=$(tc-getCC) + export STRIP=: + + econf \ + --bindir=/bin \ + --sbindir=/sbin \ + --enable-elf-shlibs \ + --with-ldopts="${LDFLAGS}" \ + $(use_enable !static dynamic-e2fsck) \ + $(use_enable !elibc_uclibc tls) \ + --without-included-gettext \ + $(use_enable nls) \ + $(use_enable userland_GNU fsck) \ + || die + 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 + # Parallel make sometimes fails + emake -j1 COMPILE_ET=compile_et || die + + # Build the FreeBSD helper + if use elibc_FreeBSD ; then + cp "${FILESDIR}"/fsck_ext2fs.c . + emake fsck_ext2fs || die + fi +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc README RELEASE-NOTES + + # Move shared libraries to /lib/, install static libraries to /usr/lib/, + # and install linker scripts to /usr/lib/. + dodir /$(get_libdir) + mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/ + dolib.a lib/*.a || die "dolib.a" + rm -f "${D}"/usr/$(get_libdir)/lib{com_err,ss}.a #125146 + local x + cd "${D}"/$(get_libdir) + for x in *.so ; do + gen_usr_ldscript ${x} || die "gen ldscript ${x}" + done + + # move 'useless' stuff to /usr/ + dosbin "${D}"/sbin/mklost+found + rm -f "${D}"/sbin/mklost+found + + if use elibc_FreeBSD ; then + # Install helpers for us + into / + dosbin "${S}"/fsck_ext2fs || die + doman "${FILESDIR}"/fsck_ext2fs.8 + + # these manpages are already provided by FreeBSD libc + # and filefrag is linux only + rm -f \ + "${D}"/sbin/filefrag \ + "${D}"/usr/share/man/man8/filefrag.8 \ + "${D}"/bin/uuidgen \ + "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ + "${D}"/usr/share/man/man1/uuidgen.1 || die + fi +} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild new file mode 100644 index 00000000..b3ee20bb --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild,v 1.8 2009/03/17 10:23:45 armin76 Exp $ + +inherit eutils flag-o-matic toolchain-funcs multilib + +DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="nls elibc_FreeBSD elibc_uclibc" + +RDEPEND="~sys-libs/${PN}-libs-${PV} + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + sys-apps/texinfo" + +pkg_setup() { + if [[ ! -e ${ROOT}/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" > "${ROOT}"/etc/mtab + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 + epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch + epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch + epatch "${FILESDIR}"/${P}-tune2fs-opt.patch #253162 + epatch "${FILESDIR}"/verbose.diff + # blargh ... trick e2fsprogs into using e2fsprogs-libs + rm -rf doc + sed -i -r \ + -e 's:@LIBINTL@:@LTLIBINTL@:' \ + -e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ + -e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \ + MCONFIG.in || die "muck libs" #122368 + sed -i -r \ + -e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \ + Makefile.in || die "remove subdirs" + touch lib/ss/ss_err.h +} + +src_compile() { + # Keep the package from doing silly things + addwrite /var/cache/fonts + export LDCONFIG=: + export CC=$(tc-getCC) + export STRIP=: + + # 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=bsd;; + *) libtype=elf;; + esac + + econf \ + --bindir=/bin \ + --sbindir=/sbin \ + --enable-${libtype}-shlibs \ + --with-ldopts="${LDFLAGS}" \ + $(use_enable !elibc_uclibc tls) \ + --without-included-gettext \ + $(use_enable nls) \ + $(use_enable userland_GNU fsck) \ + || die + 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 + 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 ${ROOT}/etc/mtab ]] ; then + if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then + rm -f "${ROOT}"/etc/mtab + fi + fi +} + +src_install() { + emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install-libs || die + dodoc README RELEASE-NOTES + + # Move shared libraries to /lib/, install static libraries to /usr/lib/, + # and install linker scripts to /usr/lib/. + dodir /$(get_libdir) + local lib slib + for lib in "${D}"/usr/$(get_libdir)/*.a ; do + slib=${lib##*/} + mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}" + gen_usr_ldscript ${slib%.a}$(get_libname) + done + + # move 'useless' stuff to /usr/ + dosbin "${D}"/sbin/mklost+found + rm -f "${D}"/sbin/mklost+found + + if use elibc_FreeBSD ; then + # Install helpers for us + into / + dosbin "${S}"/fsck_ext2fs || die + doman "${FILESDIR}"/fsck_ext2fs.8 + + # these manpages are already provided by FreeBSD libc + # and filefrag is linux only + rm -f \ + "${D}"/sbin/filefrag \ + "${D}"/usr/share/man/man8/filefrag.8 \ + "${D}"/bin/uuidgen \ + "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ + "${D}"/usr/share/man/man1/uuidgen.1 || die + fi +} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild new file mode 100644 index 00000000..6fba0c7c --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild,v 1.10 2009/01/01 15:47:52 gmsoft Exp $ + +inherit eutils flag-o-matic toolchain-funcs multilib + +DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="nls elibc_FreeBSD" + +RDEPEND="~sys-libs/${PN}-libs-${PV} + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + sys-apps/texinfo" + +pkg_setup() { + if [[ ! -e ${ROOT}/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" > "${ROOT}"/etc/mtab + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 + epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch + epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch + # blargh ... trick e2fsprogs into using e2fsprogs-libs + rm -rf doc + sed -i -r \ + -e 's:@LIBINTL@:@LTLIBINTL@:' \ + -e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ + -e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \ + MCONFIG.in || die "muck libs" #122368 + sed -i -r \ + -e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \ + Makefile.in || die "remove subdirs" + touch lib/ss/ss_err.h +} + +src_compile() { + # Keep the package from doing silly things + addwrite /var/cache/fonts + export LDCONFIG=: + export CC=$(tc-getCC) + export STRIP=: + + # 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=bsd;; + *) libtype=elf;; + esac + + econf \ + --bindir=/bin \ + --sbindir=/sbin \ + --enable-${libtype}-shlibs \ + --with-ldopts="${LDFLAGS}" \ + $(use_enable !elibc_uclibc tls) \ + --without-included-gettext \ + $(use_enable nls) \ + $(use_enable userland_GNU fsck) \ + || die + 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 + 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 ${ROOT}/etc/mtab ]] ; then + if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then + rm -f "${ROOT}"/etc/mtab + fi + fi +} + +src_install() { + emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install-libs || die + dodoc README RELEASE-NOTES + + # Move shared libraries to /lib/, install static libraries to /usr/lib/, + # and install linker scripts to /usr/lib/. + dodir /$(get_libdir) + local lib slib + for lib in "${D}"/usr/$(get_libdir)/*.a ; do + slib=${lib##*/} + mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}" + gen_usr_ldscript ${slib%.a}$(get_libname) + done + + # move 'useless' stuff to /usr/ + dosbin "${D}"/sbin/mklost+found + rm -f "${D}"/sbin/mklost+found + + if use elibc_FreeBSD ; then + # Install helpers for us + into / + dosbin "${S}"/fsck_ext2fs || die + doman "${FILESDIR}"/fsck_ext2fs.8 + + # these manpages are already provided by FreeBSD libc + # and filefrag is linux only + rm -f \ + "${D}"/sbin/filefrag \ + "${D}"/usr/share/man/man8/filefrag.8 \ + "${D}"/bin/uuidgen \ + "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ + "${D}"/usr/share/man/man1/uuidgen.1 || die + fi +} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.4.ebuild new file mode 100644 index 00000000..81c7b000 --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.4.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.4.ebuild,v 1.2 2009/04/05 03:15:53 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs multilib + +DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="nls elibc_FreeBSD" + +RDEPEND="~sys-libs/${PN}-libs-${PV} + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + sys-apps/texinfo" + +pkg_setup() { + if [[ ! -e ${ROOT}/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" > "${ROOT}"/etc/mtab + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 + epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch + epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch + # blargh ... trick e2fsprogs into using e2fsprogs-libs + rm -rf doc + sed -i -r \ + -e 's:@LIBINTL@:@LTLIBINTL@:' \ + -e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \ + -e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \ + MCONFIG.in || die "muck libs" #122368 + sed -i -r \ + -e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \ + Makefile.in || die "remove subdirs" + touch lib/ss/ss_err.h +} + +src_compile() { + # Keep the package from doing silly things + addwrite /var/cache/fonts + export CC=$(tc-getCC) + + # 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=bsd;; + *) libtype=elf;; + esac + + econf \ + --bindir=/bin \ + --sbindir=/sbin \ + --enable-${libtype}-shlibs \ + --with-ldopts="${LDFLAGS}" \ + $(use_enable !elibc_uclibc tls) \ + --without-included-gettext \ + $(use_enable nls) \ + $(use_enable userland_GNU fsck) \ + || die + 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 + 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 ${ROOT}/etc/mtab ]] ; then + if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then + rm -f "${ROOT}"/etc/mtab + fi + fi +} + +src_install() { + emake LDCONFIG=true STRIP=: DESTDIR="${D}" install install-libs || die + dodoc README RELEASE-NOTES + + # Move shared libraries to /lib/, install static libraries to /usr/lib/, + # and install linker scripts to /usr/lib/. + dodir /$(get_libdir) + local lib slib + for lib in "${D}"/usr/$(get_libdir)/*.a ; do + slib=${lib##*/} + mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}" + gen_usr_ldscript ${slib%.a}$(get_libname) + done + + # move 'useless' stuff to /usr/ + dosbin "${D}"/sbin/mklost+found + rm -f "${D}"/sbin/mklost+found + + if use elibc_FreeBSD ; then + # Install helpers for us + into / + dosbin "${S}"/fsck_ext2fs || die + doman "${FILESDIR}"/fsck_ext2fs.8 + + # these manpages are already provided by FreeBSD libc + # and filefrag is linux only + rm -f \ + "${D}"/sbin/filefrag \ + "${D}"/usr/share/man/man8/filefrag.8 \ + "${D}"/bin/uuidgen \ + "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \ + "${D}"/usr/share/man/man1/uuidgen.1 || die + fi +} diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch new file mode 100644 index 00000000..6c316ac2 --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch @@ -0,0 +1,26 @@ +Since the tests analyze the output messages, force the default locale. + +http://bugs.gentoo.org/99766 + +--- tests/test_script.in ++++ tests/test_script.in +@@ -3,6 +3,19 @@ + # Test script for e2fsck + # + ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ unset $as_var ++ fi ++done ++ + if test "$1"x = x ; then + TESTS=`ls -d $SRCDIR/[a-zA-Z]_* | $EGREP -v "\.failed|\.new"` + else diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch new file mode 100644 index 00000000..4eaebba1 --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-makefile.patch @@ -0,0 +1,72 @@ +--- Makefile.in ++++ Makefile.in +@@ -48,3 +48,3 @@ + install-shlibs-libs-recursive install-doc-libs +- if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi ++ $(MAKE) install-libs + +--- e2fsck/Makefile.in ++++ e2fsck/Makefile.in +@@ -163,6 +163,6 @@ + @echo " LINK $(root_sbindir)/fsck.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext2 + @echo " LINK $(root_sbindir)/fsck.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext3 +@@ -176,6 +176,6 @@ + @echo " LINK $(man8dir)/fsck.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext2.8 + @echo " LINK $(man8dir)/fsck.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext3.8 +--- misc/Makefile.in ++++ misc/Makefile.in +@@ -228,12 +228,12 @@ + @echo " LINK $(root_sbindir)/mkfs.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext2 + @echo " LINK $(root_sbindir)/mkfs.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext3 + @echo " LINK $(root_sbindir)/e2label" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ ++ @$(LN_S) -f tune2fs \ + $(DESTDIR)$(root_sbindir)/e2label + @echo " LINK $(root_sbindir)/findfs" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ ++ @$(LN_S) -f tune2fs \ + $(DESTDIR)$(root_sbindir)/findfs +@@ -257,6 +257,6 @@ + @echo " LINK mkfs.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext2.8 + @echo " LINK mkfs.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext3.8 +--- lib/uuid/Makefile.in ++++ lib/uuid/Makefile.in +@@ -148,5 +148,5 @@ + @echo " LINK $(man3dir)/uuid_generate_random.3" +- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3 ++ @$(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3 + @echo " LINK $(man3dir)/uuid_generate_time.3" +- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3 ++ @$(LN_S) -f uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3 + @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc" +--- lib/Makefile.elf-lib ++++ lib/Makefile.elf-lib +@@ -49,3 +49,3 @@ + @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so" +- @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ ++ @$(LN_S) -f $(ELF_SONAME) \ + $(DESTDIR)$(libdir)/$(ELF_IMAGE).so diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch new file mode 100644 index 00000000..7d091960 --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch @@ -0,0 +1,11 @@ +--- a/lib/ext2fs/ext2_fs.h ++++ b/lib/ext2fs/ext2_fs.h +@@ -414,7 +414,7 @@ + + #define i_size_high i_dir_acl + +-#if defined(__KERNEL__) || defined(__linux__) ++#if defined(__KERNEL__) || defined(__linux__) || defined(__FreeBSD__) + #define i_reserved1 osd1.linux1.l_i_reserved1 + #define i_frag osd2.linux2.l_i_frag + #define i_fsize osd2.linux2.l_i_fsize diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40.5-libintl.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40.5-libintl.patch new file mode 100644 index 00000000..27280736 --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.40.5-libintl.patch @@ -0,0 +1,15 @@ +Fixes libintl handling on non-glibc + +http://bugs.gentoo.org/122368 + +--- e2fsprogs-1.40/MCONFIG.in ++++ e2fsprogs-1.40/MCONFIG.in +@@ -71,7 +71,7 @@ + LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@ + LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ + LIBBLKID = $(LIB)/libblkid@LIB_EXT@ @STATIC_BLKID_DEVMAPPER_LIBS@ +-LIBINTL = @LIBINTL@ ++LIBINTL = @LTLIBINTL@ + DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@ + DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@ + diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.0-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.0-makefile.patch new file mode 100644 index 00000000..f4c95e14 --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.0-makefile.patch @@ -0,0 +1,87 @@ +--- e2fsck/Makefile.in ++++ e2fsck/Makefile.in +@@ -199,12 +199,12 @@ + @echo " LINK $(root_sbindir)/fsck.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext2 + @echo " LINK $(root_sbindir)/fsck.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext3 + @echo " LINK $(root_sbindir)/fsck.ext4" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext4 + @echo " LINK $(root_sbindir)/fsck.ext4dev" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext4dev +@@ -225,12 +225,12 @@ + @echo " LINK $(man8dir)/fsck.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext2.8 + @echo " LINK $(man8dir)/fsck.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext3.8 + @echo " LINK $(man8dir)/fsck.ext4.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext4.8 + @echo " LINK $(man8dir)/fsck.ext4.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext4dev.8 +--- misc/Makefile.in ++++ misc/Makefile.in +@@ -279,18 +279,18 @@ + @echo " LINK $(root_sbindir)/mkfs.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext2 + @echo " LINK $(root_sbindir)/mkfs.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext3 + @echo " LINK $(root_sbindir)/mkfs.ext4" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext4 + @echo " LINK $(root_sbindir)/mkfs.ext4dev" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext4dev + @echo " LINK $(root_sbindir)/e2label" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ ++ @$(LN_S) -f tune2fs \ + $(DESTDIR)$(root_sbindir)/e2label + @echo " LINK $(root_sbindir)/findfs" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ ++ @$(LN_S) -f tune2fs \ + $(DESTDIR)$(root_sbindir)/findfs +@@ -314,12 +314,12 @@ + @echo " LINK mkfs.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext2.8 + @echo " LINK mkfs.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext3.8 + @echo " LINK mkfs.ext4.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext4.8 + @echo " LINK mkfs.ext4dev.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext4dev.8 +--- lib/Makefile.elf-lib ++++ lib/Makefile.elf-lib +@@ -49,3 +49,3 @@ + @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so" +- @$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ ++ @$(LN_S) -f $(ELF_SONAME) \ + $(DESTDIR)$(libdir)/$(ELF_IMAGE).so diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.2-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.2-makefile.patch new file mode 100644 index 00000000..1704b7ce --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.2-makefile.patch @@ -0,0 +1,80 @@ +--- e2fsck/Makefile.in ++++ e2fsck/Makefile.in +@@ -199,12 +199,12 @@ + @echo " LINK $(root_sbindir)/fsck.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext2 + @echo " LINK $(root_sbindir)/fsck.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext3 + @echo " LINK $(root_sbindir)/fsck.ext4" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext4 + @echo " LINK $(root_sbindir)/fsck.ext4dev" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ ++ @$(LN_S) -f e2fsck \ + $(DESTDIR)$(root_sbindir)/fsck.ext4dev +@@ -225,12 +225,12 @@ + @echo " LINK $(man8dir)/fsck.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext2.8 + @echo " LINK $(man8dir)/fsck.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext3.8 + @echo " LINK $(man8dir)/fsck.ext4.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext4.8 + @echo " LINK $(man8dir)/fsck.ext4.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ ++ @$(LN_S) -f e2fsck.8 \ + $(DESTDIR)$(man8dir)/fsck.ext4dev.8 +--- misc/Makefile.in ++++ misc/Makefile.in +@@ -279,18 +279,18 @@ + @echo " LINK $(root_sbindir)/mkfs.ext2" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext2 + @echo " LINK $(root_sbindir)/mkfs.ext3" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext3 + @echo " LINK $(root_sbindir)/mkfs.ext4" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext4 + @echo " LINK $(root_sbindir)/mkfs.ext4dev" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ ++ @$(LN_S) -f mke2fs \ + $(DESTDIR)$(root_sbindir)/mkfs.ext4dev + @echo " LINK $(root_sbindir)/e2label" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ ++ @$(LN_S) -f tune2fs \ + $(DESTDIR)$(root_sbindir)/e2label + @echo " LINK $(root_sbindir)/findfs" +- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ ++ @$(LN_S) -f tune2fs \ + $(DESTDIR)$(root_sbindir)/findfs +@@ -314,12 +314,12 @@ + @echo " LINK mkfs.ext2.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext2.8 + @echo " LINK mkfs.ext3.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext3.8 + @echo " LINK mkfs.ext4.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext4.8 + @echo " LINK mkfs.ext4dev.8" +- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ ++ @$(LN_S) -f mke2fs.8 \ + $(DESTDIR)$(man8dir)/mkfs.ext4dev.8 diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.3-tune2fs-opt.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.3-tune2fs-opt.patch new file mode 100644 index 00000000..35e8a57f --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.3-tune2fs-opt.patch @@ -0,0 +1,99 @@ +http://bugs.gentoo.org/253162 + +From 27c6de45a4187a348ec0960472d4a113ee6ea425 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o <tytso@mit.edu> +Date: Sat, 15 Nov 2008 00:32:39 -0500 +Subject: [PATCH] tune2fs: Fix inefficient O(n**2) algorithms when expanding the inode size + +When running "tune2fs -I 256" on moderate to large filesystems, the +time required to run tune2fs can take many hours (20+ before some +users gave up in disgust). This was due to some O(n**2) and O(n*m) +algorithms in move_block() and inode_scan_and_fix(), respectively. + +Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> +--- + misc/tune2fs.c | 25 +++++++++++++------------ + 1 files changed, 13 insertions(+), 12 deletions(-) + +diff --git a/misc/tune2fs.c b/misc/tune2fs.c +index b29b344..e72518a 100644 +--- a/misc/tune2fs.c ++++ b/misc/tune2fs.c +@@ -1011,13 +1011,13 @@ static int move_block(ext2_filsys fs, ext2fs_block_bitmap bmap) + if (retval) + return retval; + +- for (blk = fs->super->s_first_data_block; +- blk < fs->super->s_blocks_count; blk++) { ++ for (new_blk = blk = fs->super->s_first_data_block; ++ blk < fs->super->s_blocks_count; blk++) { + + if (!ext2fs_test_block_bitmap(bmap, blk)) + continue; + +- retval = ext2fs_new_block(fs, blk, NULL, &new_blk); ++ retval = ext2fs_new_block(fs, new_blk, NULL, &new_blk); + if (retval) + goto err_out; + +@@ -1068,12 +1068,14 @@ static int process_block(ext2_filsys fs EXT2FS_ATTR((unused)), + e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)), + blk_t ref_block EXT2FS_ATTR((unused)), + int ref_offset EXT2FS_ATTR((unused)), +- void *priv_data EXT2FS_ATTR((unused))) ++ void *priv_data) + { + int ret = 0; + blk_t new_blk; ++ ext2fs_block_bitmap bmap = (ext2fs_block_bitmap) priv_data; + +- ++ if (!ext2fs_test_block_bitmap(bmap, *block_nr)) ++ return 0; + new_blk = transalate_block(*block_nr); + if (new_blk) { + *block_nr = new_blk; +@@ -1086,7 +1088,7 @@ static int process_block(ext2_filsys fs EXT2FS_ATTR((unused)), + return ret; + } + +-static int inode_scan_and_fix(ext2_filsys fs) ++static int inode_scan_and_fix(ext2_filsys fs, ext2fs_block_bitmap bmap) + { + errcode_t retval = 0; + ext2_ino_t ino; +@@ -1122,8 +1124,8 @@ static int inode_scan_and_fix(ext2_filsys fs) + * Do we need to fix this ?? + */ + +- if (inode.i_file_acl) { +- ++ if (inode.i_file_acl && ++ ext2fs_test_block_bitmap(bmap, inode.i_file_acl)) { + blk = transalate_block(inode.i_file_acl); + if (!blk) + continue; +@@ -1142,9 +1144,8 @@ static int inode_scan_and_fix(ext2_filsys fs) + if (!ext2fs_inode_has_valid_blocks(&inode)) + continue; + +- retval = ext2fs_block_iterate2(fs, ino, 0, +- block_buf, process_block, +- 0); ++ retval = ext2fs_block_iterate2(fs, ino, 0, block_buf, ++ process_block, bmap); + if (retval) + goto err_out; + +@@ -1344,7 +1345,7 @@ static int resize_inode(ext2_filsys fs, unsigned long new_size) + if (retval) + goto err_out; + +- retval = inode_scan_and_fix(fs); ++ retval = inode_scan_and_fix(fs, bmap); + if (retval) + goto err_out; + +-- +1.6.0.6 + diff --git a/sys-fs/e2fsprogs/files/fsck_ext2fs.8 b/sys-fs/e2fsprogs/files/fsck_ext2fs.8 new file mode 100644 index 00000000..ee40b26b --- /dev/null +++ b/sys-fs/e2fsprogs/files/fsck_ext2fs.8 @@ -0,0 +1,96 @@ +.TH fsck_ext2fs 8 2006-07-02 "Matthias Andree" "FreeBSD Ports" +.\" +.\" fsck_ext2fs.8 - manual page for fsck_ext2fs wrapper +.\" +.\" (C) Copyright 2006 by Matthias Andree <matthias.andree@gmx.de> +.\" +.\" License: This file may be redistributed in accordance with the terms +.\" of the GNU General Public License v2. +.\" +.\" Upstream $Id: fsck_ext2fs.8,v 1.1 2007/09/15 08:54:26 uberlord Exp $ +.\" $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.8,v 1.1 2006/07/04 15:47:51 leeym Exp $ +.\" +.SH NAME +.B fsck_ext2fs +\- compatibility wrapper for e2fsck +.SH SYNOPSIS +.P +.B fsck_ext2fs +[\fB\-Fpfnyv\fR] [\fB\-b\fR \fIblock\fR] +.SH DESCRIPTION +.P +\fBfsck_ext2fs\fR maps the traditional FreeBSD \fBfsck_ffs\fR options to +options with the same functionality for \fBe2fsck,\fR runs \fBe2fsck\fR +and then maps its exit status to values that FreeBSD understands. +\fBe2fsck\fR is a utility to check and repair ext2 and ext3 file +systems. + +.SH OPTIONS +.IP \fB\-F\fR +(check foreground mode required) Immediately exits with status 1 to tell +\fBfsck\fR that ext2fs cannot be checked in the background. \fBfsck\fR +usually runs \fBfsck_*\fR programs twice, first with \fB\-F\fR to find +out if they can do background checking, then either immediately without +\fB\-F\fR for foreground checking or deferred in the background with +\fB\-B\fR. +.IP \fB\-p\fR +(preen mode) This option suppresses adding the \fB\-f\fR option (unless +\fB\-f\fR is also given) and adds the \fB\-p\fR option to the +\fBe2fsck\fR command line. This causes \fBe2fsck\fR to automatically fix +any filesystem problems that can safely be fixed without operator +intervention. Without this option given, \fBe2fsck\fR will be run with +the \fB\-f\fR option to force a check, since interactive scan and repair +mode is the default on FreeBSD, but not on Linux where \fBe2fsck\fR +comes from. +.IP \fB\-f\fR +(force check) This option forces the check of a clean file system while +preening and is passed to \fBe2fsck\fR verbatim. +.IP \fB\-n\fR +("no" mode) This option causes the file system to be opened in read-only +mode and assume "no" as answer to all questions. This is the only way to +safely run \fBfsck\fR on a mounted ext2 or ext3 file system. This option +is passed to \fBe2fsck\fR verbatim. +.IP \fB\-y\fR +("yes" mode) This option is passed verbatim to \fBe2fsck\fR and causes +it to assume "yes" as answer to all questions. This allows the +non-interactive use of e2fsck but is rather aggressive. Use with care. +.IP \fB\-v\fR +(verbose output) This option is passed verbatim to \fBe2fsck\fR and +causes it to verbosely report its progress. +.IP "\fB\-b\fR \fIblock\fR" +(use alternate super block) This option is passed verbatim to +\fBe2fsck\fR and selects an alternate super block, for use when the +primary super block has been damaged. Please see the \fBe2fsck\fR(8) +manual page for details. + +.SH EXIT STATUS +If errors remain after \fBe2fsck\fR, an invalid option or too many +options have been specified, \fBe2fsck\fR was killed with a signal or +the \fIfork\fB system call failed, \fBfsck_ext2fs\fR exits with status +EXIT_FAILURE (usually 1). If \fBe2fsck\fR cannot be started, exits with +status 127. If the file system is clean after \fBe2fsck\fR operation, +exits with status EXIT_SUCCESS (0). + +.SH NOTES +.P +This utility is merely meant as an adaptor so that \fBe2fsck\fR can be +run during the boot process, it does not support all options that +\fBe2fsck\fR offers. If you need one of its advanced options, please run +\fBe2fsck\fR directly. + +.SH FILES +.TP +.I /sbin/e2fsck +is the location of the \fBe2fsck\fR program to run. + +.SH AUTHOR +.P +Matthias Andree <matthias.andree@gmx.de> wrote the program and this +manual page. +.SH CONFORMING TO +The FreeBSD 6.1 command line interface for \fBfsck_ufs\fR(8). +.SH SEE ALSO +.BR fsck (8), +.BR e2fsck (8) +and +.BR fsck_ufs (8). diff --git a/sys-fs/e2fsprogs/files/fsck_ext2fs.c b/sys-fs/e2fsprogs/files/fsck_ext2fs.c new file mode 100644 index 00000000..0b6a74ee --- /dev/null +++ b/sys-fs/e2fsprogs/files/fsck_ext2fs.c @@ -0,0 +1,147 @@ +/* + * fsck_ext2fs - wrapper for e2fsck on FreeBSD + * Copyright (C) 2004,2006 Matthias Andree <matthias.andree@gmx.de> + * redistributable in accordance with the + * GNU General Public License v2 + * + * $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.c,v 1.5 2006/07/04 15:47:51 leeym Exp $ + * + * Upstream: $Id: fsck_ext2fs.c,v 1.1 2007/09/15 08:54:26 uberlord Exp $ + * + * format: gindent -kr + */ + +#include <sys/types.h> +#include <unistd.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <sys/wait.h> +#include <sys/time.h> +#include <sys/resource.h> +#include <errno.h> + +__attribute__ ((noreturn)) +static int die(const char *tag) +{ + perror(tag); + exit(EXIT_FAILURE); +} + +int main(int argc, char **argv) +{ + int ch, i = 1, force = 0, status, verbose = 0, t; + long block = 0; + enum { normal, preen, yes, no } mode = normal; + char *cmd[256]; + pid_t pid; + + cmd[0] = "/sbin/e2fsck"; + while ((ch = getopt(argc, argv, "BFpfnyb:v")) != -1) { + switch (ch) { + case 'p': + mode = preen; + break; + case 'f': + force = 1; + break; + case 'n': + mode = no; + break; + case 'y': + mode = yes; + break; + case 'b': + block = atol(optarg); + break; + case 'v': + verbose++; + break; + case 'F': + /* e2fsck does not support background checking, + * hence exit with nonzero status to force + * the foreground check. */ + exit(1); + case 'B': + default: + fprintf(stderr, "%s: unknown option -%c\n", + argv[0], optopt); + exit(EXIT_FAILURE); + } + } + + if (force) + cmd[i++] = "-f"; + + switch (mode) { + case normal: + /* FreeBSD needs -f to force a check only in context + * with -p -- so map normal to force to match + * expectations */ + if (!force) + cmd[i++] = "-f"; + break; + case yes: + cmd[i++] = "-y"; + break; + case no: + cmd[i++] = "-n"; + break; + case preen: + cmd[i++] = "-p"; + break; + } + + if (block) { + static char b[30]; + + sprintf(b, "-b %ld", block); + cmd[i++] = b; + } + + /* silently limit verbose to 15 so we don't overflow the cmd array */ + if (verbose > 15) + verbose = 15; + + for (t = verbose; t > 1; t--) + cmd[i++] = "-v"; + + while (optind < argc) { + cmd[i++] = argv[optind++]; + /* sanity check so we don't overflow the cmd buffer */ + if (i+1 == sizeof(cmd)/sizeof(cmd[0])) { + errno = E2BIG; + die(argv[0]); + } + } + + cmd[i++] = 0; + + if (verbose) { + for (i=0; cmd[i]; i++) + fputs(cmd[i], stderr), + fputc(' ', stderr); + fputc('\n', stderr); + } + + pid = fork(); + switch (pid) { + case -1: + /* error */ + die("fork"); + break; + case 0: + /* child */ + (void) execv(cmd[0], cmd); + perror("execve"); + _exit(127); + default: + /* parent */ + if (pid != waitpid(pid, &status, 0)) + die("waitpid"); + if (WIFSIGNALED(status) + || (WIFEXITED(status) && WEXITSTATUS(status) >= 4)) + exit(EXIT_FAILURE); + } + exit(EXIT_SUCCESS); +} diff --git a/sys-fs/e2fsprogs/files/verbose.diff b/sys-fs/e2fsprogs/files/verbose.diff new file mode 100644 index 00000000..a893a1fe --- /dev/null +++ b/sys-fs/e2fsprogs/files/verbose.diff @@ -0,0 +1,22 @@ +--- misc/Makefile.in.ori 2009-05-12 17:00:12.000000000 +0200 ++++ misc/Makefile.in 2009-05-12 17:00:23.000000000 +0200 +@@ -67,8 +67,7 @@ + COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree + + .c.o: +- @echo " CC $<" +- @$(CC) -c $(ALL_CFLAGS) $< -o $@ ++ $(CC) -c $(ALL_CFLAGS) $< -o $@ + + all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \ + $(FMANPAGES) $(LPROGS) +@@ -149,8 +148,7 @@ + $(STATIC_LIBUUID) $(LIBINTL) + + chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P) +- @echo " LD $@" +- @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL) ++ $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL) + + lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P) + @echo " LD $@" diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml new file mode 100644 index 00000000..96a2d586 --- /dev/null +++ b/sys-fs/e2fsprogs/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>base-system</herd> +</pkgmetadata> |