summaryrefslogtreecommitdiff
path: root/x11/kdelibs3
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2009-08-18 11:57:33 +0000
committermarkd <markd@pkgsrc.org>2009-08-18 11:57:33 +0000
commitc7d74d85eeb8d75dc102f5ce48bdd4ceb2de01fc (patch)
tree1178265ef2155d98eb419e6841c325acd7d1c70f /x11/kdelibs3
parentfbbff99abc8c5d491b9a9ba264d181e518fa1733 (diff)
downloadpkgsrc-c7d74d85eeb8d75dc102f5ce48bdd4ceb2de01fc.tar.gz
Fix for CVE-2009-1725
Diffstat (limited to 'x11/kdelibs3')
-rw-r--r--x11/kdelibs3/Makefile4
-rw-r--r--x11/kdelibs3/distinfo3
-rw-r--r--x11/kdelibs3/patches/patch-aq15
3 files changed, 19 insertions, 3 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index b19ff201593..f321ec1b369 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.141 2009/06/16 16:09:36 hasso Exp $
+# $NetBSD: Makefile,v 1.142 2009/08/18 11:57:33 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 f0bd479788a..77fd3af4eec 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2008/08/27 12:02:32 markd Exp $
+$NetBSD: distinfo,v 1.95 2009/08/18 11:57:33 markd Exp $
SHA1 (kdelibs-3.5.10.tar.bz2) = c930a25f4419134def55b8466c3a6f737227fb82
RMD160 (kdelibs-3.5.10.tar.bz2) = 4c960664283c83ebc8e68932ca9044336fcff223
@@ -15,6 +15,7 @@ SHA1 (patch-aj) = 2ec8d33ce6684da7c60759cf395b78fa4ac2eaec
SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c
SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
+SHA1 (patch-aq) = 18f3885a73cd9169cf4f9c9d97420e639f7fec3c
SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
SHA1 (patch-bd) = 552c072d9e369420b2a54944cb4b0d0f75555468
SHA1 (patch-be) = fdf2d64acb70b46ec4c71bed9ee89fa34fd5dd3d
diff --git a/x11/kdelibs3/patches/patch-aq b/x11/kdelibs3/patches/patch-aq
new file mode 100644
index 00000000000..4a987e1f674
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.11 2009/08/18 11:57:33 markd Exp $
+
+KDE svn 1002164 fixes CVE-2009-1725
+
+--- khtml/html/htmltokenizer.cpp.orig 2007-05-14 19:52:39.000000000 +1200
++++ khtml/html/htmltokenizer.cpp
+@@ -736,7 +736,7 @@ void HTMLTokenizer::parseEntity(Tokenize
+ #ifdef TOKEN_DEBUG
+ kdDebug( 6036 ) << "unknown entity!" << endl;
+ #endif
+- checkBuffer(10);
++ checkBuffer(11);
+ // ignore the sequence, add it to the buffer as plaintext
+ *dest++ = '&';
+ for(unsigned int i = 0; i < cBufferPos; i++)