[Pkg-kde-commits] rev 300 - in trunk/packages/kdelibs/debian: . patches

[Adeodato Sim??]

Author: dato-guest
Date: 2004-12-13 15:01:02 -0700 (Mon, 13 Dec 2004)
New Revision: 300

Added:
   trunk/packages/kdelibs/debian/patches/post-3.3.2-kdelibs-htmlframes2.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
Log:
Commited kdelibs 3.3.1-3 packaging.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2004-12-12 03:24:22 UTC (rev 299)
+++ trunk/packages/kdelibs/debian/changelog	2004-12-13 22:01:02 UTC (rev 300)
@@ -1,3 +1,11 @@
+kdelibs (4:3.3.1-3) unstable; urgency=high
+
+  * Fix kdeaccessability Conflict. Closes: #285391
+  * Added patch to fix half of Konqueror Window Injection Vulnerability 
+    CAN-2004-115. kdebase upload will fix the rest.
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Mon, 13 Dec 2004 18:53:21 +0000
+
 kdelibs (4:3.3.1-2) unstable; urgency=medium
 
   * New upload to aid with transition of KDE 3.3 to sarge and to fix security

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2004-12-12 03:24:22 UTC (rev 299)
+++ trunk/packages/kdelibs/debian/control	2004-12-13 22:01:02 UTC (rev 300)
@@ -11,7 +11,7 @@
 Section: kde
 Architecture: all
 Depends: kdelibs4 (>= ${Source-Version}), kdelibs-bin (>= ${Source-Version}), kdelibs-data (>= ${Source-Version})
-Conflicts: kdeaccessibility (<< 4:3.3.0), kdeaddons (<< 4:3.3.0), kdeadmin (<< 4:3.3.0), kdeartwork (<< 4:3.3.0), kdebase (<< 4:3.3.0), kdebindings (<< 4:3.3.0), kdeedu (<< 4:3.3.0), kdegames (<< 4:3.3.0), kdegraphics (<< 4:3.3.0), kde-i18n (<< 4:3.3.0), kdemultimedia (<< 4:3.3.0), kdenetwork (<< 4:3.3.0), kdepim (<< 4:3.3.0), kdesdk (<< 4:3.3.0), kdetoys (<< 4:3.3.0), kdeutils (<< 4:3.3.0), kdewebdev (<< 1:3.3.0)
+Conflicts: kdeaccessibility (<< 3.3.0), kdeaddons (<< 4:3.3.0), kdeadmin (<< 4:3.3.0), kdeartwork (<< 4:3.3.0), kdebase (<< 4:3.3.0), kdebindings (<< 4:3.3.0), kdeedu (<< 4:3.3.0), kdegames (<< 4:3.3.0), kdegraphics (<< 4:3.3.0), kde-i18n (<< 4:3.3.0), kdemultimedia (<< 4:3.3.0), kdenetwork (<< 4:3.3.0), kdepim (<< 4:3.3.0), kdesdk (<< 4:3.3.0), kdetoys (<< 4:3.3.0), kdeutils (<< 4:3.3.0), kdewebdev (<< 1:3.3.0)
 Description: KDE core libraries metapackage
  KDE is a powerful Open Source graphical desktop environment
  for Unix workstations. It combines ease of use, contemporary

Added: trunk/packages/kdelibs/debian/patches/post-3.3.2-kdelibs-htmlframes2.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/post-3.3.2-kdelibs-htmlframes2.diff	2004-12-12 03:24:22 UTC (rev 299)
+++ trunk/packages/kdelibs/debian/patches/post-3.3.2-kdelibs-htmlframes2.diff	2004-12-13 22:01:02 UTC (rev 300)
@@ -0,0 +1,26 @@
+Index: khtml_part.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
+retrieving revision 1.1015.2.12
+diff -u -p -r1.1015.2.12 khtml_part.cpp
+--- kdelibs/khtml/khtml_part.cpp	17 Nov 2004 13:46:56 -0000	1.1015.2.12
++++ kdelibs/khtml/khtml_part.cpp	12 Dec 2004 15:55:30 -0000
+@@ -4758,7 +4758,7 @@ KHTMLPart *
+ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
+ {
+ #ifdef DEBUG_FINDFRAME
+-  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
++  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
+ #endif
+   // Check access
+   KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
+@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read
+   if (!checkFrameAccess(callingHtmlPart))
+      return 0;
+ 
++  if (!childFrame && !parentPart() && (name() == f))
++     return this;
++
+   FrameIt it = d->m_frames.find( f );
+   const FrameIt end = d->m_frames.end();
+   if ( it != end )