summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2018-08-15 16:09:06 +0200
committerNicolas Iooss2018-08-16 22:59:31 +0200
commit3b51acb0b10e1eef5465a8735291d2839ed3dd4a (patch)
treee28d133af10e429f53424b2704aca48b3d08023d
parent40cdd3bf470eb58bced96a0fbc11b7ec25ac7f69 (diff)
downloadaur-3b51acb0b10e1eef5465a8735291d2839ed3dd4a.tar.gz
dbus-selinux 1.12.10-1 update
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
-rw-r--r--dbus.sysusers5
3 files changed, 11 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 43c72f7a9771..77abdc7b368e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = dbus-selinux
pkgdesc = Freedesktop.org message bus system with SELinux support
- pkgver = 1.12.8
+ pkgver = 1.12.10
pkgrel = 1
url = https://wiki.freedesktop.org/www/Software/dbus/
arch = x86_64
@@ -20,18 +20,16 @@ pkgbase = dbus-selinux
makedepends = libselinux
depends = libsystemd-selinux
depends = expat
- source = git+https://anongit.freedesktop.org/git/dbus/dbus#commit=f8902fa1c840e3fab807016e6a00647b6ef9dd41
- source = dbus.sysusers
+ source = git+https://anongit.freedesktop.org/git/dbus/dbus#commit=f98e784bb6f18b4c28feca6a6e9d12b7bf021a00
validpgpkeys = DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90
validpgpkeys = 3C8672A0F49637FE064AC30F52A43A1E4B77B059
sha256sums = SKIP
- sha256sums = ee7a7a4b2f944cb2e64b9e760efb82589d81872b5b70268356fb73c83c394845
pkgname = dbus-selinux
provides = libdbus
provides = libdbus-selinux
- provides = dbus=1.12.8-1
- provides = selinux-dbus=1.12.8-1
+ provides = dbus=1.12.10-1
+ provides = selinux-dbus=1.12.10-1
conflicts = libdbus
conflicts = libdbus-selinux
conflicts = dbus
diff --git a/PKGBUILD b/PKGBUILD
index 7829dd12a20a..4df87fcd516a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
pkgbase=dbus-selinux
pkgname=(dbus-selinux dbus-docs-selinux)
-pkgver=1.12.8
+pkgver=1.12.10
pkgrel=1
pkgdesc="Freedesktop.org message bus system with SELinux support"
url="https://wiki.freedesktop.org/www/Software/dbus/"
@@ -20,10 +20,9 @@ groups=('selinux')
depends=(libsystemd-selinux expat)
makedepends=(systemd-selinux xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive graphviz audit libselinux)
_commit=f8902fa1c840e3fab807016e6a00647b6ef9dd41 # tags/dbus-1.12.8^0
-source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit"
- 'dbus.sysusers')
-sha256sums=('SKIP'
- 'ee7a7a4b2f944cb2e64b9e760efb82589d81872b5b70268356fb73c83c394845')
+_commit=f98e784bb6f18b4c28feca6a6e9d12b7bf021a00 # tags/dbus-1.12.10^0
+source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit")
+sha256sums=('SKIP')
validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvittie@collabora.co.uk>
'3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk>
@@ -73,10 +72,11 @@ package_dbus-selinux() {
rm -r "$pkgdir/var/run"
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgbase/COPYING"
+ install -Dt "$pkgdir/usr/share/licenses/$pkgbase" -m644 COPYING
# We have a pre-assigned uid (81)
- install -m644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf"
+ echo 'u dbus 81 "System Message Bus"' |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
# Split docs
mv "$pkgdir/usr/share/doc" "$srcdir"
diff --git a/dbus.sysusers b/dbus.sysusers
deleted file mode 100644
index c6199ede5c44..000000000000
--- a/dbus.sysusers
+++ /dev/null
@@ -1,5 +0,0 @@
-# sysusers.d snippet for creating the D-Bus system user automatically
-# at boot on systemd-based systems that ship with an unpopulated
-# /etc. See sysusers.d(5) for details.
-
-u dbus 81 "System Message Bus"