From 1f7e0bf466d4a44fdd10f8c6cfe619958f5ee6ee Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 22 May 2003 02:57:10 +0000 Subject: 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. --- misc/kdeartwork3/patches/patch-aa | 50 ++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 11 deletions(-) (limited to 'misc/kdeartwork3/patches') 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 -- cgit v1.2.3