Fix for mem leaks #264889 by Mattias Nissler. Upgrade to EAPI=5 for subslot usage.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 97 insertions, 17 deletions

diff --git a/sys-devel/bc/ChangeLog b/sys-devel/bc/ChangeLog
index 1d8aaeab8eb1..e0d9616da765 100644
--- a/sys-devel/bc/ChangeLog
+++ b/sys-devel/bc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/bc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.43 2014/01/18 03:08:46 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.44 2015/07/13 05:01:23 vapier Exp $
+
+*bc-1.06.95-r2 (13 Jul 2015)
+
+  13 Jul 2015; Mike Frysinger <vapier@gentoo.org> +bc-1.06.95-r2.ebuild,
+  +files/bc-1.06.95-mem-leak.patch:
+  Fix for mem leaks #264889 by Mattias Nissler. Upgrade to EAPI=5 for subslot
+  usage.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> bc-1.06.95-r1.ebuild,
   bc-1.06.95.ebuild:
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index aee8e4db2208..d77b4c909efa 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bc-1.06.95-mem-leak.patch 588 SHA256 27e30d0389b79556609a74a4bb2a19f208f0e527bf08357ad79e0f453f15ac17 SHA512 3a1f354b8979586b39e6e3f93f2df7d38c2f221fb00ceef7db6cb6b51712c0fc27dbbd75635a8e4e9e2f8f100c5a39cdc1d4c1cfc32bd6c406af94edef37e40d WHIRLPOOL 975dae719f33d5102c7e4455e940ad33b40dd4c716e9546d2a05606c898367686cdb80298e68fa6faebadf637d308dfb885cb9490e554b8cb344f23feb14ebc2
 AUX bc-1.06.95-void_uninitialized.patch 351 SHA256 440a9a20633317204a0205962f573a932ef4493b1dc9ff3253bfed22c8caf5cd SHA512 6d2803d831d8a3137c3d867606f8d40455a6f984bfe844e10e276e24cbd5d9fd1ff21b81ea91775dd7e1e55484cdde7bf859fa3e9a17887bdf548b32cdc46dae WHIRLPOOL be26b8f81e119247095a0d2c8b8131f507454ac5c087ab32da1fdce8023080286ec125ae3b7bf06b2e690498bb78b32a7e7ff78ae8cd81038904bb7168e5f620
 DIST bc-1.06.95.tar.bz2 290069 SHA256 7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1 WHIRLPOOL e91adb7b1fd42c4d47dad76f994c51ee7a8d962a24cb1b0cbeaa992fe1be59878016d5883506ec4153293daf48fbe3f345bb88fbe3f6276b3353c89573a612af
 EBUILD bc-1.06.95-r1.ebuild 1468 SHA256 6a57f375cabc9c7adbcb9861a5d573e400445945fddc9e55f2a9a3860411a84a SHA512 a6fa9740087ad54d6ad74bf7821dec8495155eacafb264c78c5a26c5825251fcf87b08ae98cd3a3b6aaad2c18720d327d317c79806ce357576d7ecc65200703f WHIRLPOOL 9298a7c4c41481d70d42d2e9310a121aea197eed4ebdae416c1c8e60293535ed3d67697509d1b7a2afccc521d57a0272332f53cd3697208b3cfb93678d8f762c
+EBUILD bc-1.06.95-r2.ebuild 1369 SHA256 a9ec8e3098814252c9375d0e45b05ea6577836486480044473f95f7e770fca1b SHA512 b9694656b3b5e4ae941c5df7893b72716adcd77be9bab2b766d1b1683d9279d04f070d90a89187ed67f0e062ede7cc7c75950df4dbeb39c5373dfe831b158dee WHIRLPOOL 8a7995261d79e831d6ffd3755eb3ada6458899841a8fb09a806e56ecae6f4fe92d12a35303e6ac7d9f97f4673a9782027b138fa4e8a98df03a20007fba9bec0c
 EBUILD bc-1.06.95.ebuild 1304 SHA256 508bce6a018bda71eb3afd0754bc25d3f4e28299e9973a89ee7520992c05f05d SHA512 56ef39b8f342f88d584cfbad4caacee503c06ac032b7a90ed57d73f85e9d7f9f25cf951d04e0de4b728d4a1eb8de006fc613d3014c03368fceb6586d539c71ea WHIRLPOOL 017b0405eeb0cbf7264d2c082377b78b42252ef0cbeb83c6ed109406a9ed2cadee6a0e16b6d484da114d3240b15edd2631e9573a17418f377cf1e8dbb881d8e6
