dbus-selinux 1.10.0-4 update

4 files changed, 38 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 40b6400874c7..eaa5574f800b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dbus-selinux
 	pkgdesc = Freedesktop.org message bus system with SELinux support
 	pkgver = 1.10.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.freedesktop.org/Software/dbus
 	arch = i686
 	arch = x86_64
@@ -16,8 +16,12 @@ pkgbase = dbus-selinux
 	makedepends = libselinux
 	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.0.tar.gz
 	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.0.tar.gz.asc
+	source = dbus.socket
+	source = dbus-setenv.service
 	md5sums = 5af6297348107a906c8449817a728b3b
 	md5sums = SKIP
+	md5sums = 5fce2cd240ab1c90fe716076b7d33b8e
+	md5sums = cb82de93178a65dad38a1356210b2453
 
 pkgname = dbus-selinux
 	depends = libdbus-selinux
@@ -27,8 +31,8 @@ pkgname = dbus-selinux
 	depends = libsystemd-selinux
 	optdepends = libx11: dbus-launch support
 	provides = dbus-core
-	provides = dbus=1.10.0-3
-	provides = selinux-dbus=1.10.0-3
+	provides = dbus=1.10.0-4
+	provides = selinux-dbus=1.10.0-4
 	conflicts = dbus-core
 	conflicts = dbus
 	conflicts = selinux-dbus
@@ -38,7 +42,7 @@ pkgname = dbus-selinux
 pkgname = libdbus-selinux
 	pkgdesc = DBus library
 	depends = libsystemd-selinux
-	provides = libdbus=1.10.0-3
+	provides = libdbus=1.10.0-4
 	conflicts = libdbus
 	replaces = libdbus
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d2b6a1f7301..4276895e144f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,16 +7,19 @@
 pkgbase=dbus-selinux
 pkgname=('dbus-selinux' 'libdbus-selinux')
 pkgver=1.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Freedesktop.org message bus system with SELinux support"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 groups=('selinux')
 makedepends=('libx11' 'systemd-selinux' 'xmlto' 'docbook-xsl' 'audit' 'libselinux')
-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@collabora.co.uk>
 
 build() {
@@ -52,6 +55,10 @@ package_dbus-selinux(){
   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-selinux/COPYING"
 }
 
diff --git a/dbus-setenv.service b/dbus-setenv.service
new file mode 100644
index 000000000000..0d049fef7afc
--- /dev/null
+++ b/dbus-setenv.service
@@ -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
diff --git a/dbus.socket b/dbus.socket
new file mode 100644
index 000000000000..e4a4f621174d
--- /dev/null
+++ b/dbus.socket
@@ -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