Add fix from upstream for realloc bug #338137 by Chris Coleman.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 136 insertions, 2 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index 24868f2898eb..f75cd463e983 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/ccache
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.66 2010/10/19 05:27:48 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.67 2010/11/19 07:54:40 vapier Exp $
+
+*ccache-2.4-r9 (19 Nov 2010)
+
+  19 Nov 2010; Mike Frysinger <vapier@gentoo.org> +ccache-2.4-r9.ebuild,
+  +files/ccache-2.4-xrealloc.patch:
+  Add fix from upstream for realloc bug #338137 by Chris Coleman.
 
   19 Oct 2010; Mart Raudsepp <leio@gentoo.org> ccache-2.4-r6.ebuild,
   ccache-2.4-r7.ebuild:
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 743b4f40dde5..b0eb1289dfa3 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ccache-2.4-profile.patch 1069 RMD160 9eaf92f401202a06ee0d0f468a2ff6e728456a24 SHA1 9177ae6bb8c7a95079a045eff3b7d0a1f33f427e SHA256 7cd6e8fcd2fc90aac484ff83c1181c82eca4ec3e2d568c10025f67ac751a6794
 AUX ccache-2.4-respectflags.patch 403 RMD160 19efa0fcb27eba9fe7ec086b8d6e261e4485f275 SHA1 27fbedc4ee219ee6f9b2c17ef8fa30dd91a024f5 SHA256 f7006cc34ecc8315b023d4533273d47a7a34958e7037242811a58ee8570efbd5
 AUX ccache-2.4-utimes.patch 3267 RMD160 57bf223bbc1da41e3955cf017aa5d472cf93b19f SHA1 e9d63db657ef4273e8c27ddf6ae6deb8127540d1 SHA256 72f617b329a68c9db57180a9940689a48acee771067392a2d68b8abf8cdf891a
+AUX ccache-2.4-xrealloc.patch 742 RMD160 7d800bfc937c00b51a073705815ae6ff5d4add8d SHA1 bfbf2e090a72c91417090b6dc030649b39969a16 SHA256 119c8fb7f3ec725444e416e42d690fdf81470213a837274bc5375f659942147c
 AUX ccache-config 1554 RMD160 cbcb9cf3b2313002e2a3336fb39e161c61d350a6 SHA1 919e73d840ba959ef4b32a66db62e4837611763b SHA256 da4a731fdcebe82fee0e5946cde131d35f528b69ec81bb0901f3b56441c485bb
 DIST ccache-2.4.tar.gz 86363 RMD160 43a0647c7faf659121a53a92ec45d245b8140124 SHA1 9833ec13de9b90d5409e60d679ac681115ef465e SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0
 EBUILD ccache-2.4-r6.ebuild 2283 RMD160 5f567792bd72ac46b0ec1858adb9940cbb0c6e63 SHA1 183e97737b438c36818e309c58a9739779927251 SHA256 e3b2747d69fc3371a8496139134114f99d16e0612ba040f96e92cede06a8f219
 EBUILD ccache-2.4-r7.ebuild 2390 RMD160 d48da0092a3780d564b9615ac1b6739fc179a38c SHA1 2ece090cff1bc3a53e2205a7646229aa29f2dd0f SHA256 8222e8059726a41553899ed0107bd14994c0b08151e9859801adee5208aec88e
 EBUILD ccache-2.4-r8.ebuild 2452 RMD160 c6ea12d3222e8ea4df1eb6698a510089dd5e47e1 SHA1 6ef767669947fa05167c2911faca92da9318fecb SHA256 0ce327aec9ef58522618d1fae858bde33f4f83d18e7fc601ed300318245b277e
-MISC ChangeLog 8642 RMD160 d73bde3c96502944837ed41bf867219d87065700 SHA1 313045ad01e6ab3472ba3337af1a340f0793a05d SHA256 d5a150f36a187c0d86657d435a33afc7a441f3ec3c1b29281e0a04c59e63ce1c
+EBUILD ccache-2.4-r9.ebuild 2507 RMD160 82aa85b625b3a969b5de6c257adeafc3fe062414 SHA1 2d3d6fbce85685191807967131eade82d48fdbae SHA256 e92c3e519f8aafd1a940f89ade71e7c766f0289ed84e517caa470e20cf4c588a
+MISC ChangeLog 8850 RMD160 76f37d26406d8368a2ce2710c258c762e6c29702 SHA1 d5a7240aa1cf91513e171bc6295de7879a292fa5 SHA256 ed7a06446221bec1b79c372256ae4461800b5aaeef89faa1d5b773ba617d20f2
 MISC metadata.xml 412 RMD160 964ade3959d81af2c5a0a88758db6ed87d80dba5 SHA1 0a38f42c23434ad993bf2d9bfd0b73552c50eb5b SHA256 c54d1b5f225e3a82754a2550d3875b7211249572a9372abdeff5fccda469aada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkzmLOAACgkQTwhj9JtAlp6MeQEAla7DXJzhHpd3wx8wTDwS5TBO
