Accepting request 1191884 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1191884
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-broker?expand=0&rev=17

allow-restart.conf

@@ -0,0 +1,3 @@
+[Unit]
+RefuseManualStart=false
+RefuseManualStop=false

block-restart.conf

@@ -0,0 +1,4 @@
+[Unit]
+RefuseManualStart=true
+RefuseManualStop=true
+

dbus-broker-33.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841
-size 253172

dbus-broker-36.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b
+size 266084

dbus-broker-36.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEvl+8jJwcn2Ck8K6uek86Ceve/yYFAmYZQPUACgkQek86Ceve
+/yYQIhAAmwUAQMdZZul6qqVNvUPmXL+0Bp3LDhn58kEXbPDj3lXzuXwChU+llwmV
+05LuxfCvbQFmBeCCAWEny5LUdhcwIrIKGyk7gNvbolhaNwk6nsOPLdJ+QP+pUNZR
+FVRMmTIU0XNh4/yuFn31MYcZrYkNtxka6H+1L5fZsJMUzFigixiIYw4gX2RVya23
+numos0ROu/BQklLES5glTyDnn2lEwpzOHY2zzX+DkFncNMgGEfIZgIzrxTb/+Jlt
+5ph+OtvcbnlTmpp68hWTk75ICxE7CM7DiOyOOJA49x5omPEeNggWd5oO/VJtN+h+
+GFX4ulbjlc2k1o44oclN2GfubeYG2PPadReYBneRDJ//ej/4ySH3Ub7t7Rg2puMu
+2sTnZsFH1uyfnkP/SKY0eLhnBkT+uoWHZC3zD3QLu/LjqGG10d8TN5gr/bQhLpJ0
+l46GR4ckhaZ4MesmJcyDZhHOVIqrjolkvap6/3/I5NPS+W0mOipaIu47QBaaoIwM
+ujJ2V+Ph4LTLD9GV1z+Z5k9NeNRhnKhf7luODb7diE2Iw/Z+7l2L13kHYpxTh5+9
+4vocJ6pxmNhwpPXLZ1UbGgZ7b9ZiBnHT393+DwwwbBp/CfoF5lgg2/JkNDdrjHkv
+XH62Wh/yNs36nk+krfoMpecRQEOmNemUL8FJ5vkH6vqjiPtUTjs=
+=tBa0
+-----END PGP SIGNATURE-----

dbus-broker.changes

@@ -1,3 +1,81 @@
+-------------------------------------------------------------------
+Tue Aug  6 13:27:48 UTC 2024 - Simon Lees <sflees@suse.de>
+
+- Looks like we need systemd_user_ scripts for some upgrades to
+  work
+
+-------------------------------------------------------------------
+Fri Apr 12 16:21:44 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 36
+  * Fix possible file-descriptor use-after-close
+  * More verbose activation failures
+
+-------------------------------------------------------------------
+Tue Jan 16 13:07:37 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Make provides versioned
+- Ensure that not both packages can be installed at the same time
+  by adding a conflicts
+
+-------------------------------------------------------------------
+Tue Jan 16 13:06:24 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Downgrade the recommends to suggests based on suggestion from
+  dimstar
+
+-------------------------------------------------------------------
+Tue Jan 16 13:01:16 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
+
+- Make restart behavior an admin decision:
+  - drop feature-suse-refuse-manual-start-stop.patch
+  - introduce 2 new subpackages:
+    dbus-broker-allow-restart
+    dbus-broker-block-restart (default to reflect the old patch
+    behavior)
+    
+    one of the 2 packages is required and leaves the admin the
+    choice if they want to be able to restart dbus-broker without
+    reboot or not.
+
+-------------------------------------------------------------------
+Wed Dec 20 14:59:15 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 35
+  * drop an error-checking remnant of old dir-iteration
+
+-------------------------------------------------------------------
+Thu Dec 14 11:20:40 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 34
+  * Use AT_RANDOM for libexpat initialization to avoid a hidden
+    dependency in libexpat-hashtables on `/dev/urandom` at
+    runtime.
+  * Check for SELinux Enforcing-mode and honor its value.
+  * Support the new `ProcessFD` key in `GetConnectionCredentials()`.
+  * Loading files from a directory will not enumerate the files
+    in a predictable order rather than the pseudo-random order
+    returned by the kernel.
+
+-------------------------------------------------------------------
+Tue Dec 12 16:31:46 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
+
+- Update feature-suse-refuse-manual-start-stop.patch: prevent
+  killing user service aswell
+
+-------------------------------------------------------------------
+Fri Sep 29 08:49:36 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- Add BuildIgnore to break cycle with dbus-1.
+
+-------------------------------------------------------------------
+Thu Sep 21 07:56:38 UTC 2023 - Simon Lees <sflees@suse.de>
+
+- Make dbus-broker start by default as it is now the only supported
+  system bus.
+- Add feature-suse-refuse-manual-start-stop.patch We don't allow
+  dbus services to be restarted as it breaks many many things.
+
 -------------------------------------------------------------------
 Fri Feb  3 11:07:22 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 

