dbus-selinux 1.10.2-1 update

4 files changed, 17 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eaa5574f800b..885c4322e59e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dbus-selinux
 	pkgdesc = Freedesktop.org message bus system with SELinux support
-	pkgver = 1.10.0
-	pkgrel = 4
+	pkgver = 1.10.2
+	pkgrel = 1
 	url = http://www.freedesktop.org/Software/dbus
 	arch = i686
 	arch = x86_64
@@ -14,14 +14,10 @@ pkgbase = dbus-selinux
 	makedepends = docbook-xsl
 	makedepends = audit
 	makedepends = libselinux
-	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.0.tar.gz
-	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.0.tar.gz.asc
-	source = dbus.socket
-	source = dbus-setenv.service
-	md5sums = 5af6297348107a906c8449817a728b3b
+	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.2.tar.gz
+	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.2.tar.gz.asc
+	md5sums = 2428919cc77b8d0028d65ee4d5dbef31
 	md5sums = SKIP
-	md5sums = 5fce2cd240ab1c90fe716076b7d33b8e
-	md5sums = cb82de93178a65dad38a1356210b2453
 
 pkgname = dbus-selinux
 	depends = libdbus-selinux
@@ -31,8 +27,8 @@ pkgname = dbus-selinux
 	depends = libsystemd-selinux
 	optdepends = libx11: dbus-launch support
 	provides = dbus-core
-	provides = dbus=1.10.0-4
-	provides = selinux-dbus=1.10.0-4
+	provides = dbus=1.10.2-1
+	provides = selinux-dbus=1.10.2-1
 	conflicts = dbus-core
 	conflicts = dbus
 	conflicts = selinux-dbus
@@ -42,7 +38,7 @@ pkgname = dbus-selinux
 pkgname = libdbus-selinux
 	pkgdesc = DBus library
 	depends = libsystemd-selinux
-	provides = libdbus=1.10.0-4
+	provides = libdbus=1.10.2-1
 	conflicts = libdbus
 	replaces = libdbus
 
diff --git a/PKGBUILD b/PKGBUILD
index 4276895e144f..89d44174876f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,22 +6,23 @@
 
 pkgbase=dbus-selinux
 pkgname=('dbus-selinux' 'libdbus-selinux')
-pkgver=1.10.0
-pkgrel=4
+pkgver=1.10.2
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system with SELinux support"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 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}
-        dbus.socket dbus-setenv.service)
-md5sums=('5af6297348107a906c8449817a728b3b'
-         'SKIP'
-         '5fce2cd240ab1c90fe716076b7d33b8e'
-         'cb82de93178a65dad38a1356210b2453')
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc})
+md5sums=('2428919cc77b8d0028d65ee4d5dbef31'
+         'SKIP')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
 
+prepare() {
+  cd dbus-$pkgver
+}
+
 build() {
   cd dbus-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
@@ -55,10 +56,6 @@ package_dbus-selinux(){
   rm -r "${pkgdir}/var/run"
   rm -r "${pkgdir}/usr/lib/pkgconfig"
 
-  # Fix up manager environment
-  install -m644 "$srcdir"/{dbus.socket,dbus-setenv.service} \
-    "$pkgdir/usr/lib/systemd/user"
-
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus-selinux/COPYING"
 }
 
diff --git a/dbus-setenv.service b/dbus-setenv.service
deleted file mode 100644
index 0d049fef7afc..000000000000
--- a/dbus-setenv.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Set Environment DBUS_SESSION_BUS_ADDRESS
-DefaultDependencies=no
-Requisite=dbus.socket
-
-[Service]
-Type=oneshot
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus
-ExecStart=/usr/bin/systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS
diff --git a/dbus.socket b/dbus.socket
deleted file mode 100644
index e4a4f621174d..000000000000
--- a/dbus.socket
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=D-Bus User Message Bus Socket
-Requires=dbus-setenv.service
-After=dbus-setenv.service
-
-[Socket]
-ListenStream=%t/bus
-
-[Install]
-WantedBy=sockets.target
-Also=dbus.service