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

[Dave Reisner]

    Date: Monday, June 11, 2012 @ 20:28:26
  Author: dreisner
Revision: 161495

upgpkg: dbus-core 1.6.0-2

- link against libsystemd
- move pid to /run/dbus/pid
- move system socket to /run/dbus/system_bus_socket
- cleanup rc.d script

Modified:
  dbus-core/trunk/PKGBUILD
  dbus-core/trunk/dbus

----------+
 PKGBUILD |   14 ++++++++------
 dbus     |   27 ++++++++++++---------------
 2 files changed, 20 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-11 23:40:45 UTC (rev 161494)
+++ PKGBUILD	2012-06-12 00:28:26 UTC (rev 161495)
@@ -4,12 +4,12 @@
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'shadow') # shadow for install scriptlet FS#29341
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
@@ -18,17 +18,19 @@
         dbus)
 md5sums=('16dcae2dd0c76e398381601ac9acdec4'
          '0ebde9920bde83fe26ce32351a7d8954'
-         '08f93dd19cffd1b45ab05c1fd4efb560')
+         '3675334f5b4442d1c3e9a008f176e85f')
 
 build() {
   cd "${srcdir}/dbus-${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 \
+      --with-system-pid-file=/run/dbus/pid \
+      --with-system-socket=/run/dbus/system_bus_socket \
       --enable-inotify --disable-dnotify \
       --disable-verbose-mode --disable-static \
       --disable-tests --disable-asserts \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
+      --enable-systemd
   make
 }
 
@@ -46,6 +48,6 @@
   #Fix configuration file
   sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
 
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
+  install -dm755 "${pkgdir}/usr/share/licenses/dbus-core"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
 }

Modified: dbus
===================================================================
--- dbus	2012-06-11 23:40:45 UTC (rev 161494)
+++ dbus	2012-06-12 00:28:26 UTC (rev 161495)
@@ -4,18 +4,17 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-case "$1" in
+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
+        if [[ ! -d /run/dbus ]] ; then
+            install -m755 -g 81 -o 81 -d /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
+        if ! dbus-daemon --system; then
             stat_fail
         else
             add_daemon dbus
@@ -24,27 +23,25 @@
         ;;
     stop)
         stat_busy "Stopping D-BUS system messagebus"
-	[ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
+        if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
             stat_fail
         else
-	    rm -f /var/run/dbus.pid
+            rm -f /run/dbus/pid
             rm_daemon dbus
             stat_done
         fi
         ;;
     restart)
         $0 stop
-	sleep 1
+        sleep 1
         $0 start
         ;;
     reload)
         stat_busy "Reloading D-BUS configuration"
-        [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \
+        if ! { [[ -f /run/dbus/pid ]] && dbus-send \
                 --system --type=method_call \
                 --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig
-        if [ $? -gt 0 ]; then
+                / org.freedesktop.DBus.ReloadConfig; }; then
             stat_fail
         else
             stat_done
@@ -52,6 +49,6 @@
         ;;
     *)
         echo "usage: $0 {start|stop|restart|reload}"
-	;;
+        ;;
 esac
 exit 0