summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-07-06 13:38:49 +0000
committerJustin Lecher <jlec@gentoo.org>2012-07-06 13:38:49 +0000
commitae9dc92a0794f96fa0cbcb2de63b2a9fef95e07a (patch)
tree905385480b64cc2d926c258dc61e21bf67c2c89d /sci-chemistry/mosflm
parentInitial commit. Ebuild based on live ebuild in qt overlay. Needed for qterminal. (diff)
downloadgentoo-2-ae9dc92a0794f96fa0cbcb2de63b2a9fef95e07a.tar.gz
gentoo-2-ae9dc92a0794f96fa0cbcb2de63b2a9fef95e07a.tar.bz2
gentoo-2-ae9dc92a0794f96fa0cbcb2de63b2a9fef95e07a.zip
sci-chemistry/mosflm: Version Bump
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/mosflm')
-rw-r--r--sci-chemistry/mosflm/ChangeLog9
-rw-r--r--sci-chemistry/mosflm/files/7.0.9-parallel.patch (renamed from sci-chemistry/mosflm/files/7.0.8-parallel.patch)0
-rw-r--r--sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch16
-rw-r--r--sci-chemistry/mosflm/mosflm-7.0.9.ebuild (renamed from sci-chemistry/mosflm/mosflm-7.0.8.ebuild)4
4 files changed, 26 insertions, 3 deletions
diff --git a/sci-chemistry/mosflm/ChangeLog b/sci-chemistry/mosflm/ChangeLog
index 3674ece42625..27ffa5162973 100644
--- a/sci-chemistry/mosflm/ChangeLog
+++ b/sci-chemistry/mosflm/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-chemistry/mosflm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.17 2012/07/05 13:50:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/ChangeLog,v 1.18 2012/07/06 13:38:49 jlec Exp $
+
+*mosflm-7.0.9 (06 Jul 2012)
+
+ 06 Jul 2012; Justin Lecher <jlec@gentoo.org> -files/7.0.8-parallel.patch,
+ -mosflm-7.0.8.ebuild, +mosflm-7.0.9.ebuild,
+ +files/mosflm-7.0.9-buffer-overflow.patch, +files/7.0.9-parallel.patch:
+ Version Bump
*mosflm-7.0.8 (05 Jul 2012)
diff --git a/sci-chemistry/mosflm/files/7.0.8-parallel.patch b/sci-chemistry/mosflm/files/7.0.9-parallel.patch
index 38c6fc45a5c0..38c6fc45a5c0 100644
--- a/sci-chemistry/mosflm/files/7.0.8-parallel.patch
+++ b/sci-chemistry/mosflm/files/7.0.9-parallel.patch
diff --git a/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch b/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch
new file mode 100644
index 000000000000..bb4a16bf30fc
--- /dev/null
+++ b/sci-chemistry/mosflm/files/mosflm-7.0.9-buffer-overflow.patch
@@ -0,0 +1,16 @@
+ mosflm/pilatus_c.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mosflm/pilatus_c.c b/mosflm/pilatus_c.c
+index 4a85b26..9893e0c 100644
+--- a/mosflm/pilatus_c.c
++++ b/mosflm/pilatus_c.c
+@@ -34,7 +34,7 @@ delete them later */
+ int cbf_int[16] = {0};
+ long cbf_int4[16] = {0};
+ double cbf_double[16] = {0};
+- char cbf_char[16][24] = {' '};
++ char cbf_char[16][32] = {' '};
+ /* temporary from cbfwrap.c - pilatus doesn't have these, so we'll
+ delete them later */
+ int id, index, iindex;
diff --git a/sci-chemistry/mosflm/mosflm-7.0.8.ebuild b/sci-chemistry/mosflm/mosflm-7.0.9.ebuild
index 278ca25bdeea..7756c132536b 100644
--- a/sci-chemistry/mosflm/mosflm-7.0.8.ebuild
+++ b/sci-chemistry/mosflm/mosflm-7.0.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.8.ebuild,v 1.1 2012/07/05 13:50:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mosflm/mosflm-7.0.9.ebuild,v 1.1 2012/07/06 13:38:49 jlec Exp $
EAPI=4
@@ -45,7 +45,7 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PV}-parallel.patch \
"${FILESDIR}"/7.0.6-impl-dec.patch \
- "${FILESDIR}"/${PN}-7.0.7-buffer-overflow.patch \
+ "${FILESDIR}"/${P}-buffer-overflow.patch \
"${FILESDIR}"/${PN}-7.0.7-impl-dec.patch
rm -rf test.f {cbf,jpg}/*.{h,c} || die