Version bump with multiple security fixes, remove old testing.

Package-Manager: portage-2.1.9.14/cvs/Linux x86_64

5 files changed, 40 insertions, 142 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 732273ee9eba..7967272ab0d3 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.79 2010/09/11 18:35:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.80 2010/10/11 13:47:37 pacho Exp $
+
+*webkit-gtk-1.2.5 (11 Oct 2010)
+
+  11 Oct 2010; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-1.2.1.ebuild,
+  -files/webkit-gtk-1.2.1-icu-4.4.patch, +webkit-gtk-1.2.5.ebuild,
+  metadata.xml:
+  Version bump: fixes for CVE-2010-1780 CVE-2010-3113 CVE-2010-1814
+  CVE-2010-1812 CVE-2010-1815 CVE-2010-3115 CVE-2010-1807 CVE-2010-3114
+  CVE-2010-3116 CVE-2010-3257 CVE-2010-3259 CVE-2010-1781 CVE-2010-1782
+  CVE-2010-1784 CVE-2010-1785 CVE-2010-1786 CVE-2010-1787 CVE-2010-1788
+  CVE-2010-1790 CVE-2010-1792 CVE-2010-1793 CVE-2010-2648 CVE-2010-2647.
+  Bump to EAPI3, add introspection support, drop libtool-1 compatibility
+  hack that should no longer be needed, remove old.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> webkit-gtk-1.2.3.ebuild:
   Marked ppc for bug #324077.
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a45139718755..9a8b2ee64792 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,20 +4,19 @@ Hash: SHA1
 AUX webkit-gtk-1.1.15.2-unaligned.patch 4403 RMD160 c9ba117a35e07ed1097787934fdb0750b2baaab5 SHA1 fd1ddaff12705784662002554a76aea67ff70320 SHA256 8b20af7ccad9d91f8d76465843b6a40e80c59c8e9620cf7772ba6f64406b3e68
 AUX webkit-gtk-1.1.15.4-darwin-quartz.patch 2353 RMD160 4293e345e05390cf93b97d381edb7c443ae0cc02 SHA1 f2d67803f59503ff9d408be0a38983ac25439dad SHA256 3aedd95fc50d92b31e6043d1e8df0c50385b96503e94945547b1f65675f21a12
 AUX webkit-gtk-1.1.15.4-icu44.patch 4907 RMD160 aec153a9a9cbeb435a0e28ba567daf215380d870 SHA1 c5366b8f1e65105faa170ef8c90c1d94f739fec2 SHA256 75a6f47728436082b5039f961f3dc5a10888c1c49779c2b4dcbb0321cf65ef8e
-AUX webkit-gtk-1.2.1-icu-4.4.patch 4343 RMD160 d1dbf729f96afd672e4d1eb0d7d24c8cc29833c0 SHA1 f5c87bf9436172fcc8263e739e8989ef5d480222 SHA256 8bbaf65397e1bc207b24af13bc3b70e04b099233e9f84a85891f1b9018b26491
 AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b54917a3311553cc78 SHA1 8c4e6c5e7c0c957ee1743a0d347b50f992460c17 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434
 DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d1659513e SHA1 0778b130720756d880c2bbe9eeef79f35bcf861a SHA256 ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
-DIST webkit-1.2.1.tar.gz 7577236 RMD160 f8c158b67fbcdfd9977edd530d5f8c15e402da6d SHA1 ced564514f0be0a88c696e7afd6902d967d532a2 SHA256 c9ee551eab4e98730fa06aaa493ce95828e6c6661ec14361e6254bc23795a2dd
 DIST webkit-1.2.3.tar.gz 6740030 RMD160 41fa194de2865867dbf7d1156d0962a7580f2275 SHA1 88c38ebeba187a062272b2aa8ca2bbd0bbb86306 SHA256 ff70b25ea8dedc0031f29f2ea8d9aa226bfa65ebd2f12772390f4e2845306fe1
+DIST webkit-1.2.5.tar.gz 6727977 RMD160 7510af4c5d15c06adf984a090a9e9550f5ea7147 SHA1 2cd50e62a0c94bba8cc8a8466ea16fac1f9fc1ce SHA256 b08a69a9ccbd84b2e23a94caf7eb5cfc390bb6cef49a4921b5eb11860b329d41
 EBUILD webkit-gtk-1.1.15.4.ebuild 2550 RMD160 64a87a310fe47ccb336c66f39b3b86a1fa869d14 SHA1 193e316fe1ba246e32c550992782f0afa360bf46 SHA256 bd88cecc6710e5d52954f5c990ee322b1e18b5b47d04164789b346d2f00ff5c3
-EBUILD webkit-gtk-1.2.1.ebuild 3303 RMD160 fb214b06c1bc98e3fd89643e08adb20bdf42ed1a SHA1 9a2a203b72cd8e0ee35216a808f6b50654438c38 SHA256 5b1743f1f426c061b392c5ac3c05233a89e23cd3452fc5e297aec84a62d2b36b
 EBUILD webkit-gtk-1.2.3.ebuild 3225 RMD160 ced54ff0b2947417f20c6f7bb7c023c7f3a1f2bf SHA1 32a8e402739755216e2ec2dc9b7c2e12f714b2d4 SHA256 bfc8c0e5d9a06a4c003cc7eae6e818f26f2bfe129e714575c26977283974f208
-MISC ChangeLog 16161 RMD160 9b2353b68a825b0b2ea75cea3b64e08a3a34a3da SHA1 6fdbf9912bb19ef36a6ea38ad7ef2a1b97fe8b03 SHA256 0ca039f30f710c13de73a3a8a9263680a69d20dcd6a2a5927b64c05869bfa3e0
-MISC metadata.xml 318 RMD160 8779b2915c61a3efda9fdd42f64caa899e3bd2e0 SHA1 6ea9740e1524cbe0bb50316af693bb558fb41ecf SHA256 46a3afd2db9273d4fc19d548ac9935d2bd6ce9e6cf868d8c94331d950898b375
+EBUILD webkit-gtk-1.2.5.ebuild 3035 RMD160 fe91d9399dd7ff38d91da36628aa849f6c9f1a1f SHA1 d147dce8d80bc9b096aff9225041de5c34af84f1 SHA256 c23abd3fc1aa4d64d737af5256ac57652dac0a384e0e52a7e392b4e28983cfc8
+MISC ChangeLog 16831 RMD160 b75e2b03e5e2996625a40a93296cd456a52971bd SHA1 a95c506e22ad1988b6d82a7cdcb1ce346c46eae5 SHA256 707eee64d7cafabeb3167fd18f88b50403a33293b5db2a8300451eefe07fdc3b
+MISC metadata.xml 415 RMD160 4cf82e15e7b1dadf71e0b4549a01b41f508d36e2 SHA1 f74ebd33bba8b57f7714e7267e2f13f97277bd38 SHA256 7498f904ea7154281d4082a83ff5a47647bdfca09ee3da630dd8e6a1ee6b0e1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyLyx8ACgkQcsIHjyDViGQ5pgCfaJceLaVVRQd1iLOrRZAKuJRc
-6fMAnR4CnRtYWxavE6cO85yi8fiIy9gn
-=UM2A
+iEYEARECAAYFAkyzFYEACgkQCaWpQKGI+9RpAQCfS2MvlqPWcYAzRaHMtzIT56Kd
+mwUAn1BuhRJIFDO+AfZ+Njwltes+RYmg
+=i5bN
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.1-icu-4.4.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.1-icu-4.4.patch
deleted file mode 100644
index 054430dcd1d0..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.1-icu-4.4.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff --git a/WebCore/platform/text/TextBreakIteratorICU.cpp b/WebCore/platform/text/TextBreakIteratorICU.cpp
-index 44423c0..f5575ee 100644
---- a/WebCore/platform/text/TextBreakIteratorICU.cpp
-+++ b/WebCore/platform/text/TextBreakIteratorICU.cpp
-@@ -24,7 +24,6 @@
- 
- #include "PlatformString.h"
- #include "TextBreakIteratorInternalICU.h"
--
- #include <unicode/ubrk.h>
- #include <wtf/Assertions.h>
- 
-@@ -38,7 +37,7 @@ static TextBreakIterator* setUpIterator(bool& createdIterator, TextBreakIterator
- 
-     if (!createdIterator) {
-         UErrorCode openStatus = U_ZERO_ERROR;
--        iterator = static_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
-+        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
-         createdIterator = true;
-         ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
-     }
-@@ -46,7 +45,7 @@ static TextBreakIterator* setUpIterator(bool& createdIterator, TextBreakIterator
-         return 0;
- 
-     UErrorCode setTextStatus = U_ZERO_ERROR;
--    ubrk_setText(iterator, string, length, &setTextStatus);
-+    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
-     if (U_FAILURE(setTextStatus))
-         return 0;
- 
-@@ -85,44 +84,44 @@ TextBreakIterator* sentenceBreakIterator(const UChar* string, int length)
-         staticSentenceBreakIterator, UBRK_SENTENCE, string, length);
- }
- 
--int textBreakFirst(TextBreakIterator* bi)
-+int textBreakFirst(TextBreakIterator* iterator)
- {
--    return ubrk_first(bi);
-+    return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
- }
- 
--int textBreakLast(TextBreakIterator* bi)
-+int textBreakLast(TextBreakIterator* iterator)
- {
--    return ubrk_last(bi);
-+    return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
- }
- 
--int textBreakNext(TextBreakIterator* bi)
-+int textBreakNext(TextBreakIterator* iterator)
- {
--    return ubrk_next(bi);
-+    return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
- }
- 
--int textBreakPrevious(TextBreakIterator* bi)
-+int textBreakPrevious(TextBreakIterator* iterator)
- {
--    return ubrk_previous(bi);
-+    return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
- }
- 
--int textBreakPreceding(TextBreakIterator* bi, int pos)
-+int textBreakPreceding(TextBreakIterator* iterator, int pos)
- {
--    return ubrk_preceding(bi, pos);
-+    return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
- }
- 
--int textBreakFollowing(TextBreakIterator* bi, int pos)
-+int textBreakFollowing(TextBreakIterator* iterator, int pos)
- {
--    return ubrk_following(bi, pos);
-+    return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
- }
- 
--int textBreakCurrent(TextBreakIterator* bi)
-+int textBreakCurrent(TextBreakIterator* iterator)
- {
--    return ubrk_current(bi);
-+    return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
- }
- 
--bool isTextBreak(TextBreakIterator* bi, int pos)
-+bool isTextBreak(TextBreakIterator* iterator, int position)
- {
--    return ubrk_isBoundary(bi, pos);
-+    return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
- }
- 
- #ifndef BUILDING_ON_TIGER
-@@ -136,7 +135,7 @@ static TextBreakIterator* setUpIteratorWithRules(bool& createdIterator, TextBrea
-         UParseError parseStatus;
-         UErrorCode openStatus = U_ZERO_ERROR;
-         String rules(breakRules);
--        iterator = static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
-+        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
-         createdIterator = true;
-         ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
-     }
-@@ -144,7 +143,7 @@ static TextBreakIterator* setUpIteratorWithRules(bool& createdIterator, TextBrea
-         return 0;
- 
-     UErrorCode setTextStatus = U_ZERO_ERROR;
--    ubrk_setText(iterator, string, length, &setTextStatus);
-+    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
-     if (U_FAILURE(setTextStatus))
-         return 0;
- 
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 6315a1f7754f..9469fa04d771 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -3,7 +3,9 @@
 <pkgmetadata>
   <herd>gnome</herd>
   <use>
-    <flag name="coverage">enable code coverage support</flag>
+	<flag name="coverage">enable code coverage support</flag>
+	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+	for introspection</flag>
 	<flag name="websockets">enable full duplex single socket communication</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
index dab3e14ad69d..2f9ff27a72ce 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild,v 1.4 2010/07/09 08:07:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.1 2010/10/11 13:47:37 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit autotools flag-o-matic eutils virtualx
 
@@ -14,9 +14,8 @@ SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
 LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-# geoclue
-# FIXME: we are still not ready for introspection
-IUSE="coverage debug doc +gstreamer +websockets" # aqua
+# geoclue is missing
+IUSE="coverage debug doc +gstreamer introspection" # aqua
 
 # use sqlite, svg by default
 # dependency on >=x11-libs/gtk+-2.13 for gail
@@ -38,11 +37,8 @@ RDEPEND="
 
 	gstreamer? (
 		media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.25:0.10 )"
-#	introspection? (
-#		>=dev-libs/gobject-introspection-0.6.2
-#		!!dev-libs/gir-repository[webkit]
-#		dev-libs/gir-repository[libsoup] )
+		>=media-libs/gst-plugins-base-0.10.25:0.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.33
@@ -55,23 +51,18 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	# Build failure with icu-4.4, bug 308699
-	epatch "${FILESDIR}"/${PN}-1.2.1-icu-4.4.patch
-
 	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
-	use sparc && epatch "${FILESDIR}"/${PN}-1.1.15.2-unaligned.patch
+	use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
 
 	# Darwin/Aqua build is broken, needs autoreconf
 	# XXX: BROKEN. Patch does not apply anymore.
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
 	#epatch "${FILESDIR}"/${PN}-1.1.15.4-darwin-quartz.patch
 
-	# Make it libtool-1 compatible
-	rm -v autotools/lt* autotools/libtool.m4 \
-		|| die "removing libtool macros failed"
 	# Don't force -O2
 	sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
+
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=autotools eautoreconf
 }
@@ -87,10 +78,12 @@ src_configure() {
 
 	myconf="
 		--disable-introspection
+		--disable-web_sockets
 		$(use_enable coverage)
 		$(use_enable debug)
 		$(use_enable gstreamer video)
-		$(use_enable websockets web_sockets)"
+		$(use_enable introspection)"
+		# Disable web-sockets per bug #326547
 		# quartz patch above does not apply anymore
 		#$(use aqua && echo "--with-target=quartz")"
 
@@ -105,14 +98,14 @@ src_test() {
 	Xemake check || die "Test phase failed"
 }
 
-#src_compile() {
+src_compile() {
 	# Fix sandbox error with USE="introspection"
 	# https://bugs.webkit.org/show_bug.cgi?id=35471
-#	addpredict "$(unset HOME; echo ~)/.local"
-#	emake || die "Compile failed"
-#}
+	addpredict "$(unset HOME; echo ~)/.local"
+	emake || die "Compile failed"
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	emake DESTDIR="${ED}" install || die "Install failed"
 	dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
 }