10 Commits

6 changed files with 57 additions and 221 deletions

View File

@ -1,12 +0,0 @@
--- dbus-1.0.1/bus/signals.c.orig 2007-04-02 13:34:02.000000000 +0200
+++ dbus-1.0.1/bus/signals.c 2007-04-02 13:35:19.000000000 +0200
@@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a,
if (a->flags != b->flags)
return FALSE;
+ if (a->matches_go_to != b->matches_go_to)
+ return FALSE;
+
if ((a->flags & BUS_MATCH_MESSAGE_TYPE) &&
a->message_type != b->message_type)
return FALSE;

View File

@ -1,28 +0,0 @@
--- dbus-1.6.8.orig/bus/messagebus.in 2011-07-13 22:42:21.000000000 +0200
+++ dbus-1.6.8/bus/messagebus.in 2013-03-29 14:19:22.268683800 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# messagebus: The D-BUS systemwide message bus
+# dbus: The D-BUS systemwide message bus
#
# chkconfig: 345 22 85
# description: This is a daemon which broadcasts notifications of system events \
@@ -10,7 +10,7 @@
# pidfile: @DBUS_SYSTEM_PID_FILE@
#
### BEGIN INIT INFO
-# Provides: messagebus
+# Provides: dbus
# Required-Start: $syslog $local_fs
# Required-Stop: $syslog $local_fs
# Default-Start: 2 3 4 5
@@ -28,7 +28,7 @@
# so we can rearrange this easily
processname=dbus-daemon
-servicename=messagebus
+servicename=dbus
RETVAL=0

View File

@ -1,11 +0,0 @@
diff -Nru dbus-1.8.12.orig/bus/dbus.service.in dbus-1.8.12/bus/dbus.service.in
--- dbus-1.8.12.orig/bus/dbus.service.in 2014-11-04 15:51:05.000000000 +0100
+++ dbus-1.8.12/bus/dbus.service.in 2014-12-04 12:20:18.198000000 +0100
@@ -2,6 +2,7 @@
Description=D-Bus System Message Bus
Documentation=man:dbus-daemon(1)
Requires=dbus.socket
+Before=basic.target
[Service]
ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation

View File

@ -1,78 +0,0 @@
#!/bin/sh
#
# messagebus: The D-BUS systemwide message bus
#
# chkconfig: 345 15 80
# description: This is a daemon which broadcasts notifications of system events \
# and other messages. See http://www.freedesktop.org/software/dbus/
#
# processname: dbus-daemon
# pidfile: /var/run/dbus/pid
#
# Sanity checks.
[ -x /usr/bin/dbus-daemon ] || exit 0
# Source function library.
. /etc/rc.d/init.d/functions
# so we can rearrange this easily
processname=dbus-daemon
servicename=messagebus
RETVAL=0
start() {
echo -n $"Starting system message bus: "
daemon --check $servicename $processname --system
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
}
stop() {
echo -n $"Stopping system message bus: "
## we don't want to kill all the per-user $processname, we want
## to use the pid file *only*; because we use the fake nonexistent
## program name "$servicename" that should be safe-ish
killproc -p /var/run/messagebus.pid $servicename -TERM
RETVAL=$?
echo
if [ $RETVAL -eq 0 ]; then
rm -f /var/lock/subsys/$servicename
rm -f /var/run/messagebus.pid
fi
}
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
status)
status $processname
RETVAL=$?
;;
restart)
stop
start
;;
condrestart)
if [ -f /var/lock/subsys/$servicename ]; then
stop
start
fi
;;
reload)
echo "Message bus can't reload its configuration, you have to restart it"
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
;;
esac
exit $RETVAL

View File

