automatic version update by autodist [release 1.16.2-1mamba;Mon Mar 03 2025]

fix requirements for pre and post scripts, other specfile fixes [release 1.15.12-1mamba;Thu Dec 05 2024]

dbus-1.0.1-cve_2006_6107.patch

@@ -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;

dbus-1.6.8-initscript-rename.patch

@@ -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
- 

dbus-initscript

@@ -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

dbus-session-profile.sh

@@ -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

dbus.spec

@@ -2,63 +2,45 @@
 %define        messagebus_gid  25
 
 Name:          dbus
-Version:       1.8.2
+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
-Source:        http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-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
+URL:           https://www.freedesktop.org/wiki/Software/dbus/
+Source:        http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.xz
 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: libexpat-devel
-BuildRequires: libgcrypt-devel
-BuildRequires: libgpg-error-devel
-BuildRequires: liblzma-devel
-BuildRequires: libpcre-devel
 BuildRequires: libselinux-devel
-BuildRequires: libsepol-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.
@@ -68,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 
@@ -85,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
@@ -106,52 +86,39 @@ Requires:      gtk-doc
 %description apidocs
 This package includes the %{name} API documentation.
 
-%debug_package
-
 %prep
 %setup -q
-%patch0 -p1 -b .cve_2006_6107
-%patch1 -p1
 
 %build
-%configure \
-    --enable-dnotify \
-    --enable-selinux \
-	--enable-systemd \
-    --disable-checks \
-    --disable-asserts \
-    --with-init-scripts=redhat \
-    --with-system-pid-file=%{_var}/run/messagebus.pid \
-    --with-system-socket=%{_var}/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}/run/dbus
 install -d %{buildroot}%{_var}/lib/dbus
 
-#install -m 0755 %{S:1} %{buildroot}%{_initrddir}/messagebus
-install -D -m 0755 %{S:2} %{buildroot}%{_sysconfdir}/profile.d/dbus-session.sh
-
-# rename initscript for systemd compatibility
-mv %{buildroot}%{_initrddir}/messagebus %{buildroot}%{_initrddir}/dbus
-
 %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 \
@@ -161,62 +128,58 @@ fi
 :
 
 %post
+%systemd_post %{name}
 if [ $1 -ge 1 ]; then
-   /sbin/ldconfig
-   /sbin/chkconfig --del messagebus 2>&1 || true
-   /sbin/chkconfig --add dbus
-   [ $1 -eq 1 ] && service dbus start
    %{_bindir}/dbus-uuidgen --ensure
 fi
 :
 
 %preun
 # erase
+%systemd_preun %{name}
 if [ $1 -eq 0 ]; then
-   service dbus stop 2>/dev/null
-   /sbin/chkconfig --del dbus
    userdel messagebus || true
    groupdel messagebus || true
 fi
 :
 
-%triggerpostun -- dbus1
-# this is required because the obsoletion of dbus1 removes the
-# user and disables the service
-/usr/sbin/useradd -u %{messagebus_uid} -c 'DBUS user' -d /dev/null \
-   -s /bin/false messagebus 2>/dev/null
-/sbin/chkconfig --add dbus
-service dbus start
-%{_bindir}/dbus-uuidgen --ensure
+%postun
+%systemd_postun %{name}
 :
 
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root)
-%{_initrddir}/dbus
 %dir %{_sysconfdir}/dbus-1
 %config %{_sysconfdir}/dbus-1/session.conf
 %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
 %{_bindir}/dbus-monitor
 %{_bindir}/dbus-run-session
 %{_bindir}/dbus-send
+%{_bindir}/dbus-test-tool
+%{_bindir}/dbus-update-activation-environment
 %{_bindir}/dbus-uuidgen
 %attr(4750,root,messagebus) %{_libexecdir}/dbus-daemon-launch-helper
