diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-06-23 10:25:54 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-06-23 10:25:54 +0200 |
| commit | c5be5e13a14ad51c59c496d407c7d7c8e7fd8540 (patch) | |
| tree | 40a256e66579ffd00df756fc091249234ff66aec /redhat/kdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch | |
| parent | d5d98e581ca554dba936ea8405d1ecf5fe8931c4 (diff) | |
| download | tde-packaging-c5be5e13a14ad51c59c496d407c7d7c8e7fd8540.tar.gz tde-packaging-c5be5e13a14ad51c59c496d407c7d7c8e7fd8540.zip | |
RHEL/Fedora: updates kdelibs
Diffstat (limited to 'redhat/kdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch')
| -rw-r--r-- | redhat/kdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch new file mode 100644 index 000000000..deb93afaa --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-fix_tdesu_internal_pathing.patch @@ -0,0 +1,33 @@ +commit e131f10b84dbec07ad49d36c192777a72189a39e +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1329026747 -0600 + + Fix tdesu internal pathing + This closes Bug 766 + +diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp +index 7f083d7..5b222f5 100644 +--- a/kdesu/stub.cpp ++++ b/kdesu/stub.cpp +@@ -121,11 +121,16 @@ int StubProcess::ConverseStub(int check) + TQCString path = getenv("PATH"); + if (!path.isEmpty() && path[0] == ':') + path = path.mid(1); +- if (m_User == "root") +- if (!path.isEmpty()) +- path = "/sbin:/bin:/usr/sbin:/usr/bin:" + path; +- else +- path = "/sbin:/bin:/usr/sbin:/usr/bin"; ++ if (m_User == "root") ++ if (!path.isEmpty()) ++ path = "/usr/local/sbin:/usr/sbin:/sbin:" + path; ++ else ++ if (strcmp(__KDE_BINDIR, "/usr/bin") == 0) { ++ path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin"; ++ } ++ else { ++ path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:" __KDE_BINDIR ":/usr/bin:/bin"; ++ } + writeLine(path); + } else if (line == "user") { + writeLine(m_User); |