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/kdelibs3 | |
| 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/kdelibs3')
| -rw-r--r-- | x11/kdelibs3/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs3/distinfo | 3 | ||||
| -rw-r--r-- | x11/kdelibs3/patches/patch-ap | 23 |
3 files changed, 27 insertions, 3 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index ad78ab729b9..c10af65667e 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -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 --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 8df2a9c4c6f..8d09db2be2f 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -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-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7 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 --git a/x11/kdelibs3/patches/patch-ap b/x11/kdelibs3/patches/patch-ap new file mode 100644 index 00000000000..2c6d0425ba8 --- /dev/null +++ b/x11/kdelibs3/patches/patch-ap @@ -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 ) |