systemd-selinux 238.133-4 update

8 files changed, 43 insertions, 197 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3cdf8837120..a16f379ac4dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-selinux
 	pkgver = 238.133
-	pkgrel = 1
+	pkgrel = 4
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
 	groups = selinux
@@ -32,10 +32,9 @@ pkgbase = systemd-selinux
 	makedepends = pcre2
 	makedepends = libselinux
 	options = strip
-	source = git+https://github.com/systemd/systemd-stable
-	source = git+https://github.com/systemd/systemd
+	source = git+https://github.com/systemd/systemd-stable#tag=v238?signed
+	source = git+https://github.com/systemd/systemd#tag=v238?signed
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
-	source = gnupg-keys.gpg
 	source = initcpio-hook-udev
 	source = initcpio-install-systemd
 	source = initcpio-install-udev
@@ -58,7 +57,6 @@ pkgbase = systemd-selinux
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = 9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e
-	sha512sums = 42dcacfa0b0c68b04267446d2c360e508dab13f06c07506f46632b19fca0561c27bb5813cd916f7d28b53f853f7197f721c1a02aacd7a3cc8d8742bb6a393cff
 	sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
 	sha512sums = 01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691
 	sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a
@@ -66,14 +64,14 @@ pkgbase = systemd-selinux
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
 	sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
 	sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19
-	sha512sums = 462ed39bd5c90168079956a402abafe8f0910882e6876b165a2c27af73833d0cad1be9cdbcb3549b34652ea86e5d0dba044946a38797bd533fdd1f5a0083f63b
-	sha512sums = 46f93725bc94381300535737fd0186a3c096fa83661179eab0c450c7b164a87d9a5dd9abcf6ae98bdeb4bf50a4ba4f1944769948c236e4814f166ff03b0ee177
+	sha512sums = 6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7
+	sha512sums = 5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8
 	sha512sums = 4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb
 	sha512sums = 872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2
 	sha512sums = 471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d
-	sha512sums = 3b11e8956169e6d80eca6e6de1b3e42641454d9d7be48961d400754f2242077d69fb7bfbeb0904f35ce569511036a7c9614a4a1cc3096fba993f46ae65e02895
-	sha512sums = bf3225011760695040e9f7be2560348e68e86eac0295f5a17a6f7e3dda7ad7c008812a15904e2071b53d5f8048891602c8a9a18608ac64930f2d8cc4fac2a319
-	sha512sums = ff1429a7c88e21d578c25d07e8cd9568577feb5a940fe39a7a815cf8431c57ca951ac6b394c53d2cdeb4efc645572c0b1b670a48cafcc405db41a6602b548e35
+	sha512sums = da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a
+	sha512sums = 08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763
+	sha512sums = 577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447
 	sha512sums = e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2
 	sha512sums = 209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67
 
@@ -109,7 +107,7 @@ pkgname = systemd-selinux
 	provides = nss-myhostname
 	provides = systemd-tools=238.133
 	provides = udev=238.133
-	provides = systemd=238.133-1
+	provides = systemd=238.133-4
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -138,15 +136,15 @@ pkgname = libsystemd-selinux
 	depends = libselinux
 	provides = libsystemd.so
 	provides = libudev.so
-	provides = libsystemd=238.133-1
+	provides = libsystemd=238.133-4
 	conflicts = libsystemd
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=238.133-1
-	provides = selinux-systemd-sysvcompat=238.133-1
+	provides = systemd-sysvcompat=238.133-4
+	provides = selinux-systemd-sysvcompat=238.133-4
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index e1dde55b6e1f..f181682c6867 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux')
 # Can be from either systemd or systemd-stable
 _commit='f58e62cbbc1c2842881a2a6ab9beda7bcb044a30'
 pkgver=238.133
-pkgrel=1
+pkgrel=4
 arch=('x86_64')
 url="https://www.github.com/systemd/systemd"
 groups=('selinux')
@@ -33,10 +33,10 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <
 # you need to update the remotes of the git repositories, for example with the following commands:
 #   git -C systemd-stable remote set-url origin https://github.com/systemd/systemd-stable
 #   git -C systemd remote set-url origin https://github.com/systemd/systemd
