[oe-commits] org.oe.dev dbus: add 1.0.2

[koen commit]

dbus: add 1.0.2

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 5ab38f8d2d2b536f4d59e4f5fae2c6749f0d694f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5ab38f8d2d2b536f4d59e4f5fae2c6749f0d694f
Files:
1
packages/dbus/dbus-0.95
packages/dbus/dbus-0.95/cross.patch
packages/dbus/dbus-0.95/dbus-1.init
packages/dbus/dbus-0.95/fix-install-daemon.patch
packages/dbus/dbus-1.0.2
packages/dbus/dbus-1.0.2/cross.patch
packages/dbus/dbus-1.0.2/dbus-1.init
packages/dbus/dbus-1.0.2/fix-install-daemon.patch
packages/dbus/dbus_1.0.2.bb
Diffs:

#
# mt diff -r5a6cf1f21b6d744fa49dd477e4a59feb602dbd7c -r5ab38f8d2d2b536f4d59e4f5fae2c6749f0d694f
#
# 
# 
# delete "packages/dbus/dbus-0.95"
# 
# delete "packages/dbus/dbus-0.95/cross.patch"
# 
# delete "packages/dbus/dbus-0.95/dbus-1.init"
# 
# delete "packages/dbus/dbus-0.95/fix-install-daemon.patch"
# 
# add_dir "packages/dbus/dbus-1.0.2"
# 
# add_file "packages/dbus/dbus-1.0.2/cross.patch"
#  content [8893afa8766367ecce4e78b1bbede8c7e4781336]
# 
# add_file "packages/dbus/dbus-1.0.2/dbus-1.init"
#  content [bc3a39440ac2899bf95874522964413b2f7b584a]
# 
# add_file "packages/dbus/dbus-1.0.2/fix-install-daemon.patch"
#  content [a130a0f9e1442b0848f09d45516d4c1fae678502]
# 
# add_file "packages/dbus/dbus_1.0.2.bb"
#  content [fef9998136f6cd4f48ded9d758df0597c642d934]
# 
============================================================
--- packages/dbus/dbus-1.0.2/cross.patch	8893afa8766367ecce4e78b1bbede8c7e4781336
+++ packages/dbus/dbus-1.0.2/cross.patch	8893afa8766367ecce4e78b1bbede8c7e4781336
@@ -0,0 +1,10 @@
+--- /tmp/configure.in	2006-11-09 21:47:10.000000000 +0100
++++ dbus-0.95/configure.in	2006-11-09 21:48:13.108554000 +0100
+@@ -719,6 +719,7 @@
+     exit (0);
+ ]])],
+               [ac_cv_have_abstract_sockets=yes],
++	      [ac_cv_have_abstract_sockets=no],
+               [ac_cv_have_abstract_sockets=no]
+ )])
+ AC_LANG_POP(C)
============================================================
--- packages/dbus/dbus-1.0.2/dbus-1.init	bc3a39440ac2899bf95874522964413b2f7b584a
+++ packages/dbus/dbus-1.0.2/dbus-1.init	bc3a39440ac2899bf95874522964413b2f7b584a
@@ -0,0 +1,96 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters at debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+  . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER $PIDDIR
+    chgrp $DAEMONUSER $PIDDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+
+  if [ ! -d $UUIDDIR ]; then
+    mkdir -p $UUIDDIR
+    chown $DAEMONUSER $UUIDDIR
+    chgrp $DAEMONUSER $UUIDDIR
+  fi
+ 
+  dbus-uuidgen --ensure  
+
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      run-parts --reverse --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  restart|force-reload)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
============================================================
--- packages/dbus/dbus-1.0.2/fix-install-daemon.patch	a130a0f9e1442b0848f09d45516d4c1fae678502
+++ packages/dbus/dbus-1.0.2/fix-install-daemon.patch	a130a0f9e1442b0848f09d45516d4c1fae678502
@@ -0,0 +1,13 @@
+Index: dbus-0.94/bus/Makefile.am
+===================================================================
+--- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
++++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
+@@ -110,7 +110,7 @@
+ 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 	fi
+-	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
============================================================
--- packages/dbus/dbus_1.0.2.bb	fef9998136f6cd4f48ded9d758df0597c642d934
+++ packages/dbus/dbus_1.0.2.bb	fef9998136f6cd4f48ded9d758df0597c642d934
@@ -0,0 +1,2 @@
+require dbus.inc
+