summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2010-10-15 14:37:12 +0000
committerThomas Beierlein <tomjbe@gentoo.org>2010-10-15 14:37:12 +0000
commit020ea5f8d2d1fc2fc2b2dca858f4446cf9b66bb3 (patch)
tree281339e6a0dfddbec977ef6fe9c42898788d084c /sci-electronics
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-020ea5f8d2d1fc2fc2b2dca858f4446cf9b66bb3.tar.gz
gentoo-2-020ea5f8d2d1fc2fc2b2dca858f4446cf9b66bb3.tar.bz2
gentoo-2-020ea5f8d2d1fc2fc2b2dca858f4446cf9b66bb3.zip
Switch to shared linking (bug 252469). Fix tests (bug 282490). Fix buffer overrun (bug 340789).
(Portage version: 2.1.9.16/cvs/Linux x86_64)
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/alliance/ChangeLog8
-rw-r--r--sci-electronics/alliance/alliance-5.0.20070718.ebuild8
-rw-r--r--sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch12
-rw-r--r--sci-electronics/alliance/files/alliance-5.0.20070718-test.patch11
4 files changed, 36 insertions, 3 deletions
diff --git a/sci-electronics/alliance/ChangeLog b/sci-electronics/alliance/ChangeLog
index 1e4a37d60763..9fff8062d329 100644
--- a/sci-electronics/alliance/ChangeLog
+++ b/sci-electronics/alliance/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-electronics/alliance
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/alliance/ChangeLog,v 1.12 2010/10/10 21:34:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/alliance/ChangeLog,v 1.13 2010/10/15 14:37:12 tomjbe Exp $
+
+ 15 Oct 2010; Thomas Beierlein <tomjbe@gentoo.org>
+ alliance-5.0.20070718.ebuild, +files/alliance-5.0.20070718-overun.patch,
+ +files/alliance-5.0.20070718-test.patch:
+ Switch to shared linking (bug 252469). Fix tests (bug 282490). Fix buffer
+ overrun (bug 340789).
10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> alliance-5.0.20060509.ebuild,
alliance-5.0.20070718.ebuild:
diff --git a/sci-electronics/alliance/alliance-5.0.20070718.ebuild b/sci-electronics/alliance/alliance-5.0.20070718.ebuild
index 0c5c3c349e74..4edc1ec4a989 100644
--- a/sci-electronics/alliance/alliance-5.0.20070718.ebuild
+++ b/sci-electronics/alliance/alliance-5.0.20070718.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-electronics/alliance/alliance-5.0.20070718.ebuild,v 1.4 2010/10/10 21:34:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/alliance/alliance-5.0.20070718.ebuild,v 1.5 2010/10/15 14:37:12 tomjbe Exp $
EAPI=1
@@ -29,6 +29,10 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/alliance-5.0-gcc43.patch
+ #fix tests (bug #282490) and buffer overrun (bug 340789)
+ epatch "${FILESDIR}"/${P}-test.patch \
+ "${FILESDIR}"/${P}-overun.patch
+
# Fix compilation issue
sed -i -e "s/private: static void operator delete/public: static void operator delete/" nero/src/ADefs.h || die "sed failed"
}
@@ -44,7 +48,7 @@ src_compile() {
--with-x \
--with-motif \
--with-xpm \
- || die "./configure failed"
+ --with-alc-shared
# See bug #134145
emake -j1 || die "emake failed"
diff --git a/sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch b/sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch
new file mode 100644
index 000000000000..50cfc30be23f
--- /dev/null
+++ b/sci-electronics/alliance/files/alliance-5.0.20070718-overun.patch
@@ -0,0 +1,12 @@
+# fix buffer overun (bug 340789)
+--- druc/src/drucbath.c.orig 2010-10-15 14:15:52.000000000 +0000
++++ druc/src/drucbath.c 2010-10-15 14:19:03.000000000 +0000
+@@ -66,7 +66,7 @@
+ rdsins_list *InstanceCourante;
+ char *TmpErrorFileName;
+ FILE *TmpErrorFile;
+-char DrucTmpFileBuffer [ DRUC_MAX_STRING_BUFFER + 1 ];
++char DrucTmpFileBuffer [ DRUC_MAX_FILE_BUFFER + 1 ];
+
+ fputs ( "\n" ,
+ DrucErrorFile
diff --git a/sci-electronics/alliance/files/alliance-5.0.20070718-test.patch b/sci-electronics/alliance/files/alliance-5.0.20070718-test.patch
new file mode 100644
index 000000000000..b9725e67974d
--- /dev/null
+++ b/sci-electronics/alliance/files/alliance-5.0.20070718-test.patch
@@ -0,0 +1,11 @@
+#fixes test run (bug 282490)
+--- bvl/src/bvl_bcomp_y.y.orig 2010-10-13 09:29:48.000000000 +0200
++++ bvl/src/bvl_bcomp_y.y 2010-10-13 09:30:13.000000000 +0200
+@@ -17,6 +17,7 @@
+ #include "bvl.h"
+ #include "bvl_byacc.h"
+ #include "bvl_bedef.h"
++#include "bvl_bcomp_y.h"
+
+ /* ###--------------------------------------------------------------### */
+ /* function : bvl_y_error */