Switch to shared linking (bug 252469). Fix tests (bug 282490). Fix buffer overrun (bug 340789).

Package-Manager: portage-2.1.9.16/cvs/Linux x86_64

5 files changed, 40 insertions, 15 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/Manifest b/sci-electronics/alliance/Manifest
index a41f974e1915..049465308fa8 100644
--- a/sci-electronics/alliance/Manifest
+++ b/sci-electronics/alliance/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX alliance-5.0-gcc43.patch 735 RMD160 26f058ea66cae8b3b4d991257e59e74c10be3f2a SHA1 0e8595cdc1c9a6cdb4e622e3fcd0dc4ad9c077f5 SHA256 28db74745780429d5783c3ae2990dd94137d6a1098f16d5d33e3db7670f687c7
+AUX alliance-5.0.20070718-overun.patch 440 RMD160 cdc65ede655e3d46a9b3f58d09ad99fb5c291d0e SHA1 618c735dd4e687e21010e48e3897e20d41a533d8 SHA256 734effb9f03b93563324eb7e3c9e2b6a67b95b086181fd77cd58c6d1abea5c25
+AUX alliance-5.0.20070718-test.patch 381 RMD160 40afcf733daf0591766f58bd61bb64fbfd372780 SHA1 0606fa372f406d849df9a25bf70ba82a1feaaa97 SHA256 a2c57be864aa1bade6197f1ce8826437a56015a70cb8d9d9884143c634a892bc
 DIST alliance-5.0-20060509.tar.gz 8192768 RMD160 9558452c7b0c7758a2d853d2d31cd8fc553f905f SHA1 93076a3b7cbbc79759498cf69fb3acfd4cc1fc05 SHA256 7f81b38707b5e6167d6278f48fc3af60de8b30d3bab2344a2b2d30ef1d5aa687
 DIST alliance-5.0-20070718.tar.gz 8197393 RMD160 dc1911517d58bbbdde86a0def21e1447a24f9dea SHA1 e975e3b58a91de96b98f0ff2360798ae5eece6be SHA256 4e17c8f9f4d344061166856d47e58527c6ae870fda0c73b5ba0200967d23af9f
 DIST alliance-tutorials-5.0-20070718.i386.rpm 2727945 RMD160 2d811f3bd8352b0fa846b5bac6a878ea17e23300 SHA1 b788d598632671f37fe02caa176283d7824ee753 SHA256 c0b9b5a96a5440be9b9a14b40f2ad446f486cad9acdd61e1c8be70b2a5c54465
 EBUILD alliance-5.0.20060509.ebuild 1325 RMD160 a5c69814299532d49eb02460923997c5078caf1e SHA1 6fddefc6ca90599fa9291f59ac6ea8ec5cb90fab SHA256 826d90f1ecc2879cbc50764330bb3e9f5b3ea7c5639914fe8905723329fdd6a7
-EBUILD alliance-5.0.20070718.ebuild 1754 RMD160 0bb716b01a309a9bbed82b847b56c76d9d2f008d SHA1 1eca7766e8e69859305125c2c4b4ce487898e319 SHA256 531d0199f9a107beceb555aeb3757114e65729c4e7672c30776d672d28eeb3db
-MISC ChangeLog 1782 RMD160 b83fad08bcd3246a46110b9a93c7b74e256a326b SHA1 2a3d1e3cf8786e1b4fb424ee3a7fbe3a4144a897 SHA256 5c040919141393c55fec0df45e7e114c1d8318af788824f2d2eeda6582e413a2
+EBUILD alliance-5.0.20070718.ebuild 1880 RMD160 c7e1be909f8068c3d0288581fbe2686881ced758 SHA1 47f314fdd36f9a32cbe89f6ef00d982be1d05498 SHA256 09f3afbbf297964b9b9eb23774d9710937bd88b94c63f89324a8586466ffdcc8
+MISC ChangeLog 2056 RMD160 ed73d1649f0f85aae3dca61cbc41552ebb98065f SHA1 7aa2a083e1902066edd080cbcb8bea6a6eb4f318 SHA256 2eb278a979f4fd1037573b5efcd79690f74b32faa7428f5129aef372b857fca9
 MISC metadata.xml 780 RMD160 fd82c785383e3cb7bf1faf218010a90a0c73c140 SHA1 7cd5688ec380585e148a11370f3ebeff7af228e4 SHA256 f14bc65123e4618907193f37cdc79e84b9890fe95a97dbc637c38f4b6d55ce6f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyyMccACgkQOeoy/oIi7uyiCACfQwMDQwFhgdDsvw4ZDMKDRz0u
-83YAoIcX11m6c9G8E/GPeLtIWuRP1BK1
-=CwE/
------END PGP SIGNATURE-----
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						*/