Workaround the hardened issues with SSP in QT by adding -fno-stack-protector to CFLAGS/CXXFLAGS.

Package-Manager: portage-2.1.3.9

7 files changed, 74 insertions, 30 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 50ccc083c8dd..304bb89332c6 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.496 2007/11/09 23:11:50 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.497 2007/11/10 08:49:05 phreak Exp $
+
+  10 Nov 2007; Christian Heim <phreak@gentoo.org> qt-3.3.4-r8.ebuild,
+  qt-3.3.8-r3.ebuild, qt-3.3.8-r4.ebuild, qt-4.3.1-r1.ebuild,
+  qt-4.3.2.ebuild:
+  Workaround the hardened issues with SSP in QT by adding -fno-stack-protector
+  to CFLAGS/CXXFLAGS.
 
   09 Nov 2007; nixnut <nixnut@gentoo.org> qt-4.3.2.ebuild:
   Stable on ppc wrt bug 198454
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 8c440d33b903..0335d476b150 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
@@ -116,30 +119,30 @@ DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b2
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
 DIST qt-x11-opensource-src-4.3.1.tar.gz 43118858 RMD160 134c1f1a9e685a9519ff88a3afc59e7b8329a270 SHA1 ca59cfdcfc390cf16c6e6b503546e8bb2cc8e1e2 SHA256 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661
 DIST qt-x11-opensource-src-4.3.2.tar.gz 43462686 RMD160 b73a3d7a1edd11987544291cce80b56f5a499969 SHA1 265fb56ded2e7ff101ebd722bd2bc1638f96057d SHA256 70198d61d038007c787bab62700d35cbd3fc925b53fe920672f2a0afbae7e276
