Remove old. Add patch for bug 281821, revbump all relevant versions.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

6 files changed, 122 insertions, 5 deletions

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index aede3c798218..8fa6b198bee0 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.44 2009/06/27 19:23:40 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.45 2009/08/17 20:12:14 yngwin Exp $
+
+*qt-webkit-4.5.2-r1 (17 Aug 2009)
+*qt-webkit-4.5.1-r1 (17 Aug 2009)
+*qt-webkit-4.4.2-r2 (17 Aug 2009)
+
+  17 Aug 2009; Ben de Groot <yngwin@gentoo.org> -qt-webkit-4.4.2.ebuild,
+  +qt-webkit-4.4.2-r2.ebuild, +qt-webkit-4.5.1-r1.ebuild,
+  +qt-webkit-4.5.2-r1.ebuild, +files/webkit-CVE-2009-1725.patch:
+  Remove old. Add patch for bug 281821, revbump all relevant versions.
 
 *qt-webkit-4.5.2 (27 Jun 2009)
 
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index 59aa9c2f3a30..b3d417625123 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -1,11 +1,14 @@
 AUX 0249-webkit-stale-frame-pointer.diff 4812 RMD160 aea505ff0783ba34a68dff4e9968fe8c0944a3be SHA1 910a7260f703e62d14eb521c6243e0f4b8bfaa76 SHA256 002f3900fbb9b17927260117db93b14297bdda4369e13f1593a949ebac0bd60d
+AUX webkit-CVE-2009-1725.patch 1065 RMD160 454a76349cb70e81166ec9872baaed5a1e715dd9 SHA1 2335f529f4504a7706609a9ab0b3849dd12fe54f SHA256 cc08037494468ea08fd10f7a064291f6302fe068bc7502bcebe3c1f496179375
 DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff
 DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675
 DIST qt-x11-opensource-src-4.5.1.tar.bz2 114667436 RMD160 702d7c6bb9787cd5602dcb8afce52bdfcfd52179 SHA1 50ba9b6d2eb7056e47dc53775be509c4ff6ec015 SHA256 b994c40e41386c9d82f025dd9198e1161717021216680adef97da3f1b8947c75
 DIST qt-x11-opensource-src-4.5.2.tar.bz2 116015284 RMD160 1af31d7fe66665e718f0c728b41becea9996fba7 SHA1 bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b SHA256 d26d94c9cb90dfe16a13b39ac7157f66ec9f5fbbf9d7faa57f7466157721f836
 EBUILD qt-webkit-4.4.2-r1.ebuild 1204 RMD160 7c273ab0808d0f57c8876a631f8f8fe1d13fd86a SHA1 57aaebe1f2f4444873b5f60107b68add1e164fe1 SHA256 746670af79dcfae1cc62d43f052769a42ffa9fc109b97e28c72c24246f9fbda9
-EBUILD qt-webkit-4.4.2.ebuild 1102 RMD160 fc6bcf5f550172032a8eb07034bae9b39ac057b7 SHA1 c1d03d1d04c3e51931453859cb56ba3414f97647 SHA256 85c5b7368065868d1261483a0005b4257b44bdef02fb7c369cea85ac194c038e
+EBUILD qt-webkit-4.4.2-r2.ebuild 1307 RMD160 4e0b92f1205a934d77f87c4e5de19891c97e8c34 SHA1 c395eb94778027da5abd7050af2f44735021587b SHA256 8db320930678cd1c7ebd8752879f34711497c7e644a067f8e1eb187c686f4b7a
+EBUILD qt-webkit-4.5.1-r1.ebuild 1179 RMD160 b553765ad6f438aa030afb1c0c2c66d00451064d SHA1 a02ff4bcdbba3f96282ff7d981211934705387d1 SHA256 d55c06d9893f7e6f118ecbaeb26dc95b901c8cac25f5cc41a2457282acdec981
 EBUILD qt-webkit-4.5.1.ebuild 1080 RMD160 bab5a324180c5ff2ccf5520eb42e59d7c0746e42 SHA1 46236b005aabde46ae8f3e76a84bda2717ac2f97 SHA256 c4bd633f42ca2b1b5ab40a914aaddc1acccd009e56cfd29cd4b1ae0f64082a35
+EBUILD qt-webkit-4.5.2-r1.ebuild 1179 RMD160 4773b60f210bb0624c0aceb7660cbcd8421bffea SHA1 3a62cda95dd886d3eb481b04b6514c4148cb4251 SHA256 4c615a6b5aec2dc201400338963496a84d596d9490c8ba3996c2bb1df55cca0b
 EBUILD qt-webkit-4.5.2.ebuild 1083 RMD160 25a66fdf6a5f55acc010f3f27bd28a7dccde1521 SHA1 b165961a552965e4c0a3d69e1daa82d77648f8de SHA256 01d9dba488c280b60d8e8f14731cc09c7b54e2a1e93fd384def0df9c5e921c94
