[arch-commits] Commit in dbus/trunk (PKGBUILD dbus-reload.hook)

[Jan Steffens]

    Date: Tuesday, August 13, 2019 @ 14:17:53
  Author: heftig
Revision: 359788

1.12.16-2: Reload D-Bus after creating users

Fixes a problem where D-Bus reloads itself on installation
of polkit, before the polkitd user is created. This then
results in polkit not being able to grab its bus name.

Added:
  dbus/trunk/dbus-reload.hook
Modified:
  dbus/trunk/PKGBUILD

------------------+
 PKGBUILD         |   10 +++++++---
 dbus-reload.hook |   13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-13 04:14:43 UTC (rev 359787)
+++ PKGBUILD	2019-08-13 14:17:53 UTC (rev 359788)
@@ -6,7 +6,7 @@
 pkgbase=dbus
 pkgname=(dbus dbus-docs)
 pkgver=1.12.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64)
@@ -14,8 +14,10 @@
 depends=(systemd-libs expat audit)
 makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive graphviz)
 _commit=23cc709db8fab94f11fa48772bff396b20aea8b0  # tags/dbus-1.12.16^0
-source=("git+https://gitlab.freedesktop.org/dbus/dbus.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/dbus/dbus.git#commit=$_commit"
+        dbus-reload.hook)
+sha256sums=('SKIP'
+            '56d0b5131e030649c6666707aefd67d5c44b6498091f7fdc92dc570b6d6b94fe')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90'  # Simon McVittie <simon.mcvittie at collabora.co.uk>
               '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie at collabora.co.uk>
 
@@ -73,6 +75,8 @@
 
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
 
+  install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
+
   # We have a pre-assigned uid (81)
   echo 'u dbus 81 "System Message Bus"' |
     install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"

Added: dbus-reload.hook
===================================================================
--- dbus-reload.hook	                        (rev 0)
+++ dbus-reload.hook	2019-08-13 14:17:53 UTC (rev 359788)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = etc/dbus-1/system.d/*.conf
+Target = usr/share/dbus-1/system.d/*.conf
+Target = usr/share/dbus-1/system-services/*.service
+
+[Action]
+Description = Reloading system bus configuration...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook reload dbus