Date: Wednesday, August 17, 2016 @ 06:00:18 Author: heftig Revision: 273856
1.10.10-3: Upstream prefers static units Added: dbus/trunk/0001-Drop-Install-sections-from-user-services.patch Modified: dbus/trunk/PKGBUILD Deleted: dbus/trunk/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch dbus/trunk/dbus.install --------------------------------------------------------------+ 0001-Drop-Install-sections-from-user-services.patch | 44 ++++++++++ 0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch | 28 ------ PKGBUILD | 13 -- dbus.install | 14 --- 4 files changed, 48 insertions(+), 51 deletions(-) Added: 0001-Drop-Install-sections-from-user-services.patch =================================================================== --- 0001-Drop-Install-sections-from-user-services.patch (rev 0) +++ 0001-Drop-Install-sections-from-user-services.patch 2016-08-17 06:00:18 UTC (rev 273856) @@ -0,0 +1,44 @@ +From 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 Mon Sep 17 00:00:00 2001 +From: Simon McVittie <[email protected]> +Date: Sat, 7 Nov 2015 13:03:47 +0100 +Subject: [PATCH] Drop [Install] sections from user services + +We install the symlink to enable dbus.socket statically, so it doesn't +make much sense to invoke `systemctl enable` on it; and +dbus.service should normally be started by socket activation +(or possibly an explicit dependency) rather than manually. + +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92402 +Signed-off-by: Simon McVittie <[email protected]> +Reviewed-by: Lennart Poettering +--- + bus/systemd-user/dbus.service.in | 3 --- + bus/systemd-user/dbus.socket.in | 4 ---- + 2 files changed, 7 deletions(-) + +diff --git a/bus/systemd-user/dbus.service.in b/bus/systemd-user/dbus.service.in +index b41f522b8af8c174..4355d72844079cc5 100644 +--- a/bus/systemd-user/dbus.service.in ++++ b/bus/systemd-user/dbus.service.in +@@ -6,6 +6,3 @@ Requires=dbus.socket + [Service] + ExecStart=@EXPANDED_BINDIR@/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation + ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig +- +-[Install] +-Also=dbus.socket +diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in +index 4793d1d4ff1dc13e..304ac4034208f811 100644 +--- a/bus/systemd-user/dbus.socket.in ++++ b/bus/systemd-user/dbus.socket.in +@@ -4,7 +4,3 @@ Description=D-Bus User Message Bus Socket + [Socket] + ListenStream=%t/bus + ExecStartPost=-@SYSTEMCTL@ --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus +- +-[Install] +-WantedBy=sockets.target +-Also=dbus.service +-- +2.9.3 + Deleted: 0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch =================================================================== --- 0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch 2016-08-17 05:49:28 UTC (rev 273855) +++ 0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch 2016-08-17 06:00:18 UTC (rev 273856) @@ -1,28 +0,0 @@ -From 2ef733b9b65f77b43786c9bd08745416e23521ea Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -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=-@SYSTEMCTL@ --user set-environment DBUS_SESSION_BUS_ADDRESS=unix: - - [Install] - WantedBy=sockets.target --Also=dbus.service --- -2.9.3 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-08-17 05:49:28 UTC (rev 273855) +++ PKGBUILD 2016-08-17 06:00:18 UTC (rev 273856) @@ -7,7 +7,7 @@ pkgbase=dbus pkgname=(dbus dbus-docs) pkgver=1.10.10 -pkgrel=2 +pkgrel=3 pkgdesc="Freedesktop.org message bus system" url="https://wiki.freedesktop.org/www/Software/dbus/"; arch=(i686 x86_64) @@ -15,16 +15,16 @@ depends=(libsystemd expat) makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen) source=(https://dbus.freedesktop.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz{,.asc} - 0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch) + 0001-Drop-Install-sections-from-user-services.patch) sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43' 'SKIP' - '49dcc608f5bbb29cc15136acd2a69e80b945df5fcc072893220cca9590ba8bd0') + '48135124680bd9ea2d7d2bd2a9f457608d97bd9aa7cb4f4396e26a1c2c91af3e') validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <[email protected]> '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <[email protected]> prepare() { cd $pkgbase-$pkgver - patch -Np1 -i ../0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch + patch -Np1 -i ../0001-Drop-Install-sections-from-user-services.patch autoreconf -fvi } @@ -51,7 +51,6 @@ provides=(libdbus) conflicts=(libdbus) replaces=(libdbus) - install=dbus.install cd $pkgbase-$pkgver @@ -59,10 +58,6 @@ rm -r "$pkgdir/var/run" - # Done post-install - rm "$pkgdir/usr/lib/systemd/user/sockets.target.wants/dbus.socket" - rmdir "$pkgdir/usr/lib/systemd/user/sockets.target.wants" - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgbase/COPYING" # Split docs Deleted: dbus.install =================================================================== --- dbus.install 2016-08-17 05:49:28 UTC (rev 273855) +++ dbus.install 2016-08-17 06:00:18 UTC (rev 273856) @@ -1,14 +0,0 @@ -post_install() { - # Enable socket by default - systemctl --global enable dbus.socket -} - -post_upgrade() { - if (( $(vercmp $2 1.10.10-1) < 0)); then - systemctl --global enable dbus.socket - fi -} - -pre_remove() { - systemctl --global disable dbus.socket -}
