systemd-selinux 232-7 update

4 files changed, 41 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6adc0257091f..4ff71161dc40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-selinux
 	pkgver = 232
-	pkgrel = 6
+	pkgrel = 7
 	url = https://www.github.com/systemd/systemd
 	arch = i686
 	arch = x86_64
@@ -38,6 +38,8 @@ pkgbase = systemd-selinux
 	source = loader.conf
 	source = splash-arch.bmp::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/splash-arch.bmp?h=packages/systemd&id=e43ddb71a5b1ab56e898347a63e54c5d5d07728a
 	source = systemd-user.pam
+	source = systemd-sysusers.hook
+	source = systemd-tmpfiles.hook
 	source = udev-hwdb.hook
 	source = 0001-disable-RestrictAddressFamilies-on-i686.patch
 	source = 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch
@@ -51,6 +53,8 @@ pkgbase = systemd-selinux
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
 	sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
 	sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19
+	sha512sums = 9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22
+	sha512sums = 0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067
 	sha512sums = 888ab01bc6e09beb08d7126472c34c9e1aa35ea34e62a09e900ae34c93b1de2fcc988586efd8d0dc962393974f45c77b206d59a86cf53e370f061bf9a1b1a862
 	sha512sums = 89f9b2d3918c679ce4f76c2b10dc7fcb7e04f1925a5f92542f06891de2a123a91df7eb67fd4ce71506a8132f5440b3560b7bb667e1c1813944b115c1dfe35e3f
 	sha512sums = b993a42c5534582631f7b379d54f6abc37e3aaa56ecf869a6d86ff14ae5a52628f4e447b6a30751bc1c14c30cec63a5c6d0aa268362d235ed477b639cac3a219
@@ -79,7 +83,6 @@ pkgname = systemd-selinux
 	depends = util-linux-selinux
 	depends = xz
 	depends = audit
-	depends = libselinux
 	optdepends = cryptsetup: required for encrypted block devices
 	optdepends = libmicrohttpd: remote journald capabilities
 	optdepends = quota-tools: kernel-level quota management
@@ -88,7 +91,7 @@ pkgname = systemd-selinux
 	provides = nss-myhostname
 	provides = systemd-tools=232
 	provides = udev=232
-	provides = systemd=232-6
+	provides = systemd=232-7
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -118,17 +121,18 @@ pkgname = libsystemd-selinux
 	depends = libgcrypt
 	depends = lz4
 	depends = xz
+	depends = libselinux
 	provides = libsystemd.so
 	provides = libudev.so
-	provides = libsystemd=232-6
+	provides = libsystemd=232-7
 	conflicts = libsystemd
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=232-6
-	provides = selinux-systemd-sysvcompat=232-6
+	provides = systemd-sysvcompat=232-7
+	provides = selinux-systemd-sysvcompat=232-7
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index 8f733d50c30a..5b84e14c7d38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=systemd-selinux
 pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux')
 pkgver=232
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="https://www.github.com/systemd/systemd"
 groups=('selinux')
@@ -27,6 +27,8 @@ source=("git+https://github.com/systemd/systemd.git#tag=v$pkgver"
         'loader.conf'
         'splash-arch.bmp::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/splash-arch.bmp?h=packages/systemd&id=e43ddb71a5b1ab56e898347a63e54c5d5d07728a'
         'systemd-user.pam'
+        'systemd-sysusers.hook'
+        'systemd-tmpfiles.hook'
         'udev-hwdb.hook'
         '0001-disable-RestrictAddressFamilies-on-i686.patch'
         '0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch'
@@ -39,6 +41,8 @@ sha512sums=('SKIP'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
+            '9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22'
+            '0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067'
             '888ab01bc6e09beb08d7126472c34c9e1aa35ea34e62a09e900ae34c93b1de2fcc988586efd8d0dc962393974f45c77b206d59a86cf53e370f061bf9a1b1a862'
             '89f9b2d3918c679ce4f76c2b10dc7fcb7e04f1925a5f92542f06891de2a123a91df7eb67fd4ce71506a8132f5440b3560b7bb667e1c1813944b115c1dfe35e3f'
             'b993a42c5534582631f7b379d54f6abc37e3aaa56ecf869a6d86ff14ae5a52628f4e447b6a30751bc1c14c30cec63a5c6d0aa268362d235ed477b639cac3a219'
@@ -142,7 +146,7 @@ package_systemd-selinux() {
   license=('GPL2' 'LGPL2.1')
   depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
            'libgcrypt' 'libsystemd-selinux' 'libidn' 'lz4' 'pam-selinux' 'libelf' 'libseccomp'
-           'util-linux-selinux' 'xz' 'audit' 'libselinux')
+           'util-linux-selinux' 'xz' 'audit')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
             "${pkgname/-selinux}=${pkgver}-${pkgrel}")
   replaces=('nss-myhostname' 'systemd-tools' 'udev' 'selinux-systemd')
@@ -212,6 +216,8 @@ package_systemd-selinux() {
   install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf
   install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp
 
+  install -Dm644 "$srcdir/systemd-sysusers.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook"
+  install -Dm644 "$srcdir/systemd-tmpfiles.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook"
   install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook"
 
   # overwrite the systemd-user PAM configuration with our own
@@ -220,7 +226,7 @@ package_systemd-selinux() {
 
 package_libsystemd-selinux() {
   pkgdesc="systemd client libraries with SELinux support"
-  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
+  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz' 'libselinux')
   license=('GPL2')
   provides=('libsystemd.so' 'libudev.so'
             "${pkgname/-selinux}=${pkgver}-${pkgrel}")
diff --git a/systemd-sysusers.hook b/systemd-sysusers.hook
new file mode 100644
index 000000000000..b0888d7cf94b
--- /dev/null
+++ b/systemd-sysusers.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysusers.d/*.conf
+
+[Action]
+Description = Updating system user accounts...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "/$f" ; done'
+NeedsTargets
diff --git a/systemd-tmpfiles.hook b/systemd-tmpfiles.hook
new file mode 100644
index 000000000000..a2c5e3ef07ad
--- /dev/null
+++ b/systemd-tmpfiles.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/tmpfiles.d/*.conf
+
+[Action]
+Description = Creating temporary files...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create "/$f"; done'
+NeedsTargets