Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5918 from Rmys/master

Browse Source 
dolphin:root
This commit is contained in:
Rmys
2018-10-18 23:10:35 +03:00
committed by GitHub
parent 1abadbee49 7c2f1c4adc
commit 4b1789d1e9
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/applications/dolphin/files/dolphin-17.04.0-allow-root.patch
+14 -10
View File
@@ -1,10 +1,9 @@
diff -Nuar a/src/main.cpp b/src/main.cpp
diff -Naur dolphin-17.04.0.old/src/main.cpp dolphin-17.04.0/src/main.cpp --- a/src/main.cpp 2018-10-07 20:41:54.000000000 +0300
--- dolphin-17.04.0.old/src/main.cpp 2017-04-25 02:44:57.440557635 -0400 +++ b/src/main.cpp 2018-10-14 16:54:12.975544992 +0300
+++ dolphin-17.04.0/src/main.cpp 2017-04-25 02:45:22.535328410 -0400 @@ -35,26 +35,8 @@
@@ -35,21 +35,8 @@ #include <QApplication>
#include <KLocalizedString> #include <QCommandLineParser>
#include <Kdelibs4ConfigMigrator>
-#ifndef Q_OS_WIN -#ifndef Q_OS_WIN
-#include <unistd.h> -#include <unistd.h>
@@ -14,10 +13,15 @@ diff -Naur dolphin-17.04.0.old/src/main.cpp dolphin-17.04.0/src/main.cpp
extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
{ {
-#ifndef Q_OS_WIN -#ifndef Q_OS_WIN
- // Check whether we are running as root - // Prohibit using sudo or kdesu (but allow using the root user directly)
- if (getuid() == 0) { - if (getuid() == 0) {
- std::cout << "Executing Dolphin as root is not possible." << std::endl; - if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
- return EXIT_FAILURE; - std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
- return EXIT_FAILURE;
- } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
- std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
- return EXIT_FAILURE;
- }
- } - }
-#endif -#endif
- -
desktop/kde/applications/dolphin/pspec.xml
+2 -2
View File
@@ -35,7 +35,7 @@
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!--<Patch level="1">dolphin-17.04.0-allow-root.patch</Patch> --> <Patch level="1">dolphin-17.04.0-allow-root.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -111,7 +111,7 @@
<Update release="20"> <Update release="20">
<Date>2018-10-18</Date> <Date>2018-10-18</Date>
<Version>18.08.2</Version> <Version>18.08.2</Version>
<Comment>Version bump.</Comment> <Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name> <Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email> <Email>muscnsl@gmail.com</Email>
</Update> </Update>