[csw-devel] SF.net SVN: gar:[5580] csw/mgar/pkg/dbus/trunk

[wbonnet at users.sourceforge.net]

Revision: 5580
          http://gar.svn.sourceforge.net/gar/?rev=5580&view=rev
Author:   wbonnet
Date:     2009-07-15 14:00:49 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
Fix issue 3626

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/checksums
    csw/mgar/pkg/dbus/trunk/files/cswdbus

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2009-07-15 12:27:44 UTC (rev 5579)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2009-07-15 14:00:49 UTC (rev 5580)
@@ -1,5 +1,5 @@
 GARNAME      = dbus
-GARVERSION   = 1.2.16
+GARVERSION   = 1.2.12
 CATEGORIES   = lib
 
 DESCRIPTION  = DBus Message Bus System

Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums	2009-07-15 12:27:44 UTC (rev 5579)
+++ csw/mgar/pkg/dbus/trunk/checksums	2009-07-15 14:00:49 UTC (rev 5580)
@@ -1,6 +1,6 @@
-39bd582c3b06a261cac44d4cab6fd60b  download/dbus-1.2.12.tar.gz
 3b3e5d4ea2722ae6258c8ee0f7688c95  download/CSWdbus.gspec
 6e26e51243c4551ac222112edf67b5db  download/CSWdbus.preinstall
+00bb177908f6107ef2f6caa082475f34  download/CSWlibdbus.gspec
 1d5dad88ae16c76d47398f8e9c2e09a0  download/CSWlibdbusdev.gspec
-00bb177908f6107ef2f6caa082475f34  download/CSWlibdbus.gspec
-92b99c85d75cac9a2d5f4d3fc43a278d  download/cswdbus
+2c465012736d7810257573dff4cd04b7  download/cswdbus
+39bd582c3b06a261cac44d4cab6fd60b  download/dbus-1.2.12.tar.gz

Modified: csw/mgar/pkg/dbus/trunk/files/cswdbus
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/cswdbus	2009-07-15 12:27:44 UTC (rev 5579)
+++ csw/mgar/pkg/dbus/trunk/files/cswdbus	2009-07-15 14:00:49 UTC (rev 5580)
@@ -36,7 +36,7 @@
                 rm -f $DBUS_VAR_RUN_DIR/pid
         fi
 
-        /opt/csw/bin/dbus-daemon --system
+        /opt/csw/bin/dbus-daemon --system --config-file=/opt/csw/etc/dbus-1/system.conf
         err=$?
         if [ $err -ne 0 ]; then
                 echo "dbus failed to start: error $err"
@@ -45,7 +45,10 @@
         ;;
 
 'stop')
-# kill -9 `/opt/csw/bin/dbus-daemon --print-pid`
+        if [ -f $DBUS_VAR_RUN_DIR/pid ]; then
+		kill -9 `cat $DBUS_VAR_RUN_DIR/pid`
+                rm -f $DBUS_VAR_RUN_DIR/pid
+        fi
         ;;
 
 *)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.