Date: Monday, October 10, 2016 @ 12:38:02 Author: heftig Revision: 278171
archrelease: copy trunk to testing-i686, testing-x86_64 Added: dbus/repos/testing-i686/ dbus/repos/testing-i686/0001-Drop-Install-sections-from-user-services.patch (from rev 278170, dbus/trunk/0001-Drop-Install-sections-from-user-services.patch) dbus/repos/testing-i686/PKGBUILD (from rev 278170, dbus/trunk/PKGBUILD) dbus/repos/testing-x86_64/ dbus/repos/testing-x86_64/0001-Drop-Install-sections-from-user-services.patch (from rev 278170, dbus/trunk/0001-Drop-Install-sections-from-user-services.patch) dbus/repos/testing-x86_64/PKGBUILD (from rev 278170, dbus/trunk/PKGBUILD) --------------------------------------------------------------------+ testing-i686/0001-Drop-Install-sections-from-user-services.patch | 44 +++++ testing-i686/PKGBUILD | 75 ++++++++++ testing-x86_64/0001-Drop-Install-sections-from-user-services.patch | 44 +++++ testing-x86_64/PKGBUILD | 75 ++++++++++ 4 files changed, 238 insertions(+) Copied: dbus/repos/testing-i686/0001-Drop-Install-sections-from-user-services.patch (from rev 278170, dbus/trunk/0001-Drop-Install-sections-from-user-services.patch) =================================================================== --- testing-i686/0001-Drop-Install-sections-from-user-services.patch (rev 0) +++ testing-i686/0001-Drop-Install-sections-from-user-services.patch 2016-10-10 12:38:02 UTC (rev 278171) @@ -0,0 +1,44 @@ +From 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 Mon Sep 17 00:00:00 2001 +From: Simon McVittie <simon.mcvit...@collabora.co.uk> +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 <simon.mcvit...@collabora.co.uk> +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 + Copied: dbus/repos/testing-i686/PKGBUILD (from rev 278170, dbus/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-10-10 12:38:02 UTC (rev 278171) @@ -0,0 +1,75 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Tom Gundersen <t...@jklm.no> +# Contributor: Link Dupont <l...@subpop.net> + +pkgbase=dbus +pkgname=(dbus dbus-docs) +pkgver=1.10.12 +pkgrel=1 +pkgdesc="Freedesktop.org message bus system" +url="https://wiki.freedesktop.org/www/Software/dbus/" +arch=(i686 x86_64) +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} + 0001-Drop-Install-sections-from-user-services.patch) +sha256sums=('210a79430b276eafc6406c71705e9140d25b9956d18068df98a70156dc0e475d' + 'SKIP' + '48135124680bd9ea2d7d2bd2a9f457608d97bd9aa7cb4f4396e26a1c2c91af3e') +validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvit...@collabora.co.uk> + '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvit...@collabora.co.uk> + +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../0001-Drop-Install-sections-from-user-services.patch + autoreconf -fvi +} + +build() { + cd $pkgbase-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \ + --with-system-pid-file=/run/dbus/pid \ + --with-system-socket=/run/dbus/system_bus_socket \ + --with-console-auth-dir=/run/console/ \ + --enable-inotify --disable-static \ + --disable-verbose-mode --disable-asserts \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --enable-systemd --enable-user-session + make +} + +check() { + cd $pkgbase-$pkgver + make check +} + +package_dbus() { + provides=(libdbus) + conflicts=(libdbus) + replaces=(libdbus) + + cd $pkgbase-$pkgver + + make DESTDIR="$pkgdir" install + + rm -r "$pkgdir/var/run" + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgbase/COPYING" + + # Split docs + mv "$pkgdir/usr/share/doc" "$srcdir" +} + +package_dbus-docs() { + pkgdesc+=" (documentation)" + depends=(dbus) + + install -d "$pkgdir/usr/share/licenses" + ln -s dbus "$pkgdir/usr/share/licenses/dbus-docs" + + mv doc "$pkgdir/usr/share" +} Copied: dbus/repos/testing-x86_64/0001-Drop-Install-sections-from-user-services.patch (from rev 278170, dbus/trunk/0001-Drop-Install-sections-from-user-services.patch) =================================================================== --- testing-x86_64/0001-Drop-Install-sections-from-user-services.patch (rev 0) +++ testing-x86_64/0001-Drop-Install-sections-from-user-services.patch 2016-10-10 12:38:02 UTC (rev 278171) @@ -0,0 +1,44 @@ +From 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 Mon Sep 17 00:00:00 2001 +From: Simon McVittie <simon.mcvit...@collabora.co.uk> +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 <simon.mcvit...@collabora.co.uk> +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 + Copied: dbus/repos/testing-x86_64/PKGBUILD (from rev 278170, dbus/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-10-10 12:38:02 UTC (rev 278171) @@ -0,0 +1,75 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Tom Gundersen <t...@jklm.no> +# Contributor: Link Dupont <l...@subpop.net> + +pkgbase=dbus +pkgname=(dbus dbus-docs) +pkgver=1.10.12 +pkgrel=1 +pkgdesc="Freedesktop.org message bus system" +url="https://wiki.freedesktop.org/www/Software/dbus/" +arch=(i686 x86_64) +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} + 0001-Drop-Install-sections-from-user-services.patch) +sha256sums=('210a79430b276eafc6406c71705e9140d25b9956d18068df98a70156dc0e475d' + 'SKIP' + '48135124680bd9ea2d7d2bd2a9f457608d97bd9aa7cb4f4396e26a1c2c91af3e') +validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvit...@collabora.co.uk> + '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvit...@collabora.co.uk> + +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../0001-Drop-Install-sections-from-user-services.patch + autoreconf -fvi +} + +build() { + cd $pkgbase-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \ + --with-system-pid-file=/run/dbus/pid \ + --with-system-socket=/run/dbus/system_bus_socket \ + --with-console-auth-dir=/run/console/ \ + --enable-inotify --disable-static \ + --disable-verbose-mode --disable-asserts \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --enable-systemd --enable-user-session + make +} + +check() { + cd $pkgbase-$pkgver + make check +} + +package_dbus() { + provides=(libdbus) + conflicts=(libdbus) + replaces=(libdbus) + + cd $pkgbase-$pkgver + + make DESTDIR="$pkgdir" install + + rm -r "$pkgdir/var/run" + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgbase/COPYING" + + # Split docs + mv "$pkgdir/usr/share/doc" "$srcdir" +} + +package_dbus-docs() { + pkgdesc+=" (documentation)" + depends=(dbus) + + install -d "$pkgdir/usr/share/licenses" + ln -s dbus "$pkgdir/usr/share/licenses/dbus-docs" + + mv doc "$pkgdir/usr/share" +}