Bring in the patches that fix the recent security problem.

PKGREVISION++

4 files changed, 45 insertions, 2 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index c402c58ec9e..a48b8067ccd 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2002/11/16 18:45:32 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.15 2002/12/06 11:00:30 skrll Exp $
 
 DISTNAME=	kdelibs-3.0.4
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 0e885b7879a..bc8e1a13b52 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/10/14 09:45:53 skrll Exp $
+$NetBSD: distinfo,v 1.11 2002/12/06 11:00:30 skrll Exp $
 
 SHA1 (kdelibs-3.0.4.tar.bz2) = f75bd9b813ccb688877aba4fa78c22747e8f3039
 Size (kdelibs-3.0.4.tar.bz2) = 7643484 bytes
@@ -55,3 +55,5 @@ SHA1 (patch-bx) = bdb54c677c9e21ecf0a67b617e17f26f5fd40019
 SHA1 (patch-by) = b3eec86ae3ffbf5a17fa808c973f0968e6c680e6
 SHA1 (patch-ca) = ee31a9cfe62d9dd4f269bf95f2721bfb289d5d51
 SHA1 (patch-cb) = 5666c768eb8d56cc1fd67e704153cfc152337f3b
+SHA1 (patch-cc) = 332ce2a57ed979d3a341f9e83a376e9e21dab6fe
+SHA1 (patch-cd) = 14fb38c90a6607a11d8d0b6ab1d71f8019af41f1
diff --git a/x11/kdelibs3/patches/patch-cc b/x11/kdelibs3/patches/patch-cc
new file mode 100644
index 00000000000..68770652081
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-cc
@@ -0,0 +1,17 @@
+$NetBSD: patch-cc,v 1.1 2002/12/06 11:00:31 skrll Exp $
+
+--- kio/misc/rlogin.protocol.orig	Sat Jan 20 23:01:05 2001
++++ kio/misc/rlogin.protocol
+@@ -1,10 +1,10 @@
+ [Protocol]
+-exec=konsole -e rlogin `echo %u | sed -e 's,rlogin:/*,,'`
++exec=ktelnetservice %u
+ protocol=rlogin
+ input=none
+ output=none
+ helper=true
+-listing=false
++listing=
+ reading=false
+ writing=false
+ makedir=false
diff --git a/x11/kdelibs3/patches/patch-cd b/x11/kdelibs3/patches/patch-cd
new file mode 100644
index 00000000000..818cf48b8a9
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-cd
@@ -0,0 +1,23 @@
+$NetBSD: patch-cd,v 1.1 2002/12/06 11:00:31 skrll Exp $
+
+--- kio/misc/ktelnetservice.cpp.orig	Tue Sep 25 12:04:11 2001
++++ kio/misc/ktelnetservice.cpp	Fri Dec  6 08:46:50 2002
+@@ -48,9 +48,16 @@
+ 
+ 	KURL url(args->arg(0));
+ 	QStringList cmd;
+-	
++
+ 	cmd << "-e";
+-	cmd << "telnet";
++        if ( url.protocol() == "telnet" )
++            cmd << "telnet";
++        else if ( url.protocol() == "rlogin" )
++            cmd << "rlogin";
++        else {
++            kdError() << "Invalid protocol " << url.protocol() << endl;
++            return 2;
++        }
+ 	if (!url.user().isEmpty())
+ 	{
+ 		cmd << "-l";