diff options
| author | markd <markd@pkgsrc.org> | 2004-12-14 11:02:18 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2004-12-14 11:02:18 +0000 |
| commit | c1dda370fc25d55d136d3aaae54506d5793fa1fa (patch) | |
| tree | 6d32096c8292c594b5645b938304d76176992e0c /x11/kdebase3 | |
| parent | 9056b0fc7f2ec550ff1c210d9cfb1e741e868e5f (diff) | |
| download | pkgsrc-c1dda370fc25d55d136d3aaae54506d5793fa1fa.tar.gz | |
Part of fix of Konqueror Window Injection Vulnerability.
From http://www.kde.org/info/security/advisory-20041213-1.txt.
Bump PKGREVISION.
Diffstat (limited to 'x11/kdebase3')
| -rw-r--r-- | x11/kdebase3/Makefile | 3 | ||||
| -rw-r--r-- | x11/kdebase3/distinfo | 3 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-am | 36 |
3 files changed, 40 insertions, 2 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 3a0b6ee2823..10433b880b3 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -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 --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index c31dd6b1ddc..1c44194b93b 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -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-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628 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 --git a/x11/kdebase3/patches/patch-am b/x11/kdebase3/patches/patch-am new file mode 100644 index 00000000000..40f69160558 --- /dev/null +++ b/x11/kdebase3/patches/patch-am @@ -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 ) |