Upgraded the e2fsprogs-libs and e2fsprogs Portage packages

Upgraded sys-libs/e2fsprogs-libs to version 1.42 on amd64 Upgraded sys-fs/e2fsprogs to version 1.42 on amd64 Gaining the "-E discard" option during mkfs supports the encrypted partition work so that mkfs can run faster during OOBE. BUG=chromium-os:22172 TEST=lumpy64 build & boot, manually confirm mkfs.ext4 supports "-E discard" Change-Id: I70114b582b46c26b69ab822b8c33b32f03ef9db0 Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/15993 Reviewed-by: Mike Frysinger <vapier@chromium.org> Reviewed-by: Paul Taysom <taysom@chromium.org>
2025-08-09 14:06:58 +02:00 · 2012-02-15 15:02:13 -08:00 · 2012-02-15 15:02:13 -08:00 · 33439af72c
commit 33439af72c
parent 3281b899f2
5 changed files with 98 additions and 20 deletions
--- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/Manifest
@ -1 +1 @@
-DIST e2fsprogs-1.41.14.tar.gz 4512157 RMD160 bdd22a93f57de1145007bffd6fc45323098e27e8 SHA1 24f9364fa3d4c0d7d00cb627b819d0e51055d6c5 SHA256 3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176
+DIST e2fsprogs-1.42.tar.gz 5709827 RMD160 91136a82c35f86f54f6573f9788d32da66b972cb SHA1 e69bc63bc319e4d1e4242cc278bfd442a60646e6 SHA256 55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46
--- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild
@ -1,6 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild,v 1.4 2011/08/29 06:13:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.1 2011/12/07 16:51:08 vapier Exp $
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac

 EAPI="3"

@ -8,12 +13,12 @@ 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/${P}.tar.gz"
+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"
-IUSE="nls elibc_FreeBSD"
+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"
+IUSE="nls static-libs elibc_FreeBSD"

 RDEPEND="~sys-libs/${PN}-libs-${PV}
 	>=sys-apps/util-linux-2.16
@ -23,6 +28,8 @@ DEPEND="${RDEPEND}
 	dev-util/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
@ -36,6 +43,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
 	epatch "${FILESDIR}"/${PN}-1.41.12-getpagesize.patch
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	epatch "${FILESDIR}"/${PN}-1.42-no-quota.patch
 	# use symlinks rather than hardlinks
 	sed -i \
 		-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \
