From 26c50c114df1ca9456e2b1accacfba90097fe7058628a433f29f152e20e9fe6e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 2 Jan 2019 00:48:36 +0000 Subject: [PATCH 1/3] - Update to new upstream release 17 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-broker?expand=0&rev=6 --- _service | 13 +++++++++++++ dbus-broker-17.tar.xz | 3 +++ dbus-broker.changes | 12 ++++++++++++ dbus-broker.spec | 22 +++++++++------------- use-system-deps.diff | 33 --------------------------------- v11.tar.gz | 3 --- 6 files changed, 37 insertions(+), 49 deletions(-) create mode 100644 _service create mode 100644 dbus-broker-17.tar.xz delete mode 100644 use-system-deps.diff delete mode 100644 v11.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..e87b41b --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + git + https://github.com/bus1/dbus-broker + v17 + 17 + + + *.tar + xz + + + diff --git a/dbus-broker-17.tar.xz b/dbus-broker-17.tar.xz new file mode 100644 index 0000000..355d622 --- /dev/null +++ b/dbus-broker-17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3be1455ff0e958b40231635d92200a3eb814a1178e618d4f46a5be15fdac200 +size 228272 diff --git a/dbus-broker.changes b/dbus-broker.changes index faa00aa..9292991 100644 --- a/dbus-broker.changes +++ b/dbus-broker.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jan 2 00:38:38 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 17 + * The compatibility launcher now namespaces transient systemd + units based on its own name on the scope-bus. + * The launcher now respects the `NAME' + configuration and correctly drops privileges of the broker + and itself after startup. + * Messages with file-descriptors will now be refused if the + client did not negotiate file-descriptor passing before. + ------------------------------------------------------------------- Mon Mar 5 20:16:26 UTC 2018 - jengelh@inai.de diff --git a/dbus-broker.spec b/dbus-broker.spec index 80431c6..f0a9ab6 100644 --- a/dbus-broker.spec +++ b/dbus-broker.spec @@ -1,7 +1,7 @@ # # spec file for package dbus-broker # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,20 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: dbus-broker -Version: 11 +Version: 17 Release: 0 Summary: XDG-conforming message bus implementation License: Apache-2.0 Group: Productivity/Telephony/Utilities Url: https://github.com/bus1/dbus-broker -Source: https://github.com/bus1/dbus-broker/archive/v%version.tar.gz -Patch1: use-system-deps.diff +#Source: https://github.com/bus1/dbus-broker/archive/v%version.tar.gz +Source: %name-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: linux-glibc-devel >= 4.13 BuildRequires: meson @@ -34,10 +34,7 @@ BuildRequires: pkgconfig(audit) >= 2.7 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.30 -BuildRequires: pkgconfig(libcsundry) >= 1 +BuildRequires: pkgconfig(libcap-ng) >= 0.6 BuildRequires: pkgconfig(libselinux) >= 2.5 BuildRequires: pkgconfig(libsystemd) >= 230 BuildRequires: pkgconfig(systemd) >= 230 @@ -57,8 +54,7 @@ from classic D-Bus: * Runtime broker control %prep -%setup -q -%patch -P 1 -p1 +%autosetup -p1 %build ln -s /bin/true rst2man @@ -67,11 +63,11 @@ ln -s /bin/true rst2man %install # make install happy -touch build/docs/dbus-broker.1 build/docs/dbus-broker-launch.1 +#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 +#find %buildroot/%_mandir -type f -size 0 -delete %pre %service_add_pre dbus-broker.service diff --git a/use-system-deps.diff b/use-system-deps.diff deleted file mode 100644 index 5a27a83..0000000 --- a/use-system-deps.diff +++ /dev/null @@ -1,33 +0,0 @@ -From: Jan Engelhardt -Date: 2017-09-21 14:40:14.104177267 +0200 - -This reverts commit 70ce99868a47ce59c36178605848ddf121dc4c07. - ---- - 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') --sub_crbtree = subproject('c-rbtree', version: '>=3') --sub_csundry = subproject('c-sundry', version: '>=1') -- --dep_cdvar = sub_cdvar.get_variable('libcdvar_dep') --dep_clist = sub_clist.get_variable('libclist_dep') --dep_crbtree = sub_crbtree.get_variable('libcrbtree_dep') --dep_csundry = sub_csundry.get_variable('libcsundry_dep') -+dep_cdvar = dependency('libcdvar', version: '>=1', fallback: [ 'c-dvar', 'libcdvar_dep' ]) -+dep_clist = dependency('libclist', version: '>=3', fallback: [ 'c-list', 'libclist_dep' ]) -+dep_crbtree = dependency('libcrbtree', version: '>=3', fallback: [ 'c-rbtree', 'libcrbtree_dep' ]) -+dep_csundry = dependency('libcsundry', version: '>=1', fallback: [ 'c-sundry', 'libcsundry_dep' ]) - dep_math = cc.find_library('m') - dep_thread = dependency('threads') - diff --git a/v11.tar.gz b/v11.tar.gz deleted file mode 100644 index dcf88b4..0000000 --- a/v11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb6aaee4577abeed160120b862572281d10b75129064c9c404fbac7ca58e5640 -size 160473 From 4565256e918914dd9d0384d12b84ec1cd9549d1ca6e0448372f44a07207304dd Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 7 Jan 2019 21:26:36 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-broker?expand=0&rev=7 --- dbus-broker.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/dbus-broker.spec b/dbus-broker.spec index f0a9ab6..151330a 100644 --- a/dbus-broker.spec +++ b/dbus-broker.spec @@ -62,12 +62,9 @@ ln -s /bin/true rst2man %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 From fed76d5399dafe5c443b3e6f5adc8a5d9ea552d44663e9f66b018aced2e80ad4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 7 Jan 2019 21:44:34 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-broker?expand=0&rev=8 --- dbus-broker.changes | 1 + dbus-broker.spec | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dbus-broker.changes b/dbus-broker.changes index 9292991..b73b63f 100644 --- a/dbus-broker.changes +++ b/dbus-broker.changes @@ -9,6 +9,7 @@ Wed Jan 2 00:38:38 UTC 2019 - Jan Engelhardt and itself after startup. * Messages with file-descriptors will now be refused if the client did not negotiate file-descriptor passing before. +- Drop use-system-deps.diff ------------------------------------------------------------------- Mon Mar 5 20:16:26 UTC 2018 - jengelh@inai.de diff --git a/dbus-broker.spec b/dbus-broker.spec index 151330a..6f6ad92 100644 --- a/dbus-broker.spec +++ b/dbus-broker.spec @@ -38,6 +38,12 @@ BuildRequires: pkgconfig(libcap-ng) >= 0.6 BuildRequires: pkgconfig(libselinux) >= 2.5 BuildRequires: pkgconfig(libsystemd) >= 230 BuildRequires: pkgconfig(systemd) >= 230 +Provides: bundled(c-dvar) = 1+ +Provides: bundled(c-ini) +Provides: bundled(c-list) = 3+git9 +Provides: bundled(c-rbtree) = 3+git34 +Provides: bundled(c-shquote) = 1+ +Provides: bundled(c-utf8) %description dbus-broker is an implementation of a message bus as defined by the