[arch-commits] Commit in dbus/trunk (PKGBUILD dbus dbus.install)

Jan de Groot jgc at archlinux.org
Sun Mar 8 12:56:22 UTC 2009


    Date: Sunday, March 8, 2009 @ 08:56:22
  Author: jgc
Revision: 29359

upgpkg: dbus 1.2.4.4permissive-1

Modified:
  dbus/trunk/PKGBUILD
Deleted:
  dbus/trunk/dbus
  dbus/trunk/dbus.install

--------------+
 PKGBUILD     |   18 +++++++++---------
 dbus         |   57 ---------------------------------------------------------
 dbus.install |   21 ---------------------
 3 files changed, 9 insertions(+), 87 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-08 12:54:15 UTC (rev 29358)
+++ PKGBUILD	2009-03-08 12:56:22 UTC (rev 29359)
@@ -3,7 +3,7 @@
 # Contributor: Link Dupont <link at subpop.net>
 #
 pkgname=dbus
-pkgver=1.2.4
+pkgver=1.2.4.4permissive
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -12,11 +12,11 @@
 depends=("dbus-core>=${pkgver}" 'libx11' 'libsm')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	30-dbus)
-md5sums=('2e643910a09f44b000a0d76038637999'
+md5sums=('ec09ba2632edbc79133f2a5efaf0249b'
          'd14e59575f04e55d21a04907b6fd9f3c')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
   	      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
               --with-system-pid-file=/var/run/dbus.pid \
@@ -25,13 +25,13 @@
 	      --disable-tests --disable-asserts || return 1
   cd tools || return 1
   make dbus-launch || return 1
-  install -m755 -d ${pkgdir}/usr/bin
-  install -m755 -d ${pkgdir}/usr/share/man/man1
-  install -m755 dbus-launch ${pkgdir}/usr/bin/ || return 1
-  install -m644 dbus-launch.1 ${pkgdir}/usr/share/man/man1/ || return 1
+  install -m755 -d "${pkgdir}/usr/bin"
+  install -m755 -d "${pkgdir}/usr/share/man/man1"
+  install -m755 dbus-launch "${pkgdir}/usr/bin/" || return 1
+  install -m644 dbus-launch.1 "${pkgdir}/usr/share/man/man1/" || return 1
 
-  install -m755 -d ${pkgdir}/etc/X11/xinit/xinitrc.d
-  install -m755 ${srcdir}/30-dbus ${pkgdir}/etc/X11/xinit/xinitrc.d/ || return 1
+  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
+  install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/" || return 1
 
   install -d -m755 ${startdir}/pkg/usr/share/licenses/dbus
   install -m644 ../COPYING ${pkgdir}/usr/share/licenses/dbus/ || return 1

Deleted: dbus
===================================================================
--- dbus	2009-03-08 12:54:15 UTC (rev 29358)
+++ dbus	2009-03-08 12:56:22 UTC (rev 29359)
@@ -1,57 +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 [ ! -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
-
-        /usr/bin/dbus-daemon --system
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon dbus
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping D-BUS system messagebus"
-	[ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid`
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-	    rm -f /var/run/dbus.pid
-            rm_daemon dbus
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    reload)
-        stat_busy "Reloading D-BUS configuration"
-        [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \
-                --system --type=method_call \
-                --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0

Deleted: dbus.install
===================================================================
--- dbus.install	2009-03-08 12:54:15 UTC (rev 29358)
+++ dbus.install	2009-03-08 12:56:22 UTC (rev 29359)
@@ -1,21 +0,0 @@
-post_install() {
-  getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus
-  getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
-  usr/bin/passwd -l dbus &>/dev/null
-  dbus-uuidgen --ensure
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-
-  #Make sure new rc script can shutdown running dbus
-  [ -f var/run/dbus/pid ] && mv var/run/dbus/pid var/run/dbus.pid
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  usr/sbin/userdel dbus &>/dev/null
-  usr/sbin/groupdel dbus &>/dev/null
-}




More information about the arch-commits mailing list