@ -55,9 +63,6 @@ src_prepare() {
 	sed -i -r \
 		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
 		Makefile.in || die "remove subdirs"
-	sed -i \
-		-e '/^#define _XOPEN/i#define _GNU_SOURCE' \
-		misc/mke2fs.c || die # needs open64() prototype

 	# Avoid rebuild
 	touch lib/ss/ss_err.h
@ -77,6 +82,7 @@ src_configure() {
 	esac

 	ac_cv_path_LDCONFIG=: \
+	QUOTA_CMT='#' \
 	econf \
 		--with-root-prefix="${EPREFIX}/" \
 		${libtype} \
@ -85,6 +91,7 @@ src_configure() {
 		$(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
@ -128,9 +135,9 @@ src_install() {

 	# Move shared libraries to /lib/, install static libraries to
 	# /usr/lib/, and install linker scripts to /usr/lib/.
-	set -- "${ED}"/usr/$(get_libdir)/*.a
-	set -- ${@/*\/lib}
-	gen_usr_ldscript -a "${@/.a}"
+	gen_usr_ldscript -a e2p ext2fs
+	# configure doesn't have an option to disable static libs :/
+	find "${D}" -name '*.a' -delete

 	if use elibc_FreeBSD ; then
 		# Install helpers for us
--- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch
@ -0,0 +1,62 @@
+quota was meant to be turned off in the 1.42 release as it's half
+baked, but the commit to disable didn't really work either.
+
+--- a/lib/quota/Makefile.in
+++ b/lib/quota/Makefile.in
+@@ -76,7 +76,8 @@
+ 		$(DESTDIR)$(includedir)/quota $(DESTDIR)$(man3dir) \
+ 		$(DESTDIR)$(libdir)/pkgconfig
+ 
+-install:: all installdirs
+install::
+disabled:: all installdirs
+ 	$(E) "	INSTALL_DATA $(libdir)/libquota.a"
+ 	$(Q) $(INSTALL_DATA) libquota.a $(DESTDIR)$(libdir)/libquota.a
+ 	-$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libquota.a
+--- a/configure
+++ b/configure
+@@ -5224,11 +5224,11 @@
+ 
+ fi
+ 
+-LIBQUOTA='$(LIB)/libquota'$LIB_EXT
+LIBQUOTA=
+ DEPLIBQUOTA=$LIBQUOTA
+-STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT
+STATIC_LIBQUOTA=
+ DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA
+-PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT
+PROFILED_LIBQUOTA=
+ DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA
+ 
+ 
+--- a/lib/quota/mkquota.h
+++ b/lib/quota/mkquota.h
+@@ -60,4 +60,17 @@
+ int quota_file_exists(ext2_filsys fs, int qtype, int fmt);
+ void quota_set_sb_inum(ext2_filsys fs, ext2_ino_t ino, int qtype);
+ 
+#define quota_init_context(a, ...)
+#define quota_data_inodes(a, ...)
+#define quota_data_add(a, ...)
+#define quota_data_sub(a, ...)
+#define quota_write_inode(a, ...)
+#define quota_update_inode(a, ...) 0
+#define quota_compute_usage(a, ...)
+#define quota_release_context(a, ...)
+#define quota_remove_inode(a, ...)
+#define quota_is_on(a, ...)
+#define quota_file_exists(a, ...) -1
+#define quota_set_sb_inum(a, ...)
+
+ #endif  /* __QUOTA_QUOTAIO_H__ */
+--- a/lib/quota/quotaio.h
+++ b/lib/quota/quotaio.h
+@@ -167,4 +167,7 @@
+ const char *quota_get_qf_path(const char *mntpt, int qtype, int fmt,
+ 			      char *path_buf, size_t path_buf_size);
+ 
+#define quota_get_qf_name(a, ...)
+#define quota_get_qf_path(a, ...)
+
+ #endif /* GUARD_QUOTAIO_H */
--- a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/Manifest
@ -1 +1 @@
-DIST e2fsprogs-libs-1.41.14.tar.gz 489703 RMD160 7bdbe03f21a8ac58179fc98083c7e07d8e37708b SHA1 9182ca542c5368d3e1df1a70040f28006771e240 SHA256 dbc7a138a3218d9b80a0626b5b692d76934d6746d8cbb762751be33785d8d9f5
+DIST e2fsprogs-libs-1.42.tar.gz 512745 RMD160 425306efda913b39e2eabb3165808562d35ca4e9 SHA1 5a18043c4933eb1eae9cb316ee47b89ad59c3875 SHA256 21ab3a769988bba04c11a028b767b048a0a4c37a4b20b1991175f7c7276006b4
--- a/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.14.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.14.ebuild
@ -1,6 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.14.ebuild,v 1.4 2011/08/29 06:12:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild,v 1.1 2011/12/07 16:50:09 vapier Exp $
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac

 EAPI="2"

@ -8,20 +13,21 @@ inherit toolchain-funcs

 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="nls elibc_glibc"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE="nls static-libs"

-RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.6 )
-	!sys-libs/com_err
+RDEPEND="!sys-libs/com_err
 	!sys-libs/ss
 	!<sys-fs/e2fsprogs-1.41.8"
 DEPEND="nls? ( sys-devel/gettext )
 	dev-util/pkgconfig"

+S=${WORKDIR}/${P%_pre*}
+
 src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 }
@ -39,9 +45,10 @@ src_configure() {
 	ac_cv_lib_uuid_uuid_generate=yes \
 	ac_cv_lib_blkid_blkid_get_cache=yes \
 	ac_cv_path_LDCONFIG=: \
+	QUOTA_CMT='#' \
 	econf \
-		--disable-libblkid \
-		--disable-libuuid \
+		--disable-lib{blkid,uuid} \
+		--disable-quota \
 		--enable-${libtype}-shlibs \
 		$(tc-has-tls || echo --disable-tls) \
 		$(use_enable nls)
@ -50,4 +57,6 @@ src_configure() {
 src_install() {
 	emake STRIP=: DESTDIR="${D}" install || die
 	gen_usr_ldscript -a com_err ss
+	# configure doesn't have an option to disable static libs :/
+	find "${D}" -name '*.a' -delete
 }