up to 248.2

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index cbd7109459647079c5e9707fb2bf6c96358c701a..c2e6496876f2a81d18c3bba27f75f91c0b970d9e 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -18,6 +18,8 @@
 %bcond_without qrencode        # QRencode support
 %bcond_without selinux         # SELinux support
 %bcond_without efi             # EFI boot support
+%bcond_without fido2           # FIDO2 support
+%bcond_without tpm2            # TPM2 support
 %bcond_with    tests           # "make check" (requires systemd already installed)
 
 %ifnarch %{ix86} %{x8664} aarch64
@@ -28,14 +30,14 @@ Summary:    A System and Service Manager
 Summary(pl.UTF-8):     systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version:       247.3
+Version:       248.2
 Release:       0.1
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
 #Source0Download: https://github.com/systemd/systemd/releases
 Source0:       https://github.com/systemd/systemd-stable/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 5be57c584847b161c67577f2d997903a
+# Source0-md5: a9ef37089c45cd9c80802c30152a7485
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -55,6 +57,7 @@ Source102:    udev.rules
 Source103:     udev-links.conf
 Source104:     udev-uinput.rules
 Source105:     udev-steam_controller.rules
+Source106:     udev-i2c.rules
 # scripts / helpers
 Source110:     udev-net.helper
 Source111:     start_udev
@@ -105,7 +108,7 @@ BuildRequires:      libapparmor-devel >= 1:2.13
 BuildRequires: libblkid-devel >= 2.24
 BuildRequires: libcap-devel
 BuildRequires: libfdisk-devel >= 2.33
-BuildRequires: libfido2-devel
+%{?with_fido2:BuildRequires:   libfido2-devel}
 BuildRequires: libgcrypt-devel >= 1.4.5
 BuildRequires: libgpg-error-devel >= 1.12
 BuildRequires: libidn2-devel
@@ -131,6 +134,7 @@ BuildRequires:      python3-lxml
 BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: sed >= 4.0
 %{?with_tests:BuildRequires:   systemd}
+%{?with_tpm2:BuildRequires:    tpm2-tss-devel}
 BuildRequires: usbutils >= 0.82
 BuildRequires: xorg-lib-libxkbcommon-devel >= 0.5.0
 BuildRequires: xz-devel
@@ -161,13 +165,14 @@ Requires: libgpg-error >= 1.12
 Requires:      libutempter
 Requires:      polkit >= 0.106
 Requires:      rc-scripts >= 0.4.5.3-7
-Requires:      setup >= 2.8.0-2
+Requires:      setup >= 2.10.1
 Requires:      udev-core = %{epoch}:%{version}-%{release}
 Requires:      udev-libs = %{epoch}:%{version}-%{release}
 Requires:      uname(release) >= 3.13
 Requires:      util-linux >= 2.30
 %{?with_cryptsetup:Suggests:   cryptsetup >= 2.3.0}
 Suggests:      fsck >= 2.25.0
+%{?with_fido2:Suggests:        libfido2}
 Suggests:      libidn2
 Suggests:      libpwquality
 Suggests:      pcre2-8
@@ -180,6 +185,7 @@ Provides:   group(systemd-journal)
 Provides:      group(systemd-journal-remote)
 Provides:      group(systemd-journal-upload)
 Provides:      group(systemd-network)
+Provides:      group(systemd-oom)
 Provides:      group(systemd-resolve)
 Provides:      group(systemd-timesync)
 Provides:      udev-acl = %{epoch}:%{version}-%{release}
@@ -187,6 +193,7 @@ Provides:   user(systemd-coredump)
 Provides:      user(systemd-journal-remote)
 Provides:      user(systemd-journal-upload)
 Provides:      user(systemd-network)
+Provides:      user(systemd-oom)
 Provides:      user(systemd-resolve)
 Provides:      user(systemd-timesync)
 # kde4 still can't live without ConsoleKit
@@ -344,6 +351,7 @@ Summary(pl.UTF-8):  Pliki konfiguracyjne, katalogi i narzędzie instalacyjne dla
 Group:         Base
 Requires(post):        coreutils
 Requires(post):        /bin/awk
+Requires:      less >= 568
 
 %description units
 Basic configuration files, directories and installation tool for the
