Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2020-01-25 13:22:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old) and /work/SRC/openSUSE:Factory/.dbus-1.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1" Sat Jan 25 13:22:54 2020 rev:161 rq:765871 version:1.12.16 Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1/dbus-1.changes 2019-12-11 11:59:13.960889070 +0100 +++ /work/SRC/openSUSE:Factory/.dbus-1.new.26092/dbus-1.changes 2020-01-25 13:23:06.516008908 +0100 @@ -1,0 +2,6 @@ +Fri Jan 17 13:02:10 UTC 2020 - Thorsten Kukuk <[email protected]> + +- Remove left overs from blocking restart on update from May 29th 2019 +- Use sysusers.d to create messagebus user + +------------------------------------------------------------------- New: ---- messagebus.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.DQ6yPY/_old 2020-01-25 13:23:10.668010728 +0100 +++ /var/tmp/diff_new_pack.DQ6yPY/_new 2020-01-25 13:23:10.672010730 +0100 @@ -1,7 +1,7 @@ # # spec file for package dbus-1-x11 # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.DQ6yPY/_old 2020-01-25 13:23:10.692010738 +0100 +++ /var/tmp/diff_new_pack.DQ6yPY/_new 2020-01-25 13:23:10.692010738 +0100 @@ -1,7 +1,7 @@ # # spec file for package dbus-1 # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,6 @@ %define with_systemd 1 %define _name dbus %define _libname libdbus-1-3 -# Temporary code to disable service restart on update [email protected] boo#1020301 -%global _backup %{_sysconfdir}/sysconfig/services.rpmbak.%{name}-%{version}-%{release} %bcond_without selinux Name: dbus-1 @@ -35,6 +33,7 @@ Source2: dbus-1.keyring Source3: baselibs.conf Source4: dbus-1.desktop +Source5: messagebus.conf Patch0: feature-suse-log-deny.patch # PATCH-FIX-OPENSUSE [email protected] -- force a feature configure won't accept without x11 in buildrequires Patch1: feature-suse-do-autolaunch.patch @@ -48,17 +47,19 @@ BuildRequires: libtool BuildRequires: permissions BuildRequires: pkgconfig +BuildRequires: sysuser-shadow +BuildRequires: sysuser-tools BuildRequires: xmlto BuildRequires: pkgconfig(libsystemd) >= 209 Requires(post): %{_libname} = %{version} Requires(post): update-alternatives Requires(pre): permissions -Requires(pre): shadow Requires(preun): update-alternatives Provides: dbus-launch %if %{with selinux} BuildRequires: libselinux-devel %endif +%sysusers_requires %package -n %{_libname} Summary: Library package for D-Bus @@ -140,6 +141,10 @@ --with-systemduserunitdir=%{_userunitdir} \ --without-x make %{?_smp_mflags} +# The original dbus sysusers config does not create our account, +# overwrite it with our user definition +cp %{SOURCE5} bus/sysusers.d/dbus.conf +%sysusers_generate_pre %{SOURCE5} messagebus doxygen -u && doxygen ./cleanup-man-pages.sh @@ -195,11 +200,8 @@ %post -n %{_libname} -p /sbin/ldconfig %postun -n %{_libname} -p /sbin/ldconfig -%pre -getent group messagebus >/dev/null || \ - %{_sbindir}/groupadd -r messagebus -getent passwd messagebus >/dev/null || \ - %{_sbindir}/useradd -r -s %{_bindir}/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus + +%pre -f messagebus.pre %service_add_pre dbus.service dbus.socket %post @@ -229,14 +231,6 @@ %postun %service_del_postun_without_restart dbus.service dbus.socket -%posttrans -# See comments in pre -if [ -s "%{_backup}" ]; then - mv -f %{_backup} %{_sysconfdir}/sysconfig/services -elif [ -e "%{_backup}" ]; then - rm -f %{_sysconfdir}/sysconfig/services -fi - %files %dir %{_localstatedir}/lib/dbus %dir /lib/dbus-1 ++++++ messagebus.conf ++++++ # Type Name ID GECOS [HOME] u messagebus - "User for D-Bus" /run/dbus
