Add the patches from KDE Security Advisory 20030409-1:

  PS/PDF file handling vulnerability
http://www.kde.org/info/security/advisory-20030409-1.txt
Bump PKGREVISION.

9 files changed, 41 insertions, 10 deletions

diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 12bbcd71cd3..1ffbf27cc29 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/04/09 13:47:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2003/04/10 13:13:26 markd Exp $
 
 DISTNAME=	kde-3.1.1
+PKGREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -14,7 +15,7 @@ DEPENDS+=	kdeaddons-3.1.1:../../misc/kdeaddons3
 DEPENDS+=	kdeadmin-3.1.1:../../misc/kdeadmin3
 DEPENDS+=	kdeedu-3.1.1:../../misc/kdeedu3
 DEPENDS+=	kdegames-3.1.1:../../games/kdegames3
-DEPENDS+=	kdegraphics-3.1.1nb1:../../graphics/kdegraphics3
+DEPENDS+=	kdegraphics-3.1.1nb2:../../graphics/kdegraphics3
 DEPENDS+=	kdemultimedia-3.1.1nb1:../../audio/kdemultimedia3
 DEPENDS+=	kdenetwork-3.1.1:../../net/kdenetwork3
 DEPENDS+=	kdepim-3.1.1:../../misc/kdepim3
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index e48a93025c2..29105f4ea0a 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/04/01 12:27:12 markd Exp $
+# $NetBSD: Makefile,v 1.23 2003/04/10 13:13:26 markd Exp $
 
 DISTNAME=	kdebase-3.1.1
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
diff --git a/x11/kdebase3/buildlink2.mk b/x11/kdebase3/buildlink2.mk
index 41da739b0e7..7a3f80e8025 100644
--- a/x11/kdebase3/buildlink2.mk
+++ b/x11/kdebase3/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/12/24 06:10:33 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/04/10 13:13:26 markd Exp $
 
 .if !defined(KDEBASE3_BUILDLINK2_MK)
 KDEBASE3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdebase3
 BUILDLINK_PKGBASE.kdebase3?=	kdebase
-BUILDLINK_DEPENDS.kdebase3?=	kdebase>=3.0.4nb1
+BUILDLINK_DEPENDS.kdebase3?=	kdebase>=3.1.1nb1
 BUILDLINK_PKGSRCDIR.kdebase3?=	../../x11/kdebase3
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 175ec26a914..484b54c239c 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2003/04/01 12:27:12 markd Exp $
+$NetBSD: distinfo,v 1.27 2003/04/10 13:13:26 markd Exp $
 
 SHA1 (kdebase-3.1.1.tar.bz2) = bae5a726544658971f02b113d2a3148fa607ad54
 Size (kdebase-3.1.1.tar.bz2) = 14917696 bytes
@@ -108,3 +108,4 @@ SHA1 (patch-eu) = 142d526643d21f02b349e4128dec3c44c7aece93
 SHA1 (patch-ev) = fed8b4a50e967efc8a6b03ef523dbe1ad7e2cecd
 SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5
 SHA1 (patch-ex) = 6dad116e38ba30ea1a9a3529e250b1e512c4865f
+SHA1 (patch-ey) = 9967afa35546e34d9692cf0cedfd0e690f235773
diff --git a/x11/kdebase3/patches/patch-ey b/x11/kdebase3/patches/patch-ey
new file mode 100644
index 00000000000..6f606522d8b
--- /dev/null
+++ b/x11/kdebase3/patches/patch-ey
@@ -0,0 +1,13 @@
+$NetBSD: patch-ey,v 1.1 2003/04/10 13:13:24 markd Exp $
+
+--- kioslave/thumbnail/gscreator.cpp.orig	Fri Dec  6 09:40:47 2002
++++ kioslave/thumbnail/gscreator.cpp
+@@ -59,6 +59,8 @@ static const char *gsargs[] = {
+     "gs",
+     "-sDEVICE=png16m",
+     "-sOutputFile=-",
++    "-dSAFER",
++    "-dPARANOIDSAFER",
+     "-dNOPAUSE",
+     "-dFirstPage=1",
+     "-dLastPage=1",
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index f7e7ddf192d..6a3d2893ccd 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2003/04/01 12:27:13 markd Exp $
+# $NetBSD: Makefile,v 1.25 2003/04/10 13:13:25 markd Exp $
 
 DISTNAME=	kdelibs-3.1.1
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk
index f9f58c0c8fd..952d7ecc04b 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.12 2003/03/11 13:10:33 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2003/04/10 13:13:26 markd Exp $
 
 .if !defined(KDELIBS3_BUILDLINK2_MK)
 KDELIBS3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdelibs3
 BUILDLINK_PKGBASE.kdelibs3?=	kdelibs
-BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.1
+BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.1.1nb1
 BUILDLINK_PKGSRCDIR.kdelibs3?=	../../x11/kdelibs3
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index f0b79b01424..8daa88fa31f 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2003/04/01 12:27:13 markd Exp $
+$NetBSD: distinfo,v 1.18 2003/04/10 13:13:26 markd Exp $
 
 SHA1 (kdelibs-3.1.1.tar.bz2) = fa0c556b78ae1310f5fabae2187bd2187452c67e
 Size (kdelibs-3.1.1.tar.bz2) = 10313173 bytes
@@ -40,3 +40,4 @@ SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
 SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14
 SHA1 (patch-cd) = f0f3842175194fc582b93ae69ea65fe62ef3ac35
 SHA1 (patch-ce) = 08e965336563bc818bbfd6dcef6b3bdbcfd89497
+SHA1 (patch-cf) = 5ba068e87b44a6ed71033709fefaa53fc4a0bcd6
diff --git a/x11/kdelibs3/patches/patch-cf b/x11/kdelibs3/patches/patch-cf
new file mode 100644
index 00000000000..04173e7c093
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-cf
@@ -0,0 +1,13 @@
+$NetBSD: patch-cf,v 1.1 2003/04/10 13:13:23 markd Exp $
+
+--- kimgio/eps.cpp.orig	Mon Mar  3 08:02:06 2003
++++ kimgio/eps.cpp
+@@ -99,7 +99,7 @@ void kimgio_eps_read (QImageIO *image)
+         tmp.setNum( wantedHeight );
+         cmdBuf += "x";
+         cmdBuf += tmp;
+-        cmdBuf += " -dNOPAUSE -sDEVICE=ppm -c "
++        cmdBuf += " -dSAFER -dPARANOIDSAFER -dNOPAUSE -sDEVICE=ppm -c "
+                 "0 0 moveto "
+                 "1000 0 lineto "
+                 "1000 1000 lineto "