systemd-selinux 230-7 update

1 files changed, 13 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 51167eeaecbc..1df388867c88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=systemd-selinux
 pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux')
 pkgver=230
-pkgrel=5
+pkgrel=7
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 groups=('selinux')
@@ -29,7 +29,7 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
         'udev-hwdb.hook')
 md5sums=('SKIP'
          '90ea67a7bb237502094914622a39e281'
-         '8a093826cbce909e34f15dccd73974c4'
+         'bee7fd6ccda39582259708e3f262ea6d'
          '1b3aa3a0551b08af9305d33f85b5c2fc'
          '20ead378f5d6df4b2a3e670301510a7d'
          'ddaef54f68f6c86c6c07835fc668f62a'
@@ -54,6 +54,15 @@ _backports=(
 
   # resolved: when restarting a transaction make sure to not touch it anymore (#3553)
   5278bbfe0c79c1f2b5bf8a215d8e7d63f1900ce9
+
+  # basic: pass flags to the fnmatch
+  2027927b1002a74d24300704a655614f8ea48e45
+
+  # nspawn: fix uid patching logic
+  0c6aeb4609f619328b9dcf8d8d815bd06e412ac5
+
+  # load-fragment: don't try to do a template instance replacement if we are not an instance (#3451)
+  9d3e340639bc0b4610f7ece98a84157dbc1c2c8f
 )
 
 prepare() {
@@ -86,6 +95,7 @@ build() {
     --with-sysvrcnd-path=
     --with-ntp-servers="${timeservers[*]}"
     --with-default-dnssec=no
+    --with-dbuspolicydir=/usr/share/dbus-1/system.d
     --without-kill-user-processes
   )
 
@@ -110,15 +120,7 @@ package_systemd-selinux() {
               'quota-tools: kernel-level quota management'
               'systemd-sysvcompat: symlink package to provide sysvinit binaries'
               'polkit: allow administration as unprivileged user')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.conf
-          etc/dbus-1/system.d/org.freedesktop.machine1.conf
-          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-          etc/dbus-1/system.d/org.freedesktop.import1.conf
-          etc/dbus-1/system.d/org.freedesktop.network1.conf
-          etc/pam.d/systemd-user
+  backup=(etc/pam.d/systemd-user
           etc/systemd/coredump.conf
           etc/systemd/journald.conf
           etc/systemd/journal-remote.conf