-/lib/systemd/system/dbus.service
-/lib/systemd/system/dbus.socket
-/lib/systemd/system/dbus.target.wants/dbus.socket
-/lib/systemd/system/multi-user.target.wants/dbus.service
-/lib/systemd/system/sockets.target.wants/dbus.socket
+%{_prefix}/lib/sysusers.d/dbus.conf
+%{_prefix}/lib/tmpfiles.d/dbus.conf
+%{_unitdir}/dbus.service
+%{_unitdir}/dbus.socket
+%{_unitdir}/multi-user.target.wants/dbus.service
+%{_unitdir}/sockets.target.wants/dbus.socket
+%{_userunitdir}/dbus.service
+%{_userunitdir}/dbus.socket
+%{_userunitdir}/sockets.target.wants/dbus.socket
+%dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/services
-%dir %{_var}/run/dbus
+%{_datadir}/dbus-1/session.conf
+%{_datadir}/dbus-1/system.conf
+%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.*
@@ -225,6 +188,8 @@ service dbus start
 %{_mandir}/man1/dbus-uuidgen.*
 %{_mandir}/man1/dbus-launch.*
 %{_mandir}/man1/dbus-monitor.*
+%{_mandir}/man1/dbus-test-tool.1*
+%{_mandir}/man1/dbus-update-activation-environment.1*
 
 %files -n lib%{name}
 %defattr(-,root,root)
@@ -234,30 +199,14 @@ service dbus start
 %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
 %dir %{_includedir}/dbus-1.0/dbus
-%{_includedir}/dbus-1.0/dbus/dbus-address.h
-%{_includedir}/dbus-1.0/dbus/dbus-bus.h
-%{_includedir}/dbus-1.0/dbus/dbus-connection.h
-%{_includedir}/dbus-1.0/dbus/dbus-errors.h
-%{_includedir}/dbus-1.0/dbus/dbus-macros.h
-%{_includedir}/dbus-1.0/dbus/dbus-memory.h
-%{_includedir}/dbus-1.0/dbus/dbus-message.h
-%{_includedir}/dbus-1.0/dbus/dbus-misc.h
-%{_includedir}/dbus-1.0/dbus/dbus-pending-call.h
-%{_includedir}/dbus-1.0/dbus/dbus-protocol.h
-%{_includedir}/dbus-1.0/dbus/dbus-server.h
-%{_includedir}/dbus-1.0/dbus/dbus-shared.h
-%{_includedir}/dbus-1.0/dbus/dbus-signature.h
-%{_includedir}/dbus-1.0/dbus/dbus-syntax.h
-%{_includedir}/dbus-1.0/dbus/dbus-threads.h
-%{_includedir}/dbus-1.0/dbus/dbus-types.h
-%{_includedir}/dbus-1.0/dbus/dbus.h
-%doc ChangeLog NEWS README
+%{_includedir}/dbus-1.0/dbus/*
+%dir %{_libdir}/cmake/DBus1
+%{_libdir}/cmake/DBus1/DBus1Config*.cmake
+#%doc ChangeLog NEWS README
 
 %files apidocs
 %defattr(-,root,root)
@@ -265,6 +214,86 @@ service dbus start
 %{_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
+
+* 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
+
+* Sat Jan 10 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.14-1mamba
+- update to 1.8.14
+- remove previous patch apparently not needed anymore with systemd 218
+
+* Fri Dec 05 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.8-2mamba
+- patch systemd service file to fix shutdown hang (http://superuser.com/questions/767414/why-does-systemd-hang-during-reboot)
+- remove old initscript and complete systemd migration
+
+* Sat Sep 20 2014 Automatic Build System <autodist@mambasoft.it> 1.8.8-1mamba
+- automatic version update by autodist
+
+* Sat Jul 12 2014 Automatic Build System <autodist@mambasoft.it> 1.8.6-1mamba
+- automatic version update by autodist
+
+* Sat Jun 14 2014 Automatic Build System <autodist@mambasoft.it> 1.8.4-1mamba
+- automatic version update by autodist
+
 * Wed May 14 2014 Automatic Build System <autodist@mambasoft.it> 1.8.2-1mamba
 - automatic version update by autodist