| 1 |
phreak 07/11/10 08:49:06 |
| 2 |
|
| 3 |
Modified: qt-3.3.8-r4.ebuild ChangeLog qt-3.3.8-r3.ebuild |
| 4 |
qt-4.3.1-r1.ebuild qt-4.3.2.ebuild |
| 5 |
qt-3.3.4-r8.ebuild |
| 6 |
Log: |
| 7 |
Workaround the hardened issues with SSP in QT by adding -fno-stack-protector to CFLAGS/CXXFLAGS. |
| 8 |
(Portage version: 2.1.3.9) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 x11-libs/qt/qt-3.3.8-r4.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: qt-3.3.8-r4.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- qt-3.3.8-r4.ebuild 15 Sep 2007 00:49:12 -0000 1.2 |
| 24 |
+++ qt-3.3.8-r4.ebuild 10 Nov 2007 08:49:05 -0000 1.3 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2007 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
# *** Please remember to update qt3.eclass when revbumping this *** |
| 32 |
|
| 33 |
@@ -150,6 +150,12 @@ |
| 34 |
# set c/xxflags and ldflags |
| 35 |
strip-flags |
| 36 |
append-flags -fno-strict-aliasing |
| 37 |
+ |
| 38 |
+ if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then |
| 39 |
+ ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
| 40 |
+ append-flags -fno-stack-protector |
| 41 |
+ fi |
| 42 |
+ |
| 43 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
| 44 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
| 45 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.497 x11-libs/qt/ChangeLog |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.497&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.497&content-type=text/plain |
| 53 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?r1=1.496&r2=1.497 |
| 54 |
|
| 55 |
Index: ChangeLog |
| 56 |
=================================================================== |
| 57 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v |
| 58 |
retrieving revision 1.496 |
| 59 |
retrieving revision 1.497 |
| 60 |
diff -u -r1.496 -r1.497 |
| 61 |
--- ChangeLog 9 Nov 2007 23:11:50 -0000 1.496 |
| 62 |
+++ ChangeLog 10 Nov 2007 08:49:05 -0000 1.497 |
| 63 |
@@ -1,6 +1,12 @@ |
| 64 |
# ChangeLog for x11-libs/qt |
| 65 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 66 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.496 2007/11/09 23:11:50 nixnut Exp $ |
| 67 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.497 2007/11/10 08:49:05 phreak Exp $ |
| 68 |
+ |
| 69 |
+ 10 Nov 2007; Christian Heim <phreak@g.o> qt-3.3.4-r8.ebuild, |
| 70 |
+ qt-3.3.8-r3.ebuild, qt-3.3.8-r4.ebuild, qt-4.3.1-r1.ebuild, |
| 71 |
+ qt-4.3.2.ebuild: |
| 72 |
+ Workaround the hardened issues with SSP in QT by adding -fno-stack-protector |
| 73 |
+ to CFLAGS/CXXFLAGS. |
| 74 |
|
| 75 |
09 Nov 2007; nixnut <nixnut@g.o> qt-4.3.2.ebuild: |
| 76 |
Stable on ppc wrt bug 198454 |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.10 x11-libs/qt/qt-3.3.8-r3.ebuild |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8-r3.ebuild?rev=1.10&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8-r3.ebuild?rev=1.10&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8-r3.ebuild?r1=1.9&r2=1.10 |
| 85 |
|
| 86 |
Index: qt-3.3.8-r3.ebuild |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r3.ebuild,v |
| 89 |
retrieving revision 1.9 |
| 90 |
retrieving revision 1.10 |
| 91 |
diff -u -r1.9 -r1.10 |
| 92 |
--- qt-3.3.8-r3.ebuild 7 Sep 2007 17:39:36 -0000 1.9 |
| 93 |
+++ qt-3.3.8-r3.ebuild 10 Nov 2007 08:49:05 -0000 1.10 |
| 94 |
@@ -1,6 +1,6 @@ |
| 95 |
# Copyright 1999-2007 Gentoo Foundation |
| 96 |
# Distributed under the terms of the GNU General Public License v2 |
| 97 |
-# $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 $ |
| 98 |
+# $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 $ |
| 99 |
|
| 100 |
# *** Please remember to update qt3.eclass when revbumping this *** |
| 101 |
|
| 102 |
@@ -147,6 +147,12 @@ |
| 103 |
# set c/xxflags and ldflags |
| 104 |
strip-flags |
| 105 |
append-flags -fno-strict-aliasing |
| 106 |
+ |
| 107 |
+ if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then |
| 108 |
+ ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
| 109 |
+ append-flags -fno-stack-protector |
| 110 |
+ fi |
| 111 |
+ |
| 112 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
| 113 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
| 114 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 115 |
|
| 116 |
|
| 117 |
|
| 118 |
1.4 x11-libs/qt/qt-4.3.1-r1.ebuild |
| 119 |
|
| 120 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.1-r1.ebuild?rev=1.4&view=markup |
| 121 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.1-r1.ebuild?rev=1.4&content-type=text/plain |
| 122 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.1-r1.ebuild?r1=1.3&r2=1.4 |
| 123 |
|
| 124 |
Index: qt-4.3.1-r1.ebuild |
| 125 |
=================================================================== |
| 126 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.1-r1.ebuild,v |
| 127 |
retrieving revision 1.3 |
| 128 |
retrieving revision 1.4 |
| 129 |
diff -u -r1.3 -r1.4 |
| 130 |
--- qt-4.3.1-r1.ebuild 25 Sep 2007 13:32:04 -0000 1.3 |
| 131 |
+++ qt-4.3.1-r1.ebuild 10 Nov 2007 08:49:05 -0000 1.4 |
| 132 |
@@ -1,6 +1,6 @@ |
| 133 |
# Copyright 1999-2007 Gentoo Foundation |
| 134 |
# Distributed under the terms of the GNU General Public License v2 |
| 135 |
-# $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 $ |
| 136 |
+# $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 $ |
| 137 |
|
| 138 |
inherit eutils flag-o-matic toolchain-funcs multilib |
| 139 |
|
| 140 |
@@ -131,6 +131,11 @@ |
| 141 |
strip-flags |
| 142 |
replace-flags -O3 -O2 |
| 143 |
|
| 144 |
+ if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then |
| 145 |
+ ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
| 146 |
+ append-flags -fno-stack-protector |
| 147 |
+ fi |
| 148 |
+ |
| 149 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
| 150 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
| 151 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 152 |
|
| 153 |
|
| 154 |
|
| 155 |
1.8 x11-libs/qt/qt-4.3.2.ebuild |
| 156 |
|
| 157 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild?rev=1.8&view=markup |
| 158 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild?rev=1.8&content-type=text/plain |
| 159 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild?r1=1.7&r2=1.8 |
| 160 |
|
| 161 |
Index: qt-4.3.2.ebuild |
| 162 |
=================================================================== |
| 163 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v |
| 164 |
retrieving revision 1.7 |
| 165 |
retrieving revision 1.8 |
| 166 |
diff -u -r1.7 -r1.8 |
| 167 |
--- qt-4.3.2.ebuild 9 Nov 2007 23:11:50 -0000 1.7 |
| 168 |
+++ qt-4.3.2.ebuild 10 Nov 2007 08:49:05 -0000 1.8 |
| 169 |
@@ -1,6 +1,6 @@ |
| 170 |
# Copyright 1999-2007 Gentoo Foundation |
| 171 |
# Distributed under the terms of the GNU General Public License v2 |
| 172 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v 1.7 2007/11/09 23:11:50 nixnut Exp $ |
| 173 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v 1.8 2007/11/10 08:49:05 phreak Exp $ |
| 174 |
|
| 175 |
inherit eutils flag-o-matic toolchain-funcs multilib |
| 176 |
|
| 177 |
@@ -127,6 +127,11 @@ |
| 178 |
strip-flags |
| 179 |
replace-flags -O3 -O2 |
| 180 |
|
| 181 |
+ if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then |
| 182 |
+ ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
| 183 |
+ append-flags -fno-stack-protector |
| 184 |
+ fi |
| 185 |
+ |
| 186 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
| 187 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
| 188 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 189 |
|
| 190 |
|
| 191 |
|
| 192 |
1.28 x11-libs/qt/qt-3.3.4-r8.ebuild |
| 193 |
|
| 194 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild?rev=1.28&view=markup |
| 195 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild?rev=1.28&content-type=text/plain |
| 196 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild?r1=1.27&r2=1.28 |
| 197 |
|
| 198 |
Index: qt-3.3.4-r8.ebuild |
| 199 |
=================================================================== |
| 200 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v |
| 201 |
retrieving revision 1.27 |
| 202 |
retrieving revision 1.28 |
| 203 |
diff -u -r1.27 -r1.28 |
| 204 |
--- qt-3.3.4-r8.ebuild 22 Jul 2007 03:05:35 -0000 1.27 |
| 205 |
+++ qt-3.3.4-r8.ebuild 10 Nov 2007 08:49:05 -0000 1.28 |
| 206 |
@@ -1,6 +1,6 @@ |
| 207 |
# Copyright 1999-2007 Gentoo Foundation |
| 208 |
# Distributed under the terms of the GNU General Public License v2 |
| 209 |
-# $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 $ |
| 210 |
+# $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 $ |
| 211 |
|
| 212 |
inherit eutils flag-o-matic toolchain-funcs |
| 213 |
|
| 214 |
@@ -123,6 +123,12 @@ |
| 215 |
use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}" |
| 216 |
# set c/xxflags and ldflags |
| 217 |
strip-flags |
| 218 |
+ |
| 219 |
+ if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then |
| 220 |
+ ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
| 221 |
+ append-flags -fno-stack-protector |
| 222 |
+ fi |
| 223 |
+ |
| 224 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
| 225 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
| 226 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 227 |
|
| 228 |
|
| 229 |
|
| 230 |
-- |
| 231 |
gentoo-commits@g.o mailing list |
Archives