@@ -573,7 +581,7 @@ Group:              Applications/Shells
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      bash-completion >= 2.0
 Obsoletes:     bash-completion-elogind
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description -n bash-completion-systemd
 bash-completion for systemd.
@@ -587,7 +595,7 @@ Summary(pl.UTF-8):  Uzupełnianie parametrów w zsh dla poleceń systemd
 Group:         Applications/Shells
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Obsoletes:     zsh-completion-elogind
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description -n zsh-completion-systemd
 zsh completion for systemd commands.
@@ -629,7 +637,7 @@ Requires:   filesystem >= 3.0-45
 Requires:      kmod >= 15
 Requires:      libblkid >= 2.24
 %{?with_selinux:Requires:      libselinux >= 2.6}
-Requires:      setup >= 2.9.0-3
+Requires:      setup >= 2.10.1
 Requires:      systemd-libs = %{epoch}:%{version}-%{release}
 Requires:      udev-libs = %{epoch}:%{version}-%{release}
 Requires:      uname(release) >= 3.13
@@ -678,7 +686,7 @@ Summary(pl.UTF-8):  Bashowe dopełnianie składni dla udev
 Group:         Applications/Shells
 Requires:      bash-completion >= 2.0
 Requires:      udev = %{epoch}:%{version}-%{release}
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description -n bash-completion-udev
 bash-completion for udev.
@@ -691,7 +699,7 @@ Summary:    zsh completion for udev commands
 Summary(pl.UTF-8):     Uzupełnianie parametrów w zsh dla poleceń udev
 Group:         Applications/Shells
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description -n zsh-completion-udev
 zsh completion for udev commands.
@@ -730,6 +738,7 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
        -Ddefault-kill-user-processes=false \
        %{?debug:--buildtype=debug} \
        -Defi=%{__true_false efi} \
+       -Dfido2=%{__true_false fido2} \
        -Dkexec-path=/sbin/kexec \
        -Dkmod-path=/sbin/kmod \
        -Dlibcryptsetup=%{__true_false cryptsetup} \
@@ -757,6 +766,7 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
        -Dsulogin-path=/sbin/sulogin \
        -Dsysvinit-path=/etc/rc.d/init.d \
        -Dsysvrcnd-path=/etc/rc.d \
+       -Dtpm2=%{__true_false tpm2} \
        -Dumount-path=/bin/umount \
        -Dusers-gid=1000 \
 
@@ -803,6 +813,7 @@ cp -a %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/40-alsa-restore.ru
 cp -a %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-udev-pld.rules
 cp -a %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-uinput.rules
 cp -a %{SOURCE105} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-steam_controller.rules
+cp -a %{SOURCE106} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/70-i2c.rules
 
 # http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames
 ln -s /dev/null $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/80-net-setup-link.rules
@@ -876,7 +887,8 @@ cp -p %{SOURCE19} $RPM_BUILD_ROOT%{systemdunitdir}/prefdm.service
        $RPM_BUILD_ROOT%{_mandir}/man8/systemd-rc-local-generator.8
 
 # provided by rc-scripts
-%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service
+%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/rc-local.service \
+       $RPM_BUILD_ROOT%{_mandir}/man8/rc-local.service.8
 
 # Make sure these directories are properly owned:
 #      - halt,kexec,poweroff,reboot: generic ones used by ConsoleKit-systemd,
@@ -921,6 +933,8 @@ rm -rf $RPM_BUILD_ROOT
 %useradd -u 320 -g 320 -d /var/log/journal -s /bin/false -c "Systemd Journal Upload" systemd-journal-upload
 %groupadd -g 333 systemd-coredump
 %useradd -u 333 -g 333 -d /var/log/journal -s /bin/false -c "Systemd Core Dumper" systemd-coredump
+%groupadd -g 341 systemd-oom
+%useradd -u 341 -g 341 -d /var/log/journal -s /bin/false -c "Systemd Userspace OOM Killer" systemd-oom
 
 %post
 /bin/systemd-machine-id-setup || :
@@ -939,6 +953,8 @@ if [ "$1" = "0" ]; then
        %groupremove systemd-coredump
        %userremove systemd-network
        %groupremove systemd-network