-source=('git+https://github.com/systemd/systemd-stable'
-        'git+https://github.com/systemd/systemd'
+source=(# fragment is latest tag for source verification, final merge in prepare()
+        "git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed"
+        "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
         '0001-Use-Arch-Linux-device-access-groups.patch'
-        'gnupg-keys.gpg'
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
@@ -57,7 +57,6 @@ source=('git+https://github.com/systemd/systemd-stable'
 sha512sums=('SKIP'
             'SKIP'
             '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'
-            '42dcacfa0b0c68b04267446d2c360e508dab13f06c07506f46632b19fca0561c27bb5813cd916f7d28b53f853f7197f721c1a02aacd7a3cc8d8742bb6a393cff'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
@@ -65,61 +64,47 @@ sha512sums=('SKIP'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            '462ed39bd5c90168079956a402abafe8f0910882e6876b165a2c27af73833d0cad1be9cdbcb3549b34652ea86e5d0dba044946a38797bd533fdd1f5a0083f63b'
-            '46f93725bc94381300535737fd0186a3c096fa83661179eab0c450c7b164a87d9a5dd9abcf6ae98bdeb4bf50a4ba4f1944769948c236e4814f166ff03b0ee177'
+            '6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7'
+            '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
             '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
             '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
             '471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d'
-            '3b11e8956169e6d80eca6e6de1b3e42641454d9d7be48961d400754f2242077d69fb7bfbeb0904f35ce569511036a7c9614a4a1cc3096fba993f46ae65e02895'
-            'bf3225011760695040e9f7be2560348e68e86eac0295f5a17a6f7e3dda7ad7c008812a15904e2071b53d5f8048891602c8a9a18608ac64930f2d8cc4fac2a319'
-            'ff1429a7c88e21d578c25d07e8cd9568577feb5a940fe39a7a815cf8431c57ca951ac6b394c53d2cdeb4efc645572c0b1b670a48cafcc405db41a6602b548e35'
+            'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
+            '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
+            '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
             'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2'
             '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
 
 _backports=(
   # nspawn: wait for network namespace creation before interface setup (#8633)
   '7511655807e90aa33ea7b71991401a79ec36bb41'
-)
 
-_reverts=(
+  # sd-shutdown improvements #8429
+  # umount: Add more asserts and remove some unused arguments
+  '0494cae03d762eaf2fb7217ee7d70f615dcb5183'
+  # umount: Decide whether to remount read-only earlier
+  '1d62d22d9432d5c4a637002c9a29b20d52f25d9a'
+  # umount: Provide the same mount flags too when remounting read-only
+  '3bc341bee9fc7dfb41a131246b6fb0afd6ff4407'
+  # umount: Try unmounting even if remounting read-only failed
+  '8645ffd12b3cc7b0292acd9e1d691c4fab4cf409'
+  # umount: Don't bother remounting api and ro filesystems read-only
+  'e783b4902f387640bba12496936d01e967545c3c'
+  # shutdown: Reduce log level of unmounts
+  '456b2199f6ef0378da007e71347657bcf83ae465'
 )
 
-_validate_tag() (
-  local success fingerprint trusted status tag=v${pkgver%.*}
-
-  cd "$srcdir/${pkgbase/-selinux}-stable"
-  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
-
-  if (( ! success )); then
-    error 'failed to validate tag %s\n' "$tag"
-    return 1
-  fi
-
-  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
-    error 'unknown or untrusted public key: %s\n' "$fingerprint"
-    return 1
-  fi
-
-  case $status in
-    'expired')
-      warning 'the signature has expired'
-      ;;
-    'expiredkey')
-      warning 'the key has expired'
-      ;;
-  esac
-
-  return 0
+_reverts=(
 )
 
 prepare() {
   cd "${pkgbase/-selinux}-stable"
 
-  # import gpg keys for verification
-  gpg --import ../gnupg-keys.gpg
-
+  # add upstream repository for cherry-picking
   git remote add -f upstream ../systemd
-  git checkout "$_commit"
+  # merge the latest stable commit (fast-foward only to make sure
+  # the verified tag is in)
+  git merge --ff-only "${_commit}"
 
   local c
   for c in "${_backports[@]}"; do
@@ -144,8 +129,6 @@ pkgver() {
 }
 
 build() {
-  _validate_tag || return
-
   local timeservers=({0..3}.arch.pool.ntp.org)
 
   local meson_options=(
diff --git a/gnupg-keys.gpg b/gnupg-keys.gpg
deleted file mode 100644
index cc4a524e4d3d..000000000000
--- a/gnupg-keys.gpg
+++ /dev/null
@@ -1,125 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGiBDjDxTgRBADILCd6h0DKdoY0bkATA20IBHAQ8axjpzVFocYco9w90jWRYj0y
-5JntFUdXB20qh/tr1+H3p7Wr/9MNJDX/k+EJ8LCbqouFItfyE1m5k2iaqlGn3MBG
-z+gbadL5x+01zZcuJmkhMa/xogs3OGvuw4QU0lRf/3VRgEvGQxh/DCQI7wCg91fQ
-X5nGmLfaEajvZk622f4cmXED/jCtmntvBwk9J8jkYDrINEeglEcF8naA/qr20AkD
-hvupalZDEL8CJVh+jKA9HcF584mQzV9BURxaWsU89sT7Jg7incdsOOSOJkCyaasO
-slt7vGKlUjHBqYCUCp336BVDOY5k2c6U52bsMvfywVAAFf4cDn3S9QHDyaYkur2R
-aqMrA/4giC+bF/K1sn4MHacr97QxEeeGNM6KG4z4QDmLeNdAANmJOLQaQFH+84Qj
-r8KyRV0zd0sioh3419AsZ/o41W4cIahovJKWyDcNwKI0tP2y3KZDVtmD26RQ/BO4
-aFEqv3Uii0Cop6j495XmSvteL7CZHLEog90hexe9ExI0xIIBs7QqTGVubmFydCBQ
-b2V0dGVyaW5nIDxsZW5uYXJ0QHBvZXR0ZXJpbmcuZGU+iF4EExECABYECwoEAwMV
-AwIDFgIBAheABQJGZKVoABIHZUdQRwABAQkQMn8mlRoBXMSoAACcCNTEt7jdZvVV
-eAYZQu5caidHZvUAnArwD7mJLWddEUK2XXWOeyOY+0WmtCtMZW5uYXJ0IFBvZXR0
-ZXJpbmcgPGxlbm5hcnRAcG9ldHRlcmluZy5uZXQ+iGMEExECACMCGwMGCwkIBwMC
-BBUCCAMEFgIDAQIeAQIXgAUCRmSlaQIZAQAKCRAyfyaVGgFcxNX0AKDeFj3gF+Fl
-CMgnw1JWu/fM5H8pYgCg7VRzOxtpEEiDSw37hv4eifyo7P60L0xlbm5hcnQgUG9l
-dHRlcmluZyAoTGlzYSkgPGxwb2V0dGVyaW5nQGxpc2EuZGU+iEkEMBECAAkFAk6K
-PXcCHSAACgkQMn8mlRoBXMSZNgCgjKt+QUMXVT1a2h25RkUyiiBPeAYAnRpV0f+q
-i9N55hov5qCieRGUdvVctDJMZW5uYXJ0IFBvZXR0ZXJpbmcgKFJlZCBIYXQpIDxs
-cG9ldHRlckByZWRoYXQuY29tPohgBBMRAgAgAhsDBgsJCAcDAgQVAggDBBYCAwEC
-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
-pNAv5+oT+kXN4g==
-=a+4L
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-NHq9Ahd8L7JVIsbKtcoP
-=a25g
------END PGP PUBLIC KEY BLOCK-----
diff --git a/systemd-binfmt.hook b/systemd-binfmt.hook
index 8e6284bbc175..9c31a4b162cc 100644
--- a/systemd-binfmt.hook
+++ b/systemd-binfmt.hook
@@ -8,4 +8,3 @@ Target = usr/lib/binfmt.d/*.conf
 Description = Registering binary formats...
 When = PostTransaction
 Exec = /usr/share/libalpm/scripts/systemd-hook binfmt
-NeedsTargets
diff --git a/systemd-hook b/systemd-hook
index 4fdee8e47936..0a664f2c5824 100644
--- a/systemd-hook
+++ b/systemd-hook
@@ -14,23 +14,17 @@ udevd_live() {
   fi
 }
 
-each_conf() {
-  while read -r f; do
-    "$@" "$(basename "$f")"
-  done
-}
-
 case $1 in
   catalog)  /usr/bin/journalctl --update-catalog ;;
   hwdb)     /usr/bin/systemd-hwdb --usr update ;;
   update)   touch -c /usr ;;
-  sysusers) each_conf /usr/bin/systemd-sysusers ;;
-  tmpfiles) each_conf /usr/bin/systemd-tmpfiles --create ;;
+  sysusers) /usr/bin/systemd-sysusers ;;
+  tmpfiles) /usr/bin/systemd-tmpfiles --create ;;
 
   daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
   udev-reload)   udevd_live;   /usr/bin/udevadm control --reload ;;
-  binfmt)        systemd_live; each_conf /usr/lib/systemd/systemd-binfmt ;;
-  sysctl)        systemd_live; each_conf /usr/lib/systemd/systemd-sysctl ;;
+  binfmt)        systemd_live; /usr/lib/systemd/systemd-binfmt ;;
+  sysctl)        systemd_live; /usr/lib/systemd/systemd-sysctl ;;
 
   *) echo >&2 "  Invalid operation '$1'"; exit 1 ;;
 esac
diff --git a/systemd-sysctl.hook b/systemd-sysctl.hook
index 348bb03152b5..aec5ac1b0e84 100644
--- a/systemd-sysctl.hook
+++ b/systemd-sysctl.hook
@@ -8,4 +8,3 @@ Target = usr/lib/sysctl.d/*.conf
 Description = Applying kernel sysctl settings...
 When = PostTransaction
 Exec = /usr/share/libalpm/scripts/systemd-hook sysctl
-NeedsTargets
diff --git a/systemd-sysusers.hook b/systemd-sysusers.hook
index a7d40057a12b..9873dd402013 100644
--- a/systemd-sysusers.hook
+++ b/systemd-sysusers.hook
@@ -8,4 +8,3 @@ Target = usr/lib/sysusers.d/*.conf
 Description = Creating system user accounts...
 When = PostTransaction
 Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
-NeedsTargets
diff --git a/systemd-tmpfiles.hook b/systemd-tmpfiles.hook
index 06554cde557e..df60d82752ea 100644
--- a/systemd-tmpfiles.hook
+++ b/systemd-tmpfiles.hook
@@ -8,4 +8,3 @@ Target = usr/lib/tmpfiles.d/*.conf
 Description = Creating temporary files...
 When = PostTransaction
 Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles
-NeedsTargets