Fixed stack-smashing problems on x86 (see bug #207102).

Package-Manager: portage-2.1.4

4 files changed, 50 insertions, 20 deletions

diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog
index 6c68e4f98c68..1fb010bff287 100644
--- a/sci-astronomy/ds9/ChangeLog
+++ b/sci-astronomy/ds9/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-astronomy/ds9
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.6 2008/01/15 16:29:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.7 2008/01/23 14:29:16 markusle Exp $
+
+  23 Jan 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/ds9-5.1-gcc4.2-x86.patch, ds9-5.1.ebuild:
+  Fixed stack-smashing problems on x86 (see bug #207102). Thanks much
+  to hsgg <hsggebhardt@gmail.com> for his patch.
 
 *ds9-5.1 (15 Jan 2008)
 
diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest
index a8c80f5bebc7..fe759991ca57 100644
--- a/sci-astronomy/ds9/Manifest
+++ b/sci-astronomy/ds9/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ds9-5.0-Makefile.patch 2645 RMD160 a897f388190650ab2d747de899f5810020df205e SHA1 7fde157a68eca4db07da0138042b57a1cd474c0f SHA256 9c5c1d937661815fcfb675793c4b25cd8baf92c6139ad4aa06823de98462299b
 MD5 8a38e5af34cf66e26ad147774f45c925 files/ds9-5.0-Makefile.patch 2645
 RMD160 a897f388190650ab2d747de899f5810020df205e files/ds9-5.0-Makefile.patch 2645
@@ -9,20 +6,24 @@ AUX ds9-5.1-Makefile.patch 1154 RMD160 1fa279839fecd4cc56a8445d34036ade9ad92406
 MD5 d3b799e7b2b9aec58f1b4f82ce12de5c files/ds9-5.1-Makefile.patch 1154
 RMD160 1fa279839fecd4cc56a8445d34036ade9ad92406 files/ds9-5.1-Makefile.patch 1154
 SHA256 632d64d27f14e73c9ccb0e16874f652d556edbff0be34e38f53ec5cbd1f1b59b files/ds9-5.1-Makefile.patch 1154
+AUX ds9-5.1-gcc4.2-x86.patch 1022 RMD160 40c9c5da3fefae0a67af6750965df797dd2f4a7b SHA1 26a7c740fceb19f5277d2528f0ab4d3e45a46507 SHA256 30a2cabeb66fc2dccc081c04d4895ceab6d62e321f317d1e8c779b6128b41da3
+MD5 fb04f4017889038635741d25dca81b86 files/ds9-5.1-gcc4.2-x86.patch 1022
+RMD160 40c9c5da3fefae0a67af6750965df797dd2f4a7b files/ds9-5.1-gcc4.2-x86.patch 1022
+SHA256 30a2cabeb66fc2dccc081c04d4895ceab6d62e321f317d1e8c779b6128b41da3 files/ds9-5.1-gcc4.2-x86.patch 1022
 DIST ds9.5.0.tar.gz 25770808 RMD160 3b54637f14766c6f315a43efbf4531901f5b9c01 SHA1 d2abb42fea2f6de75c26810b4c5fd1c6d71f397b SHA256 03e468bac3749d334c9f03c918f36e28c9eb40d3a5d54e8fecf344ba2c95090b
 DIST ds9.5.1.tar.gz 27331599 RMD160 46d915ff098f13911858320d33f5cda6c8ee0ea1 SHA1 7c2bb56e0a8a222b0d13d1d255aaa98fd2979d45 SHA256 aea981ea5714ca4dd9125aacebf2676a85e7045da7d1f97492fbe0e84a22aaf8
 EBUILD ds9-5.0.ebuild 1680 RMD160 4b19d581336b58ebfd8715b88754a7c2f180ab07 SHA1 20e498894640c9e98906c9a60a1811b1f50db0b4 SHA256 bec70668fa24fe287e91260abe1fad71109cc57a923071628f5790bd00299bf3
 MD5 94caab3e48b6eab260dd10aa59bd0efd ds9-5.0.ebuild 1680
 RMD160 4b19d581336b58ebfd8715b88754a7c2f180ab07 ds9-5.0.ebuild 1680
 SHA256 bec70668fa24fe287e91260abe1fad71109cc57a923071628f5790bd00299bf3 ds9-5.0.ebuild 1680
-EBUILD ds9-5.1.ebuild 1680 RMD160 cb03deaacc8d279b4d133d8106ca1c6409387953 SHA1 f441d77f2ffda2b2c5598ed3155e5b059f7383eb SHA256 09088c201080c381dd22e8b52e9362da17c78a8b488ff441c99baa88cdb305c0
-MD5 64496750d3ceb2f7c3bf19c917021b00 ds9-5.1.ebuild 1680
-RMD160 cb03deaacc8d279b4d133d8106ca1c6409387953 ds9-5.1.ebuild 1680
-SHA256 09088c201080c381dd22e8b52e9362da17c78a8b488ff441c99baa88cdb305c0 ds9-5.1.ebuild 1680
-MISC ChangeLog 1187 RMD160 9110b6d5042e02e7ddea2b1f8b9bd5acff7d295d SHA1 a6c89455e5c9dee6b7c4aad44256b4bfaeca8ad5 SHA256 42678ce65f40e7257c6aa2f82cee7eee6ef66650814eae1f10a3a3b2da100330
-MD5 984cecd37b3f594a3d2b9e54958b751c ChangeLog 1187
-RMD160 9110b6d5042e02e7ddea2b1f8b9bd5acff7d295d ChangeLog 1187
-SHA256 42678ce65f40e7257c6aa2f82cee7eee6ef66650814eae1f10a3a3b2da100330 ChangeLog 1187
+EBUILD ds9-5.1.ebuild 1807 RMD160 689c7597160fa29c1626b9950f69c9c7feb78991 SHA1 552402edde2a12b656e130e135d634e0439286f8 SHA256 fad987f6dcc7f6d0da6c06b84e6be76a6ed806646e2875c4789e289f6e89ce21
+MD5 7f2d90bf87bce27916915aae6fb696c2 ds9-5.1.ebuild 1807
+RMD160 689c7597160fa29c1626b9950f69c9c7feb78991 ds9-5.1.ebuild 1807
+SHA256 fad987f6dcc7f6d0da6c06b84e6be76a6ed806646e2875c4789e289f6e89ce21 ds9-5.1.ebuild 1807
+MISC ChangeLog 1411 RMD160 7c3608613644772fb15dc0c8eb7a5f6c03016252 SHA1 a1d3a841f53d13dacc7a3765c7b1aef9ec77665c SHA256 c84c018816994b32c187cf31f6627600b42c7ed000756b23aaa716eceef47507
+MD5 a2292bb41a3309bd2be021da47722421 ChangeLog 1411
+RMD160 7c3608613644772fb15dc0c8eb7a5f6c03016252 ChangeLog 1411
+SHA256 c84c018816994b32c187cf31f6627600b42c7ed000756b23aaa716eceef47507 ChangeLog 1411
 MISC metadata.xml 1072 RMD160 3c839d72950b8eb3ab84920e86017f97f3b14799 SHA1 1cefcee915ef90f64beb486d298972981ea3891e SHA256 42893aa6c35591819017a8708062c88df98d27ab0466ec07d7603b46d6e3719e
 MD5 ee263c10dd886ca228e59cd69df0db66 metadata.xml 1072
 RMD160 3c839d72950b8eb3ab84920e86017f97f3b14799 metadata.xml 1072
@@ -33,10 +34,3 @@ SHA256 efa5812cb2a04e0f5920c7b62e2ede5de791e64a34612f7dd3d42278d46828bd files/di
 MD5 7d2de667039245f3b93eee6093b3a9ce files/digest-ds9-5.1 229
 RMD160 a563c4d0745dff685f2f0ed96ffe16aa3ab6ef66 files/digest-ds9-5.1 229
 SHA256 a179c4dd16bf260c6d788693e52f39d2c5255451e0a05eed4c5d018dc24fb609 files/digest-ds9-5.1 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHjN971ycZbhPLE2ARAijGAJoCCs78sRfoVTHgK8tlHVwGzEm3xACfXeHF
-EXne0AFDuqMvnhWyTY+souk=
-=kWy/
------END PGP SIGNATURE-----
diff --git a/sci-astronomy/ds9/ds9-5.1.ebuild b/sci-astronomy/ds9/ds9-5.1.ebuild
index 9636c42ca9f8..581ea348f3a0 100644
--- a/sci-astronomy/ds9/ds9-5.1.ebuild
+++ b/sci-astronomy/ds9/ds9-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.1.ebuild,v 1.1 2008/01/15 16:29:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.1.ebuild,v 1.2 2008/01/23 14:29:16 markusle Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -27,6 +27,11 @@ src_unpack() {
 	cd "${S}"
 	# patch to speed up compilation (no man pages generation)
 	epatch "${FILESDIR}"/${P}-Makefile.patch
+
+	# fix stack smashing on x86 with gcc-4.2
+	if [[ "${ARCH}" == "x86" ]]; then
+		epatch "${FILESDIR}"/${P}-gcc4.2-x86.patch
+	fi
 }
 
 src_compile() {
diff --git a/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch b/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch
new file mode 100644
index 000000000000..99465caaec79
--- /dev/null
+++ b/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch
@@ -0,0 +1,26 @@
+diff -Naur saods9/make.linux saods9.new/make.linux
+--- saods9/make.linux	2007-12-18 17:54:57.000000000 -0500
++++ saods9.new/make.linux	2008-01-23 08:58:46.000000000 -0500
+@@ -9,15 +9,15 @@
+ 
+ # note: bug with gcc 4.1 and 4.2
+ # can't use -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CXX	= g++
++CXXOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H
++CC	= gcc
++CCOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H
++
+ #CXX	= g++
+-#CXXOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H
++#CXXOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ #CC	= gcc
+-#CCOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H
+-
+-CXX	= g++34
+-CXXOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-CC	= gcc34
+-CCOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++#CCOPT	= ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ STRIP	= strip
+ ZCAT	= zcat