systemd-selinux 242.84-2 update

4 files changed, 21 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f29153d0969e..83de9686d6be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-selinux
 	pkgver = 242.84
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
 	groups = selinux
@@ -47,12 +47,12 @@ pkgbase = systemd-selinux
 	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-hook
+	source = 20-systemd-sysusers.hook
 	source = systemd-binfmt.hook
 	source = systemd-catalog.hook
 	source = systemd-daemon-reload.hook
 	source = systemd-hwdb.hook
 	source = systemd-sysctl.hook
-	source = systemd-sysusers.hook
 	source = systemd-tmpfiles.hook
 	source = systemd-udev-reload.hook
 	source = systemd-update.hook
@@ -68,13 +68,13 @@ pkgbase = systemd-selinux
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
 	sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
 	sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19
-	sha512sums = 6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7
+	sha512sums = 869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323
+	sha512sums = 08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763
 	sha512sums = 5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8
 	sha512sums = 4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb
 	sha512sums = 872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2
 	sha512sums = 471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d
 	sha512sums = da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a
-	sha512sums = 08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763
 	sha512sums = 577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447
 	sha512sums = e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2
 	sha512sums = 209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67
@@ -113,7 +113,7 @@ pkgname = systemd-selinux
 	provides = nss-myhostname
 	provides = systemd-tools=242.84
 	provides = udev=242.84
-	provides = systemd=242.84-1
+	provides = systemd=242.84-2
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -146,7 +146,7 @@ pkgname = systemd-libs-selinux
 	provides = libsystemd.so
 	provides = libudev.so
 	provides = libsystemd-selinux
-	provides = systemd-libs=242.84-1
+	provides = systemd-libs=242.84-2
 	conflicts = libsystemd
 	conflicts = libsystemd-selinux
 	conflicts = systemd-libs
@@ -158,16 +158,16 @@ pkgname = systemd-resolvconf-selinux
 	depends = systemd-selinux
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=242.84-1
+	provides = systemd-resolvconf=242.84-2
 	conflicts = openresolv
-	conflicts = systemd-resolvconf=242.84-1
+	conflicts = systemd-resolvconf=242.84-2
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=242.84-1
-	provides = selinux-systemd-sysvcompat=242.84-1
+	provides = systemd-sysvcompat=242.84-2
+	provides = selinux-systemd-sysvcompat=242.84-2
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/systemd-sysusers.hook b/20-systemd-sysusers.hook
index 9873dd402013..9873dd402013 100644
--- a/systemd-sysusers.hook
+++ b/20-systemd-sysusers.hook
diff --git a/PKGBUILD b/PKGBUILD
index 778b896ed09e..21a91465300a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' '
 # Can be from either systemd or systemd-stable
 _commit='9d34e79ae8ef891adf3757f9248566def70471ad'
 pkgver=242.84
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 groups=('selinux')
@@ -47,12 +47,12 @@ source=(# fragment is latest tag for source verification, final merge in prepare
         'splash-arch.bmp::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/splash-arch.bmp?h=packages/systemd&id=e43ddb71a5b1ab56e898347a63e54c5d5d07728a'
         'systemd-user.pam'
         'systemd-hook'
+        '20-systemd-sysusers.hook'
         'systemd-binfmt.hook'
         'systemd-catalog.hook'
         'systemd-daemon-reload.hook'
         'systemd-hwdb.hook'
         'systemd-sysctl.hook'
-        'systemd-sysusers.hook'
         'systemd-tmpfiles.hook'
         'systemd-udev-reload.hook'
         'systemd-update.hook')
@@ -66,13 +66,13 @@ sha512sums=('SKIP'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            '6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7'
+            '869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323'
+            '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
             '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
             '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
             '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
             '471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d'
             'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
-            '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
             '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
             'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2'
             '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
diff --git a/systemd-hook b/systemd-hook
index 0a664f2c5824..6f2e899234cf 100644
--- a/systemd-hook
+++ b/systemd-hook
@@ -14,7 +14,9 @@ udevd_live() {
   fi
 }
 
-case $1 in
+op="$1"; shift
+
+case "$op" in
   catalog)  /usr/bin/journalctl --update-catalog ;;
   hwdb)     /usr/bin/systemd-hwdb --usr update ;;
   update)   touch -c /usr ;;
@@ -26,7 +28,10 @@ case $1 in
   binfmt)        systemd_live; /usr/lib/systemd/systemd-binfmt ;;
   sysctl)        systemd_live; /usr/lib/systemd/systemd-sysctl ;;
 
-  *) echo >&2 "  Invalid operation '$1'"; exit 1 ;;
+  # For use by other packages
+  reload)        systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;;
+
+  *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
 esac
 
 exit 0