Permalink
Browse files

Pullup ticket 103 to the pkgsrc-2004Q2 branch, requested by Mark Davies

Security fix for kdebase3

	Module Name:	pkgsrc
	Committed By:	markd
	Date:		Wed Aug 11 13:54:06 UTC 2004

	Modified Files:
		pkgsrc/x11/kdebase3: Makefile distinfo
	Added Files:
		pkgsrc/x11/kdebase3/patches: patch-al patch-am

	Log Message:
	Fix some issues related to html frames, cookie handling and temporary
	 filenames. From KDE cvs.
	Bump PKGREVISION.
  • Loading branch information...
agc
agc committed Aug 13, 2004
1 parent 9571ab0 commit 4d36b490f18a5ddca57b06f0b4f08ad75b3d3803
Showing with 150 additions and 3 deletions.
  1. +3 −1 doc/CHANGES-pkgsrc-2004Q2
  2. +2 −1 x11/kdebase3/Makefile
  3. +3 −1 x11/kdebase3/distinfo
  4. +120 −0 x11/kdebase3/patches/patch-al
  5. +22 −0 x11/kdebase3/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.55 2004/08/13 13:05:04 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.56 2004/08/13 13:09:54 agc Exp $
Changes to the packages collection and infrastructure on the
pkgsrc-2004Q2 branch:
@@ -106,3 +106,5 @@ Pullup ticket 92, requested by Grant Beattie [agc 2004-07-30]
Bulk build fix
Pullup ticket 102, requested by Mark Davies [agc 2004-08-13]
Security fix for kdelibs3
+Pullup ticket 103, requested by Mark Davies [agc 2004-08-13]
+ Security fix for kdebase3
View
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2004/06/10 11:51:51 markd Exp $
+# $NetBSD: Makefile,v 1.54.2.1 2004/08/13 13:09:54 agc Exp $
DISTNAME= kdebase-${_KDE_VERSION}
+PKGREVISION= 1
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
View
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2004/06/10 11:51:51 markd Exp $
+$NetBSD: distinfo,v 1.53.2.1 2004/08/13 13:09:54 agc Exp $
SHA1 (kdebase-3.2.3.tar.bz2) = bb3543a7ffa95e55a5eb87c4e476d3a800c0113c
Size (kdebase-3.2.3.tar.bz2) = 17330422 bytes
@@ -15,6 +15,8 @@ SHA1 (patch-af) = ad9b3a97151c964d4adea2d8fecd780c6198b205
SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
SHA1 (patch-aj) = 3ed17b109394ce3d24accbbd6afcad40013d6b48
SHA1 (patch-ak) = 234c9a4d01b15ab803a182c51c14a7c0cf249576
+SHA1 (patch-al) = b943f5313caee5b9ce205167e8d6637dea2c885e
+SHA1 (patch-am) = 50a11a0d3d444b32f60790dd1db59c71bd06ac99
SHA1 (patch-bb) = 1b6c717a1bedafbeae0037ee382795d8aa59f081
SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58
SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
@@ -0,0 +1,120 @@
+$NetBSD: patch-al,v 1.4.4.1 2004/08/13 13:09:54 agc Exp $
+
+Index: konqueror/konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1274.2.24
+diff -u -p -r1.1274.2.24 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24
++++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000
+@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest(
+ {
+ kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl;
+
++ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
+ QString frameName = args.frameName;
+
+ if ( !frameName.isEmpty() )
+@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest(
+ frameName.lower() != _parent )
+ {
+ KParts::BrowserHostExtension *hostExtension = 0;
+- KonqView *view = childView( frameName, &hostExtension, 0 );
++ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 );
+ if ( !view )
+ {
+ KonqMainWindow *mainWindow = 0;
+- view = findChildView( frameName, &mainWindow, &hostExtension, 0 );
++ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 );
+
+ if ( !view || !mainWindow )
+ {
+@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest(
+ }
+ }
+
+- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
+- KonqView *view = childView( part );
++ KonqView *view = childView( callingPart );
+ openURL( view, url, args );
+ }
+
+@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow
+ if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" )
+ {
+ KParts::BrowserHostExtension *hostExtension = 0;
+- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) )
++ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) )
+ {
+ // Found a view. If url isn't empty, we should open it - but this never happens currently
+ // findChildView put the resulting part in 'part', so we can just return now
+@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP
+ return 0L;
+ }
+
+-KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
++KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
+ {
+- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
++ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl;
+
+ MapViews::ConstIterator it = m_mapViews.begin();
+ MapViews::ConstIterator end = m_mapViews.end();
+@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co
+ {
+ KonqView* view = it.data();
+ QString viewName = view->viewName();
+- //kdDebug() << " - viewName=" << viewName << " "
+- // << "frame names:" << view->frameNames().join( "," ) << endl;
++ kdDebug() << " - viewName=" << viewName << " "
++ << "frame names:" << view->frameNames().join( "," ) << endl;
+ if ( !viewName.isEmpty() && viewName == name )
+ {
+- //kdDebug() << "found existing view by name: " << view << endl;
++ kdDebug() << "found existing view by name: " << view << endl;
+ if ( hostExtension )
+ *hostExtension = 0;
+ if ( part )
+@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co
+ }
+
+ // First look for a hostextension containing this frame name
+- // (KonqView looks for it recursively)
+- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), 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 )
+ {
+@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co
+ {
+ if ( frameIt.current()->name() == name )
+ {
+- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
++ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl;
+ if ( hostExtension )
+ *hostExtension = ext;
+ if ( part )
+@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co
+ }
+
+ // static
+-KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
++KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part )
+ {
+ if ( !s_lstViews )
+ return 0;
+@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView
+ QPtrListIterator<KonqMainWindow> it( *s_lstViews );
+ for (; it.current(); ++it )
+ {
+- KonqView *res = it.current()->childView( name, hostExtension, part );
++ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part );
+ if ( res )
+ {
+ if ( mainWindow )
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.7.4.1 2004/08/13 13:09:54 agc Exp $
+
+Index: konqueror/konq_mainwindow.h
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v
+retrieving revision 1.423.2.4
+diff -u -p -r1.423.2.4 konq_mainwindow.h
+--- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4
++++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000
+@@ -145,10 +145,10 @@ public:
+ void insertChildView( KonqView *childView );
+ void removeChildView( KonqView *childView );
+ KonqView *childView( KParts::ReadOnlyPart *view );
+- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
++ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
+
+ // dcop idl bug! it can't handle KonqMainWindow *&mainWindow
+- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
++ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part );
+
+ // Total number of views
+ int viewCount() const { return m_mapViews.count(); }

0 comments on commit 4d36b49

Please sign in to comment.