Grab fix from upstream for blkid memleak #171844 by Andrej Filipcic and drop ext4...

Package-Manager: portage-2.1.2.2

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index fac321366f5d12cb4f0ca1098286c4058ac16f62..61585bd2590836cc473598239d21d24110d5e0c2 100644 (file)
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.95 2007/01/26 22:40:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.96 2007/03/24 08:52:42 vapier Exp $
+
+*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:

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 000ffa57e0a26fccce34bdb7ea3e73413fad9d12..c70c3c62a7cd60be497603171b8be65dc4b81f95 100644 (file)
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -17,6 +17,10 @@ AUX e2fsprogs-1.38-tests-locale.patch 656 RMD160 16c625c16144ed16942fa19988524b7
 MD5 f199f07604566fda4f2a4dabac83a535 files/e2fsprogs-1.38-tests-locale.patch 656
 RMD160 16c625c16144ed16942fa19988524b7b5727c583 files/e2fsprogs-1.38-tests-locale.patch 656
 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598 files/e2fsprogs-1.38-tests-locale.patch 656
+AUX e2fsprogs-1.39-blkid-memleak.patch 1194 RMD160 48b7c5f74118c82610b3cedb4e1d22b8bcc3fea6 SHA1 84c6543ecbf2b9992816033d4ab16f9d3b9eb29e SHA256 b05fd802386247651efae2d91cdab1be510d941e98040bee2518aafae01d27b7
+MD5 7146ec2dedb6817a0c2ff80d1555a82d files/e2fsprogs-1.39-blkid-memleak.patch 1194
+RMD160 48b7c5f74118c82610b3cedb4e1d22b8bcc3fea6 files/e2fsprogs-1.39-blkid-memleak.patch 1194
+SHA256 b05fd802386247651efae2d91cdab1be510d941e98040bee2518aafae01d27b7 files/e2fsprogs-1.39-blkid-memleak.patch 1194
 AUX e2fsprogs-1.39-ext4-prototypes.patch 521 RMD160 b758e8bcbb18d5dd7f0a7523eaea740cf9726a38 SHA1 c88b916bac7ed73d095243cec81894294f8cae78 SHA256 bc9201eeba2ee65ada8721cbd58992e09d35c60c8e672985853769e79a552c60
 MD5 f8a337df3326ec8bf51fd27197d0e1cb files/e2fsprogs-1.39-ext4-prototypes.patch 521
 RMD160 b758e8bcbb18d5dd7f0a7523eaea740cf9726a38 files/e2fsprogs-1.39-ext4-prototypes.patch 521
@@ -39,18 +43,22 @@ RMD160 04d8e04d5e04f9a927a76b36a072c50fb80eae84 files/e2fsprogs-1.39-util-strpti
 SHA256 fa300c80bbd679967ff74c361b63a9610f911b0916eff38fd491b797c0ff99c5 files/e2fsprogs-1.39-util-strptime.patch 178
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
 DIST ext4-e2fsprogs-1.39.patch.tar 716800 RMD160 5b20e7f2133e7339d22ee85d39c92cd7af920bb9 SHA1 fce15f60164a6c067c0d5a50cf00d4716e9a4f92 SHA256 0472210d002808f1505f96b1ca0e667f3cc2a6d585bca7d9a00130d6fe0ca38e
