-%define dbus_user_uid 81
+%bcond_with coverage
+
+# Do not create provides from extension .so files because the main package
+# should anchor any reverse-dependencies
+%global __provides_exclude_from ^(.*\\.extension-kdbus)$
Name: dbus
-%define _libname libdbus
Url: http://dbus.freedesktop.org/
Summary: D-Bus Message Bus System
-License: GPL-2.0+ or AFL-2.1
-Group: System/Daemons
+License: GPL-2.0+, LGPL-2.1+, MIT, AFL-2.1, BSD-3-Clause
+Group: Base/IPC
# COMMON1-BEGIN
-# We can't enable this right now, because it will create a build cycle between
-# dbus-1 and systemd. Fun!
%define with_systemd 1
-BuildRequires: doxygen
-BuildRequires: expat-devel
+BuildRequires: autoconf-archive
BuildRequires: libtool
-BuildRequires: libzio
BuildRequires: pkg-config
+BuildRequires: expat-devel
+BuildRequires: libcap-ng-devel
%if %{with_systemd}
-BuildRequires: pkgconfig(libsystemd-daemon)
-BuildRequires: pkgconfig(libsystemd-login)
+BuildRequires: pkgconfig(libsystemd)
%endif
-Version: 1.6.8
-Release: 0
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(cynara-client)
+BuildRequires: pkgconfig(cynara-session)
+BuildRequires: pkgconfig(cynara-client-async)
+BuildRequires: pkgconfig(libdbuspolicy1)
+Version: 1.12.16
+Release: 3
Source0: http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
-Source1: rc.boot.dbus
Source3: dbus_at_console.ck
Source4: baselibs.conf
-Source5: dbus-user.service
-Source6: dbus-user.socket
-BuildRequires: libcap-ng-devel
+Source7: dbus.sh
+Source1001: dbus.manifest
# COMMON1-END
-Requires(pre): /usr/sbin/groupadd /usr/sbin/useradd
-
-Provides: dbus-1
-
-%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
-Requires: glibc-devel
-
-%package devel-doc
-
-Summary: Developer documentation package for D-Bus
-Group: Development/Libraries/Other
-Requires: %{name} = %{version}
-BuildArch: noarch
+Requires: security-config
+Requires(pre): /usr/bin/getent
+Requires(pre): /usr/sbin/useradd
+Requires(pre): /usr/sbin/groupadd
+Provides: dbus-1
%description
D-Bus is a message bus system, a simple way for applications to talk to
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).
+.
+This package provides dbus-daemon.
-%description -n %{_libname}
-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).
+%package devel
+Summary: Developer package for D-Bus
+License: AFL-2.1
+Group: Development/Libraries
+Requires: dbus-libs = %{version}
%description devel
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).
+one another.
+.
+This package provides development libraries.
-%description devel-doc
+%package libs
+Summary: Library package for D-Bus
+License: AFL-2.1
+Group: System/Libraries
+
+%description libs
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).
+one another.
+.
+This package provides shared libraries.
+
+%package tests
+Summary: Package with binaries and data for dbus tests
+License: MIT
+
+%description tests
+This package contains installable tests. Tests are compatible with 'dbus-integration-tests' framework.
+
+%if %{with coverage}
+%package coverage
+Summary: Special version of dbus library for getting coverage analysis
+
+%description coverage
+Special version of dbus library for getting coverage analysis. *.gcda coverage files
+are generated on each use of library in directory set by GCOV_PREFIX and GCOV_PREFIX_STRIP.
+Use the library by modifying LD_LIBRARY_PATH.
+This package is intended for debug/test use only.
+
+%package coverage-objects
+Summary: Generated object files and gcov notes for coverage analysis
+
+%description coverage-objects
+We need to keep objects and gcno files to analyze coverage.
+This package is intended for debug/test use only.
+%endif
+
+%package -n dbus-libs-extension-kdbus
+Summary: Extension for dbus to support KDBUS in Tizen
+License: AFL-2.1
+Requires: dbus = %{version}-%{release}
+
+%description -n dbus-libs-extension-kdbus
+This modifies dbus to support KDBUS in Tizen.
%prep
# COMMON2-BEGIN
%setup -n dbus-%{version} -q
%build
-autoreconf -fi
+cp %{SOURCE1001} .
# 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="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -fpie"
+%ifarch %{arm}
+export CFLAGS=${CFLAGS/-Wa,-mimplicit-it=thumb/}" -marm"
+%endif
export LDFLAGS="-pie"
export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
export CFLAGS="$CFLAGS -fstack-protector"
export CXXFLAGS="$CXXFLAGS -fstack-protector"
export V=1
-%configure \
- --disable-static \
- --with-pic \
- --with-dbus-user=dbus \
- --libexecdir=%{_libdir}/%{name} \
- --libdir=%{_libdir} \
- --with-init-scripts=suse \
- --enable-inotify \
- --enable-doxygen-docs \
+
+# Create kdbus extension first (dbus)
+%reconfigure \
+ --disable-static \
+ --with-pic \
+ --with-dbus-user=dbus \
+ --libexecdir=%{_libdir}/%{name} \
+ --libdir=%{_libdir} \
+ --enable-inotify \
+ --disable-doxygen-docs \
+ --disable-xml-docs \
+%if %{with_systemd}
+ --enable-systemd \
+%endif
+ --enable-kdbus-transport \
+ --enable-libdbuspolicy \
+ --with-console-auth-dir=/var/run/dbus/at_console/ \
+ --with-system-socket=/run/dbus/system_bus_socket \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --with-systemduserunitdir=%{_unitdir_user} \
+ --enable-user-session \
+ --enable-cynara \
+ --enable-modular-tests \
+ --enable-installed-tests
+
+make %{?_smp_mflags}
+
+mkdir -p extension-kdbus
+pushd dbus/.libs/
+# rm if symlink. mv if regular file.
+for FILE in libdbus-*.so*; do test -h "$FILE" && rm "$FILE" || mv "$FILE" ../../extension-kdbus/ ; done
+popd
+
+%{__make} clean
+
+# Support for generating separate packages with libraries generating coverage files
+# WARNING: if coverage build is enabled, incremental builds will not work correctly.
+# Use the option only to generate dbus-coverage packages.
+%if %{with coverage}
+%reconfigure \
+ --disable-static \
+ --with-pic \
+ --with-dbus-user=dbus \
+ --libexecdir=%{_libdir}/%{name} \
+ --libdir=%{_libdir} \
+ --enable-inotify \
+ --disable-doxygen-docs \
+ --disable-xml-docs \
+%if %{with_systemd}
+ --enable-systemd \
+%endif
+ --enable-kdbus-transport \
+ --enable-libdbuspolicy \
+ --with-console-auth-dir=/var/run/dbus/at_console/ \
+ --with-system-socket=/run/dbus/system_bus_socket \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --with-systemduserunitdir=%{_unitdir_user} \
+ --enable-user-session \
+ --enable-cynara \
+ --enable-modular-tests \
+ --enable-installed-tests \
+ --enable-compiler-coverage
+
+make %{?_smp_mflags}
+mkdir coverage
+cp dbus/.libs/libdbus-1.so.3 coverage
+mkdir coverage-objects
+find dbus -name '*.o' -exec cp '{}' coverage-objects ';'
+find dbus -name '*.gcno' -exec cp '{}' coverage-objects ';'
+
+%endif
+
+%reconfigure \
+ --disable-static \
+ --with-pic \
+ --with-dbus-user=dbus \
+ --libexecdir=%{_libdir}/%{name} \
+ --libdir=%{_libdir} \
+ --enable-inotify \
+ --disable-doxygen-docs \
+ --disable-xml-docs \
%if %{with_systemd}
- --enable-systemd \
+ --enable-systemd \
%endif
- --with-console-auth-dir=/var/run/dbus/at_console/ \
- --with-systemdsystemunitdir=%{_unitdir}
+ --with-console-auth-dir=/var/run/dbus/at_console/ \
+ --with-system-socket=/run/dbus/system_bus_socket \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --with-systemduserunitdir=%{_unitdir_user} \
+ --enable-user-session \
+ --enable-cynara \
+ --enable-modular-tests \
+ --enable-installed-tests
+
make %{?_smp_mflags}
%install
# COMMON2-END
make DESTDIR=%{buildroot} install
-mkdir -p %{buildroot}/etc/init.d
+
+# kdbus extension
+pushd extension-kdbus
+for FILE in *; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE.extension-kdbus"; done
+popd
+
mkdir -p %{buildroot}/usr/sbin
-install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus
install -d %{buildroot}/%{_localstatedir}/run/dbus
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
mkdir -p %{buildroot}/lib/dbus-1/system-services
mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services
mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces
-#mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/
-rm -f %{buildroot}/%{_libdir}/*.la
#
-rm -f %{buildroot}/%{_bindir}/dbus-launch
-rm -f %{buildroot}/%{_mandir}/man1/dbus-launch.1*
-chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
+chmod a-x AUTHORS CONTRIBUTING.md NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO
#
install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
-mkdir -p %{buildroot}%{_localstatedir}%{_libdir}/dbus
-touch %{buildroot}/%{_localstatedir}%{_libdir}/dbus/machine-id
-mkdir -p %{buildroot}%{_unitdir_user}
-install -m0644 %{SOURCE5} %{buildroot}%{_unitdir_user}/dbus.service
-install -m0644 %{SOURCE6} %{buildroot}%{_unitdir_user}/dbus.socket
+rm -rf %{buildroot}/%{_libdir}/*.la
+rm -rf %{buildroot}/%{_bindir}/dbus-launch
+
+# install script for login shells (/etc/profile.d)
+install -d %{buildroot}%{_sysconfdir}/profile.d
+install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
+
+# docs
+rm -rf %{buildroot}%{_datadir}/doc
+
+# build test binaries and copy test data
+%define relative_dbus_tests_base_dir %{_libdir}/dbus-tests
+%define dbus_tests_base_dir %{buildroot}%{relative_dbus_tests_base_dir}
+%define dbus_installed_tests_dir %{_libdir}/dbus/installed-tests/dbus
+mkdir -p %{dbus_tests_base_dir}/test-suites/dbus-tests/
+mkdir -p %{dbus_tests_base_dir}/runner/
+%__cc %{_builddir}/%{name}-%{version}/test-runner.c -g -o %{dbus_tests_base_dir}/runner/dbus-tests
+rm -fr %{buildroot}/usr/share/installed-tests/dbus
+# The tests are installed in standard directory for dbus tests.
+# However, we need to have the tests also available for dbus-integration-tests package.
+# Thus, we link selected tests to our dbus-integration-tests directory
+for f in manual-dir-iter manual-tcp test-corrupt test-dbus-daemon \
+ test-dbus-daemon-eavesdrop test-fdpass test-loopback test-marshal \
+ test-monitor test-printf test-refs test-relay test-sd-activation \
+ test-shell test-syntax test-syslog test-uid-permissions
+do ln -s %{dbus_installed_tests_dir}/$f %{dbus_tests_base_dir}/test-suites/dbus-tests/$f; done
+
+%if %{with coverage}
+%define relative_cov_lib_dir %{relative_dbus_tests_base_dir}/coverage-libs
+%define cov_lib_dir %{buildroot}%{relative_cov_lib_dir}
+mkdir -p %{cov_lib_dir}
+mkdir -p %{cov_lib_dir}/objects
+install -m 0755 coverage/* %{cov_lib_dir}
+install -m 0644 coverage-objects/* %{cov_lib_dir}/objects
+%endif
%pre
# Add the "dbus" user and group
-/usr/sbin/groupadd -r -g %{dbus_user_uid} dbus 2>/dev/null || :
-/usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} -g %{dbus_user_uid} \
- -s /sbin/nologin -r -d '/' dbus 2> /dev/null || :
+getent group dbus > /dev/null || /usr/sbin/groupadd -r -g 81 dbus 2> /dev/null || :
+getent passwd dbus > /dev/null || /usr/sbin/useradd -c 'System message bus' -u 81 -g 81 \
+ -s /sbin/nologin -r -d '/' dbus 2> /dev/null || :
+
+%post
+# Set the smack label of executable binary tools
+chsmack %{_bindir}/dbus-cleanup-sockets -a "System::Tools"
+chsmack %{_bindir}/dbus-daemon -a "System::Tools"
+chsmack %{_bindir}/dbus-monitor -a "System::Tools" -e "System"
+chsmack %{_bindir}/dbus-run-session -a "System::Tools"
+chsmack %{_bindir}/dbus-send -a "System::Tools"
+chsmack %{_bindir}/dbus-uuidgen -a "System::Tools"
+chsmack %{_bindir}/dbus-test-tool -a "System::Tools"
+chsmack %{_bindir}/dbus-update-activation-environment -a "System::Tools"
-%post -n %{_libname} -p /sbin/ldconfig
+%post -n dbus-libs-extension-kdbus
+pushd %{_libdir}
+for FILE in libdbus*.so.*.extension-kdbus; do mv "$FILE" "${FILE%.extension-kdbus}"; done
+popd
-%postun -n %{_libname} -p /sbin/ldconfig
+%files -n dbus-libs-extension-kdbus
+%manifest %{name}.manifest
+%license LICENSE.AFL-2.1
+%{_libdir}/libdbus*.so.*.extension-kdbus
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
-%docs_package
%files
+%manifest %{name}.manifest
+%license LICENSE.AFL-2.1 LICENSE.BSD-3-Clause LICENSE.LGPL-2.1+ LICENSE.MIT LICENSE.GPL-2.0+
%defattr(-, root, root)
-%dir %{_localstatedir}%{_libdir}/dbus
%dir /lib/dbus-1
%dir /lib/dbus-1/system-services
-%license COPYING
%config(noreplace) %{_sysconfdir}/dbus-1/session.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.conf
-%{_sysconfdir}/init.d/dbus
+%config(noreplace) %{_datadir}/dbus-1/session.conf
+%config(noreplace) %{_datadir}/dbus-1/system.conf
%{_sysconfdir}/ConsoleKit
%{_bindir}/dbus-cleanup-sockets
%{_bindir}/dbus-daemon
%{_bindir}/dbus-monitor
+%{_bindir}/dbus-run-session
%{_bindir}/dbus-send
%{_bindir}/dbus-uuidgen
+%{_bindir}/dbus-test-tool
+%{_bindir}/dbus-update-activation-environment
# See doc/system-activation.txt in source tarball for the rationale
# behind these permissions
%attr(4750,root,dbus) %verify(not mode) %{_libdir}/dbus/dbus-daemon-launch-helper
-%ghost %{_localstatedir}/run/dbus
-%ghost %{_localstatedir}%{_libdir}/dbus/machine-id
%dir %{_unitdir}
-%{_unitdir}/dbus.service
%{_unitdir}/dbus.socket
-%{_unitdir_user}/dbus.service
-%{_unitdir_user}/dbus.socket
-%dir %{_unitdir}/dbus.target.wants
-%{_unitdir}/dbus.target.wants/dbus.socket
-%dir %{_unitdir}/multi-user.target.wants
-%{_unitdir}/multi-user.target.wants/dbus.service
+%{_unitdir}/dbus.service
%dir %{_unitdir}/sockets.target.wants
%{_unitdir}/sockets.target.wants/dbus.socket
-
-%files -n %{_libname}
-%defattr(-, root, root)
-%{_libdir}/libdbus-1.so.*
-# Own those directories in the library instead of dbus-1, since dbus users
-# often ship files there
+%dir %{_unitdir_user}
+%{_unitdir_user}/dbus.socket
+%{_unitdir_user}/dbus.service
+%dir %{_unitdir_user}/sockets.target.wants
+%{_unitdir_user}/sockets.target.wants/dbus.socket
%dir %{_sysconfdir}/dbus-1
-%dir %{_sysconfdir}/dbus-1/session.d
-%dir %{_sysconfdir}/dbus-1/system.d
+%dir %{_datadir}/dbus-1/session.d
+%dir %{_datadir}/dbus-1/system.d
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/interfaces
%dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services
+%{_sysconfdir}/profile.d/dbus.sh
+%{_prefix}/lib/sysusers.d/dbus.conf
+%{_prefix}/lib/tmpfiles.d/dbus.conf
+
+%files libs
+%manifest %{name}.manifest
+%license LICENSE.AFL-2.1
+%exclude %{_libdir}/libdbus*.so.*.extension-kdbus
+%defattr(-, root, root)
+%{_libdir}/libdbus-1.so.*
%files devel
+%manifest %{name}.manifest
+%license LICENSE.AFL-2.1
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/libdbus-1.so
-%dir %{_libdir}/dbus-1.0
%{_libdir}/dbus-1.0/include
%{_libdir}/pkgconfig/dbus-1.pc
+%dir %{_libdir}/dbus-1.0
+%{_libdir}/cmake/DBus1/DBus1Config.cmake
+%{_libdir}/cmake/DBus1/DBus1ConfigVersion.cmake
+%{_datadir}/xml/dbus-1/busconfig.dtd
+%{_datadir}/xml/dbus-1/introspect.dtd
-%files devel-doc
+%files tests
+%manifest %{name}.manifest
+%license LICENSE.MIT LICENSE.AFL-2.1
%defattr(-,root,root)
-%dir %{_datadir}/doc/dbus
-%{_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 doc/*.txt doc/file-boilerplate.c doc/TODO
+%{_libdir}/dbus-tests/test-suites/dbus-tests
+%{_libdir}/dbus-tests/runner/dbus-tests
+%{_libdir}/dbus/installed-tests
+
+%if %{with coverage}
+%files coverage
+%{relative_cov_lib_dir}/*
+%files coverage-objects
+%{relative_cov_lib_dir}/objects/*
+%endif
%changelog
projects / platform / upstream / dbus.git / blobdiff