diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:27:59 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:27:59 +0000 |
commit | 178c5a8caeefb8c075f319b455ea818767d8ace7 (patch) | |
tree | 87d5a49b97b8a0262cb379dc30a62e4937a29d71 /kde-base/kommander | |
parent | Remove unneeded patches. (diff) | |
download | gentoo-2-178c5a8caeefb8c075f319b455ea818767d8ace7.tar.gz gentoo-2-178c5a8caeefb8c075f319b455ea818767d8ace7.tar.bz2 gentoo-2-178c5a8caeefb8c075f319b455ea818767d8ace7.zip |
Remove unneeded patches.
(Portage version: 2.1.2-r7)
Diffstat (limited to 'kde-base/kommander')
-rw-r--r-- | kde-base/kommander/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kommander/files/post-3.4-kdewebdev-2.diff | 63 |
2 files changed, 5 insertions, 64 deletions
diff --git a/kde-base/kommander/ChangeLog b/kde-base/kommander/ChangeLog index c3283e23b1fe..6d79a12a3989 100644 --- a/kde-base/kommander/ChangeLog +++ b/kde-base/kommander/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kommander # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.66 2007/02/04 02:42:35 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.67 2007/02/05 12:27:59 flameeyes Exp $ + + 05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/post-3.4-kdewebdev-2.diff: + Remove unneeded patches. 04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kommander-3.5.2.ebuild: diff --git a/kde-base/kommander/files/post-3.4-kdewebdev-2.diff b/kde-base/kommander/files/post-3.4-kdewebdev-2.diff deleted file mode 100644 index 5bf3f475f94b..000000000000 --- a/kde-base/kommander/files/post-3.4-kdewebdev-2.diff +++ /dev/null @@ -1,63 +0,0 @@ -Index: instance.cpp -=================================================================== -RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v -retrieving revision 1.49 -diff -u -3 -d -p -r1.49 instance.cpp ---- kommander/executor/instance.cpp 29 Dec 2004 09:58:46 -0000 1.49 -+++ kommander/executor/instance.cpp 13 Apr 2005 19:18:57 -0000 -@@ -131,6 +131,35 @@ 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; -+ } -+ -+ // Check whether file is not in some temporary directory. -+ 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(false).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. " -+ "<p>Any script contained in this dialog will have write access to all of your home directory; " -+ "<b>running such dialogs may be dangerous: </b>" -+ "<p>are you sure you want to continue?</qt>")) == KMessageBox::No) -+ return false; -+ } -+ - /* add runtime arguments */ - if (m_cmdArguments) { - QString args; -@@ -143,18 +172,7 @@ bool Instance::run(QFile *a_file) - KommanderWidget::setGlobal("ARGS", args); - } - KommanderWidget::setGlobal("ARGCOUNT", QString("%1").arg(m_cmdArguments)); -- -- if (m_uiFileName.directory().startsWith(locateLocal("tmp", "") + "/") || -- m_uiFileName.directory().startsWith("/tmp/")) -- { -- 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. " -- "<p>Any script contained in this dialog will have write access to all of your home directory; " -- "<b>running such dialogs may be dangerous: </b>" -- "<p>are you sure you want to continue?</qt>")) == KMessageBox::No) -- return false; -- } -- -+ - if (!m_uiFileName.isEmpty()) - { - KommanderWidget::setGlobal("_KDDIR", m_uiFileName.directory()); |