systemd-selinux 240.0-3 update

2 files changed, 41 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbdfcdbcc0da..7b24a866c8b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-selinux
-	pkgver = 239.370
-	pkgrel = 1
+	pkgver = 240.0
+	pkgrel = 3
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
 	groups = selinux
@@ -36,8 +36,8 @@ pkgbase = systemd-selinux
 	makedepends = bash-completion
 	makedepends = libselinux
 	options = strip
-	source = git+https://github.com/systemd/systemd-stable#tag=v239?signed
-	source = git+https://github.com/systemd/systemd#tag=v239?signed
+	source = git+https://github.com/systemd/systemd-stable#tag=v240?signed
+	source = git+https://github.com/systemd/systemd#tag=v240?signed
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
 	source = initcpio-hook-udev
 	source = initcpio-install-systemd
@@ -110,9 +110,9 @@ pkgname = systemd-selinux
 	optdepends = polkit: allow administration as unprivileged user
 	optdepends = curl: machinectl pull-tar and pull-raw
 	provides = nss-myhostname
-	provides = systemd-tools=239.370
-	provides = udev=239.370
-	provides = systemd=239.370-1
+	provides = systemd-tools=240.0
+	provides = udev=240.0
+	provides = systemd=240.0-3
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -132,7 +132,7 @@ pkgname = systemd-selinux
 
 pkgname = libsystemd-selinux
 	pkgdesc = systemd client libraries with SELinux support
-	license = GPL2
+	license = LGPL2.1
 	depends = glibc
 	depends = libcap
 	depends = libgcrypt
@@ -141,25 +141,25 @@ pkgname = libsystemd-selinux
 	depends = libselinux
 	provides = libsystemd.so
 	provides = libudev.so
-	provides = libsystemd=239.370-1
+	provides = libsystemd=240.0-3
 	conflicts = libsystemd
 
 pkgname = systemd-resolvconf-selinux
-	pkgdesc = systemd resolvconf replacement with SELinux support
-	license = GPL2
+	pkgdesc = systemd resolvconf replacement with SELinux support (for use with systemd-resolved)
+	license = LGPL2.1
 	depends = systemd-selinux
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=239.370-1
+	provides = systemd-resolvconf=240.0-3
 	conflicts = openresolv
-	conflicts = systemd-resolvconf=239.370-1
+	conflicts = systemd-resolvconf=240.0-3
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=239.370-1
-	provides = selinux-systemd-sysvcompat=239.370-1
+	provides = systemd-sysvcompat=240.0-3
+	provides = selinux-systemd-sysvcompat=240.0-3
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index ca33ed8570cd..a02dc36c161d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,9 +11,9 @@
 pkgbase=systemd-selinux
 pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux')
 # Can be from either systemd or systemd-stable
-_commit='3bf819c4ca718a6bc4b3b871cf52a0d1b518967d'
-pkgver=239.370
-pkgrel=1
+_commit='1742aae2aa8cd33897250d6fcfbe10928e43eb2f'
+pkgver=240.0
+pkgrel=3
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 groups=('selinux')
@@ -78,6 +78,25 @@ sha512sums=('SKIP'
             '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
 
 _backports=(
+  # https://github.com/systemd/systemd/issues/11277
+  'b261494128e60dd3168e0ea961606ec4f39c5739'
+  'ff86c92e3043f71fc801cf687600a480ee8f6778'
+
+  # https://github.com/systemd/systemd/issues/11264
+  '577ab71c58d36bc8577d15f172a306c9c05cd2f4'
+
+  # https://github.com/systemd/systemd/issues/11251
+  '7334ade4a7e103b1a01d1c8fe1ea7c7a854a1c31'
+
+  # https://github.com/systemd/systemd/issues/11255
+  'adeb26c1affd09138bb96a9e25b795d146e64c97'
+
+  # https://github.com/systemd/systemd/issues/11259
+  '8ca9e92c742602b8bcd431001e6f5b78c28c184f'
+
+  # https://github.com/systemd/systemd/issues/11293
+  '00efd4988b8e4a147f96337de32e54925640f0b7'
+  '69bd76f2b90cd00c1596b2e2c05845a4d9596fd2'
 )
 
 _reverts=(
@@ -138,8 +157,8 @@ build() {
     -Dselinux=true
 
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
-    # TODO(dreisner): consider changing this to unified
     -Ddefault-hierarchy=hybrid
+    -Ddefault-locale=C
     -Ddefault-kill-user-processes=false
     -Dfallback-hostname='archlinux'
     -Dntp-servers="${_timeservers[*]}"
@@ -261,7 +280,7 @@ package_systemd-selinux() {
 package_libsystemd-selinux() {
   pkgdesc='systemd client libraries with SELinux support'
   depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz' 'libselinux')
-  license=('GPL2')
+  license=('LGPL2.1')
   provides=('libsystemd.so' 'libudev.so'
             "${pkgname/-selinux}=${pkgver}-${pkgrel}")
   conflicts=("${pkgname/-selinux}")
@@ -271,8 +290,8 @@ package_libsystemd-selinux() {
 }
 
 package_systemd-resolvconf-selinux() {
-  pkgdesc='systemd resolvconf replacement with SELinux support'
-  license=('GPL2')
+  pkgdesc='systemd resolvconf replacement with SELinux support (for use with systemd-resolved)'
+  license=('LGPL2.1')
   depends=('systemd-selinux')
   provides=('openresolv' 'resolvconf' "${pkgname/-selinux}=${pkgver}-${pkgrel}")
   conflicts=('openresolv' "${pkgname/-selinux}=${pkgver}-${pkgrel}")