Date: Thursday, October 22, 2015 @ 19:54:46 Author: heftig Revision: 249655
Better fix for https://github.com/systemd/systemd/issues/1600 Added: dbus/trunk/0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch Modified: dbus/trunk/PKGBUILD Deleted: dbus/trunk/dbus-setenv.service dbus/trunk/dbus.socket ----------------------------------------------------------+ 0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch | 25 +++++++++++++ PKGBUILD | 18 +++++---- dbus-setenv.service | 9 ---- dbus.socket | 11 ----- 4 files changed, 35 insertions(+), 28 deletions(-) Added: 0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch =================================================================== --- 0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch (rev 0) +++ 0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch 2015-10-22 17:54:46 UTC (rev 249655) @@ -0,0 +1,25 @@ +From 53c3f6c20980a9375f4c699355e8f7963ed63d7f Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +Date: Thu, 22 Oct 2015 19:50:29 +0200 +Subject: [PATCH] user dbus.socket: Set DBUS_SESSION_BUS_ADDRESS + +As discussed in https://github.com/systemd/systemd/issues/1600 +--- + bus/systemd-user/dbus.socket.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in +index 77958f7..5535443 100644 +--- a/bus/systemd-user/dbus.socket.in ++++ b/bus/systemd-user/dbus.socket.in +@@ -3,6 +3,7 @@ Description=D-Bus User Message Bus Socket + + [Socket] + ListenStream=%t/bus ++ExecStartPost=@EXPANDED_BINDIR@/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus + + [Install] + WantedBy=sockets.target +-- +2.6.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-22 15:54:45 UTC (rev 249654) +++ PKGBUILD 2015-10-22 17:54:46 UTC (rev 249655) @@ -6,7 +6,7 @@ pkgbase=dbus pkgname=('dbus' 'libdbus') pkgver=1.10.0 -pkgrel=4 +pkgrel=5 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus"; arch=(i686 x86_64) @@ -13,13 +13,19 @@ license=('GPL' 'custom') makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl') source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc} - dbus.socket dbus-setenv.service) + 0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch) md5sums=('5af6297348107a906c8449817a728b3b' 'SKIP' - '5fce2cd240ab1c90fe716076b7d33b8e' - 'cb82de93178a65dad38a1356210b2453') + 'a97e2b8e5da583e38690d2ccd0424619') validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <[email protected]> +prepare() { + cd dbus-$pkgver + + # https://github.com/systemd/systemd/issues/1600 + patch -Np1 -i ../0001-user-dbus.socket-Set-DBUS_SESSION_BUS_ADDRESS.patch +} + build() { cd dbus-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ @@ -52,10 +58,6 @@ 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" } Deleted: dbus-setenv.service =================================================================== --- dbus-setenv.service 2015-10-22 15:54:45 UTC (rev 249654) +++ dbus-setenv.service 2015-10-22 17:54:46 UTC (rev 249655) @@ -1,9 +0,0 @@ -[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 Deleted: dbus.socket =================================================================== --- dbus.socket 2015-10-22 15:54:45 UTC (rev 249654) +++ dbus.socket 2015-10-22 17:54:46 UTC (rev 249655) @@ -1,11 +0,0 @@ -[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
