From c4d7fcfaa81e6a5db9046134138ac2ee03dd9999 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Mon, 10 Jul 2023 02:54:21 +0300
Subject: [PATCH] kdecore: drop reliance on wheel group for KAuthorization
 helpers

groups are obsolete thing (e.g. disk, optical, power, etc.)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 cmake/modules/KDE4Macros.cmake      |  8 ++++----
 kdecore/dbus_policy.stub            | 10 +++-------
 kdecore/dbus_service.stub           |  2 +-
 kutils/kpowermanager/CMakeLists.txt |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
index 21806302..cd16d598 100644
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
@@ -229,14 +229,14 @@ macro(KDE4_ADD_WIDGET _sources)
     endforeach()
 endmacro(KDE4_ADD_WIDGET)
 
-#  KDE4_INSTALL_AUTH_HELPER_FILES(HELPER_TARGET HELPER_ID HELPER_USER)
+#  KDE4_INSTALL_AUTH_HELPER_FILES(HELPER_TARGET HELPER_ID)
 #   This macro adds the needed files for an helper executable meant to be used
-#   by applications using KAuth. It accepts the helper target, the helper ID
-#   (the D-Bus name) and the user under which the helper will run on.
+#   by applications using KAuth. It accepts the helper target and the helper ID
+#   (the D-Bus name).
 #
 #   *WARNING* You have to install the helper in ${KDE4_LIBEXEC_INSTALL_DIR} to
 #             make sure everything will work.
-function(KDE4_INSTALL_AUTH_HELPER_FILES HELPER_TARGET HELPER_ID HELPER_USER)
+function(KDE4_INSTALL_AUTH_HELPER_FILES HELPER_TARGET HELPER_ID)
     if(_kdeBootStrapping)
         set(_stubFilesDir ${CMAKE_SOURCE_DIR}/kdecore)
     else()
diff --git a/kdecore/dbus_policy.stub b/kdecore/dbus_policy.stub
index 1cd647f1..f36be9f9 100644
--- a/kdecore/dbus_policy.stub
+++ b/kdecore/dbus_policy.stub
@@ -4,16 +4,12 @@
 <busconfig>
  
   <!-- Only user root can own the foo helper -->
-  <policy user="@HELPER_USER@">
+  <policy user="root">
     <allow own="@HELPER_ID@"/>
   </policy>
  
-  <!-- Only members of the wheel group and root can send messages to the foo helper -->
-  <policy user="root">
-    <allow send_destination="@HELPER_ID@"/>
-    <allow send_interface="@HELPER_ID@"/>
-  </policy>
-  <policy group="wheel">
+  <!-- Anyone can send messages to the foo helper -->
+  <policy context="default">
     <allow send_destination="@HELPER_ID@"/>
     <allow send_interface="@HELPER_ID@"/>
   </policy>
diff --git a/kdecore/dbus_service.stub b/kdecore/dbus_service.stub
index 490fe83a..62d6c87b 100644
--- a/kdecore/dbus_service.stub
+++ b/kdecore/dbus_service.stub
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=@HELPER_ID@
 Exec=@KDE4_LIBEXEC_INSTALL_DIR@/@HELPER_TARGET@
-User=@HELPER_USER@
\ No newline at end of file
+User=root
\ No newline at end of file
diff --git a/kutils/kpowermanager/CMakeLists.txt b/kutils/kpowermanager/CMakeLists.txt
index 92f41b92..753f602f 100644
--- a/kutils/kpowermanager/CMakeLists.txt
+++ b/kutils/kpowermanager/CMakeLists.txt
@@ -63,5 +63,5 @@ install(
     DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}
 )
 
-kde4_install_auth_helper_files(kpowermanager_helper org.kde.kpowermanager.helper root)
+kde4_install_auth_helper_files(kpowermanager_helper org.kde.kpowermanager.helper)