Fix for bufferoverflow, #309341

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 70 insertions, 2 deletions

diff --git a/sci-libs/libmuscle/ChangeLog b/sci-libs/libmuscle/ChangeLog
index 4428b0ed2414..d005cf485abe 100644
--- a/sci-libs/libmuscle/ChangeLog
+++ b/sci-libs/libmuscle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libmuscle
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libmuscle/ChangeLog,v 1.3 2009/07/07 17:12:22 weaver Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libmuscle/ChangeLog,v 1.4 2010/06/28 20:37:43 jlec Exp $
+
+*libmuscle-3.7-r2 (28 Jun 2010)
+
+  28 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  +files/3.7-bufferoverflow.patch, +libmuscle-3.7-r2.ebuild:
+  Fix for bufferoverflow, #309341
 
 *libmuscle-3.7-r1 (07 Jul 2009)
 
diff --git a/sci-libs/libmuscle/files/3.7-bufferoverflow.patch b/sci-libs/libmuscle/files/3.7-bufferoverflow.patch
new file mode 100644
index 000000000000..c34b8ccacbda
--- /dev/null
+++ b/sci-libs/libmuscle/files/3.7-bufferoverflow.patch
@@ -0,0 +1,22 @@
+--- libMUSCLE/globalslinux.cpp.old	2010-03-14 19:03:14.000000000 +1300
++++ libMUSCLE/globalslinux.cpp	2010-03-14 19:11:09.000000000 +1300
+@@ -159,7 +159,7 @@
+ 			}

+ 		return DEFAULT_RAM;

+ 		}

+-	int Bytes = atoi(pMem+9)*1000;

++	long Bytes = atol(pMem+9)*1000;

+ 	return ((double) Bytes)/1e6;

+ 	}

+ 

+--- libMUSCLE/progress.cpp.old	2010-03-14 19:50:27.000000000 +1300
++++ libMUSCLE/progress.cpp	2010-03-14 19:51:07.000000000 +1300
+@@ -48,7 +48,7 @@
+ 	if (MB < 0)

+ 		return "";

+ 

+-	static char Str[9];

++	static char Str[11];

+ 	static double MaxMB = 0;

+ 	static double RAMMB = 0;

+ 

diff --git a/sci-libs/libmuscle/libmuscle-3.7-r2.ebuild b/sci-libs/libmuscle/libmuscle-3.7-r2.ebuild
new file mode 100644
index 000000000000..55e61bb87898
--- /dev/null
+++ b/sci-libs/libmuscle/libmuscle-3.7-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libmuscle/libmuscle-3.7-r2.ebuild,v 1.1 2010/06/28 20:37:43 jlec Exp $
+
+EAPI="2"
+
+MY_TAG="mauve-2-3-0-release"
+#ESVN_REPO_URI="https://mauve.svn.sourceforge.net/svnroot/mauve/muscle/tags/${MY_TAG}"
+
+#inherit subversion autotools
+inherit autotools eutils
+
+DESCRIPTION="Library for sci-biology/mauve"
+HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
+#SRC_URI=""
+SRC_URI="mirror://gentoo/${P}-r1.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="doc? ( app-doc/doxygen )
+	!sci-biology/muscle"
+RDEPEND=""
+
+#S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-bufferoverflow.patch
+	eautoreconf
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+}