systemd-selinux 254.2-1 update

2 files changed, 22 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d8100f8cfbd..b03405f5ad5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = systemd-selinux
-	pkgver = 254.1
+	pkgver = 254.2
 	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
@@ -50,9 +50,10 @@ pkgbase = systemd-selinux
 	makedepends = curl
 	makedepends = gnutls
 	makedepends = python-pyelftools
+	makedepends = lib32-gcc-libs
 	makedepends = libselinux
 	options = strip
-	source = git+https://github.com/systemd/systemd-stable#tag=2c4171c3c4146fcb32253bfb6423b5a3ee42a553?signed
+	source = git+https://github.com/systemd/systemd-stable#tag=bdc3d31fc044b5c44cc1cf62e833dda189c70dcf?signed
 	source = git+https://github.com/systemd/systemd#tag=v254?signed
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
 	source = initcpio-hook-udev
@@ -148,9 +149,9 @@ pkgname = systemd-selinux
 	optdepends = libp11-kit: support PKCS#11
 	optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
 	provides = nss-myhostname
-	provides = systemd-tools=254.1
-	provides = udev=254.1
-	provides = systemd=254.1-1
+	provides = systemd-tools=254.2
+	provides = udev=254.2
+	provides = systemd=254.2-1
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -189,7 +190,7 @@ pkgname = systemd-libs-selinux
 	provides = libsystemd.so
 	provides = libudev.so
 	provides = libsystemd-selinux
-	provides = systemd-libs=254.1-1
+	provides = systemd-libs=254.2-1
 	conflicts = libsystemd
 	conflicts = libsystemd-selinux
 	conflicts = systemd-libs
@@ -201,16 +202,16 @@ pkgname = systemd-resolvconf-selinux
 	depends = systemd-selinux
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=254.1-1
+	provides = systemd-resolvconf=254.2-1
 	conflicts = openresolv
-	conflicts = systemd-resolvconf=254.1-1
+	conflicts = systemd-resolvconf=254.2-1
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=254.1-1
-	provides = selinux-systemd-sysvcompat=254.1-1
+	provides = systemd-sysvcompat=254.2-1
+	provides = selinux-systemd-sysvcompat=254.2-1
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
@@ -219,9 +220,10 @@ pkgname = systemd-ukify-selinux
 	pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image
 	license = GPL2
 	depends = binutils
+	depends = python-cryptography
 	depends = python-pefile
 	depends = systemd
 	optdepends = python-pillow: Show the size of splash image
 	optdepends = sbsigntools: Sign the embedded kernel
 	provides = ukify
-	provides = systemd-ukify=254.1-1
+	provides = systemd-ukify=254.2-1
diff --git a/PKGBUILD b/PKGBUILD
index 6444cf36f9a0..b711c4a70813 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,8 +12,8 @@ pkgname=('systemd-selinux'
          'systemd-resolvconf-selinux'
          'systemd-sysvcompat-selinux'
          'systemd-ukify-selinux')
-_tag='2c4171c3c4146fcb32253bfb6423b5a3ee42a553' # git rev-parse v${_tag_name}
-_tag_name=254.1
+_tag='bdc3d31fc044b5c44cc1cf62e833dda189c70dcf' # git rev-parse v${_tag_name}
+_tag_name=254.2
 pkgver="${_tag_name/-/}"
 pkgrel=1
 arch=('x86_64' 'aarch64')
@@ -25,7 +25,8 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam-selinux' '
              'python-jinja' 'python-lxml' 'quota-tools' 'shadow-selinux' 'gnu-efi-libs' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
              'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync'
-             'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools' 'libselinux')
+             'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools'
+             'lib32-gcc-libs' 'libselinux')
 checkdepends=('python-pefile')
 options=('strip')
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
@@ -156,6 +157,10 @@ build() {
     -Dsbat-distro-url="https://aur.archlinux.org/packages/${pkgname}/"
   )
 
+  # this uses malloc_usable_size, which is incompatible with fortification level 3
+  export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+  export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+
   arch-meson "${pkgbase/-selinux}-stable" build "${_meson_options[@]}"
 
   meson compile -C build
@@ -321,7 +326,7 @@ package_systemd-ukify-selinux() {
   pkgdesc='Combine kernel and initrd into a signed Unified Kernel Image'
   license=('GPL2')
   provides=('ukify' "${pkgname/-selinux}=${pkgver}-${pkgrel}")
-  depends=('binutils' 'python-pefile' 'systemd')
+  depends=('binutils' 'python-cryptography' 'python-pefile' 'systemd')
   optdepends=('python-pillow: Show the size of splash image'
               'sbsigntools: Sign the embedded kernel')