diff options
author | 2008-01-28 06:43:46 +0000 | |
---|---|---|
committer | 2008-01-28 06:43:46 +0000 | |
commit | cf2e2b2dc043e6dfc93779eed5883e8b8b7c5934 (patch) | |
tree | 9bacd93e6f88f9bc5456533ff0f577b7ab9be8cb /sys-fs | |
parent | old (diff) | |
download | historical-cf2e2b2dc043e6dfc93779eed5883e8b8b7c5934.tar.gz historical-cf2e2b2dc043e6dfc93779eed5883e8b8b7c5934.tar.bz2 historical-cf2e2b2dc043e6dfc93779eed5883e8b8b7c5934.zip |
Version bump.
Package-Manager: portage-2.1.4
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/Manifest | 36 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.40.5.ebuild | 129 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.5 | 3 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.40.5-libintl.patch | 15 |
5 files changed, 174 insertions, 17 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index f5d4e779a2b0..40180f4774b7 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/e2fsprogs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.127 2008/01/01 13:13:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.128 2008/01/28 06:43:46 vapier Exp $ + +*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) diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index c8db43628a6b..5530b58864a9 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -29,6 +29,10 @@ AUX e2fsprogs-1.40.4-prototypes.patch 622 RMD160 5aa9ec39ebaff23ba5a42f9458d073d MD5 e0d031bfe97c39c042196e518fd4347f files/e2fsprogs-1.40.4-prototypes.patch 622 RMD160 5aa9ec39ebaff23ba5a42f9458d073db088ade13 files/e2fsprogs-1.40.4-prototypes.patch 622 SHA256 8efad16b0c9dde8f50869c4d663706cc0c3650d7c97c4fcc33c9ab96d33ea7f9 files/e2fsprogs-1.40.4-prototypes.patch 622 +AUX e2fsprogs-1.40.5-libintl.patch 425 RMD160 a3cc77c99f42eebb8518b402c66565627ae869c3 SHA1 449968df4e6f06056d7a1266ff910394e10409e6 SHA256 281b175c362805d3c543dee4627e6ce065209652eff8ebea0d3b4f1d41ce0506 +MD5 d549e91b8b7a6bfa3bb4eb0c5e2f79ad files/e2fsprogs-1.40.5-libintl.patch 425 +RMD160 a3cc77c99f42eebb8518b402c66565627ae869c3 files/e2fsprogs-1.40.5-libintl.patch 425 +SHA256 281b175c362805d3c543dee4627e6ce065209652eff8ebea0d3b4f1d41ce0506 files/e2fsprogs-1.40.5-libintl.patch 425 AUX fsck_ext2fs.8 3806 RMD160 193e4e01508ad363c28c8d5feb124f65d59a76eb SHA1 dff54a3149f8d6187f6481c428d4b980c3abfb97 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0 MD5 a689cd9a4217895c01c91c9e697f8416 files/fsck_ext2fs.8 3806 RMD160 193e4e01508ad363c28c8d5feb124f65d59a76eb files/fsck_ext2fs.8 3806 @@ -37,13 +41,9 @@ AUX fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 SHA1 c002 MD5 5afe4af9fb6c7069c01e66e282fec576 files/fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 files/fsck_ext2fs.c 2797 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22 files/fsck_ext2fs.c 2797 -DIST e2fsprogs-1.40.2.tar.gz 3965919 RMD160 6e4ec42d50fa6f0762b5c4f58c09a0fa71a9af79 SHA1 65519d66bd15550d0bcd32ec72481ff0dbe737e2 SHA256 8bbdfd8866b60edec27fee58611d98ef841892c4e2cd0f0dacf194f20a716a63 DIST e2fsprogs-1.40.3.tar.gz 4064408 RMD160 a49813cfaa5dc972c64119628a016b5857b7a74d SHA1 46cf38d469812f0ed4fa2ab35998f73bd40bc4d3 SHA256 1d4bc00e2759b29ca3051da1154bcc53d817a4190b2a7130b3241f50ee6cb00f DIST e2fsprogs-1.40.4.tar.gz 4048867 RMD160 053556aab3de6ffffe5ab5981f436d4cdf9d9dae SHA1 c9268104027d22418e164346624cf726fa27efaa SHA256 2e1ece31b004ff1f4a26e5633e884eda11457b489bc854edaa0d7f024bc06564 -EBUILD e2fsprogs-1.40.2.ebuild 4030 RMD160 4927cad50f46478bf45961460aa86d23f3385a89 SHA1 bb87a66be02c5fd5d63093c4b374bf21fd65aed4 SHA256 683a883d38e6595b584a9174267767854fb52c24faa55958349457e4a3c57e58 -MD5 8213fbb91cd0c8e68174118477cc86fa e2fsprogs-1.40.2.ebuild 4030 -RMD160 4927cad50f46478bf45961460aa86d23f3385a89 e2fsprogs-1.40.2.ebuild 4030 -SHA256 683a883d38e6595b584a9174267767854fb52c24faa55958349457e4a3c57e58 e2fsprogs-1.40.2.ebuild 4030 +DIST e2fsprogs-1.40.5.tar.gz 4048882 RMD160 ec4a1ab69c114092075b3e6e37aade2facc6e878 SHA1 9a467da21952c8366a5eb246274a3237df7ff5de SHA256 11df6d84e0eb0da17938d4802d7872657b464c9a53ed21b0521c929d481d8ac4 EBUILD e2fsprogs-1.40.3-r1.ebuild 4023 RMD160 0a74cdc61b4d74502d91f179b89da1601aa68c54 SHA1 f2c49ac7482a46081e505fbbcf076669512591c8 SHA256 b833436e6f8a11cae8f3640a67bb852597182f9be7f4bfe6e1f35f59ad5a648d MD5 ae442f78ab812a6c6530be84c7618660 e2fsprogs-1.40.3-r1.ebuild 4023 RMD160 0a74cdc61b4d74502d91f179b89da1601aa68c54 e2fsprogs-1.40.3-r1.ebuild 4023 @@ -56,17 +56,18 @@ EBUILD e2fsprogs-1.40.4.ebuild 3889 RMD160 dcb7ce239e1006fda078e77e15aada10aafec MD5 855c5857591b34fdd1a7890552b4f91d e2fsprogs-1.40.4.ebuild 3889 RMD160 dcb7ce239e1006fda078e77e15aada10aafeca5b e2fsprogs-1.40.4.ebuild 3889 SHA256 27c19703edc521fb5245fde1d278181206c433f0ad38ee99eac47e714086662a e2fsprogs-1.40.4.ebuild 3889 -MISC ChangeLog 20081 RMD160 53a7814525b706abb463d9ac4459dde668278ab4 SHA1 7e9a9a52ba5209e0bb9412fb728e992212bcb974 SHA256 89fbca2d3982b990fd2d754e0bb1d29d6921b251b538164d99a31ce3c063b0f3 -MD5 fb6eb0e04aaec9d7314564b3b186c35c ChangeLog 20081 -RMD160 53a7814525b706abb463d9ac4459dde668278ab4 ChangeLog 20081 -SHA256 89fbca2d3982b990fd2d754e0bb1d29d6921b251b538164d99a31ce3c063b0f3 ChangeLog 20081 +EBUILD e2fsprogs-1.40.5.ebuild 4013 RMD160 8ddcf9443fd6f6532626283167cbc536ab85d80c SHA1 3a286295dc025550652a4b7c5959bacf7cdb83a0 SHA256 41f0d2e164f6079b16cd1573235248172a7f0a355a5b34e860e37546fc282d95 +MD5 62b6d3d8c14e543d80fbf85542e461c2 e2fsprogs-1.40.5.ebuild 4013 +RMD160 8ddcf9443fd6f6532626283167cbc536ab85d80c e2fsprogs-1.40.5.ebuild 4013 +SHA256 41f0d2e164f6079b16cd1573235248172a7f0a355a5b34e860e37546fc282d95 e2fsprogs-1.40.5.ebuild 4013 +MISC ChangeLog 20248 RMD160 454470400a38b45d85f36724eb14f9390ab1191e SHA1 a4cbf9aef0b4b17587848d050b0a48df3627419e SHA256 6bafa35568fd9fdd82012cfc22e44f6f09c321a1561c5a0110fbc7997acf6155 +MD5 f7975173cfe25ffce2057a93061c4563 ChangeLog 20248 +RMD160 454470400a38b45d85f36724eb14f9390ab1191e ChangeLog 20248 +SHA256 6bafa35568fd9fdd82012cfc22e44f6f09c321a1561c5a0110fbc7997acf6155 ChangeLog 20248 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 -MD5 4dfbb4dfcdb81f785ddc91f3307408ed files/digest-e2fsprogs-1.40.2 253 -RMD160 e4d75313507a8be6e01cfffe25055b77f885bc86 files/digest-e2fsprogs-1.40.2 253 -SHA256 68110f35f1b48f57c5da0f660ab454bc56debab94691022394ab4722f698b992 files/digest-e2fsprogs-1.40.2 253 MD5 39514f3775b7a460db1c9ab0808b7b1c files/digest-e2fsprogs-1.40.3 253 RMD160 d7c691d3c672cce47d5514661866a62aab0a9e53 files/digest-e2fsprogs-1.40.3 253 SHA256 4b67dff555415a64a37dcd04b3195c487f77ed3b4c4649a61f27b3b4a3f867d7 files/digest-e2fsprogs-1.40.3 253 @@ -76,10 +77,13 @@ SHA256 4b67dff555415a64a37dcd04b3195c487f77ed3b4c4649a61f27b3b4a3f867d7 files/di MD5 e4af75aa3da03473fa7660b3c429ef4f files/digest-e2fsprogs-1.40.4 253 RMD160 379f55b752888b1055efc79b3b97ac29ace3de05 files/digest-e2fsprogs-1.40.4 253 SHA256 2693aa7f92eea89a473e92977b9e7c806a7f8c878947fc5453492604545feb32 files/digest-e2fsprogs-1.40.4 253 +MD5 c54709ac64af2fd28af2ac81c2375d4e files/digest-e2fsprogs-1.40.5 253 +RMD160 c8767a2173e36d1035a3790b128299d8d8202f22 files/digest-e2fsprogs-1.40.5 253 +SHA256 a6db2298896a1892d8240d370a2c78d65dc6fbe2c3c19b501b26aae6b8d6e5d8 files/digest-e2fsprogs-1.40.5 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.8 (GNU/Linux) +Version: GnuPG v2.0.7 (GNU/Linux) -iEYEARECAAYFAkd6PGkACgkQj9hvisErhMLgIQCePyCseS7UvoNlgEmYEHOUZjsA -AIUAmgNBsGFhk2DX2hMijUnt7WsEP2fj -=F8wu +iD8DBQFHnXmoj9hvisErhMIRAjXKAJ9tEtZqD2XsAlaEE9NQZ5WOiCAhUwCg2F7h +ufL4G5vO9fBAeJ7dZvcGJq0= +=Y7us -----END PGP SIGNATURE----- diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.40.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.40.5.ebuild new file mode 100644 index 000000000000..8da0d716c8b5 --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.40.5.ebuild @@ -0,0 +1,129 @@ +# 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.5.ebuild,v 1.1 2008/01/28 06:43:46 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +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/lib/libcom_err.a )' > lib/libcom_err.a + echo 'GROUP ( /usr/lib/libcom_err.so )' > lib/libcom_err.so + echo 'GROUP ( /usr/lib/libss.a )' > lib/libss.a + echo 'GROUP ( /usr/lib/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) \ + --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)/libcom_err.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/files/digest-e2fsprogs-1.40.5 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.5 new file mode 100644 index 000000000000..b16b69b20a27 --- /dev/null +++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.40.5 @@ -0,0 +1,3 @@ +MD5 69e55eaf543acfab8e2eb8ba2883d8cd e2fsprogs-1.40.5.tar.gz 4048882 +RMD160 ec4a1ab69c114092075b3e6e37aade2facc6e878 e2fsprogs-1.40.5.tar.gz 4048882 +SHA256 11df6d84e0eb0da17938d4802d7872657b464c9a53ed21b0521c929d481d8ac4 e2fsprogs-1.40.5.tar.gz 4048882 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 000000000000..272807368cff --- /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@ + |