- upstart subpackage

- Release: 3

Changed files:
    dbus.spec -> 1.201
    messagebus.init -> 1.19
    messagebus.upstart -> 1.1

diff --git a/dbus.spec b/dbus.spec
index 8332cc58d7ece0b9d1a70ecd7096d50d565e9669..18b4a36d3fa9d4f17fa69a53f3bcda383b1362fb 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -7,7 +7,7 @@ Summary:        D-BUS message bus
 Summary(pl.UTF-8):     Magistrala przesyłania komunikatów D-BUS
 Name:          dbus
 Version:       1.2.24
-Release:       2
+Release:       3
 License:       AFL v2.1 or GPL v2
 Group:         Libraries
 Source0:       http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@ Source1:      messagebus.init
 Source2:       %{name}-daemon-1-profile.d-sh
 Source3:       %{name}-sysconfig
 Source4:       %{name}-xinitrc.sh
+Source5:       messagebus.upstart
 Patch0:                %{name}-nolibs.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-no_fatal_checks.patch
@@ -30,7 +31,7 @@ BuildRequires:        libcap-ng-devel
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.561
 BuildRequires: sed >= 4.0
 BuildRequires: xmlto
 BuildRequires: xorg-lib-libX11-devel
@@ -65,6 +66,19 @@ D-BUS to system przesyłania komunikatów pomiędzy aplikacjami. Jest
 używany zarówno jako ogólnosystemowa usługa magistrali komunikatów jak
 i możliwość przesyłania komunikatów w ramach jednej sesji użytkownika.
 
+%package upstart
+Summary:       Upstart job description for system message bus
+Summary(pl.UTF-8):     Opis zadania Upstart dla magistrali systemowej DBus
+Group:         Daemons
+Requires:      %{name} = %{version}-%{release}
+Requires:      upstart >= 0.6
+
+%description upstart
+Upstart job description for system message bus.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla magistrali systemowej DBus.
+
 %package dirs
 Summary:       D-BUS directories
 Summary(pl.UTF-8):     Katalogi D-BUS
@@ -139,7 +153,7 @@ Statyczna biblioteka D-BUS.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d} \
+install -d $RPM_BUILD_ROOT/etc/{init,profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d} \
        $RPM_BUILD_ROOT%{_datadir}/dbus-1/{services,interfaces} \
        $RPM_BUILD_ROOT%{_localstatedir}/run/dbus \
        $RPM_BUILD_ROOT/%{_lib}
@@ -151,6 +165,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/init/messagebus.conf
 
 # upstart (/sbin/init) requires libdbus so it must be in /lib(64)
 mv -f $RPM_BUILD_ROOT%{_libdir}/libdbus-1.so.* $RPM_BUILD_ROOT/%{_lib}
@@ -180,6 +195,12 @@ if [ "$1" = "0" ]; then
        %groupremove messagebus
 fi
 
+%post upstart
+%upstart_post messagebus
+
+%postun upstart
+%upstart_postun messagebus
+
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
@@ -226,6 +247,10 @@ fi
 %{_mandir}/man1/dbus-monitor.1*
 %{_mandir}/man1/dbus-send.1*
 
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/messagebus.conf
+
 %files dirs
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/dbus-1

diff --git a/messagebus.init b/messagebus.init
index 79953697bd33ee8a2dc496356e47839c42d5aaf0..99c52ee7f6781d5754a44d52a467371e832b6b7e 100644 (file)
--- a/messagebus.init
+++ b/messagebus.init
@@ -32,6 +32,7 @@ start() {
                return
        fi
 
+       emit starting messagebus
        msg_starting "D-BUS Message bus"
        # if capability is modular, load it
        if modinfo capability >/dev/null 2>&1; then
@@ -40,7 +41,10 @@ start() {
        dbus-uuidgen --ensure
        daemon --pidfile dbus.pid /usr/bin/dbus-daemon --system
        RETVAL=$?
-       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/messagebus
+       if [ $RETVAL -eq 0 ] ; then
+               touch /var/lock/subsys/messagebus
+               emit --no-wait started messagebus
+       fi
 }
 
 stop() {
@@ -50,9 +54,11 @@ stop() {
        fi
 
        # Stop daemons.
+       emit stopping messagebus
        msg_stopping "D-BUS Message bus"
        killproc --pidfile dbus.pid dbus-daemon
        rm -f /var/lock/subsys/messagebus /var/run/dbus.pid
+       emit --no-wait stopped messagebus
 }
 
 condrestart() {
@@ -78,6 +84,8 @@ reload() {
        RETVAL=$?
 }
 
+upstart_controlled
+
 RETVAL=0
 # See how we were called.
 case "$1" in

diff --git a/messagebus.upstart b/messagebus.upstart
new file mode 100644 (file)
index 0000000..0094fdb
--- /dev/null
+++ b/messagebus.upstart
@@ -0,0 +1,16 @@
+description "The D-BUS systemwide message bus"
+
+start on started SERVICE=syslog-ng
+stop on pld.shutdown-started
+
+pre-start script
+       if modinfo capability >/dev/null 2>&1; then
+               modprobe -s capability
+       fi
+       dbus-uuidgen --ensure
+end script
+
+exec /usr/bin/dbus-daemon --system --fork
+expect fork
+
+# vi: ft=upstart