dbus-selinux 1.10.10-3 update

3 files changed, 110 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 737ed6f85ebe..a169e8d0c231 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,46 +1,45 @@
 pkgbase = dbus-selinux
 	pkgdesc = Freedesktop.org message bus system with SELinux support
-	pkgver = 1.10.8
-	pkgrel = 1
-	url = http://www.freedesktop.org/Software/dbus
+	pkgver = 1.10.10
+	pkgrel = 3
+	url = https://wiki.freedesktop.org/www/Software/dbus/
 	arch = i686
 	arch = x86_64
 	groups = selinux
 	license = GPL
 	license = custom
-	makedepends = libx11
 	makedepends = systemd-selinux
 	makedepends = xmlto
 	makedepends = docbook-xsl
+	makedepends = python
+	makedepends = yelp-tools
+	makedepends = doxygen
 	makedepends = audit
 	makedepends = libselinux
-	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.8.tar.gz
-	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.8.tar.gz.asc
+	depends = libsystemd-selinux
+	depends = expat
+	source = https://dbus.freedesktop.org/releases/dbus/dbus-1.10.10.tar.gz
+	source = https://dbus.freedesktop.org/releases/dbus/dbus-1.10.10.tar.gz.asc
+	source = 0001-Drop-Install-sections-from-user-services.patch
 	validpgpkeys = DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90
 	validpgpkeys = 3C8672A0F49637FE064AC30F52A43A1E4B77B059
-	md5sums = e912e930f249454752512aa7ac864d43
-	md5sums = SKIP
+	sha256sums = 9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43
+	sha256sums = SKIP
+	sha256sums = 48135124680bd9ea2d7d2bd2a9f457608d97bd9aa7cb4f4396e26a1c2c91af3e
 
 pkgname = dbus-selinux
-	depends = libdbus-selinux
-	depends = expat
-	depends = audit
-	depends = libselinux
-	depends = libsystemd-selinux
-	optdepends = libx11: dbus-launch support
-	provides = dbus-core
-	provides = dbus=1.10.8-1
-	provides = selinux-dbus=1.10.8-1
-	conflicts = dbus-core
+	provides = libdbus
+	provides = libdbus-selinux
+	provides = dbus=1.10.10-3
+	provides = selinux-dbus=1.10.10-3
+	conflicts = libdbus
+	conflicts = libdbus-selinux
 	conflicts = dbus
 	conflicts = selinux-dbus
-	replaces = dbus-core
-	replaces = dbus
-
-pkgname = libdbus-selinux
-	pkgdesc = DBus library
-	depends = libsystemd-selinux
-	provides = libdbus=1.10.8-1
-	conflicts = libdbus
 	replaces = libdbus
+	replaces = libdbus-selinux
+
+pkgname = dbus-docs-selinux
+	pkgdesc = Freedesktop.org message bus system with SELinux support (documentation)
+	depends = dbus-selinux
 
diff --git a/0001-Drop-Install-sections-from-user-services.patch b/0001-Drop-Install-sections-from-user-services.patch
new file mode 100644
index 000000000000..e62daccaf279
--- /dev/null
+++ b/0001-Drop-Install-sections-from-user-services.patch
@@ -0,0 +1,44 @@
+From 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie@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.mcvittie@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
+
diff --git a/PKGBUILD b/PKGBUILD
index 13f59cff125f..974610f7fe8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,74 +1,78 @@
 # $Id$
-# Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Link Dupont <link@subpop.net>
 # SELinux Maintainer: Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)
 
 pkgbase=dbus-selinux
-pkgname=('dbus-selinux' 'libdbus-selinux')
-pkgver=1.10.8
-pkgrel=1
+pkgname=(dbus-selinux dbus-docs-selinux)
+pkgver=1.10.10
+pkgrel=3
 pkgdesc="Freedesktop.org message bus system with SELinux support"
-url="http://www.freedesktop.org/Software/dbus"
+url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(i686 x86_64)
-license=('GPL' 'custom')
+license=(GPL custom)
 groups=('selinux')
-makedepends=('libx11' 'systemd-selinux' 'xmlto' 'docbook-xsl' 'audit' 'libselinux')
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc})
-md5sums=('e912e930f249454752512aa7ac864d43'
-         'SKIP')
+depends=(libsystemd-selinux expat)
+makedepends=(systemd-selinux xmlto docbook-xsl python yelp-tools doxygen audit libselinux)
+source=(https://dbus.freedesktop.org/releases/${pkgbase/-selinux}/${pkgbase/-selinux}-$pkgver.tar.gz{,.asc}
+        0001-Drop-Install-sections-from-user-services.patch)
+sha256sums=('9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43'
+            'SKIP'
+            '48135124680bd9ea2d7d2bd2a9f457608d97bd9aa7cb4f4396e26a1c2c91af3e')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90'  # Simon McVittie <simon.mcvittie@collabora.co.uk>
               '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk>
 
 prepare() {
-  cd dbus-$pkgver
+  cd ${pkgbase/-selinux}-$pkgver
+  patch -Np1 -i ../0001-Drop-Install-sections-from-user-services.patch
+  autoreconf -fvi
 }
 
 build() {
-  cd dbus-$pkgver
+  cd ${pkgbase/-selinux}-$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-verbose-mode --disable-static \
-      --disable-tests --disable-asserts \
+      --enable-inotify --disable-static \
+      --disable-verbose-mode --disable-asserts \
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
       --enable-systemd --enable-user-session \
       --enable-selinux --enable-libaudit
   make
 }
 
-package_dbus-selinux(){
-  depends=('libdbus-selinux' 'expat' 'audit' 'libselinux' 'libsystemd-selinux')
-  optdepends=('libx11: dbus-launch support')
-  provides=('dbus-core' "${pkgname/-selinux}=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
-  conflicts=('dbus-core' "${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
-  replaces=('dbus-core' "${pkgname/-selinux}")
+check() {
+  cd ${pkgbase/-selinux}-$pkgver
+  make check
+}
 
-  cd dbus-$pkgver
+package_dbus-selinux() {
+  provides=(libdbus libdbus-selinux "${pkgname/-selinux}=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
+  conflicts=(libdbus libdbus-selinux "${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
+  replaces=(libdbus libdbus-selinux)
 
-  # Disable installation of libdbus
-  sed -i -e 's/^SUBDIRS = dbus/SUBDIRS =/' Makefile
+  cd ${pkgbase/-selinux}-$pkgver
 
   make DESTDIR="$pkgdir" install
 
-  rm -r "${pkgdir}/var/run"
-  rm -r "${pkgdir}/usr/lib/pkgconfig"
+  rm -r "$pkgdir/var/run"
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgbase/COPYING"
 
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus-selinux/COPYING"
+  # Split docs
+  mv "$pkgdir/usr/share/doc" "$srcdir"
 }
 
-package_libdbus-selinux(){
-  pkgdesc="DBus library"
-  depends=('libsystemd-selinux')
-  provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}")
-  conflicts=("${pkgname/-selinux}")
-  replaces=("${pkgname/-selinux}")
+package_dbus-docs-selinux() {
+  pkgdesc+=" (documentation)"
+  depends=(dbus-selinux)
+
+  install -d "$pkgdir/usr/share/licenses"
+  ln -s dbus-selinux "$pkgdir/usr/share/licenses/dbus-docs-selinux"
 
-  cd dbus-$pkgver
-  make DESTDIR="$pkgdir" -C dbus install
-  make DESTDIR="$pkgdir" install-data-am
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/libdbus-selinux/COPYING"
+  mv doc "$pkgdir/usr/share"
 }