-EBUILD qt-3.3.4-r8.ebuild 10399 RMD160 3a63653870caa0ad2e0c10a4eaacc184ded66ef0 SHA1 300d978362f3cdfd98fe6c4a1bd323a078fae530 SHA256 71731b73f95aaaea0efd925ee3daeafa35501d0c6a77c13bbfaf0537084b97d7
-MD5 3b21df364140c05ae95aab131352b0a1 qt-3.3.4-r8.ebuild 10399
-RMD160 3a63653870caa0ad2e0c10a4eaacc184ded66ef0 qt-3.3.4-r8.ebuild 10399
-SHA256 71731b73f95aaaea0efd925ee3daeafa35501d0c6a77c13bbfaf0537084b97d7 qt-3.3.4-r8.ebuild 10399
-EBUILD qt-3.3.8-r3.ebuild 11435 RMD160 d77834da99d717069252a13a28bf56d7a56a1d14 SHA1 8eaa7221f271c07f9bfa20f4cdb6701e24a70173 SHA256 bbd6f850257fae03f7ab65b8330eacf65ced727f3588e889fa45055c3612b7fb
-MD5 3cc0ff79b18d2045b586603536d03368 qt-3.3.8-r3.ebuild 11435
-RMD160 d77834da99d717069252a13a28bf56d7a56a1d14 qt-3.3.8-r3.ebuild 11435
-SHA256 bbd6f850257fae03f7ab65b8330eacf65ced727f3588e889fa45055c3612b7fb qt-3.3.8-r3.ebuild 11435
-EBUILD qt-3.3.8-r4.ebuild 11505 RMD160 1fd35dcb74c1fd05aa3c953fd4802aaaf26d7d13 SHA1 64e404e678606370c3a8114b90305052285c5e9b SHA256 70a894e64854e6d502939ba8ae1f1c0179d439aa4538f98d203f3a4a4282ce63
-MD5 3f8912644863a54b375bc119f221d8ad qt-3.3.8-r4.ebuild 11505
-RMD160 1fd35dcb74c1fd05aa3c953fd4802aaaf26d7d13 qt-3.3.8-r4.ebuild 11505
-SHA256 70a894e64854e6d502939ba8ae1f1c0179d439aa4538f98d203f3a4a4282ce63 qt-3.3.8-r4.ebuild 11505
-EBUILD qt-4.3.1-r1.ebuild 8625 RMD160 e9f685afba24af7282eedc81c7ad1f623e6ea434 SHA1 a75e64bffad1a6aed335041f7783c672500b06ea SHA256 efdea638e6a7a27c7af0098a524924fe5c9a3a39d90033d13b03626edc79c920
-MD5 48502d9e322d5b94fd1beafb78f1b4c3 qt-4.3.1-r1.ebuild 8625
-RMD160 e9f685afba24af7282eedc81c7ad1f623e6ea434 qt-4.3.1-r1.ebuild 8625
-SHA256 efdea638e6a7a27c7af0098a524924fe5c9a3a39d90033d13b03626edc79c920 qt-4.3.1-r1.ebuild 8625
-EBUILD qt-4.3.2.ebuild 8555 RMD160 36045363ef751774a865818f1ea2f4fdb18c6832 SHA1 9a9c1bb82a425875e2ac3423f74771f606766d7b SHA256 99e36025acbf4d98c5b51ce49fe94e5d4426dec3d4ec9d3a9ed1da76c25d413b
-MD5 1f901daa47b77791fd027763ebc76082 qt-4.3.2.ebuild 8555
-RMD160 36045363ef751774a865818f1ea2f4fdb18c6832 qt-4.3.2.ebuild 8555
-SHA256 99e36025acbf4d98c5b51ce49fe94e5d4426dec3d4ec9d3a9ed1da76c25d413b qt-4.3.2.ebuild 8555
-MISC ChangeLog 35629 RMD160 d1f1bdc89b0153e5a8ee12c1652a48d6eafb0f7d SHA1 e6d559de0f2b1a934e22ca4d1ee83c67b1146974 SHA256 3b79a748e4d2f27e337fdd27d0ce4f7e3f09b638e67312d7371a10fbc7f38fdc
-MD5 90bbe15230f866bfacc78d1d6b2b1803 ChangeLog 35629
-RMD160 d1f1bdc89b0153e5a8ee12c1652a48d6eafb0f7d ChangeLog 35629
-SHA256 3b79a748e4d2f27e337fdd27d0ce4f7e3f09b638e67312d7371a10fbc7f38fdc ChangeLog 35629
+EBUILD qt-3.3.4-r8.ebuild 10564 RMD160 ba215a278663c0a3eaa811c058eead8a684c5c95 SHA1 8791161e25b66d01d472c114f736d98818fbf0b3 SHA256 b40fc51531c3ed49487015fb3df92e2ab6982ceb76f1d742f5fb16f4dca35bf9
+MD5 acceb08717cf70be24569918164f3fbf qt-3.3.4-r8.ebuild 10564
+RMD160 ba215a278663c0a3eaa811c058eead8a684c5c95 qt-3.3.4-r8.ebuild 10564
+SHA256 b40fc51531c3ed49487015fb3df92e2ab6982ceb76f1d742f5fb16f4dca35bf9 qt-3.3.4-r8.ebuild 10564
+EBUILD qt-3.3.8-r3.ebuild 11605 RMD160 55cd038311b3c30ebe0d9f25af04cb5ec7e1487b SHA1 198ae6a884db2eed4b1fec1c2d03b90760bf249e SHA256 4b2ca8f557c91be75ad16bdb6041ecce8188ef6aa7911e445c81293c4f69f7b9
+MD5 bb4a354613d0a0891972eeaab129bcbd qt-3.3.8-r3.ebuild 11605
+RMD160 55cd038311b3c30ebe0d9f25af04cb5ec7e1487b qt-3.3.8-r3.ebuild 11605
+SHA256 4b2ca8f557c91be75ad16bdb6041ecce8188ef6aa7911e445c81293c4f69f7b9 qt-3.3.8-r3.ebuild 11605
+EBUILD qt-3.3.8-r4.ebuild 11670 RMD160 04113bb204e882033811ef88cc3a915f4484af4d SHA1 bf30b23b414f655b9c7445b9aeed64b2e35128af SHA256 9689b7a0908d85d2e93077e6167a39d4aa38d2b8b63ff51ecf77f1a19488eb98
+MD5 84a0b30099cfe936e5c0c2c6b991a385 qt-3.3.8-r4.ebuild 11670
+RMD160 04113bb204e882033811ef88cc3a915f4484af4d qt-3.3.8-r4.ebuild 11670
+SHA256 9689b7a0908d85d2e93077e6167a39d4aa38d2b8b63ff51ecf77f1a19488eb98 qt-3.3.8-r4.ebuild 11670
+EBUILD qt-4.3.1-r1.ebuild 8793 RMD160 f5f90f333f97672d1f5b09352d93601d06202384 SHA1 d8a8a9477901f9a9ebcb0b251ccc8425c4653e62 SHA256 e555dd997aef10f12afa9949ae6d516a5a0dfbb3c52ef54edd7371b20a995a1f
+MD5 d807c2ce18f4cba7786cc837d48d2503 qt-4.3.1-r1.ebuild 8793
+RMD160 f5f90f333f97672d1f5b09352d93601d06202384 qt-4.3.1-r1.ebuild 8793
+SHA256 e555dd997aef10f12afa9949ae6d516a5a0dfbb3c52ef54edd7371b20a995a1f qt-4.3.1-r1.ebuild 8793
+EBUILD qt-4.3.2.ebuild 8722 RMD160 b161e9678db09f62d79d76d94e36050200ef3fbd SHA1 8d184dce76af624978ea755541b32249dc8e447e SHA256 591119b38519494e891d8e73b28b94484745eb70272f46757d374a7c8f162f81
+MD5 0618781bebd3caf8273847327ab4f5dc qt-4.3.2.ebuild 8722
+RMD160 b161e9678db09f62d79d76d94e36050200ef3fbd qt-4.3.2.ebuild 8722
+SHA256 591119b38519494e891d8e73b28b94484745eb70272f46757d374a7c8f162f81 qt-4.3.2.ebuild 8722
+MISC ChangeLog 35882 RMD160 b5242116a2b923b3e302cd83c8bba897fc2e5cd2 SHA1 9a5dcbc1986c8cb9097f883f7159af60c85f0102 SHA256 a35368af14a8559f909dc20ac3f71d14e1f898313815cdbd7a48c9327ea9e7c9
+MD5 b978271382d298c6fc1df3ae70981ab0 ChangeLog 35882
+RMD160 b5242116a2b923b3e302cd83c8bba897fc2e5cd2 ChangeLog 35882
+SHA256 a35368af14a8559f909dc20ac3f71d14e1f898313815cdbd7a48c9327ea9e7c9 ChangeLog 35882
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -159,3 +162,10 @@ SHA256 e193965b05364f881551afe93de0500f5333e6efe4ea52a350b98f1802a67a47 files/di
 MD5 ed31b948a97af00c25db6283315037fd files/digest-qt-4.3.2 289
 RMD160 6e7914e1a28f2ac9e99c58fbc3c7ae6432e15fd6 files/digest-qt-4.3.2 289
 SHA256 47f1e69a82b6e66d515566900675fb127edd7542d5846e16f8e047648d1820db files/digest-qt-4.3.2 289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHNXECyuNVb5qfaOYRAm91AJ0TCt03McQvtfY/CbRKG1adQtfpbQCfS/hh
