[arch-commits] Commit in dbus/trunk (PKGBUILD dbus-setenv.service dbus.socket)

[Jan Steffens]

    Date: Sunday, October 18, 2015 @ 08:43:57
  Author: heftig
Revision: 249481

Set DBUS_SESSION_BUS_ADDRESS for the manager

Added:
  dbus/trunk/dbus-setenv.service
  dbus/trunk/dbus.socket
Modified:
  dbus/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   13 ++++++++++---
 dbus-setenv.service |    9 +++++++++
 dbus.socket         |   11 +++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-18 04:18:05 UTC (rev 249480)
+++ PKGBUILD	2015-10-18 06:43:57 UTC (rev 249481)
@@ -6,15 +6,18 @@
 pkgbase=dbus
 pkgname=('dbus' 'libdbus')
 pkgver=1.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc})
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
+        dbus.socket dbus-setenv.service)
 md5sums=('5af6297348107a906c8449817a728b3b'
-         'SKIP')
+         'SKIP'
+         '5fce2cd240ab1c90fe716076b7d33b8e'
+         'cb82de93178a65dad38a1356210b2453')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
 build() {
@@ -49,6 +52,10 @@
   rm -r "${pkgdir}/var/run"
   rm -r "${pkgdir}/usr/lib/pkgconfig"
 
+  # Fix up manager environment
+  install -m644 "$srcdir"/{dbus.socket,dbus-setenv.service} \
+    "$pkgdir/usr/lib/systemd/user"
+
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
 

Added: dbus-setenv.service
===================================================================
--- dbus-setenv.service	                        (rev 0)
+++ dbus-setenv.service	2015-10-18 06:43:57 UTC (rev 249481)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Set Environment DBUS_SESSION_BUS_ADDRESS
+DefaultDependencies=no
+Requisite=dbus.socket
+
+[Service]
+Type=oneshot
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus
+ExecStart=/usr/bin/systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS

Added: dbus.socket
===================================================================
--- dbus.socket	                        (rev 0)
+++ dbus.socket	2015-10-18 06:43:57 UTC (rev 249481)
@@ -0,0 +1,11 @@
+[Unit]
+Description=D-Bus User Message Bus Socket
+Requires=dbus-setenv.service
+After=dbus-setenv.service
+
+[Socket]
+ListenStream=%t/bus
+
+[Install]
+WantedBy=sockets.target
+Also=dbus.service