Sync from SUSE:SLFO:1.1 dbus-1 revision 394d28da41cd19d786ae5ebdfd97f1d1

2025-04-15 17:02:25 +02:00
5 changed files with 15 additions and 108 deletions
--- a/dbus-1-devel-doc.spec
+++ b/dbus-1-devel-doc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dbus-1-devel-doc
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
--- a/dbus-1-x11.spec
+++ b/dbus-1-x11.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dbus-1-x11
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
--- a/dbus-1.changes
+++ b/dbus-1.changes
@@ -1,50 +1,3 @@
-------------------------------------------------------------------
-Wed Oct 16 07:22:38 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
- Drop rcFOO symlinks (PED-266).
-
-------------------------------------------------------------------
-Mon Apr 29 12:41:45 UTC 2024 - Simon Lees <sflees@suse.de>
-
- Drop feature-suse-auto-socket-target-wants.patch and use the
-  filesystem instead, this works more consistenly with dbus-broker
-
-------------------------------------------------------------------
-Mon Jan  8 20:06:13 UTC 2024 - Callum Farmer <gmbr3@opensuse.org>
-
- Add RH/Fedora compat provides dbus-libs to library package
-  needed by Mullvad
-
-------------------------------------------------------------------
-Tue Dec 12 16:28:41 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
-
- Add feature-suse-auto-socket-target-wants.patch: move
-  from static enable symlinks to systemd created symlinks otherwise
-  it can't be enabled by systemd-presets-common-SUSE
- Update feature-suse-refuse-manual-start-stop.patch: prevent
-  killing the socket or user service aswell
-
-------------------------------------------------------------------
-Sat Dec  2 14:13:04 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
-
- common: dbus.socket still gets used after migration to
-  dbus-broker so keep pre/post/postun scriptlets
-
-------------------------------------------------------------------
-Thu Sep 21 08:49:03 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
-
- Explicitly require /usr/bin/cmp for the post scripts instead of
-  diffutils: allow other implementations like busybox-diffutils to
-  be acceptable.
-
-------------------------------------------------------------------
-Thu Sep 21 07:49:31 UTC 2023 - Simon Lees <sflees@suse.de>
-
- No longer start or offer starting dbus as a system service
-  dbus-broker will be the only supported system dbus. Although
-  the existing daemon will stay as some things (gdm) require 
-  dbus-run-session
-
 -------------------------------------------------------------------
 Wed Sep 13 08:45:38 UTC 2023 - Dirk Müller <dmueller@suse.com>

--- a/dbus-1.spec
+++ b/dbus-1.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dbus-1
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,7 @@
 #


-# The dbus service is now provided by dbus-broker
-%define with_service 0
+%define with_systemd 1
 %define _name   dbus
 %define _libname libdbus-1-3
 %bcond_without selinux
@@ -51,7 +50,7 @@ BuildRequires:  xmlto
 BuildRequires:  pkgconfig(libsystemd) >= 209
 Requires:       alts
 Requires(post): %{_libname} = %{version}
-Requires(post): /usr/bin/cmp
+Requires(post): diffutils
 Requires(pre):  permissions
 Provides:       dbus-launch = %{version}
 %if %{with selinux}
@@ -60,11 +59,12 @@ BuildRequires:  libselinux-devel
 Requires:       dbus-1-common >= %{version}
 # Later this should move to Recommends
 Requires:       dbus-1-tools >= %{version}
-Requires:       dbus-broker
+# Later on change this to just dbus-broker
+Requires:       dbus-service >= %{version}
+Recommends:     dbus-1-daemon >= %{version}

 %package -n %{_libname}
 Summary:        Library package for D-Bus
-Provides:       dbus-libs = %{version}
 Requires:       dbus-1-common >= %{version}

 %package common
@@ -166,14 +166,10 @@ cp %{SOURCE5} bus/sysusers.d/dbus.conf
 %install
 %make_install

