Accepting request 826904 from Base:System
- Update to 1.12.20
* On Unix, avoid a use-after-free if two usernames have the same
numeric uid. In older versions this could lead to a crash (denial of
service) or other undefined behaviour, possibly including incorrect
authorization decisions if <policy group=...> is used.
Like Unix filesystems, D-Bus' model of identity cannot distinguish
between users of different names with the same numeric uid, so this
configuration is not advisable on systems where D-Bus will be used.
Thanks to Daniel Onaca.
(dbus#305, dbus!166; Simon McVittie)
- From 1.12.18
* CVE-2020-12049: If a message contains more file descriptors than can
be sent, close those that did get through before reporting error.
Previously, a local attacker could cause the system dbus-daemon (or
another system service with its own DBusServer) to run out of file
descriptors, by repeatedly connecting to the server and sending fds that
would get leaked.
Thanks to Kevin Backhouse of GitHub Security Lab.
(dbus#294, GHSL-2020-057; Simon McVittie)
* Fix a crash when the dbus-daemon is terminated while one or more
monitors are active (dbus#291, dbus!140; Simon McVittie)
* The dbus-send(1) man page now documents --bus and --peer instead of
the old --address synonym for --peer, which has been deprecated since
the introduction of --bus and --peer in 1.7.6
(fd.o #48816, dbus!115; Chris Morin)
* Fix a wrong environment variable name in dbus-daemon(1)
(dbus#275, dbus!122; Mubin, Philip Withnall)
* Fix formatting of dbus_message_append_args example
(dbus!126, Felipe Franciosi)
* Avoid a test failure on Linux when built in a container as uid 0, but
OBS-URL: https://build.opensuse.org/request/show/826904
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=162
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
4c060df29f
3220
dbus-1-devel-doc.changes
Normal file
3220
dbus-1-devel-doc.changes
Normal file
File diff suppressed because it is too large
Load Diff
125
dbus-1-devel-doc.spec
Normal file
125
dbus-1-devel-doc.spec
Normal file
@ -0,0 +1,125 @@
|
||||
#
|
||||
# spec file for package dbus-1-devel-doc
|
||||
#
|
||||
# Copyright (c) 2020 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 with_systemd 1
|
||||
%define _name dbus
|
||||
%define _libname libdbus-1-3
|
||||
# Temporary code to disable service restart on update sflees@suse.de boo#1020301
|
||||
%global _backup %{_sysconfdir}/sysconfig/services.rpmbak.%{name}-%{version}-%{release}
|
||||
%bcond_without selinux
|
||||
Name: dbus-1-devel-doc
|
||||
Version: 1.12.20
|
||||
Release: 0
|
||||
Summary: Developer documentation package for D-Bus
|
||||
License: GPL-2.0-or-later OR AFL-2.1
|
||||
URL: https://dbus.freedesktop.org/
|
||||
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
|
||||
Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc
|
||||
Source2: dbus-1.keyring
|
||||
Source3: baselibs.conf
|
||||
Source4: dbus-1.desktop
|
||||
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: doxygen
|
||||
BuildRequires: libexpat-devel >= 2.1.0
|
||||
BuildRequires: xmlto
|
||||
Requires: dbus-1 = %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-BUS supplies both a system daemon and a
|
||||
per-user-login-session daemon. Also, the message bus is built on top of
|
||||
a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in
|
||||
# Skip generation of API doc manpages we do not ship
|
||||
echo 'GENERATE_MAN=NO' >> Doxyfile.in
|
||||
|
||||
%configure \
|
||||
--disable-static \
|
||||
--libexecdir=%{_libexecdir}/dbus-1 \
|
||||
--enable-doxygen-docs \
|
||||
--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} \
|
||||
--without-x
|
||||
|
||||
doxygen -u
|
||||
%make_build -C doc
|
||||
|
||||
%install
|
||||
%make_install -C doc
|
||||
|
||||
# Remove manpages for commandline tools (shipped in main package)
|
||||
rm -Rf %{buildroot}/%{_mandir}/man1/*
|
||||
rmdir -p --ignore-fail-on-non-empty %{buildroot}/%{_mandir}/man1
|
||||
|
||||
# Remove DTDs (shipped in devel subpackage)
|
||||
rm -Rf %{buildroot}/%{_datadir}/xml/dbus-1/*dtd
|
||||
rmdir -p --ignore-fail-on-non-empty %{buildroot}/%{_datadir}/xml/dbus-1
|
||||
|
||||
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
|
||||
install -m 0644 %{SOURCE4} \
|
||||
%{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
|
||||
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
||||
mkdir -p %{buildroot}/lib/dbus-1/system-services
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/doc/dbus/examples/
|
||||
install -m 0644 tools/GetAllMatchRules.py %{buildroot}%{_datadir}/doc/dbus/examples/
|
||||
install -m 0644 bus/example-*-stats.conf %{buildroot}%{_datadir}/doc/dbus/examples/
|
||||
|
||||
%files
|
||||
%dir %{_datadir}/doc/dbus
|
||||
%dir %{_datadir}/doc/dbus/examples
|
||||
%{_datadir}/doc/dbus/api/
|
||||
%doc %{_datadir}/doc/dbus/dbus-faq.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-specification.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-plan.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-tutorial.html
|
||||
%doc %{_datadir}/doc/dbus/diagram.*
|
||||
%doc %{_datadir}/doc/dbus/system-activation.txt
|
||||
%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-daemon.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-launch.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-run-session.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-monitor.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-send.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus.devhelp2
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-tool.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-update-activation-environment.1.html
|
||||
%doc %{_datadir}/doc/dbus/examples/GetAllMatchRules.py
|
||||
%doc %{_datadir}/doc/dbus/examples/example-session-disable-stats.conf
|
||||
%doc %{_datadir}/doc/dbus/examples/example-system-enable-stats.conf
|
||||
%doc doc/*.txt doc/file-boilerplate.c doc/TODO
|
||||
%{_datadir}/susehelp
|
||||
|
||||
%changelog
|
||||
@ -1,3 +1,61 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 16 21:28:10 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
|
||||
|
||||
- Update to 1.12.20
|
||||
* On Unix, avoid a use-after-free if two usernames have the same
|
||||
numeric uid. In older versions this could lead to a crash (denial of
|
||||
service) or other undefined behaviour, possibly including incorrect
|
||||
authorization decisions if <policy group=...> is used.
|
||||
Like Unix filesystems, D-Bus' model of identity cannot distinguish
|
||||
between users of different names with the same numeric uid, so this
|
||||
configuration is not advisable on systems where D-Bus will be used.
|
||||
Thanks to Daniel Onaca.
|
||||
(dbus#305, dbus!166; Simon McVittie)
|
||||
- From 1.12.18
|
||||
* CVE-2020-12049: If a message contains more file descriptors than can
|
||||
be sent, close those that did get through before reporting error.
|
||||
Previously, a local attacker could cause the system dbus-daemon (or
|
||||
another system service with its own DBusServer) to run out of file
|
||||
descriptors, by repeatedly connecting to the server and sending fds that
|
||||
would get leaked.
|
||||
Thanks to Kevin Backhouse of GitHub Security Lab.
|
||||
(dbus#294, GHSL-2020-057; Simon McVittie)
|
||||
* Fix a crash when the dbus-daemon is terminated while one or more
|
||||
monitors are active (dbus#291, dbus!140; Simon McVittie)
|
||||
* The dbus-send(1) man page now documents --bus and --peer instead of
|
||||
the old --address synonym for --peer, which has been deprecated since
|
||||
the introduction of --bus and --peer in 1.7.6
|
||||
(fd.o #48816, dbus!115; Chris Morin)
|
||||
* Fix a wrong environment variable name in dbus-daemon(1)
|
||||
(dbus#275, dbus!122; Mubin, Philip Withnall)
|
||||
* Fix formatting of dbus_message_append_args example
|
||||
(dbus!126, Felipe Franciosi)
|
||||
* Avoid a test failure on Linux when built in a container as uid 0, but
|
||||
without the necessary privileges to increase resource limits
|
||||
(dbus!58, Debian #908092; Simon McVittie)
|
||||
* When building with CMake, cope with libX11 in a non-standard location
|
||||
(dbus!129, Tuomo Rinne)
|
||||
- Run spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 19 02:59:34 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Move generation of API docs to a separate package, avoid doxygen
|
||||
dependency for building main package.
|
||||
- Build x11 and devel-doc (API doc) using _multibuild.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 19 01:53:25 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Drop no longer required call to autoreconf, remove obsolete
|
||||
BuildRequires for libtool and autoconf-archive.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 17 13:02:10 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
- Remove left overs from blocking restart on update from May 29th 2019
|
||||
- Use sysusers.d to create messagebus user
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 3 01:16:18 UTC 2019 - Simon Lees <sflees@suse.de>
|
||||
|
||||
|
||||
@ -23,12 +23,11 @@
|
||||
%endif
|
||||
%bcond_without selinux
|
||||
Name: dbus-1-x11
|
||||
Version: 1.12.16
|
||||
Version: 1.12.20
|
||||
Release: 0
|
||||
Summary: D-Bus Message Bus System
|
||||
License: GPL-2.0-or-later OR AFL-2.1
|
||||
Group: System/Daemons
|
||||
URL: http://dbus.freedesktop.org/
|
||||
URL: https://dbus.freedesktop.org/
|
||||
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
|
||||
Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc
|
||||
Source2: dbus-1.keyring
|
||||
@ -41,14 +40,14 @@ Patch1: feature-suse-do-autolaunch.patch
|
||||
Patch2: feature-suse-refuse-manual-start-stop.patch
|
||||
BuildRequires: autoconf-archive
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libexpat-devel >= 2.1.0
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(libsystemd) >= 209
|
||||
BuildRequires: pkgconfig(x11)
|
||||
Requires(post): update-alternatives
|
||||
Requires(preun): update-alternatives
|
||||
Supplements: packageand(dbus-1:libX11-6)
|
||||
Supplements: (dbus-1 and libX11-6)
|
||||
Provides: dbus-launch
|
||||
%if %{with selinux}
|
||||
BuildRequires: libselinux-devel
|
||||
@ -88,7 +87,7 @@ export V=1
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
--with-systemduserunitdir=%{_userunitdir} \
|
||||
--with-x
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
tdir=$(mktemp -d)
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80
|
||||
size 2093296
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAlz9bG4ACgkQ4FrhR4+B
|
||||
TE/zjxAAs6AUPEMcTg8SWwOo+VJIcYRfqDZUVvBOGR7oWSwIWGs7w16k4NjGa5WA
|
||||
yKE/vjaUuezXwBW54ebCBLdi2MSRszIjS1O2FcRSF4M1A6kn3q0eK0SZdi7Tc63O
|
||||
8n197f7usZOLXFSx5onpm5ToHuXmj2+F6jwwpX5qNmyyRgJkEozzzxTQkiEp+xwX
|
||||
TSITwhBxJu1VAfnaq/Z+puIqQpkK8gTJ+Rg9by+OVqqN5AVaKxDDGHEjw2q+oTyH
|
||||
EPJH17BXevk7t8p4iHW6qU82tsnEw4EuxBA8GLQKAAhisrL9BOpcFpAmQpbClNlR
|
||||
Cy+vdebE1/snIwpbPrDVT3iYd4xUWcd/RYKNEtoX6m9+bvs4jqnxuepVZj6HNbf8
|
||||
0NKIdc0zI4GrDcUVkVvcfGmpU05/30RGZP1xDXml8s2EwXJBJX+yUKvGEnKado8K
|
||||
poB0Qi9I3mlfY5eWzwW8m0vdkjccEt0Q6qgbgNYpXMLWUxTKICBud4Y37T26twYy
|
||||
2+LpD/Pstlrge/vlv8zK7VSpS+b2CZhrualZ74+IcYVEndhgdRXf5PCyOWxf93kw
|
||||
xME+ijt9QG0eTUTiFcC3hNJ2IW5hrWdNBTaVj8eIPxR7MWghLpzPjZU8M6dfZ/Wn
|
||||
FuIbR/Q5XazqDUQWokSCi2sf4HktO0t28xV200ZtxgL8YbrOQzM=
|
||||
=Olzi
|
||||
-----END PGP SIGNATURE-----
|
||||
3
dbus-1.12.20.tar.gz
Normal file
3
dbus-1.12.20.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe
|
||||
size 2095511
|
||||
16
dbus-1.12.20.tar.gz.asc
Normal file
16
dbus-1.12.20.tar.gz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAl793S8ACgkQ4FrhR4+B
|
||||
TE8Cfg//Ysb9qT9xLUvCCHdmg+efz1DCks9W21MnZ9EN7qIx/mJPZhqpy9nbaHGy
|
||||
xQl2hnYagPZXWy7ly8HpakvzYfjtyRMCd7570n/cMmVXTF5bnfOr1feScrNEEJPc
|
||||
R6LreRPVDPdiKak1bF8VeVLpil89WrtU4xRzcpWxhZLlPiN1ebOSjEKtzaW4sDYB
|
||||
KdLXLRqcVgdm44NZrTB/xic0hJrO6fhTqiJVx6Lc/CoE9FNO+/60/H2PYIWRedSm
|
||||
bEx76RmUJEn1c/+wCyixmiTE0aEWGbKIsTR5mZmnw5BFI9SegQk7cD67kLvqMgpz
|
||||
c+SMl0ivihTgcaH9jPKeg6fEvTTMkuxHQyMgYV5Rwoq0ukTgQ+b+/MjYa5OX0QqY
|
||||
4YLDqNdgVfdNabxAeGvtNoDLwIHuveB151W9/ANTd420uqkWlCjzriEAjyYv8AJt
|
||||
O53dQn6KGos8QmAKyF3dmKKZb7d2XfJLa0byHt84DeM0kAabq7P9ypf4YkbmqLCC
|
||||
Eb8kiP8FbNYaQs9i1L2D4RXK8fnZA88aQVf7yBcILJBsQDI/plZuxmSzZLMBF3dw
|
||||
SxhcGN3ArsoOqqqWnJt65Sxtt95vO9mpOvrHMB9iQWM3X2zVXh+Et8P2QY9HVhCp
|
||||
Xmj3TH9Oc6OjBipqdR8OzdTtc7lnBwjuzMhw6g2S08ZQJovniOE=
|
||||
=cwnZ
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,55 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 16 21:28:10 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
|
||||
|
||||
- Update to 1.12.20
|
||||
* On Unix, avoid a use-after-free if two usernames have the same
|
||||
numeric uid. In older versions this could lead to a crash (denial of
|
||||
service) or other undefined behaviour, possibly including incorrect
|
||||
authorization decisions if <policy group=...> is used.
|
||||
Like Unix filesystems, D-Bus' model of identity cannot distinguish
|
||||
between users of different names with the same numeric uid, so this
|
||||
configuration is not advisable on systems where D-Bus will be used.
|
||||
Thanks to Daniel Onaca.
|
||||
(dbus#305, dbus!166; Simon McVittie)
|
||||
- From 1.12.18
|
||||
* CVE-2020-12049: If a message contains more file descriptors than can
|
||||
be sent, close those that did get through before reporting error.
|
||||
Previously, a local attacker could cause the system dbus-daemon (or
|
||||
another system service with its own DBusServer) to run out of file
|
||||
descriptors, by repeatedly connecting to the server and sending fds that
|
||||
would get leaked.
|
||||
Thanks to Kevin Backhouse of GitHub Security Lab.
|
||||
(dbus#294, GHSL-2020-057; Simon McVittie)
|
||||
* Fix a crash when the dbus-daemon is terminated while one or more
|
||||
monitors are active (dbus#291, dbus!140; Simon McVittie)
|
||||
* The dbus-send(1) man page now documents --bus and --peer instead of
|
||||
the old --address synonym for --peer, which has been deprecated since
|
||||
the introduction of --bus and --peer in 1.7.6
|
||||
(fd.o #48816, dbus!115; Chris Morin)
|
||||
* Fix a wrong environment variable name in dbus-daemon(1)
|
||||
(dbus#275, dbus!122; Mubin, Philip Withnall)
|
||||
* Fix formatting of dbus_message_append_args example
|
||||
(dbus!126, Felipe Franciosi)
|
||||
* Avoid a test failure on Linux when built in a container as uid 0, but
|
||||
without the necessary privileges to increase resource limits
|
||||
(dbus!58, Debian #908092; Simon McVittie)
|
||||
* When building with CMake, cope with libX11 in a non-standard location
|
||||
(dbus!129, Tuomo Rinne)
|
||||
- Run spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 19 02:59:34 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Move generation of API docs to a separate package, avoid doxygen
|
||||
dependency for building main package.
|
||||
- Build x11 and devel-doc (API doc) using _multibuild.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 19 01:53:25 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Drop no longer required call to autoreconf, remove obsolete
|
||||
BuildRequires for libtool and autoconf-archive.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 17 13:02:10 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
|
||||
72
dbus-1.spec
72
dbus-1.spec
@ -19,15 +19,13 @@
|
||||
%define with_systemd 1
|
||||
%define _name dbus
|
||||
%define _libname libdbus-1-3
|
||||
|
||||
%bcond_without selinux
|
||||
Name: dbus-1
|
||||
Version: 1.12.16
|
||||
Version: 1.12.20
|
||||
Release: 0
|
||||
Summary: D-Bus Message Bus System
|
||||
License: GPL-2.0-or-later OR AFL-2.1
|
||||
Group: System/Daemons
|
||||
URL: http://dbus.freedesktop.org/
|
||||
URL: https://dbus.freedesktop.org/
|
||||
Source0: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz
|
||||
Source1: http://dbus.freedesktop.org/releases/dbus/%{_name}-%{version}.tar.gz.asc
|
||||
Source2: dbus-1.keyring
|
||||
@ -40,11 +38,8 @@ 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: audit-devel
|
||||
BuildRequires: autoconf-archive
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libcap-ng-devel
|
||||
BuildRequires: libexpat-devel >= 2.1.0
|
||||
BuildRequires: libtool
|
||||
BuildRequires: permissions
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: sysuser-shadow
|
||||
@ -56,28 +51,20 @@ Requires(post): update-alternatives
|
||||
Requires(pre): permissions
|
||||
Requires(preun): update-alternatives
|
||||
Provides: dbus-launch
|
||||
%sysusers_requires
|
||||
%if %{with selinux}
|
||||
BuildRequires: libselinux-devel
|
||||
%endif
|
||||
%sysusers_requires
|
||||
|
||||
%package -n %{_libname}
|
||||
Summary: Library package for D-Bus
|
||||
Group: Development/Libraries/Other
|
||||
|
||||
%package devel
|
||||
Summary: Developer package for D-Bus
|
||||
Group: Development/Libraries/Other
|
||||
Requires: %{_libname} = %{version}
|
||||
Requires: dbus-1 = %{version}
|
||||
Requires: glibc-devel
|
||||
|
||||
%package devel-doc
|
||||
Summary: Developer documentation package for D-Bus
|
||||
Group: Development/Libraries/Other
|
||||
Requires: dbus-1 = %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-Bus supplies both a system daemon and a
|
||||
@ -102,21 +89,12 @@ a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%description devel-doc
|
||||
D-Bus is a message bus system, a simple way for applications to talk to
|
||||
one another. D-BUS supplies both a system daemon and a
|
||||
per-user-login-session daemon. Also, the message bus is built on top of
|
||||
a general one-to-one message passing framework, which can be used by
|
||||
any two apps to communicate directly (without going through the message
|
||||
bus daemon).
|
||||
|
||||
%prep
|
||||
%setup -q -n %{_name}-%{version}
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
echo 'HTML_TIMESTAMP=NO' >> Doxyfile.in
|
||||
autoreconf -fi
|
||||
# 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"
|
||||
@ -127,7 +105,7 @@ export V=1
|
||||
--disable-static \
|
||||
--libexecdir=%{_libexecdir}/dbus-1 \
|
||||
--enable-inotify \
|
||||
--enable-doxygen-docs \
|
||||
--disable-doxygen-docs \
|
||||
%if %{with selinux}
|
||||
--enable-selinux \
|
||||
%endif
|
||||
@ -140,17 +118,14 @@ export V=1
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
--with-systemduserunitdir=%{_userunitdir} \
|
||||
--without-x
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
# The original dbus sysusers config does not create our account,
|
||||
# overwrite it with our user definition
|
||||
cp %{SOURCE5} bus/sysusers.d/dbus.conf
|
||||
%sysusers_generate_pre %{SOURCE5} messagebus
|
||||
|
||||
doxygen -u && doxygen
|
||||
./cleanup-man-pages.sh
|
||||
|
||||
%check
|
||||
make %{?_smp_mflags} check
|
||||
%make_build check
|
||||
|
||||
%install
|
||||
%make_install
|
||||
@ -161,9 +136,6 @@ mv -f %{buildroot}/%{_bindir}/dbus-launch %{buildroot}%{_bindir}/dbus-launch.nox
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus
|
||||
install -d %{buildroot}/run/dbus
|
||||
mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/
|
||||
install -m 0644 %{SOURCE4} \
|
||||
%{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop
|
||||
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
|
||||
mkdir -p %{buildroot}/lib/dbus-1/system-services
|
||||
|
||||
@ -175,9 +147,6 @@ done
|
||||
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
|
||||
|
||||
# don't ship executables in doc
|
||||
chmod -x %{buildroot}%{_datadir}/doc/dbus/examples/GetAllMatchRules.py
|
||||
|
||||
# Link the binaries that were in /bin back to /bin for compat (maybe remove for SLE-16)
|
||||
# Currently required to make upower work together with systemd
|
||||
mkdir -p %{buildroot}/bin
|
||||
@ -195,12 +164,13 @@ ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-lau
|
||||
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
rm -Rf %{buildroot}%{_datadir}/doc/dbus
|
||||
|
||||
%verifyscript -n dbus-1
|
||||
%verify_permissions -e %{_libexecdir}/dbus-1/dbus-daemon-launch-helper
|
||||
|
||||
%post -n %{_libname} -p /sbin/ldconfig
|
||||
%postun -n %{_libname} -p /sbin/ldconfig
|
||||
|
||||
%pre -f messagebus.pre
|
||||
%service_add_pre dbus.service dbus.socket
|
||||
|
||||
@ -312,30 +282,4 @@ fi
|
||||
%{_libdir}/cmake/
|
||||
%{_datadir}/xml/dbus-1
|
||||
|
||||
%files devel-doc
|
||||
%dir %{_datadir}/doc/dbus
|
||||
%dir %{_datadir}/doc/dbus/examples
|
||||
%{_datadir}/doc/dbus/api/
|
||||
%doc %{_datadir}/doc/dbus/dbus-faq.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-specification.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-plan.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-tutorial.html
|
||||
%doc %{_datadir}/doc/dbus/diagram.*
|
||||
%doc %{_datadir}/doc/dbus/system-activation.txt
|
||||
%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-daemon.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-launch.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-run-session.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-monitor.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-send.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus.devhelp2
|
||||
%doc %{_datadir}/doc/dbus/dbus-test-tool.1.html
|
||||
%doc %{_datadir}/doc/dbus/dbus-update-activation-environment.1.html
|
||||
%doc %{_datadir}/doc/dbus/examples/GetAllMatchRules.py
|
||||
%doc %{_datadir}/doc/dbus/examples/example-session-disable-stats.conf
|
||||
%doc %{_datadir}/doc/dbus/examples/example-system-enable-stats.conf
|
||||
%doc doc/*.txt doc/file-boilerplate.c doc/TODO
|
||||
%{_datadir}/susehelp
|
||||
|
||||
%changelog
|
||||
|
||||
@ -2,6 +2,4 @@
|
||||
# vim:sw=4 et
|
||||
# This script is called automatically during autobuild checkin.
|
||||
|
||||
cp -lf dbus-1.changes dbus-1-x11.changes
|
||||
|
||||
osc service localrun format_spec_file
|
||||
|
||||
Loading…
Reference in New Issue
Block a user