9 Commits

View File

@ -2,15 +2,15 @@
%define messagebus_gid 25
Name: dbus
Version: 1.10.22
Release: 1mamba
Version: 1.13.8
Release: 4mamba
Summary: A message bus, used for sending messages between applications
Group: System/Servers
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.freedesktop.org/Software/dbus
Source: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
Source: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.xz
Source1: dbus-initscript
Source2: %{name}-session-profile.sh
Patch0: %{name}-1.0.1-cve_2006_6107.patch
@ -50,6 +50,8 @@ BuildRequires: xmlto
%endif
Requires(pre): /usr/sbin/useradd
Requires(pre): /sbin/chkconfig
Requires(pre): filesystem >= 2.2-19mamba
Requires(pre): shadow
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Provides: dbus-tools
Obsoletes: dbus-tools
@ -118,10 +120,12 @@ This package includes the %{name} API documentation.
--enable-dnotify \
--enable-selinux \
--enable-systemd \
--enable-user-session \
--disable-checks \
--disable-asserts \
--with-system-pid-file=%{_var}/run/messagebus.pid \
--with-system-socket=%{_var}/run/dbus/system_bus_socket \
--runstatedir=/run \
--with-system-pid-file=/run/messagebus.pid \
--with-system-socket=/run/dbus/system_bus_socket \
--with-session-socket-dir=/tmp \
%if "%{stage1}" == "1"
--without-x
@ -137,17 +141,25 @@ This package includes the %{name} API documentation.
install -d 0755 %{buildroot}%{_datadir}/dbus-1/services
install -d %{buildroot}%{_sysconfdir}/dbus-1/system.d/
install -d %{buildroot}%{_sysconfdir}/dbus-1/session.d/
install -d %{buildroot}%{_var}/run/dbus
install -d %{buildroot}%{_var}/lib/dbus
#[ -e %{buildroot}%{_var}/run/dbus ] && rmdir %{buildroot}%{_var}/run/dbus
#ln -s /run/dbus %{buildroot}%{_var}/run/dbus
#install -m 0755 %{S:1} %{buildroot}%{_initrddir}/messagebus
install -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/profile.d/dbus-session.sh
#install -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/profile.d/dbus-session.sh
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%pre
if [ $1 -ge 1 ]; then
%tmpfiles_create dbus.conf
## /var/run to /run upgrade with compatibility symlink
#if [ -d /var/run/dbus -a ! -L /var/run/dbus -a ! -e /run/dbus ]; then
# mkdir /run/dbus
# mv /var/run/dbus/* /run/dbus
# rmdir /var/run/dbus
#fi
# add DBUS user
/usr/sbin/groupadd messagebus -g %{messagebus_gid} &>/dev/null
/usr/sbin/useradd -u %{messagebus_uid} -c 'DBUS user' -d /dev/null \
@ -193,7 +205,7 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%config %{_sysconfdir}/dbus-1/system.conf
%dir %{_sysconfdir}/dbus-1/system.d/
%dir %{_sysconfdir}/dbus-1/session.d/
%{_sysconfdir}/profile.d/dbus-session.sh
#%{_sysconfdir}/profile.d/dbus-session.sh
%{_bindir}/dbus-cleanup-sockets
%{_bindir}/dbus-daemon
%{_bindir}/dbus-launch
@ -204,20 +216,23 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_bindir}/dbus-update-activation-environment
%{_bindir}/dbus-uuidgen
%attr(4750,root,messagebus) %{_libexecdir}/dbus-daemon-launch-helper
%{_prefix}/lib/sysusers.d/dbus.conf
%{_prefix}/lib/tmpfiles.d/dbus.conf
%{_unitdir}/dbus.service
%{_unitdir}/dbus.socket
%{_unitdir}/dbus.target.wants/dbus.socket
#%{_unitdir}/dbus.target.wants/dbus.socket
%{_unitdir}/multi-user.target.wants/dbus.service
%{_unitdir}/sockets.target.wants/dbus.socket
#%{_prefix}/lib/sysusers.d/dbus.conf
#%{_prefix}/lib/tmpfiles.d/dbus.conf
%{_userunitdir}/dbus.service
%{_userunitdir}/dbus.socket
%{_userunitdir}/sockets.target.wants/dbus.socket
%dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/services
%{_datadir}/dbus-1/session.conf
%{_datadir}/dbus-1/system.conf
#%{_datadir}/xml/dbus-1/busconfig.dtd
#%{_datadir}/xml/dbus-1/introspect.dtd
%dir %{_var}/run/dbus
%{_datadir}/xml/dbus-1/busconfig.dtd
%{_datadir}/xml/dbus-1/introspect.dtd
#%dir %{_var}/run/dbus
%dir %{_var}/lib/dbus
%{_mandir}/man1/dbus-cleanup-sockets.*
%{_mandir}/man1/dbus-daemon.*
@ -232,7 +247,7 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%files -n lib%{name}
%defattr(-,root,root)
%{_libdir}/libdbus-1.so.*
#%doc AUTHORS COPYING
%doc AUTHORS COPYING
%files -n lib%{name}-devel
%defattr(-,root,root)
@ -244,9 +259,8 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_libdir}/dbus-1.0/include/dbus/dbus-arch-deps.h
%dir %{_includedir}/dbus-1.0/dbus
%{_includedir}/dbus-1.0/dbus/*
#%dir %{_libdir}/cmake/DBus1
#%{_libdir}/cmake/DBus1/DBus1Config.cmake
#%{_libdir}/cmake/DBus1/DBus1ConfigVersion.cmake
%dir %{_libdir}/cmake/DBus1
%{_libdir}/cmake/DBus1/DBus1Config*.cmake
#%doc ChangeLog NEWS README
%files apidocs
@ -255,6 +269,35 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_docdir}/dbus/*
%changelog
* Sun Oct 06 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.13.8-4mamba
- add Requires(pre): shadow to fix dbus-daemon-launch-helper permissions on live media
* Sun Mar 17 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.13.8-3mamba
- remove legacy /var/run/dbus symlink, require filesystem-2.2-19mamba for /run switch
* Tue Mar 05 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.13.8-2mamba
- remove profile.d/dbus-session.sh script; DBUS variables are exported by pam_systemd
* Wed Feb 20 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.13.8-1mamba
- update to 1.13.8
- configured with --enable-user-session
* Thu Mar 29 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 1.13.2-1mamba
- update to 1.13.2
- move /var/run to /run
* Tue Mar 06 2018 Automatic Build System <autodist@mambasoft.it> 1.12.6-1mamba
- automatic version update by autodist
* Sat Feb 10 2018 Automatic Build System <autodist@mambasoft.it> 1.12.4-1mamba
- automatic version update by autodist
* Sun Dec 24 2017 Automatic Build System <autodist@mambasoft.it> 1.12.2-1mamba
- automatic version update by autodist
* Tue Oct 24 2017 Automatic Build System <autodist@mambasoft.it> 1.10.24-1mamba
- automatic version update by autodist
* Tue Aug 15 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 1.10.22-1mamba
- update to 1.10.22