summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2017-08-05 18:43:46 +0200
committerNicolas Iooss2017-08-05 18:43:46 +0200
commit3dbe7793aafd2bc18baf494c3fd9e5766e0267f1 (patch)
tree9354b134fc3d3c3547e7bd5ad396b1a7d3329d1a
parent124d392676a5d366ad30f7eb9fe58d5936d81d20 (diff)
downloadaur-3dbe7793aafd2bc18baf494c3fd9e5766e0267f1.tar.gz
systemd-selinux 234.11-4 update
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD13
2 files changed, 16 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2cc5184e0201..45119f479e93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-selinux
pkgver = 234.11
- pkgrel = 1
+ pkgrel = 4
url = https://www.github.com/systemd/systemd
arch = i686
arch = x86_64
@@ -90,7 +90,7 @@ pkgname = systemd-selinux
provides = nss-myhostname
provides = systemd-tools=234.11
provides = udev=234.11
- provides = systemd=234.11-1
+ provides = systemd=234.11-4
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
@@ -119,15 +119,15 @@ pkgname = libsystemd-selinux
depends = libselinux
provides = libsystemd.so
provides = libudev.so
- provides = libsystemd=234.11-1
+ provides = libsystemd=234.11-4
conflicts = libsystemd
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=234.11-1
- provides = selinux-systemd-sysvcompat=234.11-1
+ provides = systemd-sysvcompat=234.11-4
+ provides = selinux-systemd-sysvcompat=234.11-4
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index f3993623ee2d..17372a98d6cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ _commit='d52e2bb9c20216972754c054e8534bca28baab66'
# Bump this to latest major release for signed tag verification,
# the commit count is handled by pkgver() function.
pkgver=234.11
-pkgrel=1
+pkgrel=4
arch=('i686' 'x86_64')
url="https://www.github.com/systemd/systemd"
groups=('selinux')
@@ -54,6 +54,13 @@ validpgpkeys=(
)
_backports=(
+ # cryptsetup: fix infinite timeout (#6486)
+ '0864d311766498563331f486909a0d950ba7de87'
+
+ # process-util: add getpid_cached() as a caching wrapper for getpid()
+ '5c30a6d2b805ae9b5dd0ad003b9ee86b8965bc47'
+ # tree-wide: make use of getpid_cached() wherever we can
+ 'df0ff127758809a45105893772de76082d12a26d'
)
_reverts=(
@@ -123,11 +130,13 @@ build() {
local timeservers=({0..3}.arch.pool.ntp.org)
local meson_options=(
+ --buildtype=release
+ -Db_lto=true
+
-Daudit=true
-Dgnuefi=true
-Dima=false
-Dlz4=true
- -Db_lto=true
-Dselinux=true
-Ddbuspolicydir=/usr/share/dbus-1/system.d