Fix uninitialized memory usage #349339 by David Flogeras. Convert to EAPI=2 for fun.

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

4 files changed, 68 insertions, 18 deletions

diff --git a/sys-devel/bc/ChangeLog b/sys-devel/bc/ChangeLog
index 2c031cf61336..ffbf4284d9a8 100644
--- a/sys-devel/bc/ChangeLog
+++ b/sys-devel/bc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/bc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.37 2010/02/05 09:55:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.38 2010/12/26 18:49:14 vapier Exp $
+
+*bc-1.06.95-r1 (26 Dec 2010)
+
+  26 Dec 2010; Mike Frysinger <vapier@gentoo.org> +bc-1.06.95-r1.ebuild,
+  +files/bc-1.06.95-void_uninitialized.patch:
+  Fix uninitialized memory usage #349339 by David Flogeras. Convert to
+  EAPI=2 for fun.
 
   05 Feb 2010; Alexis Ballier <aballier@gentoo.org> bc-1.06.95.ebuild:
   freebsd-lib does not ship libedit anymore
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 764f4805a243..fab9284415f3 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX bc-1.06-info-fix.diff 3182 RMD160 d19bfe2f6e7602756602e9b2a325d310c992599d SHA1 3cd82ce94393ba5afcf8d1c74dd5f95873e43557 SHA256 af234d1a97b640dfd602c4145b976fdf78174f13182682b82ed9be2514b6e143
-AUX bc-1.06-longopts.patch 913 RMD160 90323860d62319e10d7ab732e80f6f5dc76cd82e SHA1 aa18fd8c15785a53d16f9671fb034a604423f64d SHA256 e059a486695eacd05f19d7c1299507841c1e5dee814fdf06567f38f7c6674047
-AUX bc-1.06-readline42.diff 430 RMD160 17fb2062a4bd295e1db59a39c4ce9a0c5b5a8238 SHA1 d9334d4aa58403ac848be282ceaa56368cb65b68 SHA256 9d918cd82f1a056da7f61e85f0489f05edccb478f4364049b3eab1e854216f80
-AUX bc-1.06-static-save.patch 519 RMD160 672d225900708c040aabd2b44ccaaa23ed587e65 SHA1 7e3386227c0e5136087b09615983679bfc4e39df SHA256 ea85b35a105b2cb2426336b201a358f140d7e049087b092ac25f0615e3c4f760
+AUX bc-1.06.95-void_uninitialized.patch 351 RMD160 ddf88b268b16975378dabe9290724f3b8c4d1925 SHA1 c6f8d7a3081990273aa8a8574fc67327043f78b5 SHA256 440a9a20633317204a0205962f573a932ef4493b1dc9ff3253bfed22c8caf5cd
 DIST bc-1.06.95.tar.bz2 290069 RMD160 d58c2d7a1f4b7bfa910f26e5809f3169a6e0da76 SHA1 18717e0543b1dda779a71e6a812f11b8261a705a SHA256 7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc
-DIST bc-1.06.tar.gz 278926 RMD160 e0394a090ad42f289a80de1dd26d2cf591f88481 SHA1 c8f258a7355b40a485007c40865480349c157292 SHA256 4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33
-EBUILD bc-1.06-r6.ebuild 1795 RMD160 cfe43f411a00a0bc278784ac0811bee1ccc048b9 SHA1 19e62d7d4f7fb929d38be80759b312e82db34de3 SHA256 14662db5891a242281584e99d5aeda7ab8b0e6ee7ef1437513cd832236b3e2a2
+EBUILD bc-1.06.95-r1.ebuild 1371 RMD160 b7dab7a6358a039ccad471115ca32a5c23f6f099 SHA1 6225969705db82f3ae6c312d6b072062d3a384f8 SHA256 450de630211303bfe4d3c15f0311ac9322535333861236e05dbef8b531999783
 EBUILD bc-1.06.95.ebuild 1305 RMD160 3c401dca1921925d37e00ba465a36deb5dfa8380 SHA1 17b8ba8db78d769119e64849b68a80470b023e8c SHA256 8c7d5d789dcbce96c8d94736061c810b7e9dcb06db621e4e36a605266a507b0b
-MISC ChangeLog 4410 RMD160 8a2a0d90fa199f47457930abbefc73f1690ab24e SHA1 a5dc47651fac012018ffb32c71a753486bf782ee SHA256 ec44a0e26059cac31609b88755b8f6a25a21082bf9770721f19df2b4732f4171
+MISC ChangeLog 4647 RMD160 c67ac4e03d4aade72d7da21585f603539d2a19ae SHA1 6ccd13c82d459486ac63d49e5eab757e24733928 SHA256 9e61b60c7cbe3604eb3579c8049c45bf1577344afdc7bf868335c7498cc8b57c
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktr6vsACgkQvFcC4BYPU0rhXwCdHtw+u+CjhQlUGJUKVaGxjPYz
-mCwAnAzIl0XUViYTSbL/EYetsWVCf2vC
-=UJNG
------END PGP SIGNATURE-----
diff --git a/sys-devel/bc/bc-1.06.95-r1.ebuild b/sys-devel/bc/bc-1.06.95-r1.ebuild
new file mode 100644
index 000000000000..1029ed5a98d0
--- /dev/null
+++ b/sys-devel/bc/bc-1.06.95-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/12/26 18:49:14 vapier Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Handy console-based calculator utility"
+HOMEPAGE="http://www.gnu.org/software/bc/bc.html"
+SRC_URI="ftp://alpha.gnu.org/gnu/bc/${P}.tar.bz2
+	mirror://gnu/bc/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit readline static"
+
+RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
+	libedit? ( dev-libs/libedit )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-void_uninitialized.patch #349339
+}
+
+src_configure() {
+	local myconf
+	if use readline ; then
+		myconf="--with-readline --without-libedit"
+	elif use libedit ; then
+		myconf="--without-readline --with-libedit"
+	else
+		myconf="--without-readline --without-libedit"
+	fi
+	use static && append-ldflags -static
+	econf ${myconf}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS FAQ NEWS README ChangeLog
+}
diff --git a/sys-devel/bc/files/bc-1.06.95-void_uninitialized.patch b/sys-devel/bc/files/bc-1.06.95-void_uninitialized.patch
new file mode 100644
index 000000000000..3304973f89af
--- /dev/null
+++ b/sys-devel/bc/files/bc-1.06.95-void_uninitialized.patch
@@ -0,0 +1,13 @@
+http://www.pixelbeat.org/programming/oss_bug_flow.html
+https://bugs.gentoo.org/349339
+
+--- bc/storage.c
++++ bc/storage.c
+@@ -99,6 +99,7 @@
+     {
+       f = &functions[indx];
+       f->f_defined = FALSE;
++      f->f_void = FALSE;
+       f->f_body = (char *) bc_malloc (BC_START_SIZE);
+       f->f_body_size = BC_START_SIZE;
+       f->f_code_size = 0;