From ae9944edf10e0724acce5b78e03fcfe7f5b77f86 Mon Sep 17 00:00:00 2001
From: nettingsisyphus <benjamin93@163.com>
Date: Wed, 24 Mar 2021 17:12:49 +0800
Subject: [PATCH] change dbus group ID to 81

(cherry picked from commit eb8eb462d6e3e6346904d8f96c7aeabbcbb6ea93)
---
 dbus.spec | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/dbus.spec b/dbus.spec
index 6ece72f..3360435 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -1,9 +1,9 @@
 Name:     dbus
 Epoch:    1
 Version:  1.12.16
-Release:  16
+Release:  17
 Summary:  System Message Bus
-License:  AFLv2.1 or GPLv2+
+License:  AFLv3.0 or GPLv2+
 URL:      http://www.freedesktop.org/Software/dbus/
 Source0:  https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1:  00-start-message-bus.sh
@@ -130,8 +130,14 @@ make check
 
 %pre daemon
 # Add the "dbus" user and group
-%{_sbindir}/groupadd -r dbus 2>/dev/null || :
-%{_sbindir}/useradd -r -c 'D-Bus' -g dbus -s /sbin/nologin -d %{_localstatedir}/run/dbus dbus 2> /dev/null || :
+getent group dbus > /dev/null || groupadd -f -g 81 -r dbus
+if ! getent passwd dbus > /dev/null ; then
+    if ! getent passwd 81 > /dev/null ; then
+        useradd -r -u 81 -c 'D-Bus' -g dbus -s /sbin/nologin -d %{_localstatedir}/run/dbus dbus
+    else
+        useradd -r -g dbus -c 'D-Bus' -s /sbin/nologin -d %{_localstatedir}/run/dbus dbus
+    fi
+fi
 
 %preun daemon
 %systemd_preun dbus.service dbus.socket
@@ -225,6 +231,9 @@ make check
 %exclude %{_pkgdocdir}/README
 
 %changelog
+* Wed Mar 24 2021 Anakin Zhang <benjamin93@163.com> - 1:1.12.16-17
+- change dbus group ID to 81
+
 * Fri Mar 19 2021 shenyangyang <shenyangyang4@huawei.com> - 1:1.12.16-16
 - Fix CVE-2020-35512
 
-- 
Gitee