summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO25
-rw-r--r--0002-make-homed-userdbd-repart-services-installable.patch171
-rw-r--r--PKGBUILD23
3 files changed, 20 insertions, 199 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dab40c64fc3..dc12bfa8dee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = systemd-selinux
- pkgver = 245.7
+ pkgver = 246.1
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -38,10 +38,9 @@ pkgbase = systemd-selinux
makedepends = systemd
makedepends = libselinux
options = strip
- source = git+https://github.com/systemd/systemd-stable#tag=8a8b000d682a7108463c5c74bc876c5658d9de4a?signed
- source = git+https://github.com/systemd/systemd#tag=v245?signed
+ source = git+https://github.com/systemd/systemd-stable#tag=7fb880ddf101b871f68aae0d86db652e2c13c5db?signed
+ source = git+https://github.com/systemd/systemd#tag=v246?signed
source = 0001-Use-Arch-Linux-device-access-groups.patch
- source = 0002-make-homed-userdbd-repart-services-installable.patch
source = initcpio-hook-udev
source = initcpio-install-systemd
source = initcpio-install-udev
@@ -64,7 +63,6 @@ pkgbase = systemd-selinux
sha512sums = SKIP
sha512sums = SKIP
sha512sums = e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4
- sha512sums = 85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123
sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
sha512sums = f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e
sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a
@@ -126,9 +124,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=245.7
- provides = udev=245.7
- provides = systemd=245.7-1
+ provides = systemd-tools=246.1
+ provides = udev=246.1
+ provides = systemd=246.1-1
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
@@ -156,12 +154,13 @@ pkgname = systemd-libs-selinux
depends = libgcrypt
depends = lz4
depends = xz
+ depends = zstd
depends = libselinux
provides = libsystemd
provides = libsystemd.so
provides = libudev.so
provides = libsystemd-selinux
- provides = systemd-libs=245.7-1
+ provides = systemd-libs=246.1-1
conflicts = libsystemd
conflicts = libsystemd-selinux
conflicts = systemd-libs
@@ -173,16 +172,16 @@ pkgname = systemd-resolvconf-selinux
depends = systemd-selinux
provides = openresolv
provides = resolvconf
- provides = systemd-resolvconf=245.7-1
+ provides = systemd-resolvconf=246.1-1
conflicts = openresolv
- conflicts = systemd-resolvconf=245.7-1
+ conflicts = systemd-resolvconf=246.1-1
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=245.7-1
- provides = selinux-systemd-sysvcompat=245.7-1
+ provides = systemd-sysvcompat=246.1-1
+ provides = selinux-systemd-sysvcompat=246.1-1
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/0002-make-homed-userdbd-repart-services-installable.patch b/0002-make-homed-userdbd-repart-services-installable.patch
deleted file mode 100644
index ef81b9cfe29..00000000000
--- a/0002-make-homed-userdbd-repart-services-installable.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 7e1ed1f3b29162df25064b33dc55ac8cf432bb0b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 13 Mar 2020 18:33:44 +0100
-Subject: [PATCH 1/3] units: make systemd-repart.service installable
-
-This essentially adds another layer of configurability:
-build disable, this, presence of configuration. The default is
-set to enabled, because the service does nothing w/o config.
----
- presets/90-systemd.preset | 1 +
- units/meson.build | 3 +--
- units/systemd-repart.service.in | 6 +++++-
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
-index dc9d02f0b9..7406c92a5c 100644
---- a/presets/90-systemd.preset
-+++ b/presets/90-systemd.preset
-@@ -19,6 +19,7 @@ enable getty@.service
- enable systemd-timesyncd.service
- enable systemd-networkd.service
- enable systemd-resolved.service
-+enable systemd-repart.service
-
- disable console-getty.service
- disable debug-shell.service
-diff --git a/units/meson.build b/units/meson.build
-index ea91f0cc9e..9964eb79a4 100644
---- a/units/meson.build
-+++ b/units/meson.build
-@@ -228,8 +228,7 @@ in_units = [
- 'multi-user.target.wants/'],
- ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'],
- ['systemd-volatile-root.service', ''],
-- ['systemd-repart.service', 'ENABLE_REPART',
-- 'sysinit.target.wants/ initrd-root-fs.target.wants/'],
-+ ['systemd-repart.service', 'ENABLE_REPART'],
- ['user-runtime-dir@.service', ''],
- ['user@.service', ''],
- ]
-diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
-index 7ce6aefd29..41a9d82b93 100644
---- a/units/systemd-repart.service.in
-+++ b/units/systemd-repart.service.in
-@@ -21,5 +21,9 @@ Type=oneshot
- RemainAfterExit=yes
- ExecStart=@rootbindir@/systemd-repart --dry-run=no
-
--# The tool returns 77 if there's no GPT partition table pre-existing
-+# The tool returns 77 if there's no existing GPT partition table
- SuccessExitStatus=77
-+
-+[Install]
-+WantedBy=sysinit.target
-+WantedBy=initrd-root-fs.target
-From 5ef9eda17fda06aaf81ab3f0ff6f87a80b860c94 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 13 Mar 2020 18:38:09 +0100
-Subject: [PATCH 2/3] units: make systemd-homed.service installable
-
-Fixes #15083. Users might want to disable homed if not used to save resources.
----
- presets/90-systemd.preset | 1 +
- test/units/testsuite-46.service | 4 +++-
- units/meson.build | 3 +--
- units/systemd-homed.service.in | 4 ++++
- 4 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
-index 7406c92a5c..53eb8a7806 100644
---- a/presets/90-systemd.preset
-+++ b/presets/90-systemd.preset
-@@ -20,6 +20,7 @@ enable systemd-timesyncd.service
- enable systemd-networkd.service
- enable systemd-resolved.service
- enable systemd-repart.service
-+enable systemd-homed.service
-
- disable console-getty.service
- disable debug-shell.service
-diff --git a/units/meson.build b/units/meson.build
-index 9964eb79a4..d8ee6df184 100644
---- a/units/meson.build
-+++ b/units/meson.build
-@@ -201,8 +201,7 @@ in_units = [
- ['systemd-portabled.service', 'ENABLE_PORTABLED',
- 'dbus-org.freedesktop.portable1.service'],
- ['systemd-userdbd.service', 'ENABLE_USERDB'],
-- ['systemd-homed.service', 'ENABLE_HOMED',
-- 'multi-user.target.wants/ dbus-org.freedesktop.home1.service'],
-+ ['systemd-homed.service', 'ENABLE_HOMED'],
- ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'],
- ['systemd-random-seed.service', 'ENABLE_RANDOMSEED',
- 'sysinit.target.wants/'],
-diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in
-index 7cf98e6fa6..8138f5125c 100644
---- a/units/systemd-homed.service.in
-+++ b/units/systemd-homed.service.in
-@@ -34,3 +34,7 @@ SystemCallArchitectures=native
- SystemCallErrorNumber=EPERM
- SystemCallFilter=@system-service @mount
- @SERVICE_WATCHDOG@
-+
-+[Install]
-+WantedBy=multi-user.target
-+Alias=dbus-org.freedesktop.home1.service
-From ead7af30939e3f1903455c7e06bc7cfeef54d4a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 13 Mar 2020 18:40:54 +0100
-Subject: [PATCH 3/3] units: make systemd-userdbd.{socket,service} installable
-
-It's lightweight and generally useful, so it should be enabled by default. But
-users might want to disable it for whatever reason, and things should be fine
-without it, so let's make it installable so it can be disabled if wanted.
-
-Fixes #15175.
----
- presets/90-systemd.preset | 1 +
- units/meson.build | 3 +--
- units/systemd-userdbd.service.in | 3 +++
- units/systemd-userdbd.socket | 3 +++
- 4 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
-index 53eb8a7806..db61ef12d3 100644
---- a/presets/90-systemd.preset
-+++ b/presets/90-systemd.preset
-@@ -21,6 +21,7 @@ enable systemd-networkd.service
- enable systemd-resolved.service
- enable systemd-repart.service
- enable systemd-homed.service
-+enable systemd-userdbd.socket
-
- disable console-getty.service
- disable debug-shell.service
-diff --git a/units/meson.build b/units/meson.build
-index d8ee6df184..8ec9eb94e4 100644
---- a/units/meson.build
-+++ b/units/meson.build
-@@ -139,8 +139,7 @@ units = [
- 'sysinit.target.wants/'],
- ['systemd-udevd-kernel.socket', '',
- 'sockets.target.wants/'],
-- ['systemd-userdbd.socket', 'ENABLE_USERDB',
-- 'sockets.target.wants/'],
-+ ['systemd-userdbd.socket', 'ENABLE_USERDB'],
- ['time-set.target', ''],
- ['time-sync.target', ''],
- ['timers.target', ''],
-diff --git a/units/systemd-userdbd.service.in b/units/systemd-userdbd.service.in
-index e30ed2109e..3b76705373 100644
---- a/units/systemd-userdbd.service.in
-+++ b/units/systemd-userdbd.service.in
-@@ -39,3 +39,6 @@ SystemCallErrorNumber=EPERM
- SystemCallFilter=@system-service
- Type=notify
- @SERVICE_WATCHDOG@
-+
-+[Install]
-+Also=systemd-userdbd.socket
-diff --git a/units/systemd-userdbd.socket b/units/systemd-userdbd.socket
-index 1c749ea1d2..2b4bb7a87a 100644
---- a/units/systemd-userdbd.socket
-+++ b/units/systemd-userdbd.socket
-@@ -17,3 +17,6 @@ Before=sockets.target
- ListenStream=/run/systemd/userdb/io.systemd.Multiplexer
- Symlinks=/run/systemd/userdb/io.systemd.NameServiceSwitch
- SocketMode=0666
-+
-+[Install]
-+WantedBy=sockets.target
diff --git a/PKGBUILD b/PKGBUILD
index 507eb91d904..a77535af7d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
pkgbase=systemd-selinux
pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux')
-_tag='8a8b000d682a7108463c5c74bc876c5658d9de4a' # git rev-parse v${pkgver}
-pkgver=245.7
+_tag='7fb880ddf101b871f68aae0d86db652e2c13c5db' # git rev-parse v${pkgver}
+pkgver=246.1
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -37,7 +37,6 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <
source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
"git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
'0001-Use-Arch-Linux-device-access-groups.patch'
- '0002-make-homed-userdbd-repart-services-installable.patch'
'initcpio-hook-udev'
'initcpio-install-systemd'
'initcpio-install-udev'
@@ -58,7 +57,6 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
sha512sums=('SKIP'
'SKIP'
'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
- '85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
'f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
@@ -78,8 +76,6 @@ sha512sums=('SKIP'
'825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97')
_backports=(
- # systemd-resolved: use hostname for certificate validation in DoT
- 'eec394f10bbfcc3d2fc8504ad8ff5be44231abd5'
)
_reverts=(
@@ -103,9 +99,6 @@ prepare() {
# Replace cdrom/dialout/tape groups with optical/uucp/storage
patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
-
- # Make homed/userdbd/repart services installable (to allow uninstalling)
- patch -Np1 -i ../0002-make-homed-userdbd-repart-services-installable.patch
}
build() {
@@ -218,10 +211,10 @@ package_systemd-selinux() {
mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs
# manpages shipped with systemd-sysvcompat
- rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8
+ rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8
# executable (symlinks) shipped with systemd-sysvcompat
- rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
+ rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,shutdown}
# files shipped with systemd-resolvconf
rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
@@ -232,7 +225,7 @@ package_systemd-selinux() {
-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
+ install -m0644 "${pkgbase/-selinux}-stable/tmpfiles.d/legacy.conf" "$pkgdir"/usr/lib/tmpfiles.d
# ship default policy to leave services disabled
echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
@@ -265,7 +258,7 @@ package_systemd-selinux() {
package_systemd-libs-selinux() {
pkgdesc='systemd client libraries with SELinux support'
- depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz' 'libselinux')
+ depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz' 'zstd' 'libselinux')
license=('LGPL2.1')
provides=('libsystemd' 'libsystemd.so' 'libudev.so'
'libsystemd-selinux'
@@ -300,11 +293,11 @@ package_systemd-sysvcompat-selinux() {
"selinux-systemd-sysvcompat=${pkgver}-${pkgrel}")
install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \
- build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+ build/man/{halt,poweroff,reboot,shutdown}.8
install -d -m0755 "$pkgdir"/usr/bin
ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init
- for tool in runlevel reboot shutdown poweroff halt telinit; do
+ for tool in halt poweroff reboot shutdown; do
ln -s systemctl "$pkgdir"/usr/bin/$tool
done
}