++FxzJZLqzB0T9fsA+fdc1Ps=
+=WNtf
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild
index 46b17b13c225..baa9297c4a1d 100644
--- a/x11-libs/qt/qt-3.3.4-r8.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.27 2007/07/22 03:05:35 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.28 2007/11/10 08:49:05 phreak Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -123,6 +123,12 @@ src_unpack() {
 	use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
 	# set c/xxflags and ldflags
 	strip-flags
+
+	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
+		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
+		append-flags -fno-stack-protector
+	fi
+
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
diff --git a/x11-libs/qt/qt-3.3.8-r3.ebuild b/x11-libs/qt/qt-3.3.8-r3.ebuild
index 1f2d5ddb0675..3997b7ca5942 100644
--- a/x11-libs/qt/qt-3.3.8-r3.ebuild
+++ b/x11-libs/qt/qt-3.3.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r3.ebuild,v 1.9 2007/09/07 17:39:36 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r3.ebuild,v 1.10 2007/11/10 08:49:05 phreak Exp $
 
 # *** Please remember to update qt3.eclass when revbumping this ***
 
@@ -147,6 +147,12 @@ src_unpack() {
 	# set c/xxflags and ldflags
 	strip-flags
 	append-flags -fno-strict-aliasing
+
+	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
+		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
+		append-flags -fno-stack-protector
+	fi
+
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
diff --git a/x11-libs/qt/qt-3.3.8-r4.ebuild b/x11-libs/qt/qt-3.3.8-r4.ebuild
index 4cbd0c2aaafe..4148f11d3b59 100644
--- a/x11-libs/qt/qt-3.3.8-r4.ebuild
+++ b/x11-libs/qt/qt-3.3.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.2 2007/09/15 00:49:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.3 2007/11/10 08:49:05 phreak Exp $
 
 # *** Please remember to update qt3.eclass when revbumping this ***
 
@@ -150,6 +150,12 @@ src_unpack() {
 	# set c/xxflags and ldflags
 	strip-flags
 	append-flags -fno-strict-aliasing
+
+	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
+		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
+		append-flags -fno-stack-protector
+	fi
+
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
diff --git a/x11-libs/qt/qt-4.3.1-r1.ebuild b/x11-libs/qt/qt-4.3.1-r1.ebuild
index e14b6e47de2b..277337a7401c 100644
--- a/x11-libs/qt/qt-4.3.1-r1.ebuild
+++ b/x11-libs/qt/qt-4.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.1-r1.ebuild,v 1.3 2007/09/25 13:32:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.1-r1.ebuild,v 1.4 2007/11/10 08:49:05 phreak Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -131,6 +131,11 @@ src_unpack() {
 	strip-flags
 	replace-flags -O3 -O2
 
+	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
+		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
+		append-flags -fno-stack-protector
+	fi
+
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
diff --git a/x11-libs/qt/qt-4.3.2.ebuild b/x11-libs/qt/qt-4.3.2.ebuild
index 146c6583d907..027bf42c0696 100644
--- a/x11-libs/qt/qt-4.3.2.ebuild
+++ b/x11-libs/qt/qt-4.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v 1.7 2007/11/09 23:11:50 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v 1.8 2007/11/10 08:49:05 phreak Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -127,6 +127,11 @@ src_unpack() {
 	strip-flags
 	replace-flags -O3 -O2
 
+	if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
+		ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
+		append-flags -fno-stack-protector
+	fi
+
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \