Update patch for bug #274566.

Package-Manager: portage-13655-svn/cvs/Linux x86_64

4 files changed, 81 insertions, 7 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 4beb1853f930..412310f042b5 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.610 2009/06/18 02:33:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.611 2009/06/20 13:43:28 arfrever Exp $
+
+*kdelibs-4.2.4-r3 (20 Jun 2009)
+
+  20 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -kdelibs-4.2.4-r2.ebuild, +kdelibs-4.2.4-r3.ebuild,
+  files/4.2.4-CVE-2009-1690.patch:
+  Update patch for bug #274566.
 
   18 Jun 2009; Jeroen Roovers <jer@gentoo.org> kdelibs-3.5.10-r6.ebuild:
   Stable for HPPA (bug #271889).
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 2b91e603a433..7374a4a156e5 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,4 +1,4 @@
-AUX 4.2.4-CVE-2009-1690.patch 527 RMD160 d9329dd9ad770041fa9a87f424db849d57059dbb SHA1 7a0c386bde03cf0e84a8cd580867ba6f26512247 SHA256 a39c1985db2d944a23755c0b368988b5bdfc702dfe46df12c9ddd959d7232902
+AUX 4.2.4-CVE-2009-1690.patch 2437 RMD160 9ef96f67e0ee878d112d270339b979c3263fd93e SHA1 bc253af5e4b6329935e88a6999c7925e6c6ddf08 SHA256 8e8b32827e2e5375ce61b08e8264085b285e58a4838028165b2cfeefa1d38010
 AUX 4.2.4-fixPopupForPlasmaboard.patch 2180 RMD160 bc24d337f03f05be742f7963e8eb14161f643183 SHA1 bd40ad5289c2ec5b17d3a46d53e4fc5b205dc3f3 SHA256 627fef9fbd0df29c1c11ffd0e7fbb979189c31b11ec16d7db1ae981053384669
 AUX dist/09_disable_debug_messages_if_not_explicitly_enabled.patch 1840 RMD160 097372c9264497b1aabb8b21e8b9959c24cca2f1 SHA1 f19dd9bbf3ed0868442a970a4c588640922c6cbc SHA256 92b8a8c8f46f06a0bfd93babb52f6d87c7b3f5dc6478b4f5d8e8c56c9e4e5bce
 AUX dist/20_use_dejavu_as_default_font.patch 1543 RMD160 805f4c6e685b8b6598acb1c69b5f6d41fa6ce010 SHA1 09eeafca53dd1c4b9347fd9d295949d37022e2f5 SHA256 9a6b141d5eb5fd73700086fef591074674563a2e5b374d3af4c6cea52726fc03
@@ -31,6 +31,6 @@ EBUILD kdelibs-3.5.9-r2.ebuild 6185 RMD160 243ff66b2e98d84d99ffa8d6fd5dde6c3abc8
 EBUILD kdelibs-3.5.9-r3.ebuild 6269 RMD160 602398051cb2f76fb4b6ad0033e5be96789c889d SHA1 fe3fc37c34973a7dc9d089c7a71142c5300da9f6 SHA256 b8db06b4e4d0ab40dd33384a05316a7e157a29ddf88a08030b48818cdcff4fef
 EBUILD kdelibs-3.5.9-r4.ebuild 6354 RMD160 aa9e38063aa1c51140bbf62d2b29b0dd6ab6f42e SHA1 d02244fa79ed1762ab57599d88ed5622997b0a2a SHA256 155356e94d21f88d17c1058f01d6d8d6b165e58ec1347ffb9ae21c6e0dc484f2
 EBUILD kdelibs-3.5.9.ebuild 6023 RMD160 b88aa72dd0d019e386300fa1d3558fe4d80a5cb7 SHA1 81edb64474a81df1d5421c90ebabad35ed0ea702 SHA256 1c49b81f26a1f1cb9d01c41e68840dcf712f8e2577389ea665d0362140104c8e
-EBUILD kdelibs-4.2.4-r2.ebuild 6025 RMD160 3f097edceeb3145a2ab875d57f03ad07542fedf6 SHA1 b4f645135e4f60e6c2dbc75d9c75777fea0b7f13 SHA256 9c3b9ea71e7b4f020bd0022bedb7f71cd4916e2088435a04110976599c49325b
-MISC ChangeLog 102108 RMD160 a12335c9c89d28b27ea8454a21b57952dbe9e0d7 SHA1 62184b67025f768879c144bb3d61e4ba218d8d6d SHA256 e436aa18e3749118c5b8d55084523468b0e039700c7023d340b31737e04b22e3
+EBUILD kdelibs-4.2.4-r3.ebuild 6024 RMD160 76fb4ed6fb25e66159d32205da021110905c595a SHA1 085e6e84f0fd4389c7d546fceef07b2cbaf34857 SHA256 ccea7beec475f009d48dd63f0472ad81e59da95d52723a187a1e5b95b395c37e
+MISC ChangeLog 102341 RMD160 6c041b7a70d1739f532d9d5c48d31a21bc6ea945 SHA1 f4f4ee8a7f5c734210afb1356250bb1b7d98380d SHA256 f77c8e3996e10b9aa8161e512b2025699127f9d0cea74e53a1dc5837e80cfd95
 MISC metadata.xml 375 RMD160 0a16bbd99eb0c4f3d89dbede17c5d6feea41c6ba SHA1 531b56c08557857a57c7833d2bab42cdf879b9a8 SHA256 3b5a8f2ca27aa45532679f3ab64756b02a953c5c11e86d9539cec95bab292b9b
diff --git a/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch b/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch
index 2810d842d0fa..c274996f2709 100644
--- a/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch
+++ b/kde-base/kdelibs/files/4.2.4-CVE-2009-1690.patch
@@ -1,5 +1,72 @@
---- branches/KDE/4.2/kdelibs/khtml/svg/SVGList.h	2009/01/06 17:13:38	906699
-+++ branches/KDE/4.2/kdelibs/khtml/svg/SVGList.h	2009/06/17 21:56:00	983302
+https://bugs.gentoo.org/show_bug.cgi?id=274566
+http://websvn.kde.org/?view=rev&revision=983302
+http://websvn.kde.org/?view=rev&revision=983316
+
+--- khtml/html/htmlparser.cpp
++++ khtml/html/htmlparser.cpp
+@@ -216,7 +216,6 @@
+ 
+     form = 0;
+     map = 0;
+-    head = 0;
+     end = false;
+     isindex = 0;
+ 
+@@ -678,8 +677,7 @@
+             case ID_BASE:
+                 if(!head) {
+                     head = new HTMLHeadElementImpl(document);
+-                    e = head;
+-                    insertNode(e);
++                    insertNode(head.get());
+                     handled = true;
+                 }
+                 break;
+@@ -894,7 +892,7 @@
+     case ID_HEAD:
+         if(!head && (current->id() == ID_HTML || current->isDocumentNode())) {
+             head = new HTMLHeadElementImpl(document);
+-            n = head;
++            n = head.get();
+         }
+         break;
+     case ID_BODY:
+@@ -1800,19 +1798,19 @@
+     head = new HTMLHeadElementImpl(document);
+     HTMLElementImpl *body = doc()->body();
+     int exceptioncode = 0;
+-    doc()->documentElement()->insertBefore(head, body, exceptioncode);
++    doc()->documentElement()->insertBefore(head.get(), body, exceptioncode);
+     if ( exceptioncode ) {
+ #ifdef PARSER_DEBUG
+         kDebug( 6035 ) << "creation of head failed!!!!:" << exceptioncode;
+ #endif
+-        delete head;
++        delete head.get();
+         head = 0;
+     }
+         
+     // If the body does not exist yet, then the <head> should be pushed as the current block.
+     if (head && !body) {
+         pushBlock(head->id(), tagPriority(head->id()));
+-        setCurrent(head);
++        setCurrent(head.get());
+     }
+ }
+ 
+--- khtml/html/htmlparser.h
++++ khtml/html/htmlparser.h
+@@ -155,7 +155,7 @@
+     /*
+      * the head element. Needed for crappy html which defines <base> after </head>
+      */
+-    DOM::HTMLHeadElementImpl *head;
++    RefPtr<DOM::HTMLHeadElementImpl> head;
+ 
+     /*
+      * a possible <isindex> element in the head. Compatibility hack for
+--- khtml/svg/SVGList.h
++++ khtml/svg/SVGList.h
 @@ -97,7 +97,11 @@
  
          Item insertItemBefore(Item newItem, unsigned int index, ExceptionCode&)
diff --git a/kde-base/kdelibs/kdelibs-4.2.4-r2.ebuild b/kde-base/kdelibs/kdelibs-4.2.4-r3.ebuild
index a740575f59f8..dde74f959350 100644
--- a/kde-base/kdelibs/kdelibs-4.2.4-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.4-r3.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/kde-base/kdelibs/kdelibs-4.2.4-r2.ebuild,v 1.1 2009/06/17 22:25:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.4-r3.ebuild,v 1.1 2009/06/20 13:43:28 arfrever Exp $
 
 EAPI="2"