-EBUILD e2fsprogs-1.39-r1.ebuild 4115 RMD160 eb3f439c3f2174fa506cf5fa3efcc53a6e22303f SHA1 b4081122c69c6f41530bd709859c6f66b0b7c420 SHA256 016d47be1c93ef2447659c4ae5b619bd08977bb8b246c60b0fc6361b1a25bc8c
-MD5 47e43e5f622bfaa7dbcabe8dc73459c0 e2fsprogs-1.39-r1.ebuild 4115
-RMD160 eb3f439c3f2174fa506cf5fa3efcc53a6e22303f e2fsprogs-1.39-r1.ebuild 4115
-SHA256 016d47be1c93ef2447659c4ae5b619bd08977bb8b246c60b0fc6361b1a25bc8c e2fsprogs-1.39-r1.ebuild 4115
+EBUILD e2fsprogs-1.39-r1.ebuild 4134 RMD160 813116a571ccb7d910707fd87ac98ffa2c3123c0 SHA1 dfc45693e5712abe57dd9654d8979bdb9583f8ad SHA256 87348159bbda080d97dd6abcb01bb3c92a10c09ce4c830cab28c88302936aca4
+MD5 716ed4c217eecfbbbb87c6eb637ce194 e2fsprogs-1.39-r1.ebuild 4134
+RMD160 813116a571ccb7d910707fd87ac98ffa2c3123c0 e2fsprogs-1.39-r1.ebuild 4134
+SHA256 87348159bbda080d97dd6abcb01bb3c92a10c09ce4c830cab28c88302936aca4 e2fsprogs-1.39-r1.ebuild 4134
+EBUILD e2fsprogs-1.39-r2.ebuild 3959 RMD160 a10942ccd9b866dbf2cb0966fb0f243c6711802d SHA1 0b024bc40c43569dca5d76bc17de32916831b259 SHA256 0cd661ae94d71d32a236aa3adfe5a12088cb03a2070657002f80834dd2219c13
+MD5 2156e833f56e38b1638a93900ab1c3d4 e2fsprogs-1.39-r2.ebuild 3959
+RMD160 a10942ccd9b866dbf2cb0966fb0f243c6711802d e2fsprogs-1.39-r2.ebuild 3959
+SHA256 0cd661ae94d71d32a236aa3adfe5a12088cb03a2070657002f80834dd2219c13 e2fsprogs-1.39-r2.ebuild 3959
 EBUILD e2fsprogs-1.39.ebuild 3773 RMD160 d86bd1048293be54efaba2b121cb66199b6bffab SHA1 3207da1989239265d11b0b9f91d7374731bbca22 SHA256 27ffaf0ad7faad5b2de8bf490f56cd377b292b434f3e003f6f2b6b80a523c123
 MD5 9cde58b75db8e27a56c692484c95a839 e2fsprogs-1.39.ebuild 3773
 RMD160 d86bd1048293be54efaba2b121cb66199b6bffab e2fsprogs-1.39.ebuild 3773
 SHA256 27ffaf0ad7faad5b2de8bf490f56cd377b292b434f3e003f6f2b6b80a523c123 e2fsprogs-1.39.ebuild 3773
-MISC ChangeLog 15751 RMD160 4fe626f596e86600ea57498c7c74d904100be31f SHA1 3d33b8cde2c4e2e70fe2091bc1465a0fbf5253cb SHA256 400fbbfaa56a8aeea4b26d75ec6941c42cd9ce5a821e7523451a054ccf12dad0
-MD5 4927e244d0e0dab7f76804eb94200961 ChangeLog 15751
-RMD160 4fe626f596e86600ea57498c7c74d904100be31f ChangeLog 15751
-SHA256 400fbbfaa56a8aeea4b26d75ec6941c42cd9ce5a821e7523451a054ccf12dad0 ChangeLog 15751
+MISC ChangeLog 16030 RMD160 926f5af969fa4394ebf3d9474f2d194ba977eaa8 SHA1 62920ada1b9b0ac2946dae74f4d40fbbe8365801 SHA256 72ddaeedef69a869a250bade2ae5fce57ac62190763021648d94b9f9bd70227e
+MD5 85ae21f17408a07baeac5728875b37a2 ChangeLog 16030
+RMD160 926f5af969fa4394ebf3d9474f2d194ba977eaa8 ChangeLog 16030
+SHA256 72ddaeedef69a869a250bade2ae5fce57ac62190763021648d94b9f9bd70227e ChangeLog 16030
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -61,10 +69,13 @@ SHA256 7f2869196368e8285912d8cc8ebe8d2ad3f08d07abad83f1011f753f3f824762 files/di
 MD5 b9dfcbb27ee58be28e401b8a17bccc0d files/digest-e2fsprogs-1.39-r1 515
 RMD160 7b999a2cd6bb72521fedc467433e23f7d9bde740 files/digest-e2fsprogs-1.39-r1 515
 SHA256 031d234c293c7df0edc6d603c55f54ee8880a322532f0a2c7f98877e2eae189a files/digest-e2fsprogs-1.39-r1 515