-MISC ChangeLog 5183 SHA256 c3cf51a53a0ff9a5454999db83f27bab9fa3aaa00c9194cc0f948d2b8b96df68 SHA512 4ed56654b8af1cfc08a3954ab9139b835111ad0170869c3fb703bd67a514bb1053f1daf44180f8b66dd6f6b40b4d5243687becd11461fe0f9958fb7459d532cf WHIRLPOOL 472e520074b978c21c8f72821205e398bdf76a67beb11b326c0690b14ebbcc67285c96dd03b13d4f1b8f876f96b3311b644912e008b2e9261d97c769f85ac5ae
+MISC ChangeLog 5410 SHA256 f574acef36c7004c8bc22e12a552eb2b6166e48fab41c5f53f202ff8d3d4b863 SHA512 4ba4844821b30f9a1310c4fb8cee9c1d8dd032d3471c586ee0cb2fa5b818ecf0721bdaf09ca0801a1c57167e98904a16dec64f1166302931ebe6900167d07427 WHIRLPOOL 67548d5ab13d8b54d86d4ee48584f6df284efd9c3c0473f0725961d81cbd032e423a688092b409b875958ba0da23ead6d98d39075d7622ff0782e72c8fc0204b
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS2fBEAAoJEPGu1DbS6WIAMlIP/i1NejaSYeLUszjmj9TU8PgD
-27p7xOYlXwhj7k7NrEtQh1liOTarnQ0cGIXknrUAoCmlkOyFJ0RJOVwMyBO3Md8C
-Y7Kea3oLLeCpHe7fXHwubQzy2Hj9nhJx3ITs2DujCDTpOw43/bwRM8SqjCSh4u1A
-U1s7n/Rxr/jni/YBqbfiw9aisygD3MgmbBnuuRf5QMd4CBRe5uIJ8DiHxjDUAiMY
-mPBwLOjzq4lJzprBva58tFXcFPsUiXrLQU4zb5Qfjup4bF6VAcak/T5l48wvVqWs
-7yv3DsNA5kEZeFxNKstd6ozNIDvpkfz591PMoOI1W0Gg+Im9cgGR4z5oA8mN5upp
-JSJPzPRjkvSvgAAH1G85MC9jGXo2MktIqTFhKbZk3UmC35ADA6s9EhBeoGKW4/F0
-+zD9ldmADLpJiBPY5PPsxfCl3wMNj6LjE+YawOPhNmFFzEJFnEobhxY8UBdUfEd4
-VQn6slp2dS5MF1S9XqKi3PnY1o468oOU+bZ3dGlyC+NEi6O5+kpSk9OS3SsS9Gtn
-lHIV1azxL0Sz5SkdvR/EsMokKSR8xDs1Y6r/yw2Si4Pcbl5kirb2XQE8LD9g9AZM
-5JoEVIlxdrUcBrls9u+9xX/o00IswIqxs4CSVr9zDJOkfTszkgMVB328N8m9J0Xz
-oeqk2t/ORpjzCsH/gRWl
-=C+h3
+iQIcBAEBCAAGBQJVo0YkAAoJEPGu1DbS6WIAV5IP/R6hhudtt6kEtrN0hM6URGgW
+5qlwHA2m58Pl9+1goHBAjuJOKb+tiZUkngQHxtueVMcA9RyARmoJo5ePbKd5dLU8
+vyEjLf8a8YSODXGYtAYgD886Ts9V/9VlO9Ph1t8aZjCCTiNH2vCrrVz401tEBuJj
+GWL6TgEGli54iph5WQGTXB4DjBHcjMip61PxD44QONOOWJ0kxN22pDadNq+aTsfQ
+bFifrK3dnOqmKNdWPZvmBoKOZRZKR1YJuZRXuEp4SNU3vWLD1wtOo10ThCDaZayy
+wmarYJEn29u8t/D0mfodHYk13w5N3ElsaqKZH9Al8qjl1I+RSPWEOYgfTuvMp/Yq
+ZfOqtvq3y/b+G0CLExnhsvOdeMGEQ0zCgYsgdZI5TYbxKYqlaNIp5XczCChrhI34
+RRtCgqS/MkMvsdfJodwp2f6CROoX4LMU0Q3guB69pBlQZlT+CBUAa4yPsxAt/E/t
+aB8TeiWbyP/OqalUyzmbenrZZnoQeh3TfSkaS2Vg8L36l4V9FLfRRvmo2ATg9h41
+WQLHwtBz0aNbf/7bX+y6BB1b0REGdt2OFD2cnnwBEKgVhqmrFre46AxqSzB13r7U
+r7RU05H17IpADV/eMJvTMEWJw79pxge4CpTCUs/rNM3ko5EYJTn5H3X5YNe2RuEe
+NDSPqycYoJ+pSiW3XKqS
+=oIVI
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
new file mode 100644
index 000000000000..8a59a3aa8425
--- /dev/null
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06.95-r2.ebuild,v 1.1 2015/07/13 05:01:23 vapier Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Handy console-based calculator utility"
+HOMEPAGE="http://www.gnu.org/software/bc/bc.html"
+SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
+	mirror://gnu/bc/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit readline static"
+
+RDEPEND="!readline? ( libedit? ( dev-libs/libedit:= ) )
+	readline? (
+		>=sys-libs/readline-4.1:0=
+		>=sys-libs/ncurses-5.2:=
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-void_uninitialized.patch #349339
+	epatch "${FILESDIR}"/${P}-mem-leak.patch #264889
+}
+
+src_configure() {
+	local libedit
+	if use readline ; then
+		libedit="--without-libedit"
+	else
+		libedit=$(use_with libedit)
+	fi
+	use static && append-ldflags -static
+	econf \
+		$(use_with readline) \
+		${libedit}
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/sys-devel/bc/files/bc-1.06.95-mem-leak.patch b/sys-devel/bc/files/bc-1.06.95-mem-leak.patch
new file mode 100644
index 000000000000..13628464b540
--- /dev/null
+++ b/sys-devel/bc/files/bc-1.06.95-mem-leak.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/264889
+
+--- a/bc/bc.y
++++ b/bc/bc.y
+@@ -569,6 +569,7 @@ expression		:  named_expression ASSIGN_OP
+ 				    generate (">");
+ 				  break;
+ 				}
++			      free($2);
+ 			    }
+ 			| expression '+' expression
+ 			    {
+--- a/bc/util.c
++++ b/bc/util.c
+@@ -602,8 +602,7 @@ lookup (name, namekind)
+     case FUNCTDEF:
+       if (id->f_name != 0)
+ 	{
+-	  if (namekind != FUNCT)
+-	    free(name);
++	  free(name);
+ 	  /* Check to see if we are redefining a math lib function. */ 
+ 	  if (use_math && namekind == FUNCTDEF && id->f_name <= 6)
+ 	    id->f_name = next_func++;