+aFt7jqzHYsLIYy2r2nsA/AgQurex5ebT33SwxoEpQvTiRxuPxordfsUUrz4c43Ni
+=i/i7
+-----END PGP SIGNATURE-----
diff --git a/dev-util/ccache/ccache-2.4-r9.ebuild b/dev-util/ccache/ccache-2.4-r9.ebuild
new file mode 100644
index 000000000000..5cafb2966152
--- /dev/null
+++ b/dev-util/ccache/ccache-2.4-r9.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-2.4-r9.ebuild,v 1.1 2010/11/19 07:54:40 vapier Exp $
+
+inherit eutils autotools multilib
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${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=""
+
+# Note: this version is designed to be auto-detected and used if
+# you happen to have Portage 2.0.X+ installed.
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/ccache-2.4-profile.patch
+	epatch "${FILESDIR}"/ccache-2.4-respectflags.patch
+	epatch "${FILESDIR}"/ccache-2.4-utimes.patch
+	epatch "${FILESDIR}"/ccache-2.4-xrealloc.patch #338137
+	eautoconf
+}
+
+do_links() {
+	insinto /usr/$(get_libdir)/ccache/bin
+	for a in ${CHOST}-{gcc,g++,c++} gcc c++ g++; do
+	    dosym /usr/bin/ccache /usr/$(get_libdir)/ccache/bin/${a}
+	done
+}
+
+src_install() {
+	dobin ccache || die
+	doman ccache.1
+	dodoc README
+	dohtml web/*.html
+
+	diropts -m0755
+	dodir /usr/$(get_libdir)/ccache/bin
+	keepdir /usr/$(get_libdir)/ccache/bin
+
+	dobin "${FILESDIR}"/ccache-config || die
+
+	diropts -m0700
+	dodir /root/.ccache
+	keepdir /root/.ccache
+}
+
+pkg_preinst() {
+	# Do NOT duplicate this in your ebuilds or phear of the wrath!!!
+	if [[ ${ROOT} = "/" ]] ; then
+	    einfo "Scanning for compiler front-ends..."
+	    do_links
+	else
+	    ewarn "Install is incomplete; you must run the following commands:"
+	    ewarn " # ccache-config --install-links"
+	    ewarn " # ccache-config --install-links ${CHOST}"
+	    ewarn "after booting or chrooting to ${ROOT} to complete installation."
+	fi
+}
+
+pkg_postinst() {
+	# nuke broken symlinks from previous versions that shouldn't exist
+	for i in cc ${CHOST}-cc ; do
+	    [[ -L "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}" ]] && \
+			rm -rf "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}"
+	done
+	[[ -d "${ROOT}/usr/$(get_libdir)/ccache.backup" ]] && \
+		rm -fr "${ROOT}/usr/$(get_libdir)/ccache.backup"
+
+	elog "To use ccache with **non-Portage** C compiling, add"
+	elog "/usr/$(get_libdir)/ccache/bin to the beginning of your path, before /usr/bin."
+	elog "Portage 2.0.46-r11+ will automatically take advantage of ccache with"
+	elog "no additional steps.  If this is your first install of ccache, type"
+	elog "something like this to set a maximum cache size of 2GB:"
+	elog "# ccache -M 2G"
+}
diff --git a/dev-util/ccache/files/ccache-2.4-xrealloc.patch b/dev-util/ccache/files/ccache-2.4-xrealloc.patch
new file mode 100644
index 000000000000..8e2d44dc6137
--- /dev/null
+++ b/dev-util/ccache/files/ccache-2.4-xrealloc.patch
@@ -0,0 +1,35 @@
+https://bugzilla.samba.org/show_bug.cgi?id=7090
+https://bugs.gentoo.org/338137
+
+From 52a9cd8eb8a69f9dc6944c047faf112b7137a07b Mon Sep 17 00:00:00 2001
+From: Andrew Tridgell <tridge@samba.org>
+Date: Mon, 17 Jul 2006 05:41:12 +0200
+Subject: [PATCH] fixed a bug in x_realloc()
+
+---
+ util.c |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 073fa81..29d0e5b 100644
+--- a/util.c
++++ b/util.c
+@@ -187,14 +187,10 @@ void *x_realloc(void *ptr, size_t size)
+ {
+ 	void *p2;
+ 	if (!ptr) return x_malloc(size);
+-	p2 = malloc(size);
++	p2 = realloc(ptr, size);
+ 	if (!p2) {
+ 		fatal("out of memory in x_realloc");
+ 	}
+-	if (ptr) {
+-		memcpy(p2, ptr, size);
+-		free(ptr);
+-	}
+ 	return p2;
+ }
+ 
+-- 
+1.7.3.1
+