dbus-broker.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dbus-broker
 #
-# Copyright (c) 2023 SUSE LLC
+# 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
@@ -17,19 +17,24 @@
 
 
 Name:           dbus-broker
-Version:        33
+Version:        36
 Release:        0
-Summary:        XDG-conforming message bus implementation
+Summary:        XDG message bus implementation
 License:        Apache-2.0
 Group:          System/Daemons
 URL:            https://github.com/bus1/dbus-broker
 
 Source:         https://github.com/bus1/dbus-broker/releases/download/v%version/dbus-broker-%version.tar.xz
+Source2:        https://github.com/bus1/dbus-broker/releases/download/v%version/dbus-broker-%version.tar.xz.asc
+Source10:       allow-restart.conf
+Source11:       block-restart.conf
 BuildRequires:  linux-glibc-devel >= 4.17
 BuildRequires:  meson
 BuildRequires:  pkg-config
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(audit) >= 3.0
+# dbus-1 requires dbus-broker, break that dep to avoid a cycle.
+#!BuildIgnore: dbus-broker
 BuildRequires:  pkgconfig(dbus-1) >= 1.10
 BuildRequires:  pkgconfig(expat) >= 2.2.3
 BuildRequires:  pkgconfig(glib-2.0) >= 2.50
@@ -45,6 +50,8 @@ Provides:       bundled(c-rbtree) = 3+git34
 Provides:       bundled(c-shquote) = 1+
 Provides:       bundled(c-stdaux) = 1+
 Provides:       bundled(c-utf8) = 1+
+Requires:       dbus-broker-restart-behavior = %version
+Suggests:       dbus-broker-block-restart = %version
 %{?systemd_ordering}
 
 %description
@@ -61,6 +68,28 @@ from classic D-Bus:
 * Support for SASL pipelining
 * Runtime broker control
 
+%package allow-restart
+Summary:        Restart behavior configuration for dbus-broker - Allow restarting
+Provides:       dbus-broker-restart-behavior = %version-%release
+Conflicts:      dbus-broker-restart-behavior
+BuildArch:      noarch
+
+%description allow-restart
+This package configures how the service behave to the systemctl restart command.
+
+By installing this package dbus-broker will be allowed to restart
+
+%package block-restart
+Summary:        Restart behavior configuration for dbus-broker - Block restarting
+Provides:       dbus-broker-restart-behavior = %version-%release
+Conflicts:      dbus-broker-restart-behavior
+BuildArch:      noarch
+
+%description block-restart
+This package configures how the service behave to the systemctl restart command.
+
+By installing this package dbus-broker will be blocked to restart
+
 %prep
 %autosetup -p1
 
@@ -71,24 +100,44 @@ ln -s /bin/true rst2man
 
 %install
 %meson_install
+for mode in allow block ; do
+	install -Dpm0644 "%_sourcedir/$mode-restart.conf" "%buildroot/%_unitdir/dbus-broker.service.d/$mode-restart.conf"
+	install -Dpm0644 "%_sourcedir/$mode-restart.conf" "%buildroot/%_userunitdir/dbus-broker.service.d/$mode-restart.conf"
+done
 
 %pre
 %service_add_pre dbus-broker.service
+%systemd_user_pre dbus-broker.service
 
 %post
 %service_add_post dbus-broker.service
+%systemd_user_post dbus-broker.service
 
 %preun
 %service_del_preun dbus-broker.service
 
 %postun
-%service_del_postun dbus-broker.service
+%service_del_postun_without_restart dbus-broker.service
 
 %files
 %_bindir/dbus-broker*
 %_unitdir/*.service
-%_prefix/lib/systemd/user/*.service
+%_userunitdir/*.service
-%_prefix/lib/systemd/catalog/
+%_journalcatalogdir/*
 %license LICENSE
 
+%files allow-restart
+%license LICENSE
+%dir %_unitdir/dbus-broker.service.d/
+%dir %_userunitdir/dbus-broker.service.d/
+%_unitdir/dbus-broker.service.d/allow-restart.conf
+%_userunitdir/dbus-broker.service.d/allow-restart.conf
+
+%files block-restart
+%license LICENSE
+%dir %_unitdir/dbus-broker.service.d/
+%dir %_userunitdir/dbus-broker.service.d/
+%_unitdir/dbus-broker.service.d/block-restart.conf
+%_userunitdir/dbus-broker.service.d/block-restart.conf
+
 %changelog