diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-06-28 21:00:46 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-06-28 21:00:46 +0000 |
| commit | e197e2d4ad8e11638e9d1d49594a0ffbd42a65ca (patch) | |
| tree | 621a10f828d6b6cbb04c5da2d22a75781763db46 /sci-biology/muscle | |
| parent | Hide debug message from init script (diff) | |
| download | gentoo-2-e197e2d4ad8e11638e9d1d49594a0ffbd42a65ca.tar.gz gentoo-2-e197e2d4ad8e11638e9d1d49594a0ffbd42a65ca.tar.bz2 gentoo-2-e197e2d4ad8e11638e9d1d49594a0ffbd42a65ca.zip | |
Fix for Fix for bufferoverflow, thanks ssuominen reporting that on irc to me
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-biology/muscle')
| -rw-r--r-- | sci-biology/muscle/files/3.7-bufferoverflow.patch | 16 | ||||
| -rw-r--r-- | sci-biology/muscle/muscle-3.7-r1.ebuild | 5 |
2 files changed, 13 insertions, 8 deletions
diff --git a/sci-biology/muscle/files/3.7-bufferoverflow.patch b/sci-biology/muscle/files/3.7-bufferoverflow.patch index 62dab42e3cb5..670ad64959cb 100644 --- a/sci-biology/muscle/files/3.7-bufferoverflow.patch +++ b/sci-biology/muscle/files/3.7-bufferoverflow.patch @@ -1,6 +1,8 @@ ---- 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 @@ +diff --git a/globalslinux.cpp b/globalslinux.cpp +index 63baaa1..b1cfcb0 100644 +--- a/globalslinux.cpp ++++ b/globalslinux.cpp +@@ -156,7 +156,7 @@ double GetRAMSizeMB() } return DEFAULT_RAM; } @@ -9,9 +11,11 @@ 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 @@ +diff --git a/progress.cpp b/progress.cpp +index a0e91bb..f9b093e 100644 +--- a/progress.cpp ++++ b/progress.cpp +@@ -41,7 +41,7 @@ const char *MemToStr(double MB) if (MB < 0) return ""; diff --git a/sci-biology/muscle/muscle-3.7-r1.ebuild b/sci-biology/muscle/muscle-3.7-r1.ebuild index e2b1b7ca4b0c..9d88b07e5d0c 100644 --- a/sci-biology/muscle/muscle-3.7-r1.ebuild +++ b/sci-biology/muscle/muscle-3.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/muscle/muscle-3.7-r1.ebuild,v 1.1 2010/06/28 20:30:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/muscle/muscle-3.7-r1.ebuild,v 1.2 2010/06/28 21:00:46 jlec Exp $ EAPI="3" @@ -22,7 +22,8 @@ DEPEND="${RDEPEND}" S="${WORKDIR}" src_prepare() { - epatch"${FILESDIR}"/${PV}-bufferoverflow.patch + edos2unix progress.cpp globalslinux.cpp + epatch "${FILESDIR}"/${PV}-bufferoverflow.patch sed -i \ "s:-static::g" \ "${S}/Makefile" |