Sun May 5 01:06:40 PDT 2013

4 files changed, 11 insertions, 76 deletions

diff --git a/core/dbus/30-dbus b/core/dbus/30-dbus
index 69d2660da..42b3a5ff7 100644
--- a/core/dbus/30-dbus
+++ b/core/dbus/30-dbus
@@ -1,8 +1,6 @@
 #!/bin/bash
 
 # launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  eval `$dbuslaunch --sh-syntax --exit-with-session`
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then
+  eval $(dbus-launch --sh-syntax --exit-with-session)
 fi
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 32b9a30bf..fc6448616 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 172792 2012-12-06 01:48:03Z tomegun $
+# $Id: PKGBUILD 184216 2013-05-03 22:55:42Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.6.8
-pkgrel=6
+pkgver=1.6.10
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-# do not depend on systemd to avoid circular dep,
-# dep on shadow for install scriptlet FS#29341
-depends=('expat' 'coreutils' 'filesystem' 'shadow')
-makedepends=('libx11')
+depends=('expat' 'coreutils' 'filesystem')
+makedepends=('libx11' 'systemd')
 optdepends=('libx11: dbus-launch support')
 provides=('dbus-core')
 conflicts=('dbus-core')
 replaces=('dbus-core')
 options=(!libtool)
-install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
-        30-dbus dbus systemd-user-session.patch)
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
+        30-dbus systemd-user-session.patch)
 
 build() {
   cd dbus-$pkgver
@@ -47,13 +44,10 @@ package(){
 
   rm -rf "$pkgdir/var/run"
 
-  install -Dm755 ../dbus "$pkgdir/etc/rc.d/dbus"
-
   install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
-md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2'
-         '9fafe8b28460aeaa6054309ef4c5ed92'
-         'f0364f3f5dc5f653bb05d39aa36e3264'
+md5sums=('de4970c20629aeb958a12132415b3630'
+         '3314d727fa57fc443fce25b5cbeebbcc'
          'd8a1bd529b3ddca671ee1a695a143db9')
diff --git a/core/dbus/dbus b/core/dbus/dbus
deleted file mode 100644
index bf532a274..000000000
--- a/core/dbus/dbus
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case $1 in
-    start)
-        stat_busy "Starting D-BUS system messagebus"
-        if [[ ! -d /run/dbus ]] ; then
-            install -m755 -g 81 -o 81 -d /run/dbus
-        fi
-
-        if ! dbus-daemon --system; then
-            stat_fail
-        else
-            add_daemon dbus
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping D-BUS system messagebus"
-        if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
-            stat_fail
-        else
-            rm -f /run/dbus/pid
-            rm_daemon dbus
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-    reload)
-        stat_busy "Reloading D-BUS configuration"
-        if ! { [[ -f /run/dbus/pid ]] && dbus-send \
-                --system --type=method_call \
-                --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig; }; then
-            stat_fail
-        else
-            stat_done
-        fi
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart|reload}"
-        ;;
-esac
-exit 0
diff --git a/core/dbus/dbus.install b/core/dbus/dbus.install
deleted file mode 100644
index 01506cf96..000000000
--- a/core/dbus/dbus.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_upgrade() {
-  # Make sure new rc script can shutdown running dbus
-  if [ -f run/dbus.pid -a -d run/dbus ]; then
-    mv run/dbus.pid run/dbus/pid
-  fi
-}