-MISC ChangeLog 5877 RMD160 7abef1239120459be8771461aed4a0e35d1597d2 SHA1 947cb20587b55b0c00e1dbd4ed2148874741c820 SHA256 1428be42ca566de04517aef647f3395b29f98fe296b926e3186f3c023d05170d
+MISC ChangeLog 6248 RMD160 2ba21bf1bcb8dd4c3ea6a4b608895e0c1fcbc184 SHA1 7d8e1471f70523fb7ef9c9abbae884410bcea2a1 SHA256 c437effe3ab900c6d7469452fa0f00bf0fc03358974e8747065f65006a5d10f9
 MISC metadata.xml 284 RMD160 b9074d3491bcd710578c8eea5d49322e37cbeee9 SHA1 43a9766ca508301d94a0a11151d1e7114d5f2e9a SHA256 d93c9eadc729c0d1cee418ee259ed1fac10fc8d908a3508d67a73bd9f1de900a
diff --git a/x11-libs/qt-webkit/files/webkit-CVE-2009-1725.patch b/x11-libs/qt-webkit/files/webkit-CVE-2009-1725.patch
new file mode 100644
index 000000000000..80e45ad9770c
--- /dev/null
+++ b/x11-libs/qt-webkit/files/webkit-CVE-2009-1725.patch
@@ -0,0 +1,22 @@
+Index: master/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp
+===================================================================
+--- a/master/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp
++++ b/master/src/3rdparty/webkit/WebCore/html/HTMLTokenizer.cpp
+@@ -865,5 +865,7 @@
+                 } else {
+                     // FIXME: We should eventually colorize entities by sending them as a special token.
+-                    checkBuffer(11);
++                    // 12 bytes required: up to 10 bytes in m_cBuffer plus the
++                    // leading '&' and trailing ';'
++                    checkBuffer(12);
+                     *dest++ = '&';
+                     for (unsigned i = 0; i < cBufferPos; i++)
+@@ -876,5 +878,7 @@
+                 }
+             } else {
+-                checkBuffer(10);
++                // 11 bytes required: up to 10 bytes in m_cBuffer plus the
++                // leading '&'
++                checkBuffer(11);
+                 // ignore the sequence, add it to the buffer as plaintext
+                 *dest++ = '&';
diff --git a/x11-libs/qt-webkit/qt-webkit-4.4.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.4.2-r2.ebuild
index b076c3d7a724..b30dac81b58a 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.4.2.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.2.ebuild,v 1.9 2009/04/11 16:24:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.2-r2.ebuild,v 1.1 2009/08/17 20:12:14 yngwin Exp $
 
 EAPI="1"
 inherit qt4-build flag-o-matic toolchain-funcs
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.trolltech.com/"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="4"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
 IUSE=""
 
 DEPEND="~x11-libs/qt-gui-${PV}
@@ -31,6 +31,11 @@ src_unpack() {
 	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
 
 	qt4-build_src_unpack
+
+	# Apply bugfix patches from qt-copy (KDE)
+	epatch "${FILESDIR}"/0249-webkit-stale-frame-pointer.diff
+	# Security patch from upstream, bug 281821
+	epatch "${FILESDIR}"/webkit-CVE-2009-1725.patch
 }
 
 src_compile() {
diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.1-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.1-r1.ebuild
new file mode 100644
index 000000000000..f4cbe4f9fc0c
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.5.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.1-r1.ebuild,v 1.1 2009/08/17 20:12:14 yngwin Exp $
+
+EAPI="2"
+inherit qt4-build flag-o-matic
+
+DESCRIPTION="The Webkit module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+IUSE="kde"
+
+DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl]
+	~x11-libs/qt-gui-${PV}[debug=]
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon ) )
+	kde? ( media-sound/phonon )"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"
+QT4_EXTRACT_DIRECTORIES="
+include/
+src/
+tools/"
+QCONFIG_ADD="webkit"
+QCONFIG_DEFINE="QT_WEBKIT"
+
+src_prepare() {
+	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
+	qt4-build_src_prepare
+	# Security patch from upstream, bug 281821
+	epatch "${FILESDIR}"/webkit-CVE-2009-1725.patch
+}
+
+src_configure() {
+	# This fixes relocation overflows on alpha
+	use alpha && append-ldflags "-Wl,--no-relax"
+	myconf="${myconf} -webkit"
+	qt4-build_src_configure
+}
diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.2-r1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.2-r1.ebuild
new file mode 100644
index 000000000000..b4a6d872d86e
--- /dev/null
+++ b/x11-libs/qt-webkit/qt-webkit-4.5.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.2-r1.ebuild,v 1.1 2009/08/17 20:12:14 yngwin Exp $
+
+EAPI="2"
+inherit qt4-build flag-o-matic
+
+DESCRIPTION="The Webkit module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+IUSE="kde"
+
+DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl]
+	~x11-libs/qt-gui-${PV}[debug=]
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon ) )
+	kde? ( media-sound/phonon )"
+RDEPEND="${DEPEND}"
+
+QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"
+QT4_EXTRACT_DIRECTORIES="
+include/
+src/
+tools/"
+QCONFIG_ADD="webkit"
+QCONFIG_DEFINE="QT_WEBKIT"
+
+src_prepare() {
+	[[ $(tc-arch) == "ppc64" ]] && append-flags -mminimal-toc #241900
+	qt4-build_src_prepare
+	# Security patch from upstream, bug 281821
+	epatch "${FILESDIR}"/webkit-CVE-2009-1725.patch
+}
+
+src_configure() {
+	# This fixes relocation overflows on alpha
+	use alpha && append-ldflags "-Wl,--no-relax"
+	myconf="${myconf} -webkit"
+	qt4-build_src_configure
+}