Merge pull request #6790 from Rmys/master

applications-19.04.0
This commit is contained in:
Rmys
2019-04-18 21:58:24 +03:00
committed by GitHub
2 changed files with 7 additions and 7 deletions
@@ -1,7 +1,7 @@
diff -Nuar a/kwrite/main.cpp b/kwrite/main.cpp diff -Nuar a/kwrite/main.cpp b/kwrite/main.cpp
--- a/kwrite/main.cpp 2018-10-03 20:00:34.000000000 +0300 --- a/kwrite/main.cpp 2019-04-09 10:03:07.000000000 +0300
+++ b/kwrite/main.cpp 2018-10-13 09:31:37.316058274 +0300 +++ b/kwrite/main.cpp 2019-04-18 21:54:45.688862069 +0300
@@ -42,25 +42,8 @@ @@ -43,25 +43,8 @@
#include "../urlinfo.h" #include "../urlinfo.h"
@@ -16,10 +16,10 @@ diff -Nuar a/kwrite/main.cpp b/kwrite/main.cpp
- // Prohibit using sudo or kdesu (but allow using the root user directly) - // Prohibit using sudo or kdesu (but allow using the root user directly)
- if (getuid() == 0) { - if (getuid() == 0) {
- if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { - if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
- std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl; - std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
- return EXIT_FAILURE; - return EXIT_FAILURE;
- } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) { - } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
- std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl; - std::cout << "Executing KWrite with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
- return EXIT_FAILURE; - return EXIT_FAILURE;
- } - }
- } - }
+2 -2
View File
@@ -38,8 +38,8 @@
<Dependency>plasma-framework-devel</Dependency> <Dependency>plasma-framework-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- <Patch level="1">kate-17.04.0-allow-root.patch</Patch> --> <Patch level="1">kate-17.04.0-allow-root.patch</Patch>
<!-- <Patch level="1">kwrite-17.04.0-allow-root.patch</Patch> --> <Patch level="1">kwrite-17.04.0-allow-root.patch</Patch>
</Patches> </Patches>
</Source> </Source>