[arch-commits] CVS update of extra/daemons/dbus (PKGBUILD dbus)

[Jan de Groot]

    Date: Friday, March 21, 2008 @ 18:59:55
  Author: jgc
    Path: /home/cvs-extra/extra/daemons/dbus

Modified: PKGBUILD (1.9 -> 1.10) dbus (1.2 -> 1.3)

upgpkg: dbus 1.1.20-2
    Fix userid to be dbus instead of 81 in config, implement FS#9847


----------+
 PKGBUILD |    9 ++++++---
 dbus     |    3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)


Index: extra/daemons/dbus/PKGBUILD
diff -u extra/daemons/dbus/PKGBUILD:1.9 extra/daemons/dbus/PKGBUILD:1.10
--- extra/daemons/dbus/PKGBUILD:1.9	Wed Mar 12 16:53:50 2008
+++ extra/daemons/dbus/PKGBUILD	Fri Mar 21 18:59:55 2008
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.9 2008/03/12 20:53:50 jgc Exp $
+# $Id: PKGBUILD,v 1.10 2008/03/21 22:59:55 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Link Dupont <link at subpop.net>
 #
 pkgname=dbus
 pkgver=1.1.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	dbus)
-md5sums=('c552b9bc4b69e4c602644abc21b7661e' 'bfb54a989fcde1fd2d6aef7fb45ee109')
+md5sums=('c552b9bc4b69e4c602644abc21b7661e' 'c109dfdabf11e891dfd6c99e54dd6f56')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -30,6 +30,9 @@
   install -m755 -d  ${startdir}/pkg/etc/rc.d || return 1
   install -m 755 ${startdir}/dbus ${startdir}/pkg/etc/rc.d/ || return 1
 
+  #Fix configuration file
+  sed -i -e 's|<user>81</user>|<user>dbus</user>|' ${startdir}/pkg/etc/dbus-1/system.conf || return 1
+
   #install .keep files so pacman doesn't delete empty dirs
   touch ${startdir}/pkg/usr/share/dbus-1/services/.keep || return 1
   touch ${startdir}/pkg/usr/share/dbus-1/system-services/.keep || return 1
Index: extra/daemons/dbus/dbus
diff -u extra/daemons/dbus/dbus:1.2 extra/daemons/dbus/dbus:1.3
--- extra/daemons/dbus/dbus:1.2	Sun Feb  4 16:41:22 2007
+++ extra/daemons/dbus/dbus	Fri Mar 21 18:59:55 2008
@@ -7,6 +7,9 @@
 case "$1" in
     start)
         stat_busy "Starting D-BUS system messagebus"
+	if [ ! -x /var/run/dbus ] ; then
+	    install -m755 -g 81 -o 81 -d /var/run/dbus
+	fi
         if [ -x /usr/bin/dbus-uuidgen ] ; then
             /usr/bin/dbus-uuidgen --ensure
         fi