systemd-selinux 243.0-1 update

10 files changed, 35 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83de9686d6be..31364dec08e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-selinux
-	pkgver = 242.84
-	pkgrel = 2
+	pkgver = 243.0
+	pkgrel = 1
 	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=v242?signed
-	source = git+https://github.com/systemd/systemd#tag=v242?signed
+	source = git+https://github.com/systemd/systemd-stable#tag=v243?signed
+	source = git+https://github.com/systemd/systemd#tag=v243?signed
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
 	source = initcpio-hook-udev
 	source = initcpio-install-systemd
@@ -48,14 +48,14 @@ pkgbase = systemd-selinux
 	source = systemd-user.pam
 	source = systemd-hook
 	source = 20-systemd-sysusers.hook
-	source = systemd-binfmt.hook
-	source = systemd-catalog.hook
-	source = systemd-daemon-reload.hook
-	source = systemd-hwdb.hook
-	source = systemd-sysctl.hook
-	source = systemd-tmpfiles.hook
-	source = systemd-udev-reload.hook
-	source = systemd-update.hook
+	source = 30-systemd-binfmt.hook
+	source = 30-systemd-catalog.hook
+	source = 30-systemd-daemon-reload.hook
+	source = 30-systemd-hwdb.hook
+	source = 30-systemd-sysctl.hook
+	source = 30-systemd-tmpfiles.hook
+	source = 30-systemd-udev-reload.hook
+	source = 30-systemd-update.hook
 	validpgpkeys = 63CDA1E5D3FC22B998D20DD6327F26951A015CC4
 	validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E
 	sha512sums = SKIP
@@ -111,9 +111,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=242.84
-	provides = udev=242.84
-	provides = systemd=242.84-2
+	provides = systemd-tools=243.0
+	provides = udev=243.0
+	provides = systemd=243.0-1
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -146,7 +146,7 @@ pkgname = systemd-libs-selinux
 	provides = libsystemd.so
 	provides = libudev.so
 	provides = libsystemd-selinux
-	provides = systemd-libs=242.84-2
+	provides = systemd-libs=243.0-1
 	conflicts = libsystemd
 	conflicts = libsystemd-selinux
 	conflicts = systemd-libs
@@ -158,16 +158,16 @@ pkgname = systemd-resolvconf-selinux
 	depends = systemd-selinux
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=242.84-2
+	provides = systemd-resolvconf=243.0-1
 	conflicts = openresolv
-	conflicts = systemd-resolvconf=242.84-2
+	conflicts = systemd-resolvconf=243.0-1
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=242.84-2
-	provides = selinux-systemd-sysvcompat=242.84-2
+	provides = systemd-sysvcompat=243.0-1
+	provides = selinux-systemd-sysvcompat=243.0-1
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/systemd-binfmt.hook b/30-systemd-binfmt.hook
index 9c31a4b162cc..9c31a4b162cc 100644
--- a/systemd-binfmt.hook
+++ b/30-systemd-binfmt.hook
diff --git a/systemd-catalog.hook b/30-systemd-catalog.hook
index d28bddc4bbcd..d28bddc4bbcd 100644
--- a/systemd-catalog.hook
+++ b/30-systemd-catalog.hook
diff --git a/systemd-daemon-reload.hook b/30-systemd-daemon-reload.hook
index 87923e862669..87923e862669 100644
--- a/systemd-daemon-reload.hook
+++ b/30-systemd-daemon-reload.hook
diff --git a/systemd-hwdb.hook b/30-systemd-hwdb.hook
index f0440b0a6457..f0440b0a6457 100644
--- a/systemd-hwdb.hook
+++ b/30-systemd-hwdb.hook
diff --git a/systemd-sysctl.hook b/30-systemd-sysctl.hook
index aec5ac1b0e84..aec5ac1b0e84 100644
--- a/systemd-sysctl.hook
+++ b/30-systemd-sysctl.hook
diff --git a/systemd-tmpfiles.hook b/30-systemd-tmpfiles.hook
index df60d82752ea..df60d82752ea 100644
--- a/systemd-tmpfiles.hook
+++ b/30-systemd-tmpfiles.hook
diff --git a/systemd-udev-reload.hook b/30-systemd-udev-reload.hook
index 04238bd58d3d..04238bd58d3d 100644
--- a/systemd-udev-reload.hook
+++ b/30-systemd-udev-reload.hook
diff --git a/systemd-update.hook b/30-systemd-update.hook
index 7084a0c161c8..7084a0c161c8 100644
--- a/systemd-update.hook
+++ b/30-systemd-update.hook
diff --git a/PKGBUILD b/PKGBUILD
index 21a91465300a..b236bd33546c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,9 +11,9 @@
 pkgbase=systemd-selinux
 pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux')
 # Can be from either systemd or systemd-stable
