Add fix by Lubomir Rintel for corrupting some object files #288977 by Hugo Mildenberger.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

4 files changed, 111 insertions, 6 deletions

diff --git a/dev-libs/elfutils/ChangeLog b/dev-libs/elfutils/ChangeLog
index 4562b72d8113..e5659f27f09c 100644
--- a/dev-libs/elfutils/ChangeLog
+++ b/dev-libs/elfutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/elfutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.125 2009/09/26 21:53:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.126 2009/11/21 03:53:04 vapier Exp $
+
+*elfutils-0.143-r1 (21 Nov 2009)
+
+  21 Nov 2009; Mike Frysinger <vapier@gentoo.org> +elfutils-0.143-r1.ebuild,
+  +files/elfutils-0.143-fix-fill_mmap-for-sections-past-the-section-headers.
+  patch:
+  Add fix by Lubomir Rintel for corrupting some object files #288977 by Hugo
+  Mildenberger.
 
 *elfutils-0.143 (26 Sep 2009)
 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 7c7649152b77..c012efc496e7 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX elfutils-0.118-PaX-support.patch 954 RMD160 ed86dfec7b51b273721f3dd0c6e11bba935e6c1e SHA1 baaaa3686902c3f4ce9f81f7a83e2e66ba1575d2 SHA256 e769e1168dc645ce99655f984f5c19a54d765210cacd098556b6b68743b877fa
 AUX elfutils-0.131-gnu-inline.patch 8899 RMD160 6c41d63b3e231eda0ba2f337a206bf649ec85729 SHA1 53d0d15bc925f559471e2ab0ad86539208f93140 SHA256 69e1781732b3babd00d6fbc5976f908d293942cc3f253f451e9c22f49ee6b7b6
+AUX elfutils-0.143-fix-fill_mmap-for-sections-past-the-section-headers.patch 1245 RMD160 48198cbd02f93e6f7ea646429c5ba33daee9e22c SHA1 1b5953fda6d163f6b0d6bdd40c2e99abda1418ed SHA256 942b17fd3422677bfd09f919c535abea0bb9a3c43f323a04d32c375b83da719c
 DIST elfutils-0.127-patches-1.0.tar.bz2 19950 RMD160 7bd6e8fd52a2c5df3b423a6e9f553a745dab6047 SHA1 20591f01ae916464aa28ca291e96a3d3a632dd4f SHA256 ccaa15294c9a1e11b6b0d0cf20ea2f882a8fbda47141301b5af57db5064f23eb
 DIST elfutils-0.127.tar.gz 1247883 RMD160 f083e5d3d5fdbb82f15a95f4b420c0086d2f52e1 SHA1 2b6074069960ed9258df0efc9899e7a3a0be5aeb SHA256 bb5d2a846dbb5c9e779cec37a0ebdb4b1c8071131cfcce05358a08367281c38a
 DIST elfutils-0.131-patches-1.0.tar.bz2 16640 RMD160 28c168d3d3f6731697354ab867a25c99c387ed32 SHA1 d83422054505c8e265afda85946b930636cc1321 SHA256 f959d97b68a53eedf1712bdfbf496faae0de5a0e2474aa5641a9811263b5ff8e
@@ -14,13 +15,14 @@ EBUILD elfutils-0.127.ebuild 1634 RMD160 4dad189c3c1daf6c71282cab84af27f6f771f6c
 EBUILD elfutils-0.131-r1.ebuild 1718 RMD160 3f616ab94b1e857de1debb37861393010027d6b1 SHA1 aa77b3e6fbf17a6a345b114cc79e143a44955fa8 SHA256 33dfcd202766305fa203e77c8ef2eee5819f456fddef1f5e063bb5445f4f88c0
 EBUILD elfutils-0.131-r2.ebuild 1664 RMD160 9635abfafbef3c1b63737a7fc4c7381944846d1c SHA1 252537336a56403a0f454f3c38fee263a405e846 SHA256 66c43e02f03bb5db40ff18994de7119ca55198cf585e144a5c4e3357a566808f
 EBUILD elfutils-0.140.ebuild 1811 RMD160 db4e3e25b1590eeae6185531528b570659e8ffbf SHA1 a021ac57f72caac6f131842fcc557cbff326a9b4 SHA256 b73f4cdbf34f7b85c82a8acf26487ab2c9c30390c96860995e144ecf81f62dd8
+EBUILD elfutils-0.143-r1.ebuild 1980 RMD160 68e02eaf6b9e71770b8730f8acb88191cdc5362b SHA1 512b4eeeb48c8a7044ab6b145c2337246ddb7177 SHA256 cee89ff5ed0deadd823abd43905a385b24216a68063c6d73e757572640260635
 EBUILD elfutils-0.143.ebuild 1882 RMD160 f920f22ea0b296e6bf9463db37f1f385731dbad7 SHA1 f6c087c720264d477a52eedacc004b435a489a1e SHA256 b1122eddc3c646401039e218789a61ab1e61a22998765c261adbdba58a16bbc6
