[arch-commits] Commit in dbus/repos (10 files)
Jan Steffens
heftig at archlinux.org
Tue Aug 16 01:30:30 UTC 2016
Date: Tuesday, August 16, 2016 @ 01:30:30
Author: heftig
Revision: 273839
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
dbus/repos/testing-i686/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch
(from rev 273838, dbus/trunk/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch)
dbus/repos/testing-i686/PKGBUILD
(from rev 273838, dbus/trunk/PKGBUILD)
dbus/repos/testing-i686/dbus.install
(from rev 273838, dbus/trunk/dbus.install)
dbus/repos/testing-x86_64/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch
(from rev 273838, dbus/trunk/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch)
dbus/repos/testing-x86_64/PKGBUILD
(from rev 273838, dbus/trunk/PKGBUILD)
dbus/repos/testing-x86_64/dbus.install
(from rev 273838, dbus/trunk/dbus.install)
Deleted:
dbus/repos/testing-i686/PKGBUILD
dbus/repos/testing-i686/dbus.install
dbus/repos/testing-x86_64/PKGBUILD
dbus/repos/testing-x86_64/dbus.install
-----------------------------------------------------------------------------+
/PKGBUILD | 160 ++++++++++
/dbus.install | 28 +
testing-i686/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch | 28 +
testing-i686/PKGBUILD | 76 ----
testing-i686/dbus.install | 14
testing-x86_64/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch | 28 +
testing-x86_64/PKGBUILD | 76 ----
testing-x86_64/dbus.install | 14
8 files changed, 244 insertions(+), 180 deletions(-)
Copied: dbus/repos/testing-i686/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch (from rev 273838, dbus/trunk/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch)
===================================================================
--- testing-i686/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch (rev 0)
+++ testing-i686/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch 2016-08-16 01:30:30 UTC (rev 273839)
@@ -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
+
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-08-16 01:25:25 UTC (rev 273838)
+++ testing-i686/PKGBUILD 2016-08-16 01:30:30 UTC (rev 273839)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Link Dupont <link at subpop.net>
-
-pkgbase=dbus
-pkgname=(dbus dbus-docs)
-pkgver=1.10.10
-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})
-sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43'
- 'SKIP')
-validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvittie at collabora.co.uk>
- '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie at collabora.co.uk>
-
-prepare() {
- cd $pkgbase-$pkgver
-}
-
-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)
- install=dbus.install
-
- cd $pkgbase-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- 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
- 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-i686/PKGBUILD (from rev 273838, dbus/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-08-16 01:30:30 UTC (rev 273839)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Link Dupont <link at subpop.net>
+
+pkgbase=dbus
+pkgname=(dbus dbus-docs)
+pkgver=1.10.10
+pkgrel=2
+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-user-dbus.socket-Remove-Install-Also-dbus.service.patch)
+sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43'
+ '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() {
+ 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)
+ install=dbus.install
+
+ cd $pkgbase-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ 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
+ 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"
+}
Deleted: testing-i686/dbus.install
===================================================================
--- testing-i686/dbus.install 2016-08-16 01:25:25 UTC (rev 273838)
+++ testing-i686/dbus.install 2016-08-16 01:30:30 UTC (rev 273839)
@@ -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
-}
Copied: dbus/repos/testing-i686/dbus.install (from rev 273838, dbus/trunk/dbus.install)
===================================================================
--- testing-i686/dbus.install (rev 0)
+++ testing-i686/dbus.install 2016-08-16 01:30:30 UTC (rev 273839)
@@ -0,0 +1,14 @@
+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
+}
Copied: dbus/repos/testing-x86_64/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch (from rev 273838, dbus/trunk/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch)
===================================================================
--- testing-x86_64/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch (rev 0)
+++ testing-x86_64/0001-user-dbus.socket-Remove-Install-Also-dbus.service.patch 2016-08-16 01:30:30 UTC (rev 273839)
@@ -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
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-08-16 01:25:25 UTC (rev 273838)
+++ testing-x86_64/PKGBUILD 2016-08-16 01:30:30 UTC (rev 273839)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Link Dupont <link at subpop.net>
-
-pkgbase=dbus
-pkgname=(dbus dbus-docs)
-pkgver=1.10.10
-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})
-sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43'
- 'SKIP')
-validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvittie at collabora.co.uk>
- '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie at collabora.co.uk>
-
-prepare() {
- cd $pkgbase-$pkgver
-}
-
-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)
- install=dbus.install
-
- cd $pkgbase-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- 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
- 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/PKGBUILD (from rev 273838, dbus/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-08-16 01:30:30 UTC (rev 273839)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Link Dupont <link at subpop.net>
+
+pkgbase=dbus
+pkgname=(dbus dbus-docs)
+pkgver=1.10.10
+pkgrel=2
+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-user-dbus.socket-Remove-Install-Also-dbus.service.patch)
+sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43'
+ '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() {
+ 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)
+ install=dbus.install
+
+ cd $pkgbase-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ 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
+ 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"
+}
Deleted: testing-x86_64/dbus.install
===================================================================
--- testing-x86_64/dbus.install 2016-08-16 01:25:25 UTC (rev 273838)
+++ testing-x86_64/dbus.install 2016-08-16 01:30:30 UTC (rev 273839)
@@ -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
-}
Copied: dbus/repos/testing-x86_64/dbus.install (from rev 273838, dbus/trunk/dbus.install)
===================================================================
--- testing-x86_64/dbus.install (rev 0)
+++ testing-x86_64/dbus.install 2016-08-16 01:30:30 UTC (rev 273839)
@@ -0,0 +1,14 @@
+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
+}
More information about the arch-commits
mailing list