From 87aa94c403fdb107a44c3160f9f5b9463e663e5f Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 25 Jun 2017 12:47:11 +0200 Subject: dolphin: let the user decide if she wants to run dolphin as root --- kde/patch/dolphin.patch | 3 ++ kde/patch/dolphin/dolphin_revert_noroot.patch | 44 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 kde/patch/dolphin.patch create mode 100644 kde/patch/dolphin/dolphin_revert_noroot.patch diff --git a/kde/patch/dolphin.patch b/kde/patch/dolphin.patch new file mode 100644 index 0000000..dfe3a2f --- /dev/null +++ b/kde/patch/dolphin.patch @@ -0,0 +1,3 @@ +# Let the user decide whether she wants to run Dolphin as root: +cat $CWD/patch/dolphin/dolphin_revert_noroot.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/dolphin/dolphin_revert_noroot.patch b/kde/patch/dolphin/dolphin_revert_noroot.patch new file mode 100644 index 0000000..46bb541 --- /dev/null +++ b/kde/patch/dolphin/dolphin_revert_noroot.patch @@ -0,0 +1,44 @@ +Taken from openSUSE: +https://build.opensuse.org/package/view_file/KDE:Applications/dolphin/0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch?expand=1 + +From ba74d639178916221c748b0d5d89f7ac4f5ed669 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Sat, 22 Apr 2017 14:00:33 +0200 +Subject: [PATCH] Revert "Disallow executing Dolphin as root on Linux" + +This reverts commit 0bdd8e0b0516555c6233fdc7901e9b417cf89791. +We ship a desktop file to open dolphin as root and we allow YaST on the +desktop. So this patch is absolutely pointless for us. +--- + src/main.cpp | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/main.cpp b/src/main.cpp +index 789a52996..acba8daed 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -35,21 +35,8 @@ + #include + #include + +-#ifndef Q_OS_WIN +-#include +-#endif +-#include +- + extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) + { +-#ifndef Q_OS_WIN +- // Check whether we are running as root +- if (getuid() == 0) { +- std::cout << "Executing Dolphin as root is not possible." << std::endl; +- return EXIT_FAILURE; +- } +-#endif +- + QApplication app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon())); +-- +2.12.0 + -- cgit v1.2.3