Update KDE to 3.1.2.

Changes:

kdeartwork:
* Fixed a potential printf() format string attack in the slideshow screensaver

kdepim:
* korganizer: Exchange plugin supports secure WebDAV.
* korganizer: Fix timezone handling when timezone names are Unicode strings.

kdeutils:
* kedit: Save immediately when Settings/Save Settings is called.
* khexedit: Fixed insertion of local files.

3 files changed, 45 insertions, 18 deletions

diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile
index 1543a6dd64c..3bfa0a622b6 100644
--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2003/05/02 11:55:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/22 02:57:11 markd Exp $
 
-DISTNAME=	kdeartwork-3.1.1
-PKGREVISION=	1
+DISTNAME=	kdeartwork-3.1.2
 CATEGORIES=	misc
 COMMENT=	Artwork for the KDE integrated X11 desktop
 
diff --git a/misc/kdeartwork3/distinfo b/misc/kdeartwork3/distinfo
index 2a65db7bead..18558bff57f 100644
--- a/misc/kdeartwork3/distinfo
+++ b/misc/kdeartwork3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/04/01 12:27:09 markd Exp $
+$NetBSD: distinfo,v 1.8 2003/05/22 02:57:11 markd Exp $
 
-SHA1 (kdeartwork-3.1.1.tar.bz2) = 83e702abb23110ff542a29038fd0b0944cdd1cf3
-Size (kdeartwork-3.1.1.tar.bz2) = 13841579 bytes
-SHA1 (patch-aa) = 67ca2b9718e29c22773ea94ed88e50ab7bf6e708
+SHA1 (kdeartwork-3.1.2.tar.bz2) = 4c051cf1d0be9e653f080f1e74b762f2def7d12f
+Size (kdeartwork-3.1.2.tar.bz2) = 13854609 bytes
+SHA1 (patch-aa) = 03e56d80ae4d4d7588b93f6dc6a7e47d78d4018d
diff --git a/misc/kdeartwork3/patches/patch-aa b/misc/kdeartwork3/patches/patch-aa
index 0a50af6e874..38b129ca42e 100644
--- a/misc/kdeartwork3/patches/patch-aa
+++ b/misc/kdeartwork3/patches/patch-aa
@@ -1,13 +1,41 @@
-$NetBSD: patch-aa,v 1.1 2003/03/11 13:22:23 markd Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/22 02:57:12 markd Exp $
 
---- configure.orig	Tue Feb  4 01:11:07 2003
+--- configure.orig	Thu May  8 00:13:17 2003
 +++ configure
-@@ -24320,7 +24320,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
- XSCREENSAVER_HACKS_DIR=
- 
- if test "$XSCREENSAVER" != "NO"; then
--   hackdir=`echo $XSCREENSAVER | sed -e "s,/bin/xscreensaver,/lib/xscreensaver,"`
-+   hackdir=`echo $XSCREENSAVER | sed -e "s,/bin/xscreensaver,/libexec/xscreensaver,"`
-    echo "$as_me:$LINENO: checking for $hackdir/flame" >&5
- echo $ECHO_N "checking for $hackdir/flame... $ECHO_C" >&6
-    if test -x $hackdir/flame; then
+@@ -24849,12 +24849,12 @@ done
+ IFS=$old_IFS
+ 
+ 
+-   echo "$as_me:$LINENO: checking for lib/xscreensaver/flame" >&5
+-echo $ECHO_N "checking for lib/xscreensaver/flame... $ECHO_C" >&6
++   echo "$as_me:$LINENO: checking for libexec/xscreensaver/flame" >&5
++echo $ECHO_N "checking for libexec/xscreensaver/flame... $ECHO_C" >&6
+    if test -n "$XSCREENSAVER"; then
+         kde_cv_path="$XSCREENSAVER";
+    else
+-        kde_cache=`echo lib/xscreensaver/flame | sed 'y%./+-%__p_%'`
++        kde_cache=`echo libexec/xscreensaver/flame | sed 'y%./+-%__p_%'`
+ 
+         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -24870,16 +24870,16 @@ else
+ 	IFS=$kde_save_IFS
+ 
+         for dir in $dirs; do
+-	  if test -x "$dir/lib/xscreensaver/flame"; then
++	  if test -x "$dir/libexec/xscreensaver/flame"; then
+ 	    if test -n ""
+ 	    then
+-              evalstr="$dir/lib/xscreensaver/flame  2>&1 "
++              evalstr="$dir/libexec/xscreensaver/flame  2>&1 "
+ 	      if eval $evalstr; then
+-                kde_cv_path="$dir/lib/xscreensaver/flame"
++                kde_cv_path="$dir/libexec/xscreensaver/flame"
+                 break
+ 	      fi
+             else
+-		kde_cv_path="$dir/lib/xscreensaver/flame"
++		kde_cv_path="$dir/libexec/xscreensaver/flame"
+                 break
+ 	    fi
+           fi