remove profile.d/dbus-session.sh script; DBUS variables are exported by pam_systemd [release 1.13.8-2mamba;Tue Mar 05 2019]

configured with --enable-user-session [release 1.13.8-1mamba;Wed Feb 20 2019]

dbus-1.8.12-systemd-fix-shutdown-hangs.patch

@@ -0,0 +1,11 @@
+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

dbus.spec

@@ -2,19 +2,20 @@
 %define        messagebus_gid  25
 
 Name:          dbus
-Version:       1.8.4
+Version:       1.13.8
-Release:       1mamba
+Release:       2mamba
 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
 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
@@ -25,13 +26,12 @@ BuildRequires: libX11-devel
 %endif
 BuildRequires: libaudit-devel
 BuildRequires: libcap-ng-devel
+BuildRequires: libdw-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
 ## AUTOBUILDREQ-END
 %if "%{stage1}" != "1"
@@ -111,18 +111,19 @@ This package includes the %{name} API documentation.
 %prep
 %setup -q
 %patch0 -p1 -b .cve_2006_6107
-%patch1 -p1
+#%patch2 -p1
 
 %build
 %configure \
     --enable-dnotify \
     --enable-selinux \
 	--enable-systemd \
+	--enable-user-session \
     --disable-checks \
     --disable-asserts \
-    --with-init-scripts=redhat \
+	--runstatedir=/run \
-    --with-system-pid-file=%{_var}/run/messagebus.pid \
+    --with-system-pid-file=/run/messagebus.pid \
-    --with-system-socket=%{_var}/run/dbus/system_bus_socket \
+    --with-system-socket=/run/dbus/system_bus_socket \
     --with-session-socket-dir=/tmp \
 %if "%{stage1}" == "1"
    --without-x
@@ -138,20 +139,24 @@ 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
-
-# rename initscript for systemd compatibility
-mv %{buildroot}%{_initrddir}/messagebus %{buildroot}%{_initrddir}/dbus
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %pre
 if [ $1 -ge 1 ]; then
+   # /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,33 +166,30 @@ fi
 :
 
 %post
+%systemd_post %{name}
 if [ $1 -ge 1 ]; then
    /sbin/ldconfig
-   /sbin/chkconfig --del messagebus 2>&1 || true
+   [ $1 -eq 1 ] && systemctl -q start dbus
-   /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
+%postun
-# this is required because the obsoletion of dbus1 removes the
+%systemd_postun %{name}
-# user and disables the service
+:
-/usr/sbin/useradd -u %{messagebus_uid} -c 'DBUS user' -d /dev/null \
+
-   -s /bin/false messagebus 2>/dev/null
+%posttrans
-/sbin/chkconfig --add dbus
+# clean old sysv broken links
-service dbus start
+find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;   
-%{_bindir}/dbus-uuidgen --ensure
 :
 
 %post -n lib%{name} -p /sbin/ldconfig
@@ -195,27 +197,38 @@ service dbus start
 
 %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
+#%{_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
+%{_prefix}/lib/sysusers.d/dbus.conf
-/lib/systemd/system/dbus.socket
+%{_prefix}/lib/tmpfiles.d/dbus.conf
-/lib/systemd/system/dbus.target.wants/dbus.socket
+%{_unitdir}/dbus.service
-/lib/systemd/system/multi-user.target.wants/dbus.service
+%{_unitdir}/dbus.socket
-/lib/systemd/system/sockets.target.wants/dbus.socket
+#%{_unitdir}/dbus.target.wants/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
+%{_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 %{_var}/lib/dbus
 %{_mandir}/man1/dbus-cleanup-sockets.*
@@ -225,6 +238,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)
@@ -240,24 +255,10 @@ service dbus start
 %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/*
-%{_includedir}/dbus-1.0/dbus/dbus-bus.h
+%dir %{_libdir}/cmake/DBus1
-%{_includedir}/dbus-1.0/dbus/dbus-connection.h
+%{_libdir}/cmake/DBus1/DBus1Config*.cmake
-%{_includedir}/dbus-1.0/dbus/dbus-errors.h
+#%doc ChangeLog NEWS README
-%{_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
 
 %files apidocs
 %defattr(-,root,root)
@@ -265,6 +266,46 @@ service dbus start
 %{_docdir}/dbus/*
 
 %changelog
+* 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