[PATCH 1/2] dbus-broker: Do not longer create user/group

[PATCH 1/2] dbus-broker: Do not longer create user/group

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]

The dbus user and group will be created by the dbus-common packge
which is a dependency of dbus-brocker. So no need for trying to doubble
create them.
---
 dbus-broker/dbus-broker.nm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/dbus-broker/dbus-broker.nm b/dbus-broker/dbus-broker.nm
index a65a1e0d6..5a33f4ad7 100644
--- a/dbus-broker/dbus-broker.nm
+++ b/dbus-broker/dbus-broker.nm
@@ -5,7 +5,7 @@
 
 name       = dbus-broker
 version    = 32
-release    = 1
+release    = 2
 
 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
 groups     = System/Daemons
@@ -58,16 +58,6 @@ packages
 			dbus-common
 		end
 
-		prerequires += shadow-utils
-
-		script prein
-			getent group dbus >/dev/null || groupadd -r dbus
-			getent passwd dbus >/dev/null || \
-				useradd -r -g dbus -d / -s /sbin/nologin \
-					-c "User for dbus service" dbus
-			exit  0
-		end
-
 		# Just search for new unit files that were just installed.
 		script postin
 			systemctl daemon-reload >/dev/null 2>&1 || :
-- 
2.30.2

[PATCH 2/2] dbus: Ship our own sysusers file

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 908 bytes --]

The one from the project is very limited, so we
have to replace it by our own written.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 dbus/dbus.nm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dbus/dbus.nm b/dbus/dbus.nm
index d6daa5270..6761df82c 100644
--- a/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@ -7,7 +7,7 @@ name       = dbus
 ver_major  = 1
 ver_minor  = 15
 ver_plevel = 2
-release    = 1
+release    = 2
 
 version    = %{ver_major}.%{ver_minor}.%{ver_plevel}
 dbus_ver   = %{ver_major}.%{ver_minor}.%{ver_plevel}
@@ -68,6 +68,9 @@ build
 		rm -rvf %{BUILDROOT}/%{unitdir}/multi-user.target.wants
 		rm -rvf %{BUILDROOT}/usr/lib/tmpfiles.d
 
+		# Remove project's own sysusers file - we have or own one.
+		rm -rvf %{BUILDROOT}%{sysusersdir}/%{name}.conf
+
 		# Remove daemon related folders in /var
 		rm -rvf %{BUILDROOT}/%{localstatedir}
 	end
-- 
2.30.2