-_commit='9d34e79ae8ef891adf3757f9248566def70471ad'
-pkgver=242.84
-pkgrel=2
+_commit='efb536d0cbe2e58f80e501d19999928c75e08f6a'
+pkgver=243.0
+pkgrel=1
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 groups=('selinux')
@@ -48,14 +48,14 @@ source=(# fragment is latest tag for source verification, final merge in prepare
         'systemd-user.pam'
         'systemd-hook'
         '20-systemd-sysusers.hook'
-        'systemd-binfmt.hook'
-        'systemd-catalog.hook'
-        'systemd-daemon-reload.hook'
-        'systemd-hwdb.hook'
-        'systemd-sysctl.hook'
-        'systemd-tmpfiles.hook'
-        'systemd-udev-reload.hook'
-        'systemd-update.hook')
+        '30-systemd-binfmt.hook'
+        '30-systemd-catalog.hook'
+        '30-systemd-daemon-reload.hook'
+        '30-systemd-hwdb.hook'
+        '30-systemd-sysctl.hook'
+        '30-systemd-tmpfiles.hook'
+        '30-systemd-udev-reload.hook'
+        '30-systemd-update.hook')
 sha512sums=('SKIP'
             'SKIP'
             '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'
@@ -78,30 +78,6 @@ sha512sums=('SKIP'
             '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
 
 _backports=(
-  # basic/socket-util: put a limit on the loop to flush connections
-  '67962036f6c6cfd34828c1f1f1fbdc0018fb9898'
-
-  # network: logs link state change
-  '0beb9542e90ab1c5d1507a1046a326fbcf73861c'
-
-  # network: drop invalid assertion
-  '51aba17b88617515e037e8985d3a4ea871ac47fe'
-  # network: fix assertion when link get carrier
-  'b9ea3d2e47b3741f3f46ba9c5e19640136933b71'
-
-  # network: do not use ordered_set_printf() for DOMAINS= or ROUTE_DOMAINS=
-  'fe0e16db093a7da09fcb52a2bc7017197047443d'
-
-  # network: honor MTUBytes= setting
-  '933c70a0a4e4fac47d18e0348ae97ee3d48dc139'
-  # network: bump MTU bytes only when MTUByte= is not set
-  'f6fcc1c2a41eae749467de58453174296b635a69'
-
-  # network: do not send ipv6 token to kernel
-  '9f6e82e6eb3b6e73d66d00d1d6eee60691fb702f'
-
-  # cgroup-util: kill also threads
-  'e48fcfef06d81bf08607d3c1657fdc6aa1e9a6ee'
 )
 
 _reverts=(
@@ -163,6 +139,7 @@ build() {
     -Dima=false
     -Dlibidn2=true
     -Dlz4=true
+    -Dman=true
     -Dselinux=true
 
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
@@ -231,10 +208,6 @@ package_systemd-selinux() {
 
   DESTDIR="$pkgdir" meson install -C build
 
-  # don't write units to /etc by default. some of these will be re-enabled on
-  # post_install.
-  rm -rv "$pkgdir"/etc/systemd/system/*
-
   # we'll create this on installation
   rmdir "$pkgdir"/var/log/journal/remote
 
@@ -252,8 +225,9 @@ package_systemd-selinux() {
   rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
 
   # avoid a potential conflict with [core]/filesystem
-  rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf
-  sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
+  rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf}
+  sed -i -e '/^C \/etc\/nsswitch\.conf/d' \
+    -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
 
   # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
   install -m0644 ${pkgbase/-selinux}-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d