-%if !%{with_service}
-rm -r %{buildroot}%{_unitdir}/multi-user.target.wants
-rm %{buildroot}%{_unitdir}/*.service
-rm %{buildroot}%{_userunitdir}/*.service
-%endif
-
 # dbus-launch, too
 mv -f %{buildroot}/%{_bindir}/dbus-launch %{buildroot}%{_bindir}/dbus-launch.nox11
+mkdir -p %{buildroot}%{_sbindir}
+ln -sf %{_sbindir}/service  %{buildroot}/%{_sbindir}/rcdbus
 install -d %{buildroot}/run/dbus
 mkdir -p %{buildroot}/%{_libdir}/pkgconfig

@@ -204,9 +200,7 @@ rm -Rf %{buildroot}%{_datadir}/doc/dbus
 %postun -n %{_libname} -p /sbin/ldconfig

 %pre
-%if %{with_service}
 %service_add_pre dbus.service
-%endif
 # removing old update-alternatives entries
 if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
    %{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.nox11
@@ -215,7 +209,6 @@ fi
 %post
 /sbin/ldconfig
 %set_permissions %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
-%if %{with_service}
 %service_add_post dbus.service

 %preun
@@ -223,7 +216,6 @@ fi

 %postun
 %service_del_postun_without_restart dbus.service
-%endif

 %pre common -f messagebus.pre
 %service_add_pre dbus.socket
@@ -256,14 +248,11 @@ fi
 # See doc/system-activation.txt in source tarball for the rationale
 # behind these permissions
 %attr(4750,root,messagebus) %verify(not mode) %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
-%if %{with_service}
 %{_unitdir}/dbus.service
-%endif
-%if %{with_service}
+%{_sbindir}/rcdbus
 %dir %{_unitdir}/multi-user.target.wants
 %{_unitdir}/multi-user.target.wants/dbus.service
 %{_userunitdir}/dbus.service
-%endif
 %dir %{_datadir}/libalternatives
 %dir %{_datadir}/libalternatives/dbus-launch
 %{_datadir}/libalternatives/dbus-launch/10.conf
@@ -288,14 +277,16 @@ fi
 %dir %{_datadir}/dbus-1/services
 %dir %{_datadir}/dbus-1/system.d
 %dir %{_datadir}/dbus-1/system-services
+%dir %{_userunitdir}/sockets.target.wants
+%{_userunitdir}/sockets.target.wants/dbus.socket
+%dir %{_unitdir}/sockets.target.wants
+%{_unitdir}/sockets.target.wants/dbus.socket
 %{_prefix}/lib/sysusers.d/dbus.conf
 %{_prefix}/lib/tmpfiles.d/dbus.conf
 %{_datadir}/dbus-1/session.conf
 %{_datadir}/dbus-1/system.conf
 %{_unitdir}/dbus.socket
 %{_userunitdir}/dbus.socket
-%{_unitdir}/sockets.target.wants
-%{_userunitdir}/sockets.target.wants

 %files daemon
 %{_bindir}/dbus-cleanup-sockets
--- a/feature-suse-refuse-manual-start-stop.patch
+++ b/feature-suse-refuse-manual-start-stop.patch
@@ -11,40 +11,3 @@ Index: dbus-1.14.0/bus/dbus.service.in
 
 [Service]
 Type=notify
-Index: dbus-1.14.0/bus/dbus.socket.in
-===================================================================
--- dbus-1.14.0.orig/bus/dbus.socket.in
-+++ dbus-1.14.0/bus/dbus.socket.in
-@@ -1,5 +1,7 @@
- [Unit]
- Description=D-Bus System Message Bus Socket
-+RefuseManualStart=true
-+RefuseManualStop=true
- 
- [Socket]
- ListenStream=@DBUS_SYSTEM_SOCKET@
-Index: dbus-1.14.0/bus/systemd-user/dbus.socket.in
-===================================================================
--- dbus-1.14.0.orig/bus/systemd-user/dbus.socket.in
-+++ dbus-1.14.0/bus/systemd-user/dbus.socket.in
-@@ -1,5 +1,7 @@
- [Unit]
- Description=D-Bus User Message Bus Socket
-+RefuseManualStart=true
-+RefuseManualStop=true
- 
- [Socket]
- ListenStream=%t/bus
-Index: dbus-1.14.0/bus/systemd-user/dbus.service.in
-===================================================================
--- dbus-1.14.0.orig/bus/systemd-user/dbus.service.in
-+++ dbus-1.14.0/bus/systemd-user/dbus.service.in
-@@ -2,6 +2,8 @@
- Description=D-Bus User Message Bus
- Documentation=man:dbus-daemon(1)
- Requires=dbus.socket
-+RefuseManualStart=true
-+RefuseManualStop=true
- 
- [Service]
- Type=notify