Accepting request 1322094 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1322094
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=183

_multibuild

@@ -1,4 +0,0 @@
-<multibuild>
-<package>dbus-1-devel-doc</package>
-<package>dbus-1-x11</package>
-</multibuild>

dbus-1-devel-doc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dbus-1-devel-doc
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

dbus-1-x11.spec

@@ -1,125 +0,0 @@
-#
-# spec file for package dbus-1-x11
-#
-# Copyright (c) 2024 SUSE LLC
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
-#
-
-
-%define _name   dbus
-%define _libname libdbus-1-3
-%if 0%{?suse_version} <= 1320
-%define _userunitdir %{_prefix}/lib/systemd/user
-%endif
-%bcond_without selinux
-Name:           dbus-1-x11
-Version:        1.14.10
-Release:        0
-Summary:        D-Bus Message Bus System
-License:        AFL-2.1 OR GPL-2.0-or-later
-URL:            https://dbus.freedesktop.org/
-Source0:        https://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.xz
-Source1:        https://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.xz.asc
-Source2:        dbus-1.keyring
-Source3:        baselibs.conf
-Source4:        dbus-1.desktop
-
-# PATCH-FEATURE-OPENSUSE feature-suse-log-deny.patch
-Patch0:         feature-suse-log-deny.patch
-# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires
-Patch1:         feature-suse-do-autolaunch.patch
-# PATCH-FEATURE-OPENSUSE sflees@suse.de, users shouldn't be allowed to start / stop the dbus service.
-Patch2:         feature-suse-refuse-manual-start-stop.patch
-
-BuildRequires:  alts
-BuildRequires:  autoconf-archive
-BuildRequires:  libcap-ng-devel
-BuildRequires:  libexpat-devel >= 2.1.0
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(libsystemd) >= 209
-BuildRequires:  pkgconfig(x11)
-
-Requires:       alts
-Supplements:    (dbus-1 and libX11-6)
-Provides:       dbus-launch
-%if %{with selinux}
-BuildRequires:  libselinux-devel
-%endif
-
-%description
-D-Bus contains some tools that require Xlib to be installed, those are
-in this separate package so server systems need not install X.
-
-%prep
-%setup -q -n %{_name}-%{version}
-%autopatch -p1
-
-%build
-echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in
-# We use -fpie/-pie for the whole build; this is the recommended way to harden
-# the build upstream, see discussion in fdo#46570
-export CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -fpie"
-export LDFLAGS="-pie"
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-export V=1
-# --with-x=auto is a workaround until https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/263
-# is included (1.14.1+)
-%configure \
-    --disable-static \
-    --disable-asserts \
-    --runstatedir=%{_rundir} \
-    --libexecdir=%{_libexecdir}/dbus-1 \
-    --enable-inotify \
-    --disable-doxygen-docs \
-%if %{with selinux}
-    --enable-selinux \
-%endif
-    --enable-systemd \
-    --enable-user-session \
-    --enable-libaudit \
-    --with-console-auth-dir=/run/dbus/at_console/ \
-    --with-system-pid-file=/run/dbus/pid \
-    --with-system-socket=/run/dbus/system_bus_socket \
-    --with-systemdsystemunitdir=%{_unitdir} \
-    --with-systemduserunitdir=%{_userunitdir} \
-    --with-x=auto
-%make_build
-
-%install
-tdir=$(mktemp -d)
-make DESTDIR=$tdir install
-mkdir -p %{buildroot}/%{_bindir}
-mv $tdir/%{_bindir}/dbus-launch %{buildroot}/%{_bindir}/dbus-launch.x11
-# create entries for libalternatives
-ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/dbus-launch
-mkdir -p %{buildroot}%{_datadir}/libalternatives/dbus-launch
-cat > %{buildroot}%{_datadir}/libalternatives/dbus-launch/20.conf <<EOF
-binary=%{_bindir}/dbus-launch.x11
-group=dbus-launch
-EOF
-
-%pre
-# removing old update-alternatives entries
-if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
-    %{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.x11
-fi
-
-%files
-%dir %{_datadir}/libalternatives
-%dir %{_datadir}/libalternatives/dbus-launch
-%{_datadir}/libalternatives/dbus-launch/20.conf
-%{_bindir}/dbus-launch
-%{_bindir}/dbus-launch.x11
-
-%changelog

dbus-1.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Dec 11 02:26:17 UTC 2025 - Simon Lees <sflees@suse.de>
+
+- dbus-1-daemon no longer provides dbus-service (bsc#1254491)
+
+-------------------------------------------------------------------
+Thu Dec  5 00:17:14 UTC 2024 - Simon Lees <sflees@suse.de>
+
+- having eavesdropping enabled causes a warning to be logged with
+  dbus-broker boo#1232563
+  * Adds feature-suse-disable-eavesdrop.patch
+- dbus-launch is actually now in the dbus-daemon package.
+
+-------------------------------------------------------------------
+Wed Oct 23 03:21:02 UTC 2024 - Simon Lees <sflees@suse.de>
+
+- Package cleanup
+  * Drop -x11 varient that is no longer needed
+  * dbus-launch is now in the dbus-daemon package.
+  * This also removes update alternatives for dbus-launch
+
 -------------------------------------------------------------------
 Wed Oct 16 07:22:38 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

dbus-1.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dbus-1
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -39,7 +39,9 @@ Patch0:         feature-suse-log-deny.patch
 Patch1:         feature-suse-do-autolaunch.patch
 # PATCH-FEATURE-OPENSUSE sflees@suse.de, users shouldn't be allowed to start / stop the dbus service.
 Patch2:         feature-suse-refuse-manual-start-stop.patch
-BuildRequires:  alts
+# PATCH-FEATURE-OPENSUSE sflees@suse.de, having eavesdropping enabled causes a warning to be logged with
+#               dbus-broker boo#1232563
+Patch3:         feature-suse-disable-eavesdrop.patch
 BuildRequires:  audit-devel
 BuildRequires:  cmake
 BuildRequires:  libcap-ng-devel
@@ -49,11 +51,8 @@ BuildRequires:  pkgconfig
 BuildRequires:  sysuser-tools
 BuildRequires:  xmlto
 BuildRequires:  pkgconfig(libsystemd) >= 209
-Requires:       alts
 Requires(post): %{_libname} = %{version}
 Requires(post): /usr/bin/cmp
-Requires(pre):  permissions
-Provides:       dbus-launch = %{version}
 %if %{with selinux}
 BuildRequires:  libselinux-devel
 %endif
@@ -75,7 +74,8 @@ BuildArch:      noarch
 %package daemon
 Summary:        D-Bus message bus daemon
 Provides:       dbus-1:%{_bindir}/dbus-daemon
-Provides:       dbus-service = %{version}
+Provides:       dbus-launch = %{version}
+Requires(pre):  permissions
 
 %package devel
 Summary:        Developer package for D-Bus
@@ -172,8 +172,6 @@ rm %{buildroot}%{_unitdir}/*.service
 rm %{buildroot}%{_userunitdir}/*.service
 %endif
 
-# dbus-launch, too
-mv -f %{buildroot}/%{_bindir}/dbus-launch %{buildroot}%{_bindir}/dbus-launch.nox11
 install -d %{buildroot}/run/dbus
 mkdir -p %{buildroot}/%{_libdir}/pkgconfig
 
@@ -185,14 +183,6 @@ done
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
 
-# create entries for libalternatives
-ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/dbus-launch
-mkdir -p %{buildroot}%{_datadir}/libalternatives/dbus-launch
-cat > %{buildroot}%{_datadir}/libalternatives/dbus-launch/10.conf <<EOF
-binary=%{_bindir}/dbus-launch.nox11
-group=dbus-launch
-EOF
-
 find %{buildroot} -type f -name "*.la" -delete -print
 
 rm -Rf %{buildroot}%{_datadir}/doc/dbus
@@ -209,12 +199,13 @@ rm -Rf %{buildroot}%{_datadir}/doc/dbus
 %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
+    if [ -f %{_bindir}/dbus-launch.nox11 ]; then
+        %{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.nox11
+    fi
 fi
 
 %post
 /sbin/ldconfig
-%set_permissions %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
 %if %{with_service}
 %service_add_post dbus.service
 
@@ -248,14 +239,13 @@ fi
 %postun common
 %service_del_postun_without_restart dbus.socket
 
+%post daemon
+%set_permissions %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
+
 %files
 %dir %{_libexecdir}/dbus-1/
 %license COPYING
 %doc AUTHORS NEWS README
-
-# 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
@@ -264,12 +254,6 @@ fi
 %{_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
-%{_bindir}/dbus-launch.nox11
-%{_bindir}/dbus-launch
-%{_mandir}/man1/dbus-launch.1%{?ext_man}
 
 %files -n %{_libname}
 %{_libdir}/libdbus-1.so.*
@@ -298,12 +282,17 @@ fi
 %{_userunitdir}/sockets.target.wants
 
 %files daemon
+# 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
 %{_bindir}/dbus-cleanup-sockets
 %{_bindir}/dbus-daemon
+%{_bindir}/dbus-launch
 %{_bindir}/dbus-run-session
 %{_bindir}/dbus-test-tool
 %{_mandir}/man1/dbus-cleanup-sockets.1%{?ext_man}
 %{_mandir}/man1/dbus-daemon.1%{?ext_man}
+%{_mandir}/man1/dbus-launch.1%{?ext_man}
 %{_mandir}/man1/dbus-run-session.1%{?ext_man}
 %{_mandir}/man1/dbus-test-tool.1%{?ext_man}
 

feature-suse-disable-eavesdrop.patch

@@ -0,0 +1,13 @@
+Index: dbus-1.14.10/bus/session.conf.in
+===================================================================
+--- dbus-1.14.10.orig/bus/session.conf.in
++++ dbus-1.14.10/bus/session.conf.in
+@@ -30,7 +30,7 @@
+     <!-- Allow everything to be sent -->
+     <allow send_destination="*" eavesdrop="true"/>
+     <!-- Allow everything to be received -->
+-    <allow eavesdrop="true"/>
++    <allow receive_sender="*"/>
+     <!-- Allow anyone to own anything -->
+     <allow own="*"/>
+   </policy>