From 2aa921ccdaf0f6da2403a98896720dc5deb91955 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Wed, 21 Aug 2019 18:19:53 -0500
Subject: systemd-242.84-2.par1: rebuild

---
 libre/systemd/20-systemd-sysusers.hook | 10 ++++++++++
 libre/systemd/PKGBUILD                 |  8 ++++----
 libre/systemd/systemd-hook             |  9 +++++++--
 libre/systemd/systemd-sysusers.hook    | 10 ----------
 4 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 libre/systemd/20-systemd-sysusers.hook
 delete mode 100644 libre/systemd/systemd-sysusers.hook

diff --git a/libre/systemd/20-systemd-sysusers.hook b/libre/systemd/20-systemd-sysusers.hook
new file mode 100644
index 000000000..9873dd402
--- /dev/null
+++ b/libre/systemd/20-systemd-sysusers.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysusers.d/*.conf
+
+[Action]
+Description = Creating system user accounts...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index a6cc25cb2..de2288ef1 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -14,7 +14,7 @@ pkgname+=("${_systemd_libs[@]/#/systemd-}")
 # Can be from either systemd or systemd-stable
 _commit='9d34e79ae8ef891adf3757f9248566def70471ad'
 pkgver=242.84
-pkgrel=1
+pkgrel=2
 pkgrel+=.par1
 arch=('x86_64')
 arch+=('i686' 'armv7h' 'ppc64le')
@@ -42,13 +42,13 @@ source=(# fragment is latest tag for source verification, final merge in prepare
         'splash-parabola.bmp'
         'systemd-user.pam'
         'systemd-hook'
+        '20-systemd-sysusers.hook'
         'udev-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'
@@ -69,14 +69,14 @@ sha512sums=('SKIP'
             '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'
             'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            '12abea62121f4e0867ffbcf6ba96bb1540dd7d86775556fc180ae6c844abfd13310b6782ff6d0e665c8d875446c17b40495d6c2fbc7ddcb42f9a13e1b57a8c40'
+            'd8ed2e26a6562ed7835a861a7a534842befec22475db0442cd26350ac54446bc9fec6b4c8429ed6d983cc600564446ab2827ea10cacef7e950220d01f0961214'
+            '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
             'b7ee4f212c910df62c3472103a64a3cdf0d31292bc2f8fa839e5c86f34faa3ef1a3693601f5716779c4552a0d2b1d57538d45610f4c2e1c80e155ffbf0af187d'
             '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
             '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
             '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
             '96bb157de6921086a2bfc45a650414fbffa787bccff2cbd838cbe05c6fc635cbabd533360608eb7ca2f80ab7df795065a27abf4a1b1ea2b406612a3fcf420bdc'
             'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
-            '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
             '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
             'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'
             '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'
diff --git a/libre/systemd/systemd-hook b/libre/systemd/systemd-hook
index 793a42943..00252cf79 100644
--- a/libre/systemd/systemd-hook
+++ b/libre/systemd/systemd-hook
@@ -7,7 +7,9 @@ systemd_live() {
   fi
 }
 
-case $1 in
+op="$1"; shift
+
+case "$op" in
   catalog)  /usr/bin/journalctl --update-catalog ;;
   update)   touch -c /usr ;;
   sysusers) /usr/bin/systemd-sysusers ;;
@@ -17,7 +19,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
diff --git a/libre/systemd/systemd-sysusers.hook b/libre/systemd/systemd-sysusers.hook
deleted file mode 100644
index 9873dd402..000000000
--- a/libre/systemd/systemd-sysusers.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/sysusers.d/*.conf
-
-[Action]
-Description = Creating system user accounts...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
-- 
cgit v1.2.2