From 26e7067ea12af6c5763b06ed15f0967af1c7d1553b806b7a0e1164e685a94062 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 5 Mar 2018 20:18:08 +0000 Subject: [PATCH 1/2] - Update to new upstream release 11 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-broker?expand=0&rev=3 --- dbus-broker.changes | 25 +++++++++++++++++++++++++ dbus-broker.spec | 21 +++++++++++++-------- use-system-deps.diff | 20 ++++++++++++-------- v11.tar.gz | 3 +++ v4.tar.gz | 3 --- 5 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 v11.tar.gz delete mode 100644 v4.tar.gz diff --git a/dbus-broker.changes b/dbus-broker.changes index f1029ec..faa00aa 100644 --- a/dbus-broker.changes +++ b/dbus-broker.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Mar 5 20:16:26 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 11 + * The policy-type of the dbus-broker API has been simplified. + It is now reduced to a policy-batch indexed by uids, in + combination with a policy-batch indexed either by gid or + uid-range. + * The launcher now supports a `--config-file PATH` commandline + option to override the root configuration file, which is + still deduced based on the passed scope parameter. + +------------------------------------------------------------------- +Tue Feb 6 00:37:19 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 9 + * AddListener() on org.bus1.DBus.Broker now supports UID ranges. + * dbus-broker.service unit is now ordered before basic.target. + * The launcher now uses instantiated systemd template units + when activating a service that has no associated systemd + service file. + * The launcher now supports configuration reloading. + * Activated units now inherit their user from the actual D-Bus + service, if provided. + ------------------------------------------------------------------- Sun Sep 10 23:30:34 UTC 2017 - jengelh@inai.de diff --git a/dbus-broker.spec b/dbus-broker.spec index 2ed6acd..59019dd 100644 --- a/dbus-broker.spec +++ b/dbus-broker.spec @@ -1,7 +1,7 @@ # # spec file for package dbus-broker # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: dbus-broker -Version: 4 +Version: 11 Release: 0 Summary: XDG-conforming message bus implementation License: Apache-2.0 @@ -27,19 +27,20 @@ Url: https://github.com/bus1/dbus-broker Source: https://github.com/bus1/dbus-broker/archive/v%version.tar.gz Patch1: use-system-deps.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: glibc-linux-devel >= 4.13 BuildRequires: meson BuildRequires: pkg-config BuildRequires: pkgconfig(audit) >= 2.7 -BuildRequires: pkgconfig(libcdvar) >= 1 +BuildRequires: pkgconfig(dbus-1) >= 1.10 +BuildRequires: pkgconfig(expat) >= 2.2.3 +BuildRequires: pkgconfig(glib-2.0) >= 2.50 +BuildRequires: pkgconfig(libcdvar) >= 1.7 BuildRequires: pkgconfig(libclist) >= 3 -BuildRequires: pkgconfig(libcrbtree) >= 3 +BuildRequires: pkgconfig(libcrbtree) >= 3.30 BuildRequires: pkgconfig(libcsundry) >= 1 BuildRequires: pkgconfig(libselinux) >= 2.5 BuildRequires: pkgconfig(libsystemd) >= 230 -BuildRequires: pkgconfig(dbus-1) >= 1.10 -BuildRequires: pkgconfig(glib-2.0) >= 2.50 BuildRequires: pkgconfig(systemd) >= 230 -BuildRequires: pkgconfig(expat) %description dbus-broker is an implementation of a message bus as defined by the @@ -60,13 +61,17 @@ from classic D-Bus: %patch -P 1 -p1 %build +ln -s /bin/true rst2man %meson -Daudit=true -Dselinux=true %meson_build %install +# make install happy +touch build/docs/dbus-broker.1 build/docs/dbus-broker-launch.1 %meson_install mkdir -p "%buildroot/%_sbindir" ln -s service "%buildroot/%_sbindir/rcdbus-broker" +find %buildroot/%_mandir -type f -size 0 -delete %pre %service_add_pre dbus-broker.service @@ -86,6 +91,6 @@ ln -s service "%buildroot/%_sbindir/rcdbus-broker" %_unitdir/*.service %_prefix/lib/systemd/user/*.service %_sbindir/rc* -%doc COPYING LICENSE +%license LICENSE %changelog diff --git a/use-system-deps.diff b/use-system-deps.diff index 050a45b..5a27a83 100644 --- a/use-system-deps.diff +++ b/use-system-deps.diff @@ -3,13 +3,17 @@ Date: 2017-09-21 14:40:14.104177267 +0200 This reverts commit 70ce99868a47ce59c36178605848ddf121dc4c07. -diff --git a/meson.build b/meson.build -index a429847..61e1e4e 100644 ---- a/meson.build -+++ b/meson.build -@@ -16,15 +16,10 @@ cc = meson.get_compiler('c') - conf = configuration_data() - mod_pkgconfig = import('pkgconfig') +--- + meson.build | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +Index: dbus-broker-11/meson.build +=================================================================== +--- dbus-broker-11.orig/meson.build ++++ dbus-broker-11/meson.build +@@ -26,15 +26,10 @@ mod_pkgconfig = import('pkgconfig') + + prog_rst2man = find_program('rst2man', 'rst2man.py') -sub_cdvar = subproject('c-dvar', version: '>=1') -sub_clist = subproject('c-list', version: '>=3') @@ -26,4 +30,4 @@ index a429847..61e1e4e 100644 +dep_csundry = dependency('libcsundry', version: '>=1', fallback: [ 'c-sundry', 'libcsundry_dep' ]) dep_math = cc.find_library('m') dep_thread = dependency('threads') - dep_expat = dependency('expat') + diff --git a/v11.tar.gz b/v11.tar.gz new file mode 100644 index 0000000..dcf88b4 --- /dev/null +++ b/v11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb6aaee4577abeed160120b862572281d10b75129064c9c404fbac7ca58e5640 +size 160473 diff --git a/v4.tar.gz b/v4.tar.gz deleted file mode 100644 index cd83838..0000000 --- a/v4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:165fab697e0f9ef66588688758edb601c89b65ee3240d462cc278f0755c6e122 -size 148231 From a9ad76a4c8cace9ead0bdcf1a02b8fa4849b9a24a2b7da7870e4f1d97dba4bb9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 9 Mar 2018 08:48:29 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-broker?expand=0&rev=4 --- dbus-broker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbus-broker.spec b/dbus-broker.spec index 59019dd..80431c6 100644 --- a/dbus-broker.spec +++ b/dbus-broker.spec @@ -27,7 +27,7 @@ Url: https://github.com/bus1/dbus-broker Source: https://github.com/bus1/dbus-broker/archive/v%version.tar.gz Patch1: use-system-deps.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: glibc-linux-devel >= 4.13 +BuildRequires: linux-glibc-devel >= 4.13 BuildRequires: meson BuildRequires: pkg-config BuildRequires: pkgconfig(audit) >= 2.7