@ -1,11 +0,0 @@
dbus_session_file=~/.dbus/session-bus/$(cat /var/lib/dbus/machine-id)-0
if [ -e "$dbus_session_file" ]; then
. "$dbus_session_file"
if [ "$DBUS_SESSION_BUS_PID" -a -e /proc/$DBUS_SESSION_BUS_PID -a \
"`readlink /proc/$DBUS_SESSION_BUS_PID/exe`" = "/usr/bin/dbus-daemon" ]; then
export DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID DBUS_SESSION_BUS_WINDOWID
else
unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID DBUS_SESSION_BUS_WINDOWID
fi
fi
unset dbus_session_file

138
dbus.spec
View File

@ -2,65 +2,45 @@
%define messagebus_gid 25
Name: dbus
Version: 1.13.8
Release: 4mamba
Version: 1.16.2
Release: 1mamba
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
URL: https://www.freedesktop.org/wiki/Software/dbus/
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
Patch1: dbus-1.6.8-initscript-rename.patch
Patch2: dbus-1.8.12-systemd-fix-shutdown-hangs.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
%if "%{stage1}" != "1"
BuildRequires: libICE-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
%endif
BuildRequires: libapparmor-devel
BuildRequires: libaudit-devel
BuildRequires: libcap-ng-devel
BuildRequires: libdw-devel
BuildRequires: libexpat-devel
BuildRequires: libgcrypt-devel
BuildRequires: libgpg-error-devel
BuildRequires: liblzma-devel
BuildRequires: libselinux-devel
BuildRequires: systemd-devel
BuildRequires: libsystemd-devel
## AUTOBUILDREQ-END
%if "%{stage1}" != "1"
BuildRequires: libXau-devel
BuildRequires: libxcb-devel
BuildRequires: libXdmcp-devel
%endif
BuildRequires: pkgconfig >= 0.19
BuildRequires: gettext-devel
BuildRequires: libxml2-devel
BuildRequires: libxml2-utils
BuildRequires: libglib-devel
%if "%{_build}" == "%{_host}"
BuildRequires: doxygen
BuildRequires: xmlto
%endif
Requires(pre): /usr/sbin/useradd
Requires(pre): /sbin/chkconfig
Requires(pre): filesystem >= 2.2-19mamba
Requires(pre): shadow
Requires(pre): systemd
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Provides: user(messagebus)
Provides: group(messagebus)
Provides: dbus-tools
Obsoletes: dbus-tools
## *AUTOSPEC-OFF*
Obsoletes: dbus-viewer
Obsoletes: dbus1-viewer
Obsoletes: dbus1
## *AUTOSPEC-ON*
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Obsoletes: dbus-tools < 1.14.0
Obsoletes: dbus-viewer < 1.14.0
Obsoletes: dbus1-viewer < 1.14.0
Obsoletes: dbus1 < 1.14.0
%description
D-BUS is a message bus, used for sending messages between applications.
@ -70,7 +50,7 @@ Conceptually, it fits somewhere in between raw sockets and CORBA in terms of com
Summary: Tools for D-BUS
Group: System/Tools
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Obsoletes: dbus1-tools
Obsoletes: dbus1-tools < 1.14.0
%description tools
dbus-launch: utility to start a message bus from a shell script
@ -87,17 +67,15 @@ D-Bus shared library.
Summary: Devel package for %{name}
Group: Development/Libraries
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Obsoletes: dbus-devel
Obsoletes: dbus-devel < 1.14.0
Provides: dbus-devel = %{?epoch:%epoch:}%{version}-%{release}
## *AUTOSPEC-OFF*
Obsoletes: dbus1-devel
Obsoletes: dbus1-devel < 1.14.0
Provides: dbus1-devel = %{?epoch:%epoch:}%{version}-%{release}
## *AUTOSPEC-ON*
%description -n lib%{name}-devel
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in terms of complexity.
This package contains static libraries and header files need for development.
This package contains static libraries and header files needed for development.
%package apidocs
Group: Documentation
@ -108,45 +86,26 @@ Requires: gtk-doc
%description apidocs
This package includes the %{name} API documentation.
%debug_package
%prep
%setup -q
%patch0 -p1 -b .cve_2006_6107
#%patch2 -p1
%build
%configure \
--enable-dnotify \
--enable-selinux \
--enable-systemd \
--enable-user-session \
--disable-checks \
--disable-asserts \
--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
%endif
%meson \
-Druntime_dir=/run \
-Dsystem_pid_file=/run/messagebus.pid \
-Dsystem_socket=/run/dbus/system_bus_socket \
-Dsession_socket_dir=/tmp
%make
#make check
%meson_build
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall
%meson_install
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}/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
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -171,8 +130,6 @@ fi
%post
%systemd_post %{name}
if [ $1 -ge 1 ]; then
/sbin/ldconfig
[ $1 -eq 1 ] && systemctl -q start dbus
%{_bindir}/dbus-uuidgen --ensure
fi
:
@ -190,14 +147,6 @@ fi
%systemd_postun %{name}
:
%posttrans
# clean old sysv broken links
find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
:
%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig
%files
%defattr(-,root,root)
%dir %{_sysconfdir}/dbus-1
@ -205,7 +154,6 @@ 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
%{_bindir}/dbus-cleanup-sockets
%{_bindir}/dbus-daemon
%{_bindir}/dbus-launch
@ -220,7 +168,6 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_prefix}/lib/tmpfiles.d/dbus.conf
%{_unitdir}/dbus.service
%{_unitdir}/dbus.socket
#%{_unitdir}/dbus.target.wants/dbus.socket
%{_unitdir}/multi-user.target.wants/dbus.service
%{_unitdir}/sockets.target.wants/dbus.socket
%{_userunitdir}/dbus.service
@ -230,9 +177,9 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%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
%dir %{_datadir}/xml/dbus-1
%{_datadir}/xml/dbus-1/*.dtd
%{_datadir}/xml/dbus-1/catalog.xml
%dir %{_var}/lib/dbus
%{_mandir}/man1/dbus-cleanup-sockets.*
%{_mandir}/man1/dbus-daemon.*
@ -252,8 +199,6 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%files -n lib%{name}-devel
%defattr(-,root,root)
%{_libdir}/libdbus-1.so
%{_libdir}/libdbus-1.a
%{_libdir}/libdbus-1.la
%{_libdir}/pkgconfig/*.pc
%dir %{_libdir}/dbus-1.0/include/dbus
%{_libdir}/dbus-1.0/include/dbus/dbus-arch-deps.h
@ -269,6 +214,37 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_docdir}/dbus/*
%changelog
* Mon Mar 03 2025 Automatic Build System <autodist@openmamba.org> 1.16.2-1mamba
- automatic version update by autodist
* Tue Dec 17 2024 Automatic Build System <autodist@openmamba.org> 1.16.0-1mamba
- automatic version update by autodist
* Thu Dec 05 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.12-1mamba
- update to 1.15.12
- fix requirements for pre and post scripts, other specfile fixes
* Tue Feb 20 2024 Automatic Build System <autodist@openmamba.org> 1.15.8-1mamba
- automatic update by autodist
* Sat Sep 02 2023 Automatic Build System <autodist@mambasoft.it> 1.14.10-1mamba
- automatic version update by autodist
* Wed Jun 07 2023 Automatic Build System <autodist@mambasoft.it> 1.14.8-1mamba
- automatic version update by autodist
* Thu Feb 09 2023 Automatic Build System <autodist@mambasoft.it> 1.14.6-1mamba
- automatic version update by autodist
* Thu Oct 06 2022 Automatic Build System <autodist@mambasoft.it> 1.14.4-1mamba
- automatic version update by autodist
* Wed Sep 28 2022 Automatic Build System <autodist@mambasoft.it> 1.14.2-1mamba
- automatic version update by autodist
* Fri Mar 04 2022 Automatic Build System <autodist@mambasoft.it> 1.14.0-1mamba
- automatic version update by autodist
* 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