Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-webkit: ChangeLog qt-webkit-4.6.2-r1.ebuild qt-webkit-4.5.3-r3.ebuild
Date: Fri, 09 Apr 2010 22:26:11
Message-Id: 20100409222607.6A0BF2C04B@corvid.gentoo.org
1 yngwin 10/04/09 22:26:07
2
3 Modified: ChangeLog
4 Added: qt-webkit-4.6.2-r1.ebuild qt-webkit-4.5.3-r3.ebuild
5 Log:
6 Adding security patches for bug #314193. Make dbus optional, fixes bug #292337.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.85 x11-libs/qt-webkit/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.85&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.85&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.84&r2=1.85
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
19 retrieving revision 1.84
20 retrieving revision 1.85
21 diff -u -r1.84 -r1.85
22 --- ChangeLog 2 Apr 2010 10:01:25 -0000 1.84
23 +++ ChangeLog 9 Apr 2010 22:26:07 -0000 1.85
24 @@ -1,6 +1,22 @@
25 # ChangeLog for x11-libs/qt-webkit
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.84 2010/04/02 10:01:25 hwoarang Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.85 2010/04/09 22:26:07 yngwin Exp $
29 +
30 +*qt-webkit-4.6.2-r1 (09 Apr 2010)
31 +*qt-webkit-4.5.3-r3 (09 Apr 2010)
32 +
33 + 09 Apr 2010; Ben de Groot <yngwin@g.o> +qt-webkit-4.5.3-r3.ebuild,
34 + +files/qt-webkit-4.5.3-cve-2010-0046-css-format-mem-corruption.patch,
35 + +files/qt-webkit-4.5.3-cve-2010-0049-freed-line-boxes-ltr-rtl.patch,
36 + +files/qt-webkit-4.5.3-cve-2010-0050-crash-misnested-style-tags.patch,
37 + +files/qt-webkit-4.5.3-cve-2010-0052-destroyed-input-cached.patch,
38 + +qt-webkit-4.6.2-r1.ebuild,
39 + +files/qt-webkit-4.6.2-cve-2010-0051-lax-css-parsing-cross-domain-theft.pa
40 + tch,
41 + +files/qt-webkit-4.6.2-cve-2010-0054-image-element-pointer-name-getter.pat
42 + ch:
43 + Adding security patches for bug #314193. Make dbus optional, fixes bug
44 + #292337.
45
46 02 Apr 2010; Markos Chandras <hwoarang@g.o> qt-webkit-4.6.2.ebuild:
47 Adjust phonon dependencies
48
49
50
51 1.1 x11-libs/qt-webkit/qt-webkit-4.6.2-r1.ebuild
52
53 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2-r1.ebuild?rev=1.1&view=markup
54 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2-r1.ebuild?rev=1.1&content-type=text/plain
55
56 Index: qt-webkit-4.6.2-r1.ebuild
57 ===================================================================
58 # Copyright 1999-2010 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.6.2-r1.ebuild,v 1.1 2010/04/09 22:26:07 yngwin Exp $
61
62 EAPI="2"
63 inherit qt4-build
64
65 DESCRIPTION="The Webkit module for the Qt toolkit"
66 SLOT="4"
67 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
68 IUSE="dbus kde"
69
70 DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=,ssl]
71 ~x11-libs/qt-gui-${PV}[aqua=,dbus?,debug=]
72 ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=]
73 dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )
74 !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug=]
75 media-sound/phonon[aqua=] ) )
76 kde? ( || ( media-sound/phonon[aqua=] ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,dbus=,debug] ) )"
77 RDEPEND="${DEPEND}"
78
79 PATCHES=(
80 "${FILESDIR}"/${PN}-4.6.0-solaris-strnstr.patch
81 "${FILESDIR}"/${PN}-4.5.3-cve-2010-0046-css-format-mem-corruption.patch
82 "${FILESDIR}"/${PN}-4.5.3-cve-2010-0049-freed-line-boxes-ltr-rtl.patch
83 "${FILESDIR}"/${PN}-4.5.3-cve-2010-0050-crash-misnested-style-tags.patch
84 "${FILESDIR}"/${PN}-4.5.3-cve-2010-0052-destroyed-input-cached.patch
85 "${FILESDIR}"/${P}-cve-2010-0051-lax-css-parsing-cross-domain-theft.patch
86 "${FILESDIR}"/${P}-cve-2010-0054-image-element-pointer-name-getter.patch
87 )
88
89 pkg_setup() {
90 QT4_TARGET_DIRECTORIES="
91 src/3rdparty/webkit/WebCore
92 tools/designer/src/plugins/qwebview"
93 QT4_EXTRACT_DIRECTORIES="
94 include/
95 src/
96 tools/"
97 QCONFIG_ADD="webkit"
98 QCONFIG_DEFINE="QT_WEBKIT"
99
100 qt4-build_pkg_setup
101 }
102
103 src_prepare() {
104 [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
105 qt4-build_src_prepare
106 }
107
108 src_configure() {
109 myconf="${myconf} -webkit $(qt_use dbus qdbus)"
110 qt4-build_src_configure
111 }
112
113
114
115 1.1 x11-libs/qt-webkit/qt-webkit-4.5.3-r3.ebuild
116
117 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.3-r3.ebuild?rev=1.1&view=markup
118 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.3-r3.ebuild?rev=1.1&content-type=text/plain
119
120 Index: qt-webkit-4.5.3-r3.ebuild
121 ===================================================================
122 # Copyright 1999-2010 Gentoo Foundation
123 # Distributed under the terms of the GNU General Public License v2
124 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.3-r3.ebuild,v 1.1 2010/04/09 22:26:07 yngwin Exp $
125
126 EAPI="2"
127 inherit eutils qt4-build flag-o-matic
128
129 DESCRIPTION="The Webkit module for the Qt toolkit"
130 SLOT="4"
131 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
132 IUSE="dbus kde"
133
134 DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl]
135 ~x11-libs/qt-gui-${PV}[dbus?,debug=]
136 dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] )
137 !kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[dbus=,debug=]
138 media-sound/phonon ) )
139 kde? ( media-sound/phonon )"
140 RDEPEND="${DEPEND}"
141
142 pkg_setup() {
143 QT4_TARGET_DIRECTORIES="
144 src/3rdparty/webkit/WebCore
145 tools/designer/src/plugins/qwebview"
146 QT4_EXTRACT_DIRECTORIES="
147 include/
148 src/
149 tools/"
150 QCONFIG_ADD="webkit"
151 QCONFIG_DEFINE="QT_WEBKIT"
152
153 qt4-build_pkg_setup
154 }
155
156 src_prepare() {
157 [[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
158 epatch "${FILESDIR}"/30_webkit_unaligned_access.diff #235685
159 epatch "${FILESDIR}"/${P}-no-javascript-crash.patch #295573
160
161 # patches graciously borrowed from Fedora for bug #314193
162 epatch "${FILESDIR}"/${P}-cve-2010-0046-css-format-mem-corruption.patch
163 epatch "${FILESDIR}"/${P}-cve-2010-0049-freed-line-boxes-ltr-rtl.patch
164 epatch "${FILESDIR}"/${P}-cve-2010-0050-crash-misnested-style-tags.patch
165 epatch "${FILESDIR}"/${P}-cve-2010-0052-destroyed-input-cached.patch
166
167 qt4-build_src_prepare
168 }
169
170 src_configure() {
171 # This fixes relocation overflows on alpha
172 use alpha && append-ldflags "-Wl,--no-relax"
173 myconf="${myconf} -webkit $(qt_use dbus qdbus)"
174 qt4-build_src_configure
175 }
Report Message
Find on MARC Find on Google Groups