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

[Dave Reisner]

    Date: Sunday, June 24, 2012 @ 15:56:14
  Author: dreisner
Revision: 162301

upgpkg: dbus-core 1.6.0-4

- remove dbus-uuidgen from rc script (this is already done on install)
- juggle machine-id file properly to /etc to play nicely with systemd

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

--------------+
 PKGBUILD     |    4 ++--
 dbus         |    3 ---
 dbus.install |    7 ++++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-24 19:35:10 UTC (rev 162300)
+++ PKGBUILD	2012-06-24 19:56:14 UTC (rev 162301)
@@ -4,7 +4,7 @@
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
@@ -18,7 +18,7 @@
         dbus)
 md5sums=('16dcae2dd0c76e398381601ac9acdec4'
          '0ebde9920bde83fe26ce32351a7d8954'
-         '3675334f5b4442d1c3e9a008f176e85f')
+         'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"

Modified: dbus
===================================================================
--- dbus	2012-06-24 19:35:10 UTC (rev 162300)
+++ dbus	2012-06-24 19:56:14 UTC (rev 162301)
@@ -10,9 +10,6 @@
         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
 
         if ! dbus-daemon --system; then
             stat_fail

Modified: dbus.install
===================================================================
--- dbus.install	2012-06-24 19:35:10 UTC (rev 162300)
+++ dbus.install	2012-06-24 19:56:14 UTC (rev 162301)
@@ -2,7 +2,12 @@
   getent group dbus >/dev/null || groupadd -g 81 dbus
   getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
   passwd -l dbus &>/dev/null
-  dbus-uuidgen --ensure=/etc/machine-id
+
+  if [[ ! -L var/lib/dbus/machine-id ]]; then
+    [[ -e var/lib/dbus/machine-id && ! -e etc/machine-id ]] && mv var/lib/dbus/machine-id etc/
+    ln -sf ../../../etc/machine-id var/lib/dbus/
+  fi
+  dbus-uuidgen --ensure=etc/machine-id
 }
 
 post_upgrade() {