+MD5 fc00317ae73d9c2807fd61dff454474c files/digest-e2fsprogs-1.39-r2 247
+RMD160 7fc0216dd2eb0963650054e763b94a26a3214c6a files/digest-e2fsprogs-1.39-r2 247
+SHA256 7f2869196368e8285912d8cc8ebe8d2ad3f08d07abad83f1011f753f3f824762 files/digest-e2fsprogs-1.39-r2 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF+1Dw8bi6rjpTunYRAh5fAKCbJUmIyQTPtVvOEJGNJ7nzGOUjYwCfSDaW
-SKbWVnpRmIYMkl96i2B5G+Q=
-=JVNN
+iD8DBQFGBOb68bi6rjpTunYRAq9DAKDOeSvVJe6BOFG65LlgKKSrJnTMcQCfdvaE
+d534EVyeOOHwtlHmbnXS8Kw=
+=IcEO
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.39-r2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.39-r2.ebuild
new file mode 100644 (file)
index 0000000..b4971b7
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.39-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39-r2.ebuild,v 1.1 2007/03/24 08:52:42 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/${PN}/${P}.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 static"
+
+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}"/${P}-blkid-memleak.patch #171844
+       # Fix locale issues while running tests #99766
+       epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch
+       epatch "${FILESDIR}"/${PN}-1.38-locale.patch #131462
+       # Fix a cosmetic error in mk_cmds's help output.
+       epatch "${FILESDIR}"/e2fsprogs-1.32-mk_cmds-cosmetic.patch
+       epatch "${FILESDIR}"/e2fsprogs-1.39-util-strptime.patch
+       chmod u+w po/*.po # Userpriv fix #27348
+       # Clean up makefile to suck less
+       epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch
+       epatch "${FILESDIR}"/e2fsprogs-1.39-parse-types.patch #146903
+       # Fixes libintl handling on non-glibc #122368
+       epatch "${FILESDIR}"/${PN}-1.39-libintl.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"
+       ln -s "${ROOT}"/usr/$(get_libdir)/libcom_err.a lib/libcom_err.a
+       ln -s "${ROOT}"/$(get_libdir)/libcom_err.so lib/libcom_err.so
+       ln -s /usr/bin/mk_cmds lib/ss/mk_cmds
+       ln -s "${ROOT}"/usr/include/ss/ss_err.h lib/ss/
+       ln -s "${ROOT}"/$(get_libdir)/libss.so lib/libss.so
+
+       # 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=/bin/true
+       export CC=$(tc-getCC)
+       export STRIP=/bin/true
+
+       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
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc ChangeLog README RELEASE-NOTES SHLIBS
+       docinto e2fsck
+       dodoc e2fsck/ChangeLog e2fsck/CHANGES
+
+       # 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
+
+       ln -s libext2fs.info.gz  $D/usr/share/info/booga.info.gz
+       # move 'useless' stuff to /usr/
+       dosbin "${D}"/sbin/mklost+found
+       rm -f "${D}"/sbin/mklost+found
+
+       # these manpages are already provided by FreeBSD libc
+       use elibc_FreeBSD && \
+               rm -f "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
+                       "${D}"/usr/share/man/man1/uuidgen.1
+}

diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r2 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r2
new file mode 100644 (file)
index 0000000..7e58444
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r2
@@ -0,0 +1,3 @@
+MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111
+RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111
+SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111

diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.39-blkid-memleak.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-blkid-memleak.patch
new file mode 100644 (file)
index 0000000..ce8ee8a
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.39-blkid-memleak.patch
@@ -0,0 +1,53 @@
+http://bugs.gentoo.org/171844
+
+# HG changeset patch
+# User tytso@mit.edu
+# Date Tue Mar  6 19:56:18 2007 -0500
+# Node ID 5a2a75111d7a6fc4b5ee99663f252a42d5a2b227
+# parent: 69a666bd25f57107a09e5bad0a158b8a810e6a63
+Fix memory leak in blkid library
+
+Addresses Debian Bug: #413661
+
+Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+
+2007-03-06  Theodore Tso  <tytso@mit.edu>
+
+       * devname.c (dm_probe_all), probe.c (blkid_verify): Fix memory
+               leak.  (Addresses Debian Bug #413661)
+
+--- a/lib/blkid/devname.c      Sun Mar  4 08:17:18 2007 -0500
++++ b/lib/blkid/devname.c      Tue Mar  6 19:56:18 2007 -0500
+@@ -305,6 +305,7 @@
+               probe_one(cache, device, dev, BLKID_PRI_DM, only_if_new);
+ 
+ try_next:
++              free(device);
+               next = names->next;
+       } while (next);
+ 
+--- a/lib/blkid/probe.c        Sun Mar  4 08:17:18 2007 -0500
++++ b/lib/blkid/probe.c        Tue Mar  6 19:56:18 2007 -0500
+@@ -886,9 +886,9 @@
+       }
+ 
+       if (!dev->bid_type) {
+-              if (probe.fd >= 0) close(probe.fd);
+               blkid_free_dev(dev);
+-              return NULL;
++              dev = 0;
++              goto found_type;
+       }
+               
+ found_type:
+@@ -908,7 +908,8 @@
+               free(probe.sbbuf);
+       if (probe.buf)
+               free(probe.buf);
+-      close(probe.fd);
++      if (probe.fd >= 0) 
++              close(probe.fd);
+ 
+       return dev;
+ }
+