From 113c4f0d8f4bfe7beca4f7fcce7d2c513cef7b2c Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@jolla.com>
Date: Wed, 20 Nov 2019 09:18:14 +0100
Subject: [PATCH] [ssu] Revert "Protect SSU dbus interface with sailfish-system
 group." Contributes to JB#47997

This reverts commit 645745b798b75a75d50303673226bacb6887f1b9.
---
 dbus/org.nemo.ssu.conf | 2 +-
 rpm/ssu.spec           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dbus/org.nemo.ssu.conf b/dbus/org.nemo.ssu.conf
index ab31c6a..1941286 100644
--- a/dbus/org.nemo.ssu.conf
+++ b/dbus/org.nemo.ssu.conf
@@ -8,7 +8,7 @@
     <allow send_destination="org.nemo.ssu" send_interface="org.nemo.ssu"/>
   </policy>
 
-  <policy group="sailfish-system">
+  <policy group="system">
     <allow send_destination="org.nemo.ssu" send_interface="org.nemo.ssu"/>
     <allow send_destination="org.nemo.ssu" send_interface="org.freedesktop.DBus.Introspectable"/>
     <allow send_destination="org.nemo.ssu" send_interface="org.freedesktop.DBus.Peer"/>
diff --git a/rpm/ssu.spec b/rpm/ssu.spec
index 6b3c975..fdd8020 100644
--- a/rpm/ssu.spec
+++ b/rpm/ssu.spec
@@ -17,7 +17,6 @@ BuildRequires: pkgconfig(libshadowutils)
 BuildRequires: pkgconfig(connman-qt5)
 BuildRequires: oneshot
 BuildRequires: doxygen
-Requires(pre): sailfish-setup
 Requires(pre): shadow-utils
 Requires(pre): /usr/bin/groupadd-user
 Requires(postun): shadow-utils
@@ -193,6 +192,8 @@ cd .. && cp -R doc/html/* %{buildroot}/%{_docdir}/%{name}/
 
 
 %pre
+groupadd -rf ssu
+groupadd-user ssu
 if [ -f /etc/ssu/ssu.ini ]; then
   chgrp ssu /etc/ssu/ssu.ini
   chmod 664 /etc/ssu/ssu.ini