[pkgsrc/trunk]: pkgsrc/x11 Part of fix of Konqueror Window Injection Vulnerab...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/157da86af57d
branches:  trunk
changeset: 485502:157da86af57d
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Dec 14 11:02:18 2004 +0000

description:
Part of fix of Konqueror Window Injection Vulnerability.
>From http://www.kde.org/info/security/advisory-20041213-1.txt.
Bump PKGREVISION.

diffstat:

 x11/kdebase3/Makefile         |   3 ++-
 x11/kdebase3/distinfo         |   3 ++-
 x11/kdebase3/patches/patch-am |  36 ++++++++++++++++++++++++++++++++++++
 x11/kdelibs3/Makefile         |   4 ++--
 x11/kdelibs3/distinfo         |   3 ++-
 x11/kdelibs3/patches/patch-ap |  23 +++++++++++++++++++++++
 6 files changed, 67 insertions(+), 5 deletions(-)

diffs (126 lines):

diff -r 47c83e4e2af3 -r 157da86af57d x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Tue Dec 14 10:58:30 2004 +0000
+++ b/x11/kdebase3/Makefile     Tue Dec 14 11:02:18 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2004/12/10 06:05:16 markd Exp $
+# $NetBSD: Makefile,v 1.65 2004/12/14 11:05:27 markd Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    x11
 COMMENT=       Base modules for the KDE 3 integrated X11 desktop
 
diff -r 47c83e4e2af3 -r 157da86af57d x11/kdebase3/distinfo
--- a/x11/kdebase3/distinfo     Tue Dec 14 10:58:30 2004 +0000
+++ b/x11/kdebase3/distinfo     Tue Dec 14 11:02:18 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2004/12/10 06:05:16 markd Exp $
+$NetBSD: distinfo,v 1.59 2004/12/14 11:05:27 markd Exp $
 
 SHA1 (kdebase-3.3.2.tar.bz2) = 7807437bed2a2ee83591755f70ad42358a52a36e
 Size (kdebase-3.3.2.tar.bz2) = 19995043 bytes
@@ -16,6 +16,7 @@
 SHA1 (patch-aj) = 2a0b38f4968bfca00e56ef4a6e06bfc3a874ae33
 SHA1 (patch-ak) = df7ff2bf5ed6bb2442d49df1c277712712a7f966
 SHA1 (patch-al) = f90dac7b597b12111e41d5f0c57b0f58d78cc83b
+SHA1 (patch-am) = 5d20f608191757987aa5ea6a3cc4d52f8f05cd4e
 SHA1 (patch-bb) = d4d352c9fb24792a2e5931ee9c5131cd735cec21
 SHA1 (patch-bc) = c236cc8b3f9caebf2540425232f2d90ec66c70d1
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
diff -r 47c83e4e2af3 -r 157da86af57d x11/kdebase3/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-am     Tue Dec 14 11:02:18 2004 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-am,v 1.10 2004/12/14 11:05:27 markd Exp $
+
+--- konqueror/konq_mainwindow.cc.orig  2004-11-29 06:27:03.000000000 +1300
++++ konqueror/konq_mainwindow.cc
+@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
+     QString viewName = view->viewName();
+     kdDebug() << "       - viewName=" << viewName << "   "
+               << "frame names:" << view->frameNames().join( "," ) << endl;
++
++    // First look for a hostextension containing this frame name
++    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++    if ( ext )
++    {
++      ext = ext->findFrameParent(callingPart, name);
++      kdDebug() << "BrowserHostExtension found part " << ext << endl;
++      if (!ext)
++         continue; // Don't use this window
++    }
++
+     if ( !viewName.isEmpty() && viewName == name )
+     {
+       kdDebug() << "found existing view by name: " << view << endl;
+@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
+       return view;
+     }
+ 
+-    // First look for a hostextension containing this frame name
+-    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+-    if ( ext )
+-    {
+-      ext = ext->findFrameParent(callingPart, name);
+-    }
+-
+ //    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+ 
+     if ( ext )
diff -r 47c83e4e2af3 -r 157da86af57d x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Tue Dec 14 10:58:30 2004 +0000
+++ b/x11/kdelibs3/Makefile     Tue Dec 14 11:02:18 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2004/12/10 06:02:57 markd Exp $
+# $NetBSD: Makefile,v 1.71 2004/12/14 11:02:18 markd Exp $
 
 DISTNAME=      kdelibs-${_KDE_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
diff -r 47c83e4e2af3 -r 157da86af57d x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Tue Dec 14 10:58:30 2004 +0000
+++ b/x11/kdelibs3/distinfo     Tue Dec 14 11:02:18 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2004/12/10 06:02:57 markd Exp $
+$NetBSD: distinfo,v 1.46 2004/12/14 11:02:18 markd Exp $
 
 SHA1 (kdelibs-3.3.2.tar.bz2) = 69325b603375d31d4d537955383f4893e4a7945f
 Size (kdelibs-3.3.2.tar.bz2) = 15623180 bytes
@@ -9,6 +9,7 @@
 SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
 SHA1 (patch-an) = 0fccfa014212073f235945732ef3a3329756f9b5
 SHA1 (patch-ao) = 5cc9be57db26a2615ae9c982eb2b894c2c193e6b
+SHA1 (patch-ap) = bd0aa3b4a4b56cd74b674ce191b48268adecc8b9
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = 172e1146d4e1e49a1a61d7ddc415dbfa4e5c4088
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
diff -r 47c83e4e2af3 -r 157da86af57d x11/kdelibs3/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs3/patches/patch-ap     Tue Dec 14 11:02:18 2004 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ap,v 1.10 2004/12/14 11:02:18 markd Exp $
+
+--- khtml/khtml_part.cpp.orig  2004-11-29 06:30:50.000000000 +1300
++++ khtml/khtml_part.cpp
+@@ -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 )