diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-07-12 20:36:02 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-07-12 20:36:02 +0200 |
commit | 4186eabcad11c1cf1a6fdc6a555b72404eee0137 (patch) | |
tree | 7a07ac977ec9f17772623b3ec02801d5dad964f9 /kde-apps/dolphin | |
parent | app-crypt/certbot: fixing acme dep (diff) | |
download | gentoo-4186eabcad11c1cf1a6fdc6a555b72404eee0137.tar.gz gentoo-4186eabcad11c1cf1a6fdc6a555b72404eee0137.tar.bz2 gentoo-4186eabcad11c1cf1a6fdc6a555b72404eee0137.zip |
kde-apps: Add KDE Applications 18.04.3
Package-Manager: Portage-2.3.42, Repoman-2.3.9
Diffstat (limited to 'kde-apps/dolphin')
-rw-r--r-- | kde-apps/dolphin/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/dolphin/dolphin-18.04.3.ebuild | 91 | ||||
-rw-r--r-- | kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch | 56 | ||||
-rw-r--r-- | kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch | 45 |
4 files changed, 193 insertions, 0 deletions
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest index d894c9d2d7bb..1292469b2d33 100644 --- a/kde-apps/dolphin/Manifest +++ b/kde-apps/dolphin/Manifest @@ -1,2 +1,3 @@ DIST dolphin-17.12.3.tar.xz 4841752 BLAKE2B 1f58cb0f1663e131a1b8dc58fc47d40a8a68bcb998fd3c6191f99176263523d40c1d9057b569c10c14e2a6b0be91b2eaaf07a54acdd386984d0da167cb84fabd SHA512 44cf8baaeead69dd5529ce7da96d78f507029fa47ac9ac50de9d77cb15335dd0b0e0c916f2cdd0d5cadc465e461115dbfd02c51af38d03da985d66bd22456136 DIST dolphin-18.04.2.tar.xz 4850780 BLAKE2B 001fcd1f3fabfe449d5b6ac82763dcba0bfb3aa5303e54b2f72c105521deddd7f0264c435da9471cca5978d69afccb391810c1b6b4ee69f5f66f39034e8e1484 SHA512 760e698903717f30c08d69ae5872b1d42c523d6a554a6570cda6bfbd4fe2c37f2744e461728e7d090cfab6bed0055bf48b8cbb38128503386698f71c5d5f5198 +DIST dolphin-18.04.3.tar.xz 4850916 BLAKE2B 1d2a5c4f5e94e2f30055804d96c205eb2c03864ad2b6c245d917549986fbac26686e654818dacf93fcb711f59bfe6e7f3a011e578988f5bf9e6b6cb82fc33876 SHA512 167a35225dd4e75b7ff863771287a471273e0594c247ef058adc718682eb07f014ca84bc373e1c3a846e99711aad3d9a16b12aab8543aa3603e17f944b206b21 diff --git a/kde-apps/dolphin/dolphin-18.04.3.ebuild b/kde-apps/dolphin/dolphin-18.04.3.ebuild new file mode 100644 index 000000000000..7688b7f2c3b5 --- /dev/null +++ b/kde-apps/dolphin/dolphin-18.04.3.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Plasma filemanager focusing on usability" +HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin" +KEYWORDS="~amd64 ~x86" +IUSE="semantic-desktop thumbnail" + +DEPEND=" + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kinit) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + media-libs/phonon[qt5(+)] + semantic-desktop? ( + $(add_frameworks_dep baloo) + $(add_frameworks_dep kfilemetadata) + $(add_kdeapps_dep baloo-widgets) + ) + !semantic-desktop? ( + $(add_frameworks_dep kdelibs4support) + ) +" +RDEPEND="${DEPEND} + $(add_kdeapps_dep kio-extras) + thumbnail? ( + $(add_kdeapps_dep ffmpegthumbs) + $(add_kdeapps_dep thumbnailers) + ) +" + +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}/${PN}-18.04.1-flto.patch" + "${FILESDIR}/${PN}-18.04.3-root-user.patch" + "${FILESDIR}/${PN}-18.04.3-root-warn.patch" +) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package semantic-desktop KF5Baloo) + $(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets) + $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) + ) + + kde5_src_configure +} + +pkg_postinst() { + kde5_pkg_postinst + + if ! has_version "kde-apps/ark:${SLOT}" ; then + elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}" + fi + + if ! has_version "kde-apps/kleopatra:${SLOT}" ; then + elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}" + fi +} diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch b/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch new file mode 100644 index 000000000000..04baafa1d8e8 --- /dev/null +++ b/kde-apps/dolphin/files/dolphin-18.04.3-root-user.patch @@ -0,0 +1,56 @@ +From 40453cb627a39f1ff92373f865426f0bcdc83419 Mon Sep 17 00:00:00 2001 +From: Nathaniel Graham <nate@kde.org> +Date: Wed, 9 May 2018 17:18:08 -0600 +Subject: Re-allow running Dolphin as the root user (but still not using sudo) + +Summary: +Prohibiting the use of Dolphin as the actual root user (not using `sudo` or `kdesu`) breaks legitimate use cases for using the root user. An example is Kali, a distro that logs in as the root user by default as a deliberate design choice. + +In such an environment, there is no additional security vulnerability beyond what you're already potentially exposing yourself to. So, let's re-enable it. + +BUG: 387974 +FIXED-IN: 18.08.0 + +Test Plan: +- Log in as normal user and run `sudo dolphin`: you get an error message. +- Log in as normal user and run `kdesu dolphin`: you get an error message. +- Log in as the root user and run dolphin normally: it works. + +Reviewers: markg, elvisangelaccio, #dolphin + +Reviewed By: markg + +Subscribers: chinmoyr, cfeck, elvisangelaccio, mmustac, Fuchs, markg, graesslin, nicolasfella, zzag, kfm-devel, emmanuelp + +Tags: #dolphin + +Differential Revision: https://phabricator.kde.org/D12795 +--- + src/main.cpp | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/main.cpp b/src/main.cpp +index db52e11..75bab67 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -43,10 +43,15 @@ + extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) + { + #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) { +- std::cout << "Executing Dolphin as root is not possible." << std::endl; +- return EXIT_FAILURE; ++ if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { ++ 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 + +-- +cgit v0.11.2 diff --git a/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch b/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch new file mode 100644 index 000000000000..bd6e2ab0d815 --- /dev/null +++ b/kde-apps/dolphin/files/dolphin-18.04.3-root-warn.patch @@ -0,0 +1,45 @@ +From 621cd24acfec8cbed19e9aa6ff8650cd6f38f809 Mon Sep 17 00:00:00 2001 +From: Nathaniel Graham <nate@kde.org> +Date: Sun, 6 May 2018 17:48:54 -0600 +Subject: Show a warning when running as the root user + +Summary: Now that Dolphin can be run as the root user again, let's show a warning. + +Test Plan: +When run with the root user account: +{F5882057} + +Reviewers: #dolphin, markg, elvisangelaccio + +Reviewed By: markg, elvisangelaccio + +Subscribers: acooligan, anthonyfieroni, chinmoyr, kfm-devel, rikmills, emmanuelp, zzag, nicolasfella, elvisangelaccio, Fuchs, mmustac, markg + +Tags: #dolphin + +Differential Revision: https://phabricator.kde.org/D12732 +--- + src/dolphinviewcontainer.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp +index bf8ac88..7b99595 100644 +--- a/src/dolphinviewcontainer.cpp ++++ b/src/dolphinviewcontainer.cpp +@@ -108,6 +108,14 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) : + m_messageWidget->setCloseButtonVisible(true); + m_messageWidget->hide(); + ++#ifndef Q_OS_WIN ++ if (getuid() == 0) { ++ ++ // We must be logged in as the root user; show a big scary warning ++ showMessage(i18n("Running Dolphin as root can be dangerous. Please be careful."), Warning); ++ } ++#endif ++ + m_view = new DolphinView(url, this); + connect(m_view, &DolphinView::urlChanged, + m_urlNavigator, &KUrlNavigator::setLocationUrl); +-- +cgit v0.11.2 |