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

Merge pull request #5919 from Rmys/master

Browse Source 
kate:root
This commit is contained in:
Rmys
2018-10-18 23:32:10 +03:00
committed by GitHub
parent 4b1789d1e9 3b6487b3d5
commit 36ff53e178
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/applications/kate/files/kate-17.04.0-allow-root.patch
+12 -10
View File
@@ -1,7 +1,7 @@
diff -Nuar a/kate/main.cpp b/kate/main.cpp
--- a/kate/main.cpp --- a/kate/main.cpp 2018-10-03 20:00:34.000000000 +0300
+++ b/kate/main.cpp +++ b/kate/main.cpp 2018-10-13 09:30:25.415054269 +0300
@@ -51,24 +51,9 @@ @@ -52,26 +52,9 @@
#include "qtsingleapplication/qtsingleapplication.h" #include "qtsingleapplication/qtsingleapplication.h"
#endif #endif
@@ -14,13 +14,15 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
-#ifndef Q_OS_WIN -#ifndef Q_OS_WIN
- /** - // Prohibit using sudo or kdesu (but allow using the root user directly)
- * Check whether we are running as root
- **/
- if (getuid() == 0) { - if (getuid() == 0) {
- std::cout << "Executing Kate as root is not possible. To edit files as root use:" << std::endl; - if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
- std::cout << "SUDO_EDITOR=kate sudoedit <file>" << std::endl; - std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
- return 0; - return EXIT_FAILURE;
- } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
- std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
- return EXIT_FAILURE;
- }
- } - }
-#endif -#endif
/** /**
desktop/kde/applications/kate/files/kwrite-17.04.0-allow-root.patch
+12 -10
View File
@@ -1,7 +1,7 @@
diff -Nuar a/kwrite/main.cpp b/kwrite/main.cpp
--- a/kwrite/main.cpp --- a/kwrite/main.cpp 2018-10-03 20:00:34.000000000 +0300
+++ b/kwrite/main.cpp +++ b/kwrite/main.cpp 2018-10-13 09:31:37.316058274 +0300
@@ -42,23 +42,8 @@ @@ -42,25 +42,8 @@
#include "../urlinfo.h" #include "../urlinfo.h"
@@ -13,13 +13,15 @@
extern "C" Q_DECL_EXPORT int main(int argc, char **argv) extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
{ {
-#ifndef Q_OS_WIN -#ifndef Q_OS_WIN
- /** - // Prohibit using sudo or kdesu (but allow using the root user directly)
- * Check whether we are running as root
- **/
- if (getuid() == 0) { - if (getuid() == 0) {
- std::cout << "Executing KWrite as root is not possible. To edit files as root use:" << std::endl; - if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
- std::cout << "SUDO_EDITOR=kwrite sudoedit <file>" << std::endl; - std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
- return 0; - return EXIT_FAILURE;
- } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
- std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
- return EXIT_FAILURE;
- }
- } - }
-#endif -#endif
/** /**
desktop/kde/applications/kate/pspec.xml
+3 -3
View File
@@ -34,8 +34,8 @@
<Dependency>kded-devel</Dependency> <Dependency>kded-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>
@@ -88,7 +88,7 @@
<Update release="21"> <Update release="21">
<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>