summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2016-06-24 21:53:57 +0200
committerNicolas Iooss2016-06-24 21:53:57 +0200
commit065433630da1826d843b24d299ac1c16fea63252 (patch)
treefaaf98d51d7c2c57eff88f56d00412339013e361
parentf572f4b58dbd3bc3ccd7b4b1a4c9891b6691a5c2 (diff)
downloadaur-065433630da1826d843b24d299ac1c16fea63252.tar.gz
systemd-selinux 230-4 update
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD5
2 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f398cacc7816..bb7bdb92ff36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-selinux
pkgver = 230
- pkgrel = 3
+ pkgrel = 4
url = http://www.freedesktop.org/wiki/Software/systemd
arch = i686
arch = x86_64
@@ -80,7 +80,7 @@ pkgname = systemd-selinux
provides = nss-myhostname
provides = systemd-tools=230
provides = udev=230
- provides = systemd=230-3
+ provides = systemd=230-4
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
@@ -120,15 +120,15 @@ pkgname = libsystemd-selinux
depends = xz
provides = libsystemd.so
provides = libudev.so
- provides = libsystemd=230-3
+ provides = libsystemd=230-4
conflicts = libsystemd
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=230-3
- provides = selinux-systemd-sysvcompat=230-3
+ provides = systemd-sysvcompat=230-4
+ provides = selinux-systemd-sysvcompat=230-4
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index 3356d7321262..43dfc519481f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=systemd-selinux
pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux')
pkgver=230
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
groups=('selinux')
@@ -45,6 +45,9 @@ _backports=(
# systemctl: fix return values on success
5f056378b0ceffb6e6fba3513f7eae72e2d09dc8
+
+ # automount: handle expire_tokens when the mount unit changes its state (#3434)
+ 0a62f81045dd810c8f1223cccbac4d706ea2cb45
)
prepare() {