+       %userremove systemd-oom
+       %groupremove systemd-oom
        %userremove systemd-resolve
        %groupremove systemd-resolve
        %userremove systemd-timesync
@@ -950,11 +966,11 @@ if [ "$1" = "0" ]; then
        %groupremove systemd-journal
 fi
 
-%triggerpostun -- systemd < 1:208-1
+%triggerpostun -- systemd < 1:220-1
+# systemd < 1:208-1
 chgrp -R systemd-journal /var/log/journal
 chmod g+s /var/log/journal
-
-%triggerpostun -- systemd < 1:220-1
+# systemd < 1:220-1
 # https://bugs.freedesktop.org/show_bug.cgi?id=89202
 /bin/getfacl -p /var/log/journal/$(cat /etc/machine-id) | grep -v '^#' | sort -u | /bin/setfacl -R --set-file=- /var/log/journal/$(cat /etc/machine-id) || :
 
@@ -1012,14 +1028,14 @@ if [ $1 -ge 1 ]; then
        /bin/systemctl daemon-reload || :
 fi
 
-%triggerpostun units -- systemd-units < 43-7
+%triggerpostun units -- systemd-units < 1:242
+# systemd-units < 43-7
 # Remove design fialures
 %{__rm} -f %{_sysconfdir}/systemd/system/network.target.wants/ifcfg@*.service || :
 %{__rm} -f %{_sysconfdir}/systemd/system/network.target.wants/network-post.service || :
 %{__rm} -f %{_sysconfdir}/systemd/system/multi-user.target.wants/network-post.service || :
 /bin/systemctl reenable network.service || :
-
-%triggerpostun units -- systemd-units < 1:183
+# systemd-units < 1:183
 /bin/systemctl --quiet enable systemd-udev-settle.service || :
 %{__rm} -f /etc/systemd/system/basic.target.wants/udev-settle.service || :
 # preserve renamed configs
@@ -1031,22 +1047,19 @@ if [ -f /etc/systemd/systemd-logind.conf.rpmsave ]; then
        %{__mv} /etc/systemd/logind.conf{,.rpmnew}
        %{__mv} -f /etc/systemd/systemd-logind.conf.rpmsave /etc/systemd/logind.conf
 fi
-
-%triggerpostun units -- systemd-units < 1:187-3
+# systemd-units < 1:187-3
 if [ -f /etc/sysconfig/rpm ]; then
        . /etc/sysconfig/rpm
        if [ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ]; then
                echo "disable *" >>%{_sysconfdir}/systemd/system-preset/default.preset
        fi
 fi
-
-%triggerpostun units -- systemd-units < 1:208-9
+# systemd-units < 1:208-9
 # remove buggy symlink
 if [ -L /etc/systemd/system/getty.target.wants/getty@.service ] ; then
        rm -f /etc/systemd/system/getty.target.wants/getty@.service || :
 fi
-
-%triggerpostun units -- systemd-units < 1:242
+# systemd-units < 1:242
 if [ -L /var/lib/systemd/timesync ] ; then
        rm -f /var/lib/systemd/timesync || :
 fi
@@ -1104,13 +1117,14 @@ if [ "$2" = 0 ]; then
        /sbin/start_udev || exit 0
 fi
 
-%triggerpostun -n udev-core -- udev < 108
+%triggerpostun -n udev-core -- udev < 165
+# udev < 108
 %{__sed} -i -e 's#IMPORT{program}="/sbin/#IMPORT{program}="#g' /etc/udev/rules.d/*.rules
 %if "%{_lib}" != "lib"
 %{__sed} -i -e 's#/%{_lib}/udev/#/lib/udev/#g' /etc/udev/rules.d/*.rules
 %endif
 
-%triggerpostun -n udev-core -- udev < 165
+# udev < 165
 /bin/udevadm info --convert-db
 
 %post -n udev-core
@@ -1181,6 +1195,7 @@ fi
 %attr(755,root,root) /bin/systemd-inhibit
 %attr(755,root,root) /bin/systemd-machine-id-setup
 %attr(755,root,root) /bin/systemd-notify
+%attr(755,root,root) /bin/systemd-sysext
 %attr(755,root,root) /bin/systemd-sysusers
 %attr(755,root,root) /bin/systemd-tty-ask-password-agent
 %attr(755,root,root) /bin/userdbctl
@@ -1191,6 +1206,7 @@ fi
 %attr(755,root,root) %{_bindir}/kernel-install
 %attr(755,root,root) %{_bindir}/localectl
 %attr(755,root,root) %{_bindir}/systemd-cat
+%{?with_cryptsetup:%attr(755,root,root) %{_bindir}/systemd-cryptenroll}
 %attr(755,root,root) %{_bindir}/systemd-delta
 %attr(755,root,root) %{_bindir}/systemd-detect-virt
 %attr(755,root,root) %{_bindir}/systemd-dissect
@@ -1377,6 +1393,7 @@ fi
 %{_mandir}/man1/systemd.1*
 %{_mandir}/man1/systemd-ask-password.1*
 %{_mandir}/man1/systemd-cat.1*
+%{?with_cryptsetup:%{_mandir}/man1/systemd-cryptenroll.1*}
 %{_mandir}/man1/systemd-delta.1*
 %{_mandir}/man1/systemd-detect-virt.1*
 %{_mandir}/man1/systemd-dissect.1*
@@ -1513,6 +1530,7 @@ fi
 %{_mandir}/man8/systemd-sleep.8*
 %{_mandir}/man8/systemd-socket-proxyd.8*
 %{_mandir}/man8/systemd-sysctl.8*
+%{_mandir}/man8/systemd-sysext.8*
 %{_mandir}/man8/systemd-system-update-generator.8*
 %{_mandir}/man8/systemd-sysusers.8*
 %{_mandir}/man8/systemd-sysusers.service.8*
@@ -1559,7 +1577,10 @@ fi
 %attr(755,root,root) /sbin/shutdown
 %attr(755,root,root) /sbin/telinit
 %{_mandir}/man1/init.1*
-%{?with_cryptsetup:%{_mandir}/man5/crypttab.5*}
+%if %{with cryptsetup}
+%{_mandir}/man5/crypttab.5*
+%{_mandir}/man5/veritytab.5*
+%endif
 %{_mandir}/man8/halt.8*
 %{_mandir}/man8/poweroff.8*
 %{_mandir}/man8/reboot.8*
@@ -1731,6 +1752,7 @@ fi
 %{systemdunitdir}/systemd-suspend.service
 %{systemdunitdir}/systemd-suspend-then-hibernate.service
 %{systemdunitdir}/systemd-sysctl.service
+%{systemdunitdir}/systemd-sysext.service
 %{systemdunitdir}/systemd-sysusers.service
 %{systemdunitdir}/systemd-time-wait-sync.service
 %{systemdunitdir}/systemd-timedated.service
@@ -1773,8 +1795,12 @@ fi
 %{systemdunitdir}/blockdev@.target
 %{systemdunitdir}/bluetooth.target
 %{systemdunitdir}/boot-complete.target
-%{?with_cryptsetup:%{systemdunitdir}/cryptsetup-pre.target}
-%{?with_cryptsetup:%{systemdunitdir}/cryptsetup.target}
+%if %{with cryptsetup}
+%{systemdunitdir}/cryptsetup-pre.target
+%{systemdunitdir}/cryptsetup.target
+%{systemdunitdir}/veritysetup-pre.target
+%{systemdunitdir}/veritysetup.target
+%endif
 %{systemdunitdir}/ctrl-alt-del.target
 %{systemdunitdir}/default.target
 %{systemdunitdir}/emergency.target
@@ -1809,6 +1835,7 @@ fi
 %{systemdunitdir}/remote-fs.target
 %if %{with cryptsetup}
 %{systemdunitdir}/remote-cryptsetup.target
+%{systemdunitdir}/remote-veritysetup.target
 %endif
 %{systemdunitdir}/rescue.target
 %{systemdunitdir}/rpcbind.target
@@ -1863,6 +1890,7 @@ fi
 %dir %{systemdunitdir}/timers.target.wants
 %if %{with cryptsetup}
 %{systemdunitdir}/initrd-root-device.target.wants/remote-cryptsetup.target
+%{systemdunitdir}/initrd-root-device.target.wants/remote-veritysetup.target
 %endif
 %{systemdunitdir}/graphical.target.wants/display-manager.service
 %{systemdunitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service
@@ -1885,7 +1913,10 @@ fi
 %{systemdunitdir}/sockets.target.wants/systemd-journald.socket
 %{systemdunitdir}/sockets.target.wants/systemd-udevd-control.socket
 %{systemdunitdir}/sockets.target.wants/systemd-udevd-kernel.socket
-%{?with_cryptsetup:%{systemdunitdir}/sysinit.target.wants/cryptsetup.target}
+%if %{with cryptsetup}
+%{systemdunitdir}/sysinit.target.wants/cryptsetup.target
+%{systemdunitdir}/sysinit.target.wants/veritysetup.target
+%endif
 %{systemdunitdir}/sysinit.target.wants/dev-hugepages.mount
 %{systemdunitdir}/sysinit.target.wants/dev-mqueue.mount
 %{systemdunitdir}/sysinit.target.wants/kmod-static-nodes.service
@@ -1963,6 +1994,7 @@ fi
 %{_mandir}/man8/systemd-suspend.service.8*
 %{_mandir}/man8/systemd-suspend-then-hibernate.service.8*
 %{_mandir}/man8/systemd-sysctl.service.8*
+%{_mandir}/man8/systemd-sysext.service.8*
 %{_mandir}/man8/systemd-time-wait-sync.service.8*
 %{_mandir}/man8/systemd-timedated.service.8*
 %{_mandir}/man8/systemd-tmpfiles-clean.service.8*
@@ -2052,6 +2084,7 @@ fi
 %attr(755,root,root) /bin/oomctl
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/oomd.conf
 %attr(755,root,root) /lib/systemd/systemd-oomd
+%{systemdunitdir}/dbus-org.freedesktop.oom1.service
 %{systemdunitdir}/systemd-oomd.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.oom1.service
 %{_datadir}/dbus-1/system.d/org.freedesktop.oom1.conf
@@ -2084,6 +2117,7 @@ fi
 %{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf
 %{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy
 %{_mandir}/man1/portablectl.1*
+%{_mandir}/man5/org.freedesktop.portable1.5*
 %{_mandir}/man8/systemd-portabled.8*
 %{_mandir}/man8/systemd-portabled.service.8*
 
@@ -2219,6 +2253,7 @@ fi
 
 %attr(755,root,root) /lib/udev/ata_id
 %attr(755,root,root) /lib/udev/cdrom_id
+%attr(755,root,root) /lib/udev/dmi_memory_id
 %attr(755,root,root) /lib/udev/fido_id
 %attr(755,root,root) /lib/udev/mtd_probe
 %attr(755,root,root) /lib/udev/scsi_id
@@ -2228,6 +2263,7 @@ fi
 
 /lib/udev/hwdb.d/20-acpi-vendor.hwdb
 /lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
+/lib/udev/hwdb.d/20-dmi-id.hwdb
 /lib/udev/hwdb.d/20-net-ifname.hwdb
 /lib/udev/hwdb.d/20-OUI.hwdb
 /lib/udev/hwdb.d/20-pci-classes.hwdb
@@ -2238,6 +2274,7 @@ fi
 /lib/udev/hwdb.d/20-usb-vendor-model.hwdb
 /lib/udev/hwdb.d/20-vmbus-class.hwdb
 /lib/udev/hwdb.d/60-autosuspend-chromiumos.hwdb
+/lib/udev/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
 /lib/udev/hwdb.d/60-autosuspend.hwdb
 /lib/udev/hwdb.d/60-evdev.hwdb
 /lib/udev/hwdb.d/60-input-id.hwdb
@@ -2266,6 +2303,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-udev-pld.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-uinput.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-steam_controller.rules
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-i2c.rules
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/80-net-setup-link.rules
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
@@ -2285,6 +2323,7 @@ fi
 /lib/udev/rules.d/60-persistent-v4l.rules
 /lib/udev/rules.d/60-serial.rules
 /lib/udev/rules.d/64-btrfs.rules
+/lib/udev/rules.d/70-memory.rules
 /lib/udev/rules.d/70-mouse.rules
 /lib/udev/rules.d/70-power-switch.rules
 /lib/udev/rules.d/70-touchpad.rules