Removing memory leak patch due to miscompilation in applications depending on libtar. Check bug 228445 for reference

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 61 insertions, 3 deletions

diff --git a/dev-libs/libtar/ChangeLog b/dev-libs/libtar/ChangeLog
index 0a1844b74286..c101cdb1254d 100644
--- a/dev-libs/libtar/ChangeLog
+++ b/dev-libs/libtar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libtar
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/ChangeLog,v 1.4 2008/12/31 03:20:25 darkside Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/ChangeLog,v 1.5 2009/10/18 16:13:56 vostorga Exp $
+
+*libtar-1.2.11-r2 (18 Oct 2009)
+
+  18 Oct 2009; Víctor Ostorga <vostorga@gentoo.org>
+  +libtar-1.2.11-r2.ebuild, +files/libtar-1.2.11-example-fix.patch:
+  Removing memory leak patch due to miscompilation in applications depending
+  on libtar. Check bug 228445 for reference
 
   31 Dec 2008; Jeremy Olexa <darkside@gentoo.org> libtar-1.2.11-r1.ebuild:
   add ~amd64 kw, bug 250566
diff --git a/dev-libs/libtar/Manifest b/dev-libs/libtar/Manifest
index 6a710c1e225f..93e7a7b04275 100644
--- a/dev-libs/libtar/Manifest
+++ b/dev-libs/libtar/Manifest
@@ -1,5 +1,7 @@
+AUX libtar-1.2.11-example-fix.patch 533 RMD160 3190fbcc139992e6618101b4f0ca12278f2a86da SHA1 9adc72e14aaccba0df4f6d3f343b10a085866e88 SHA256 637467f70c4bb33e4df95fb196af081d2c7526ac198e789ca9f48cc9a15a58fe
 AUX libtar-1.2.11-memleak.patch 2974 RMD160 6124aba523a366d2ebbe7801bc514e0748589704 SHA1 2c5aa519d02715ce3174c8997377abd5984399df SHA256 b01e052f4dba94beef78e22403c6f73b7329cda751be713982d5fb43614c3fb3
 DIST libtar-1.2.11.tar.gz 145354 RMD160 205d1213ed32f9708fb2135010afdd9e184c430e SHA1 9611f23024b0e89aad1cfea301122186b3c160f8 SHA256 4a2eefb6b7088f41de57356e5059cbf1f917509b4a810f7c614625a378e87bb8
 EBUILD libtar-1.2.11-r1.ebuild 696 RMD160 84165e6d078ca55c08dba366e662c5abb83afa98 SHA1 4a7381ed9f4466058e8119b3eb79adca3dd8eefa SHA256 0ae91193b1402b10b33deffdaf66240b286be694f62a7ff3e6bf5e1a67d0f9f9
-MISC ChangeLog 746 RMD160 0e2c5eaa23ef3fab2ed175919a1c9dac02db8bdb SHA1 34ffbde068b59c2918cb72e14395008bd7966856 SHA256 fc857f470ee78aa66cc426a7fca8e5e2184386150ea4e399dbcd3626dc2797cf
+EBUILD libtar-1.2.11-r2.ebuild 720 RMD160 47fd40147952163620e99176e9a2a96aa7f14960 SHA1 97c8c7397e31abf6681bae2115d2f2608ac21807 SHA256 70504e142a0ae39da113a7497ce266f4325456185e33d1996cce637efcdbb813
+MISC ChangeLog 1022 RMD160 b7cc389e210496f62facbaba818f354dd6b23f8f SHA1 0a5c82ed29ac75ec0a865ce247101596168b7dd0 SHA256 9f4c7d6d47a1d8c567c37b39c7ccdedda6248e700da28f1ea4c0c925b0c4b2df
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/dev-libs/libtar/files/libtar-1.2.11-example-fix.patch b/dev-libs/libtar/files/libtar-1.2.11-example-fix.patch
new file mode 100644
index 000000000000..f7f3bf50911b
--- /dev/null
+++ b/dev-libs/libtar/files/libtar-1.2.11-example-fix.patch
@@ -0,0 +1,20 @@
+--- libtar-1.2.11.orig/libtar/libtar.c
++++ libtar-1.2.11/libtar/libtar.c
+@@ -19,6 +19,7 @@
+ #include <sys/param.h>
+ 
+ #ifdef STDC_HEADERS
++# include <stdlib.h>
+ # include <string.h>
+ #endif
+ 
+@@ -91,6 +92,10 @@
+ 		return -1;
+ 	}
+ 
++	/* This is a bad thing to do on big-endian lp64 systems, where the
++	   size and placement of integers is different than pointers.
++	   However, to fix the problem 4 wrapper functions would be needed and
++	   an extra bit of data associating GZF with the wrapper functions.  */
+ 	return (int)gzf;
+ }
diff --git a/dev-libs/libtar/libtar-1.2.11-r2.ebuild b/dev-libs/libtar/libtar-1.2.11-r2.ebuild
new file mode 100644
index 000000000000..8a17042373f0
--- /dev/null
+++ b/dev-libs/libtar/libtar-1.2.11-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/libtar-1.2.11-r2.ebuild,v 1.1 2009/10/18 16:13:56 vostorga Exp $
+
+inherit eutils
+
+DESCRIPTION="C library for manipulating POSIX tar files"
+HOMEPAGE="http://www.feep.net/libtar/"
+SRC_URI="ftp://ftp.feep.net/pub/software/libtar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-example-fix.patch
+	sed -i '/INSTALL_PROGRAM/s: -s$::' */Makefile.in
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog README TODO
+}