Fix for bufferoverflow, #309341

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-libs/libmuscle/ChangeLog b/sci-libs/libmuscle/ChangeLog
index 4428b0ed241475fa3af206eb7a693fdf9605c241..d005cf485abe14233b7a9176938324f4f90876e1 100644 (file)
--- 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/Manifest b/sci-libs/libmuscle/Manifest
index fcebc7332d8864502249a3076e8458548861239b..d8f9958a3ea95eeb2fa0c150baf5f777d2cfd464 100644 (file)
--- a/sci-libs/libmuscle/Manifest
+++ b/sci-libs/libmuscle/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 3.7-bufferoverflow.patch 591 RMD160 19d84737c5fa84517f5c9477ea8dee18efad877c SHA1 6e7d0058e8db352d7695ca35305aabe91f0bbab7 SHA256 6a806d73ca6e6a0f297ac0a2e37b1736759376cd36f7e3013146ce52fd4beab5
 DIST libmuscle-3.7-r1.tar.bz2 458852 RMD160 18a7ac0155d5c0756542e84de9b6b14451bfa29b SHA1 35747936f9325dcedbfdc7281ee7a10c3b90a29c SHA256 3c0df6aeb8ea86bcd92e61f509486244176cee22c9bd7239ff16a51e1d046a14
 EBUILD libmuscle-3.7-r1.ebuild 823 RMD160 e07e1d5c947c7dc726c47f554c6f746c2868ad59 SHA1 864843daba6395a74c1108c31c78a0d28cacafd3 SHA256 a30d79912be6c532c4306229eb89fd252c6d344bd38488ebfb0bd8ef4dd9d51b
+EBUILD libmuscle-3.7-r2.ebuild 874 RMD160 62c39d23413e42bf6712931e1744a92445d624cb SHA1 9ad91290f288dee50ed7e3d7d9618a5a7ea74616 SHA256 17c4a1abde0d436bce8a87229869e70a6622ad22c94b70c6e3a8ae12449072dc
 EBUILD libmuscle-9999.ebuild 705 RMD160 e2856ea034f3be0e0a392a74533b7d4d173b7d02 SHA1 529f812724de1b0f2095f7142ab671913c32db4f SHA256 35611c83c218e874ef9b4c093f8ae4fb3460e217e5deeea4796882473c0e45e8
-MISC ChangeLog 624 RMD160 4c189e8a0d5a96c2cee4ce41e160bc4dc181ad49 SHA1 90c29b8575904c46816af8294456483d22c3339b SHA256 c7216ca24cf180abea6504b633569ead5a5ed2ab93d9288733103cc401e0314d
+MISC ChangeLog 798 RMD160 5904e060a525fd3bb082a016e424ea7f0dca5a91 SHA1 f7b42a50564e10d3ed4f82476ba37ab7e47dd9de SHA256 4be1b3c817ccac1e11dcf908147329f3260e32df343687e2288b8800eb00aece
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwpCB0ACgkQgAnW8HDreRYFCwCgjYfEy2U/9WMvOuoh2MWAPcDj
+tW0AoMTksShU3NJwniMz89y3p5m9we2j
+=lDfC
+-----END PGP SIGNATURE-----

diff --git a/sci-libs/libmuscle/files/3.7-bufferoverflow.patch b/sci-libs/libmuscle/files/3.7-bufferoverflow.patch
new file mode 100644 (file)
index 0000000..c34b8cc
--- /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 @@
+                       }\r
+               return DEFAULT_RAM;\r
+               }\r
+-      int Bytes = atoi(pMem+9)*1000;\r
++      long Bytes = atol(pMem+9)*1000;\r
+       return ((double) Bytes)/1e6;\r
+       }\r
+ \r
+--- 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)\r
+               return "";\r
+ \r
+-      static char Str[9];\r
++      static char Str[11];\r
+       static double MaxMB = 0;\r
+       static double RAMMB = 0;\r
+ \r

diff --git a/sci-libs/libmuscle/libmuscle-3.7-r2.ebuild b/sci-libs/libmuscle/libmuscle-3.7-r2.ebuild
new file mode 100644 (file)
index 0000000..55e61bb
--- /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
+}