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 | c8d7d10ce56dc086ab9df755862a4e2ca389fc35 (patch) | |
| tree | 08233e3ff51fed9800492b58e89bf37e7067243c /sci-biology | |
| parent | Hide debug message from init script (diff) | |
| download | historical-c8d7d10ce56dc086ab9df755862a4e2ca389fc35.tar.gz historical-c8d7d10ce56dc086ab9df755862a4e2ca389fc35.tar.bz2 historical-c8d7d10ce56dc086ab9df755862a4e2ca389fc35.zip | |
Fix for Fix for bufferoverflow, thanks ssuominen reporting that on irc to me
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-biology')
| -rw-r--r-- | sci-biology/muscle/Manifest | 10 | ||||
| -rw-r--r-- | sci-biology/muscle/files/3.7-bufferoverflow.patch | 16 | ||||
| -rw-r--r-- | sci-biology/muscle/muscle-3.7-r1.ebuild | 5 |
3 files changed, 18 insertions, 13 deletions
diff --git a/sci-biology/muscle/Manifest b/sci-biology/muscle/Manifest index 6e4bf2b42614..777225500f2d 100644 --- a/sci-biology/muscle/Manifest +++ b/sci-biology/muscle/Manifest @@ -1,13 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 3.7-bufferoverflow.patch 575 RMD160 1052b974dfa00bf7ce0ef98dd190e654e5221218 SHA1 649dfbbc4db3b8d83f8a488b04b217cf48d79465 SHA256 c55e807cc0c80d3374ea6261b568aad5b7c581fa3b23a6224974ce70af4a06dd +AUX 3.7-bufferoverflow.patch 595 RMD160 ea1634cdf67e0c40425b37146b2a7dbb6a13f0a7 SHA1 682b2bb28f22c234deb77e34b2497f5e59b1cc46 SHA256 2acf33bcf8ebb6ee6c4171fd0dd4407a08a3c4577902c683a948a1b3231a243e AUX 3.8.31-make.patch 989 RMD160 22e88148f5701f5d7d6910c5f1bbd86e26220127 SHA1 2f55918397322ffe83464b3da5e3e5d972a40f63 SHA256 f5352a5fc8a792d7af177d1e829a33e59bc39dedb81baf17c6424f8520ea6879 DIST muscle3.6_src.tar.gz 185267 RMD160 4afda92b982ec2b05853a582479c61a7d8814f51 SHA1 e8a4998ee10a8f067fd1ba63966e32e69da62d36 SHA256 32b818a51f421e1d687f513dc31374a330470950151a5e7df961e64781699431 DIST muscle3.7_src.tar.gz 189907 RMD160 6eb64afd2032914781f453b925589c35e432b96c SHA1 6a3cbef3a8a00cf230f17bf90592f7108607d103 SHA256 a028f545612f9d260e35909959e98ae7aec552b1eac8806c3ae59cf1b00f7235 DIST muscle3.8.31_src.tar.gz 515267 RMD160 18c9cf465f330a77d6a06ff9323c311a6f6be662 SHA1 2fe55db73ff4e7ac6d4ca692f8f213d1c5071dac SHA256 43c5966a82133bd7da5921e8142f2f592c2b5f53d802f0527a2801783af809ad EBUILD muscle-3.6.ebuild 847 RMD160 8a29fc7b68c5fb0c3680c513ede51aeaeaad4b11 SHA1 c38e5eebcf8f35e430f85f958de35083295ae0f0 SHA256 f3c041cb767be4e858a5854a03ee51e8424cd4197a7c723c4b28a46705a80c67 -EBUILD muscle-3.7-r1.ebuild 889 RMD160 50388fc702b5d9d3cecb527b0ae4175f8763400e SHA1 ac9ceff54bd84270180be2f7d4cafef5bcec0fa1 SHA256 f8b12e052d95621b9604ebcc677ac40f54d9fba3290e3d5e95a6528f2930f9cf +EBUILD muscle-3.7-r1.ebuild 931 RMD160 7ecbd010e2dca170c73059a8d5219f40ac7a84e5 SHA1 ea4e84108d7f48240af338d6901378e516bca427 SHA256 8e3ac32ffebb75d5575a396de517de8921d72c9e01b838c0d4865367f8d559a4 EBUILD muscle-3.7.ebuild 844 RMD160 1335020b6dcd0b8107165ada30a4c2ce4790ed86 SHA1 36c7c37bed6ac9c26e2a74646a39131630084b92 SHA256 9c6826b8d266d05f79f61c6940b36dbc54adea197eaf19cfad605543f6517d2b EBUILD muscle-3.8.31.ebuild 733 RMD160 e4139817205be0c2e14060b03f9de2468675d050 SHA1 c0d18e04a0ff065fff8113fca508628d48346ecd SHA256 cca4af8de32649c613201dbdadb0e5090bcb72eaf5c27652866a50635c806c30 MISC ChangeLog 1842 RMD160 25862c30c6158545eed1ad7dbde8d10b71fecf04 SHA1 b9de92f72f17472b226487d83e31cd69d0484670 SHA256 159c335a44e98ced0bed3dfb3db8cb7274667dd95ffffc160d42f9706ae5f6f7 @@ -15,7 +15,7 @@ MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwpBk0ACgkQgAnW8HDreRb05ACfbkAApihWWkoLVPr73deAmqa1 -vT4An2XHvs+0cW/7ZJd7vNMo+5Tphvbh -=tKEG +iEYEARECAAYFAkwpDYMACgkQgAnW8HDreRYhZACgiEV+73EQ/Oy3wMHPd7jmAJIO +2zoAn0lT4tRiWZJUOvDuRlaJg561Ti3J +=dHnM -----END PGP SIGNATURE----- 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" |