Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked
in at 2017-01-31 12:28:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
and /work/SRC/openSUSE:Factory/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1.changes 2017-01-11
12:02:17.610086783 +0100
+++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1.changes 2017-02-03
17:35:25.560022150 +0100
@@ -1,0 +2,8 @@
+Wed Jan 25 00:49:03 UTC 2017 - sfl...@suse.de
+
+- Don't restart dbus on upgrade - Includes temporary work around
+ for last version boo#1020301
+- Add 0001-Add-RefuseManualStartStop.patch don't allow users to Manually
+ start or stop dbus.
+
+-------------------------------------------------------------------
New:
----
0001-Add-RefuseManualStartStop.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1.spec ++++++
--- /var/tmp/diff_new_pack.WIKAHJ/_old 2017-02-03 17:35:26.255923654 +0100
+++ /var/tmp/diff_new_pack.WIKAHJ/_new 2017-02-03 17:35:26.259923088 +0100
@@ -19,6 +19,8 @@
%define with_systemd 1
%define _name dbus
%define _libname libdbus-1-3
+# Temporary code to disable service restart on update sfl...@suse.de
boo#1020301
+%global _backup /etc/sysconfig/services.rpmbak.%{name}-%{version}-%{release}
%if 0%{?suse_version} <= 1320
%define _userunitdir %{_prefix}/lib/systemd/user
%endif
@@ -38,6 +40,8 @@
# PATCH-FIX-OPENSUSE co...@suse.de -- force a feature configure won't accept
without x11 in buildrequires
Patch1: dbus-do-autolaunch.patch
Patch2: 0001-Drop-Install-sections-from-user-services.patch
+# Patch-Feature-opensuse sfl...@suse.de, users shouldn't be allowed to start /
stop the dbus service.
+Patch3: 0001-Add-RefuseManualStartStop.patch
BuildRequires: audit-devel
BuildRequires: doxygen
BuildRequires: libcap-ng-devel
@@ -113,6 +117,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in
@@ -227,6 +232,31 @@
%endif
%service_add_pre dbus.service dbus.socket
+# Lines below are temporary code to disable service restart on update
sfl...@suse.de boo#1020301
+# These are potentially not needed on non tumbleweed systems where updates
while running a desktop are not supported.
+# This seems likely to only effect the last version of tumbleweed where the
service files were added and can probably be
+# removed reletavly soon.
+
+# Get the current version
+CURRENT_VER=$(dbus-daemon --version | sed
's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1)
+
+# If the current version is or less then 1.10.2 where this change was added
then migration needs to be run
+# The following line will return 1.10.2 if its newer then the current version
+TEST_VER=$(printf "1.10.2\n$CURRENT_VER" | sort -Vr | head -1)
+
+if [[ "$FIRST_ARG" -gt 1 && $TEST_VER == "1.10.12" ]]; then
+ if [[ -f /etc/sysconfig/services ]]; then
+ cp -a /etc/sysconfig/services %{_backup}
+ else
+ touch %{_backup}
+ fi
+ cat >>/etc/sysconfig/services <<EOF
+# temporarily added by rpm update to avoid dbus service restart
+# backup saved in %{_backup}
+DISABLE_RESTART_ON_UPDATE="yes"
+EOF
+fi
+
%post
if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id
]; then
cmp -s %{_localstatedir}/lib/dbus/machine-id %{_sysconfdir}/machine-id >
/dev/null
@@ -254,8 +284,18 @@
%service_del_preun dbus.service dbus.socket
%postun
+# immediately restarting the dbus service causes issues, As such wait for the
next reboot to restart
+export DISABLE_RESTART_ON_UPDATE=yes
%service_del_postun dbus.service dbus.socket
+%posttrans
+# See comments in pre
+if [[ -s %{_backup} ]]; then
+ mv -f %{_backup} /etc/sysconfig/services
+elif [[ -e %{_backup} ]]; then
+ rm -f /etc/sysconfig/services
+fi
+
%files
%defattr(-, root, root)
%dir %{_localstatedir}/lib/dbus
++++++ 0001-Add-RefuseManualStartStop.patch ++++++
Index: dbus-1.10.12/bus/dbus.service.in
===================================================================
--- dbus-1.10.12.orig/bus/dbus.service.in
+++ dbus-1.10.12/bus/dbus.service.in
@@ -2,6 +2,8 @@
Description=D-Bus System Message Bus
Documentation=man:dbus-daemon(1)
Requires=dbus.socket
+RefuseManualStart=true
+RefuseManualStop=true
[Service]
ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork
--nopidfile --systemd-activation
