diff options
author | drochner <drochner@pkgsrc.org> | 2005-04-26 19:46:32 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2005-04-26 19:46:32 +0000 |
commit | e1a7570902c3a9b9aedc37822d473906bd07ae45 (patch) | |
tree | 2f1c3b75d3428430a2eec66ebc1102f786f85443 /www | |
parent | d2380f9246ac3fdc82d8ffd881744669c09392c3 (diff) | |
download | pkgsrc-e1a7570902c3a9b9aedc37822d473906bd07ae45.tar.gz |
hmm - add patch for previous commit (was CVS misbehaviour, not me...)
Diffstat (limited to 'www')
-rw-r--r-- | www/kdewebdev3/patches/patch-aa | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/www/kdewebdev3/patches/patch-aa b/www/kdewebdev3/patches/patch-aa new file mode 100644 index 00000000000..2c004fa3157 --- /dev/null +++ b/www/kdewebdev3/patches/patch-aa @@ -0,0 +1,45 @@ +$NetBSD: patch-aa,v 1.3 2005/04/26 19:46:32 drochner Exp $ + +Index: kommander/executor/instance.cpp +=================================================================== +RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v +retrieving revision 1.49 +retrieving revision 1.49.2.3 +diff -u -3 -d -p -r1.49 -r1.49.2.3 +--- kommander/executor/instance.cpp 29 Dec 2004 09:58:46 -0000 1.49 ++++ kommander/executor/instance.cpp 17 Apr 2005 08:56:01 -0000 1.49.2.3 +@@ -131,6 +131,14 @@ bool Instance::build(QFile *a_file) + + bool Instance::run(QFile *a_file) + { ++ // Check whether extension is *.kmdr ++ if (!m_uiFileName.fileName().endsWith(".kmdr")) { ++ KMessageBox::error(0, i18n("<qt>This file does not have a <b>.kmdr</b> extension. As a security precaution " ++ "Kommander will only run Kommander scripts with a clear identity.</qt>"), ++ i18n("Wrong Extension")); ++ return false; ++ } ++ + /* add runtime arguments */ + if (m_cmdArguments) { + QString args; +@@ -144,8 +152,17 @@ bool Instance::run(QFile *a_file) + } + KommanderWidget::setGlobal("ARGCOUNT", QString("%1").arg(m_cmdArguments)); + +- if (m_uiFileName.directory().startsWith(locateLocal("tmp", "") + "/") || +- m_uiFileName.directory().startsWith("/tmp/")) ++ QStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); ++ tmpDirs += KGlobal::dirs()->resourceDirs("cache"); ++ tmpDirs.append("/tmp/"); ++ tmpDirs.append("/var/tmp/"); ++ ++ bool inTemp = false; ++ for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I) ++ if (m_uiFileName.directory().startsWith(*I)) ++ inTemp = true; ++ ++ if (inTemp) + { + if (KMessageBox::warningYesNo(0, i18n("<qt>This dialog is running from your <i>/tmp</i> directory. " + " This may mean that it was run from a KMail attachment or from a webpage. " |