-MISC ChangeLog 16071 RMD160 280dccd99e72d33eb5a13ec1b9a3e37f48d6389a SHA1 a34fb1a4335e1c3683edce2dbd5b33c14434b253 SHA256 0f7ed303587c421bbe64cbec53863c9f27566bbfdfded86c81321fdd8b8429f3
+MISC ChangeLog 16359 RMD160 cb3e0d3d08c8be459afc8b2b517c2bf9914bdde5 SHA1 943a37ad8296cf691bf904bcceb86bc9962dd914 SHA256 9a369411f858e788dce84c48b25ad2210a1e194f85fad48959dc445d4fc73611
 MISC metadata.xml 281 RMD160 2e23c1850f32822e50d0905b2e36ba1e22c004b2 SHA1 8f2ea427f9a348676d948018d621bea51f0f8740 SHA256 2418a06fe1c33bf09a8cad2a5b582a9a5b4c2d3315e74f67e3b10c4d76f53736
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkq+jZgACgkQiqiDRvmkBmIGkwCfQPnSZm7JNkSjzJNy4xcfb7kU
-N3IAoNUs89819dwgAHa/GimKskYXyzmf
-=T+YF
+iEYEARECAAYFAksHZPUACgkQlPl3HsVfCDr0sACeNfXkd5cjJjlDNXbCCvmA5aUj
+a/8AnRQ+5eipy/tQ5sPvtbkAq/Pyz6tU
+=1j4e
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/elfutils/elfutils-0.143-r1.ebuild b/dev-libs/elfutils/elfutils-0.143-r1.ebuild
new file mode 100644
index 000000000000..4b0331de099c
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.143-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.143-r1.ebuild,v 1.1 2009/11/21 03:53:04 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://people.redhat.com/drepper/"
+#SRC_URI="ftp://sources.redhat.com/pub/systemtap/${PN}/${P}.tar.gz"
+#SRC_URI="mirror://debian/pool/main/e/elfutils/elfutils_${PV}.orig.tar.gz"
+SRC_URI="https://fedorahosted.org/releases/e/l/elfutils/${P}.tar.bz2"
+
+LICENSE="GPL-2-with-exceptions"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bzip2 lzma nls test zlib"
+
+# This pkg does not actually seem to compile currently in a uClibc
+# environment (xrealloc errs), but we need to ensure that glibc never
+# gets pulled in as a dep since this package does not respect virtual/libc
+RDEPEND="zlib? ( >=sys-libs/zlib-1.2.2.3 )
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+	nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4
+	>=sys-devel/binutils-2.15.90.0.1
+	>=sys-devel/gcc-4.1.2
+	!dev-libs/libelf"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.118-PaX-support.patch
+	epatch "${FILESDIR}"/${P}-fix-fill_mmap-for-sections-past-the-section-headers.patch #288977
+	find . -name Makefile.in -print0 | xargs -0 sed -i -e 's:-W\(error\|extra\)::g'
+	use test || sed -i -e 's: tests::' Makefile.in #226349
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		--program-prefix="eu-" \
+		$(use_with zlib) \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+
+	emake || die
+}
+
+src_test() {
+	env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \
+		emake -j1 check || die "test failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
+}
diff --git a/dev-libs/elfutils/files/elfutils-0.143-fix-fill_mmap-for-sections-past-the-section-headers.patch b/dev-libs/elfutils/files/elfutils-0.143-fix-fill_mmap-for-sections-past-the-section-headers.patch
new file mode 100644
index 000000000000..2d613985e4fe
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.143-fix-fill_mmap-for-sections-past-the-section-headers.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/288977
+
+From 59869a0ec5f8f8bfcaea12fecd17053e3f2b1764 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Fri, 23 Oct 2009 16:18:51 +0200
+Subject: [PATCH] Fix fill_mmap for sections past the section headers
+
+If fill_mmap() was run for a section that's past the shdr_end, but does
+not immediately follow the section headers the fill start would be
+determined incorrectly as shdr_end, which would wipe off contents of
+sections between shdr_end and current one.
+
+Issue was reported and triaged by Hugo Mildenberger and Peter Alfredsen.
+---
+ libelf/ChangeLog          |    5 +++++
+ libelf/elf32_updatefile.c |    7 +++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+--- a/libelf/elf32_updatefile.c	2009-10-23 21:33:06.000000000 +0200
++++ b/libelf/elf32_updatefile.c	2009-10-23 21:39:38.000000000 +0200
+@@ -322,8 +322,11 @@
+ 
+ 	    if (last_position + written != scn_start + offset
+ 		&& shdr_end < scn_start + offset)
+-	      memset (shdr_end, __libelf_fill_byte,
+-		      scn_start + offset - shdr_end);
++	      {
++		char *fill_start = MAX (shdr_end, scn_start);
++		memset (fill_start, __libelf_fill_byte,
++			scn_start + offset - fill_start);
++	      }
+ 	  }
+ 
+ 	  if (scn->data_list_rear != NULL)