gentoo resync : 28.04.2021

4 files changed, 52 insertions, 4 deletions

diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 1ce0136d8ac5..ac4ab3d07be8 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,5 +1,6 @@
-DIST kglobalaccel-5.77.0.tar.xz 87632 BLAKE2B 51136f6e380a913b6793ebc8e3483a42713778d9dfd3f3ba14d09496de75b2ee3dc2426f12d386590e0b00e6d61c00ab6c27eff656d5fc20a576d0c17bc9dbe2 SHA512 e35c4f5ce44f023292b154073642bcf17dd8b952caff6c5cd0368d947ccc0b53548bd149147e37a4724d78f08fd14f3315e1523dfe0b5279b50691cee0ff249c
+AUX kglobalaccel-5.80.0-dont-run-w-root-privs.patch 1383 BLAKE2B 77925b30b0360ced4a2e31c5ab7529604e8d0e11f50bdc1f78c6b808796a3cc9b021ff17da429026e943319ba8ebd0041de4c60e88bd141f17fca7248950a62f SHA512 91a982bbc2b99569b03161e78b53b3fc6bcb7c03e3c69abac4d9a5917e4b5d0766d9289766d00efcd3c9df24016509c389fcea78a9efba190da8eb3e3bc06870
 DIST kglobalaccel-5.80.0.tar.xz 87360 BLAKE2B f05027f4aeb71ba17b42bfe3214222737df4689e72e7eaa2e848d891e4934acead92051a21ce49313513050d4e3b01148576ca0ab58c609670fc88e7bedc15cb SHA512 6e12d3926f1b44425747bfca3eea21986cfe57ce032a2f691a2ab6b12556feec15cceea4b2b6c21bbdc9ecb6af11e9fb64489d60d9e95f4443b0a74ebab551af
-EBUILD kglobalaccel-5.77.0.ebuild 765 BLAKE2B d63d29ab93229dadc2c004ea0f0a2b848f68ed42719f94c44dc328540df8d080d1dd209e88957a559c1650e4e57b7a03c37183e9279d4b3e35b0f65c94305afb SHA512 57a62cc6dd8d08820fed3c28149d4f5fb9005576f01d9be80aacfa65b016659e999647fb29d9f7d0a3ac4b5410b716b912b87d822cbf828a750a50a336ec1dc7
-EBUILD kglobalaccel-5.80.0.ebuild 768 BLAKE2B 696eccce98b84e6f677eec4cbc6f582ac04c5e211bfefa16e49ed4d915a86699abdc1db8e4154139e763faad60544b4e0f54fe7ed2b4d7a4a36b8f7fa7db6d20 SHA512 71116289029140ea86e6537116a50a772ef82592d6dbf3a95c7fd7a06cf6375136132c295248938635b3e26f93094588775bb6fe43786b1fb53442e3e3a75caa
+DIST kglobalaccel-5.81.0.tar.xz 87748 BLAKE2B 6043423a6af0125ebd0b45aa0372204b7ae5746a1f93d21b4db154198b659b53f1fa46e160ff6705e9c88d3d62c2ea6d880f1e1fc618df23034535830ac5cc5b SHA512 e9523878d1c9bbc526428e22211c04d9b87e9e6f804f6b58bf939f1757205f9f9b69b26b54d726195dfb9df5d142a9ed849cc91c94f5c9b9762c6ca8bdf1aeb7
+EBUILD kglobalaccel-5.80.0-r1.ebuild 855 BLAKE2B 8772c8ecb5ab37f6d51417f8722e6186e97a086cbb4ffb29db568d06516508acc16e62571a25f8d65bf0966ebe52d02c995539453e383a31c1b06cc0c064da8b SHA512 13c333282bb973e21a7cc381bf593c8beebd746870fc4c641b088bc2f4daa3e24a523999d4742ba66fa13c9919cc24e1103ffe1457745876a0a6f10ec279db68
+EBUILD kglobalaccel-5.81.0.ebuild 768 BLAKE2B 696eccce98b84e6f677eec4cbc6f582ac04c5e211bfefa16e49ed4d915a86699abdc1db8e4154139e763faad60544b4e0f54fe7ed2b4d7a4a36b8f7fa7db6d20 SHA512 71116289029140ea86e6537116a50a772ef82592d6dbf3a95c7fd7a06cf6375136132c295248938635b3e26f93094588775bb6fe43786b1fb53442e3e3a75caa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.80.0-dont-run-w-root-privs.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.80.0-dont-run-w-root-privs.patch
new file mode 100644
index 000000000000..ab606eebed99
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.80.0-dont-run-w-root-privs.patch
@@ -0,0 +1,43 @@
+From bbec74337b3186bc258bd5adf849b89191789535 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Fri, 29 Jan 2021 11:31:54 +0100
+Subject: [PATCH] Don't let kglobalaccel run if KDE_SESSION_UID mismatches
+
+Otherwise shortcuts execute actions as the wrong user.
+---
+ src/runtime/main.cpp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/runtime/main.cpp b/src/runtime/main.cpp
+index d2917ad..46506b3 100644
+--- a/src/runtime/main.cpp
++++ b/src/runtime/main.cpp
+@@ -10,6 +10,8 @@
+ #include "kglobalacceld.h"
+ #include "logging_p.h"
+ 
++#include <unistd.h>
++
+ #include <KAboutData>
+ #include <KCrash>
+ #include <KDBusService>
+@@ -57,6 +59,16 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
+         return 0;
+     }
+ 
++    // It's possible that kglobalaccel gets started as the wrong user by
++    // accident, e.g. kdesu dolphin leads to dbus activation. It then installs
++    // its grabs and the actions are run as the wrong user.
++    bool isUidset = false;
++    const int sessionuid = qEnvironmentVariableIntValue("KDE_SESSION_UID", &isUidset);
++    if(isUidset && static_cast<uid_t>(sessionuid) != getuid()) {
++        qCWarning(KGLOBALACCELD) << "kglobalaccel running as wrong user, exiting.";
++        return 0;
++    }
++
+     KDBusService service(KDBusService::Unique);
+ 
+     app.setQuitOnLastWindowClosed(false);
+-- 
+GitLab
+
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.77.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.80.0-r1.ebuild
index beabdcd07183..7013c72b0717 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.77.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.80.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -30,3 +30,7 @@ DEPEND="
 	x11-libs/xcb-util-keysyms
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dont-run-w-root-privs.patch # bug 767478, KDE-bug 423059
+)
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.80.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.81.0.ebuild
index 6473474b63b6..6473474b63b6 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.80.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.81.0.ebuild