systemd-selinux 245.7-1 update

3 files changed, 26 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa80d71a2aa9..dab40c64fc3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-selinux
-	pkgver = 245.6
-	pkgrel = 8
+	pkgver = 245.7
+	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
 	groups = selinux
@@ -38,7 +38,7 @@ pkgbase = systemd-selinux
 	makedepends = systemd
 	makedepends = libselinux
 	options = strip
-	source = git+https://github.com/systemd/systemd-stable#tag=a47534aa62edfddb2df86e2d0c208979f24dc8c2?signed
+	source = git+https://github.com/systemd/systemd-stable#tag=8a8b000d682a7108463c5c74bc876c5658d9de4a?signed
 	source = git+https://github.com/systemd/systemd#tag=v245?signed
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
 	source = 0002-make-homed-userdbd-repart-services-installable.patch
@@ -66,7 +66,7 @@ pkgbase = systemd-selinux
 	sha512sums = e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4
 	sha512sums = 85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123
 	sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
-	sha512sums = 80ac350fb4dc58c52d4c1ce77a1f91b8cd64d4c99a1c1e24194acac56f9e4a69b2304b13113e93d38459041fa073fe97840776d99ed7e4ce99aa76a3adb39583
+	sha512sums = f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e
 	sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a
 	sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
@@ -119,15 +119,16 @@ pkgname = systemd-selinux
 	depends = libaudit.so
 	depends = libp11-kit
 	depends = libp11-kit.so
+	depends = openssl
 	optdepends = libmicrohttpd: remote journald capabilities
 	optdepends = quota-tools: kernel-level quota management
 	optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
 	optdepends = polkit: allow administration as unprivileged user
 	optdepends = curl: machinectl pull-tar and pull-raw
 	provides = nss-myhostname
-	provides = systemd-tools=245.6
-	provides = udev=245.6
-	provides = systemd=245.6-8
+	provides = systemd-tools=245.7
+	provides = udev=245.7
+	provides = systemd=245.7-1
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -160,7 +161,7 @@ pkgname = systemd-libs-selinux
 	provides = libsystemd.so
 	provides = libudev.so
 	provides = libsystemd-selinux
-	provides = systemd-libs=245.6-8
+	provides = systemd-libs=245.7-1
 	conflicts = libsystemd
 	conflicts = libsystemd-selinux
 	conflicts = systemd-libs
@@ -172,16 +173,16 @@ pkgname = systemd-resolvconf-selinux
 	depends = systemd-selinux
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=245.6-8
+	provides = systemd-resolvconf=245.7-1
 	conflicts = openresolv
-	conflicts = systemd-resolvconf=245.6-8
+	conflicts = systemd-resolvconf=245.7-1
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=245.6-8
-	provides = selinux-systemd-sysvcompat=245.6-8
+	provides = systemd-sysvcompat=245.7-1
+	provides = selinux-systemd-sysvcompat=245.7-1
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index 8950c783aa2b..507eb91d904a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,9 +10,9 @@
 
 pkgbase=systemd-selinux
 pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux')
-_tag='a47534aa62edfddb2df86e2d0c208979f24dc8c2' # git rev-parse v${pkgver}
-pkgver=245.6
-pkgrel=8
+_tag='8a8b000d682a7108463c5c74bc876c5658d9de4a' # git rev-parse v${pkgver}
+pkgver=245.7
+pkgrel=1
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 groups=('selinux')
@@ -60,7 +60,7 @@ sha512sums=('SKIP'
             'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
             '85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            '80ac350fb4dc58c52d4c1ce77a1f91b8cd64d4c99a1c1e24194acac56f9e4a69b2304b13113e93d38459041fa073fe97840776d99ed7e4ce99aa76a3adb39583'
+            'f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -80,34 +80,6 @@ sha512sums=('SKIP'
 _backports=(
   # systemd-resolved: use hostname for certificate validation in DoT
   'eec394f10bbfcc3d2fc8504ad8ff5be44231abd5'
-
-  # unregister binary formats during shutdown #15566
-  # shared: add common helper for unregistering all binfmt entries
-  '965cc99416a3b5a2a71127e9e6d2e4a95ab3c432'
-  # shutdown: unregister all binfmt_misc entries before entering shutdown loop
-  '0282c0285a3e3c2e409305ce28555a6ad0489539'
-  # binfmt: modernize code a bit
-  'f3670df13e144c2f81bf6f9a0bea581e6d555bdd'
-  # binfmt: also unregister binfmt entries from unit
-  '846acb6798a63f35162f58e1146d1a1f40849e86'
-  # man: document binfmt's new --unregister switch
-  'cd9aa8f0f91b113acb079e79750c146c0529c2d7'
-
-  # Revert "job: Don't mark as redundant if deps are relevant"
-  'cc479760b4736082d26ec332f2423a9ab23d59c5'
-
-  # these are in stable branch already
-
-  # sd-journal: don't check namespaces if we have no namespace to go by
-  'd55f53e95646174f3b5921e920e9210c5af43856'
-
-  # parse-util: backport safe_atou32_full()
-  '64126925181809e7c0b8916471186c0bfa19d6ce'
-  # basic/user-util: always use base 10 for user/group numbers 
-  '9498903de6c1f7b0c3e5f1654d0ee451a304c59d'
-
-  # Fix build with µhttpd 0.9.71
-  'd17eabb1052e7c8c432331a7a782845e36164f01'
 )
 
 _reverts=(
@@ -171,6 +143,7 @@ build() {
     -Ddefault-hierarchy=hybrid
     -Ddefault-kill-user-processes=false
     -Ddefault-locale=C
+    -Ddns-over-tls=openssl
     -Dfallback-hostname='archlinux'
     -Dnologin-path=/usr/bin/nologin
     -Dntp-servers="${_timeservers[*]}"
@@ -210,7 +183,7 @@ package_systemd-selinux() {
            'libgcrypt' 'systemd-libs-selinux' 'libidn2' 'libidn2.so' 'lz4' 'pam-selinux'
            'libelf' 'libseccomp' 'libseccomp.so' 'util-linux-selinux' 'libblkid.so'
            'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' 'libp11-kit'
-           'libp11-kit.so')
+           'libp11-kit.so' 'openssl')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
             "${pkgname/-selinux}=${pkgver}-${pkgrel}")
   conflicts=('nss-myhostname' 'systemd-tools' 'udev'
diff --git a/initcpio-install-systemd b/initcpio-install-systemd
index 03311bbafdea..9e23070dd53f 100644
--- a/initcpio-install-systemd
+++ b/initcpio-install-systemd
@@ -69,10 +69,13 @@ add_systemd_unit() {
                 map add_systemd_unit "${values[@]}"
                 ;;
             Exec*)
-                # don't add binaries unless they are required
-                if [[ ${values[0]:0:1} != '-' ]]; then
-                    add_binary "${values[0]}"
-                fi
+                # do not add binaries unless they are required,
+                # strip special executable prefixes
+                case ${values[0]} in
+                    -*)  ;;
+                    !!*) add_binary "${values[0]#!!}" ;;
+                    *)   add_binary "${values[0]#[@!:+]}" ;;
+                esac
                 ;;
         esac