[arch-commits] Commit in dbus/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, August 16, 2016 @ 01:25:25
  Author: heftig
Revision: 273838

1.10.10-2: Fix warning on enable

Added:
  dbus/trunk/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch
Modified:
  dbus/trunk/PKGBUILD

--------------------------------------------------------------+
 0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch |   28 ++++++++++
 PKGBUILD                                                     |   10 ++-
 2 files changed, 35 insertions(+), 3 deletions(-)

Added: 0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch
===================================================================
--- 0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch	                        (rev 0)
+++ 0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch	2016-08-16 01:25:25 UTC (rev 273838)
@@ -0,0 +1,28 @@
+From 2ef733b9b65f77b43786c9bd08745416e23521ea Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 16 Aug 2016 03:14:15 +0200
+Subject: [PATCH] user dbus.socket: Remove [Install] Also=dbus.service
+
+When enabling dbus.socket, the cycle between dbus.socket and
+dbus.service is broken by ignoring the Also=dbus.socket. Since the
+install section of dbus.service is otherwise empty, systemctl then
+complains that dbus.service is a static unit.
+
+Break the cycle ourselves by removing Also=dbus.service. The intended
+behavior of enabling the socket when enabling the service remains.
+---
+ bus/systemd-user/dbus.socket.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in
+index 4793d1d4ff1dc13e..3b56b3e7f6603024 100644
+--- a/bus/systemd-user/dbus.socket.in
++++ b/bus/systemd-user/dbus.socket.in
+@@ -7,4 +7,3 @@ ExecStartPost=- at SYSTEMCTL@ --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:
+ 
+ [Install]
+ WantedBy=sockets.target
+-Also=dbus.service
+-- 
+2.9.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-16 00:46:34 UTC (rev 273837)
+++ PKGBUILD	2016-08-16 01:25:25 UTC (rev 273838)
@@ -7,7 +7,7 @@
 pkgbase=dbus
 pkgname=(dbus dbus-docs)
 pkgver=1.10.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(i686 x86_64)
@@ -14,14 +14,18 @@
 license=(GPL custom)
 depends=(libsystemd expat)
 makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen)
-source=(https://dbus.freedesktop.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz{,.asc})
+source=(https://dbus.freedesktop.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz{,.asc}
+        0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch)
 sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43'
-            'SKIP')
+            'SKIP'
+            '49dcc608f5bbb29cc15136acd2a69e80b945df5fcc072893220cca9590ba8bd0')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90'  # Simon McVittie <simon.mcvittie at collabora.co.uk>
               '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
 prepare() {
   cd $pkgbase-$pkgver
+  patch -Np1 -i ../0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch
+  autoreconf -fvi
 }
 
 build() {