X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=systemd.spec;h=b224a4a7f3094d9edffe1fe5ae310317e6921452;hb=0ac4918;hp=cd2ad06e18060a08639f3bf1afd6fe5f1b062594;hpb=8ad860a431805d89e7961d34f71cebb548688ddd;p=packages%2Fsystemd.git

diff --git a/systemd.spec b/systemd.spec
index cd2ad06..b224a4a 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -6,12 +6,11 @@
 #   - restore (write) sane value for kernel.hotplug, i.e from rc-scripts: sysctl -q -e -w kernel.hotplug=/lib/firmware/firmware-loader.sh
 # - dev->udev upgrade:
 #   - /dev/urandom remains missing, not created with start_udev anymore
-#
-#warning: Installed (but unpackaged) file(s) found:
-#	/usr/lib/rpm/macros.d/macros.systemd
+# - clean up unpackaged files
 #
 # Conditional build:
 %bcond_without	audit		# audit support
+%bcond_without	bpf		# BPF programs in restricted C support
 %bcond_without	cryptsetup	# cryptsetup support
 %bcond_without	microhttpd	# use microhttpd for network journal access
 %bcond_without	pam		# PAM authentication support
@@ -30,14 +29,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:	250
+Version:	251.7
 Release:	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:	f08322d101f88f80068112d8284a5151
+# Source0-md5:	5ef4286f7678127ca151c7910291874e
 Source1:	%{name}-sysv-convert
 Source2:	%{name}_booted.c
 Source3:	network.service
@@ -80,11 +79,13 @@ Patch13:	sysctl.patch
 Patch14:	pld-pam-%{name}-user.patch
 Patch15:	%{name}-x32.patch
 Patch16:	rpm-macros.patch
+Patch17:	%{name}-include.patch
 URL:		https://www.freedesktop.org/wiki/Software/systemd/
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
 BuildRequires:	binutils >= 3:2.22.52.0.1-2
 BuildRequires:	bzip2-devel
+%{?with_bpf:BuildRequires:	clang >= 10.0.0}
 # ln --relative
 BuildRequires:	coreutils >= 8.16
 %{?with_cryptsetup:BuildRequires:	cryptsetup-devel >= 2.4.0}
@@ -94,6 +95,7 @@ BuildRequires:	docbook-dtd42-xml
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl-nons
 BuildRequires:	elfutils-devel >= 0.177
+BuildRequires:	gcc >= 6:4.9
 BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.22.0
 BuildRequires:	glibc-misc
@@ -103,11 +105,13 @@ BuildRequires:	gperf
 BuildRequires:	intltool >= 0.40.0
 # pkgconfig(libiptc)
 BuildRequires:	iptables-devel
+%{?with_bpf:BuildRequires:	kernel-tools >= 5.13.0}
 BuildRequires:	kmod-devel >= 15
 BuildRequires:	libapparmor-devel >= 1:2.13
 BuildRequires:	libblkid-devel >= 2.24
+%{?with_bpf:BuildRequires:	libbpf-devel >= 0.1.0}
 BuildRequires:	libcap-devel
-BuildRequires:	libfdisk-devel >= 2.33
+BuildRequires:	libfdisk-devel >= 2.32
 %{?with_fido2:BuildRequires:	libfido2-devel}
 BuildRequires:	libgcrypt-devel >= 1.4.5
 BuildRequires:	libgpg-error-devel >= 1.12
@@ -126,12 +130,14 @@ BuildRequires:	ninja
 BuildRequires:	p11-kit-devel >= 0.23.3
 %{?with_pam:BuildRequires:	pam-devel >= 1.1.2}
 BuildRequires:	pcre2-8-devel
+# for sbat-distro* in src/boot/efi/meson.build
+BuildRequires:	pld-release
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	polkit-devel >= 0.106
 BuildRequires:	python3
 BuildRequires:	python3-jinja2
 BuildRequires:	python3-lxml
-%{?with_qrencode:BuildRequires:	qrencode-devel >= 4}
+%{?with_qrencode:BuildRequires:	qrencode-devel >= 3}
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
@@ -156,45 +162,40 @@ Requires:	%{name}-tools = %{epoch}:%{version}-%{release}
 Requires:	/etc/os-release
 Requires:	SysVinit-tools
 Requires:	agetty
-Requires:	curl-libs >= 7.32.0
 Requires:	dbus >= 1.9.18
 Requires:	elfutils >= 0.177
 Requires:	filesystem >= 4.0-39
 Requires:	glibc >= 2.16
-Requires:	gnutls-libs >= 3.6.0
 Requires:	kmod >= 25-2
 Requires:	libgpg-error >= 1.12
-%{?with_microhttpd:Requires:	libmicrohttpd >= 0.9.33}
 Requires:	libutempter
 Requires:	polkit >= 0.106
 Requires:	rc-scripts >= 0.4.5.3-7
 Requires:	setup >= 2.10.1
 Requires:	udev-core = %{epoch}:%{version}-%{release}
 Requires:	udev-libs = %{epoch}:%{version}-%{release}
-Requires:	uname(release) >= 3.13
+Requires:	uname(release) >= 4.15
 Requires:	util-linux >= 2.30
+Suggests:	%{name}-container = %{epoch}:%{version}-%{release}
+Suggests:	%{name}-sysv-compat = %{epoch}:%{version}-%{release}
 %{?with_cryptsetup:Suggests:	cryptsetup >= 2.4.0}
 Suggests:	fsck >= 2.25.0
 %{?with_fido2:Suggests:	libfido2}
 Suggests:	libidn2
 Suggests:	libpwquality
 Suggests:	pcre2-8
-%{?with_qrencode:Suggests:	qrencode-libs >= 4}
+%{?with_qrencode:Suggests:	qrencode-libs >= 3}
 Suggests:	service(klogd)
 Suggests:	service(syslog)
 Suggests:	xorg-lib-libxkbcommon >= 0.5.0
 Provides:	group(systemd-coredump)
 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}
 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)
@@ -349,6 +350,19 @@ Install this package when you are ready to final switch to systemd.
 Ten pakiet należy zainstalować po przygotowaniu się do ostatecznego
 przejścia na systemd.
 
+%package sysv-compat
+Summary:	systemd/SysV interoperability tools
+Summary(pl.UTF-8):	Narzędzia wspomagające współpracę między systemd a SysV
+Group:		Base
+Requires:	python3
+Requires:	python3-modules
+
+%description sysv-compat
+systemd/SysV interoperability tools.
+
+%description sysv-compat -l pl.UTF-8
+Narzędzia wspomagające współpracę między systemd a SysV.
+
 %package units
 Summary:	Configuration files, directories and installation tool for systemd
 Summary(pl.UTF-8):	Pliki konfiguracyjne, katalogi i narzędzie instalacyjne dla systemd
@@ -382,9 +396,23 @@ Tools that work with and without systemd started.
 %description tools -l pl.UTF-8
 Narzędzia działające przy uruchomionym jak i bez systemd.
 
-%package journal-gateway
-Summary:	Gateway for serving journal events over the network using HTTP
-Summary(pl.UTF-8):	Bramka do serwowania zdarzeń dziennika po sieci poprzez HTTP
+%package container
+Summary:	Tools for container/VM management
+Summary(pl.UTF-8):	Narzędzia do zarządzania kontenerami/wirtualnymi maszynami
+License:	LGPL v2.1+
+Group:		Base
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	curl-libs >= 7.32.0
+
+%description container
+Tools for container/VM management.
+
+%description container -l pl.UTF-8
+Narzędzia do zarządzania kontenerami/wirtualnymi maszynami.
+
+%package journal-remote
+Summary:	Tools for sending and receiving remote journal logs
+Summary(pl.UTF-8):	Narzędzia do wysyłania i odbierania zdarzeń dziennika po sieci
 License:	LGPL v2.1+
 Group:		Base
 Requires:	%{name} = %{epoch}:%{version}-%{release}
@@ -394,24 +422,30 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Requires:	curl-libs >= 7.32.0
+Requires:	gnutls-libs >= 3.6.0
+Requires:	libmicrohttpd >= 0.9.33
 Provides:	group(systemd-journal-gateway)
+Provides:	group(systemd-journal-remote)
+Provides:	group(systemd-journal-upload)
 Provides:	user(systemd-journal-gateway)
+Provides:	user(systemd-journal-remote)
+Provides:	user(systemd-journal-upload)
+Obsoletes:	systemd-journal-gateway < 1:251.4-3
 Conflicts:	systemd < 1:206-3
 
-%description journal-gateway
-systemd-journal-gatewayd serves journal events over the network using
-HTTP.
+%description journal-remote
+Tools for sending and receiving remote journal logs.
 
-%description journal-gateway -l pl.UTF-8
-systemd-journal-gatewayd serwuje zdarzenia dziennika po sieci poprzez
-HTTP.
+%description journal-remote -l pl.UTF-8
+Narzędzia do wysyłania i odbierania zdarzeń dziennika po sieci.
 
 %package homed
 Summary:	systemd home area/user account manager
 Summary(pl.UTF-8):	Zarządca obszarów domowych/kont użytkownika dla systemd
 Group:		Base
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	libfdisk >= 2.33
+Requires:	libfdisk >= 2.32
 
 %description homed
 systemd-homed is a system service that may be used to create, remove,
@@ -478,7 +512,7 @@ Summary:	systemd service to automatically grow and add partitions
 Summary(pl.UTF-8):	Usługa systemd do automatycznego powiększania lub dodawania partycji
 Group:		Base
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	libfdisk >= 2.33
+Requires:	libfdisk >= 2.32
 
 %description repart
 systemd-repart grows and adds partitions to a partition table, based
@@ -493,6 +527,7 @@ Summary:	systemd network name resolution manager
 Summary(pl.UTF-8):	Zarządca rozwiązywania nazw sieciowych systemd
 Group:		Base
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	gnutls-libs >= 3.6.0
 
 %description resolved
 systemd-resolved is a system service that manages network name
@@ -510,6 +545,18 @@ responder LLMNR.
 Generuje także dla zgodności plik /run/systemd/resolve/resolv.conf,
 który można użyć do dowiązania symbolicznego z /etc/resolv.conf.
 
+%package sysupdate
+Summary:	systemd service for automatic system update
+Summary(pl.UTF-8):	Usługa systemd do automatycznych aktualizacji systemu
+Group:		Base
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description sysupdate
+systemd service for automatic system update.
+
+%description sysupdate -l pl.UTF-8
+Usługa systemd do automatycznych aktualizacji systemu.
+
 %package inetd
 Summary:	Native inet service support for systemd via socket activation
 Summary(pl.UTF-8):	Natywna obsługa usług inet dla systemd
@@ -563,7 +610,7 @@ Requires:	libseccomp >= 2.4.0
 %{?with_selinux:Requires:	libselinux >= 2.6}
 Requires:	lz4-libs >= 1:1.3.0
 Requires:	zstd >= 1.4.0
-Obsoletes:	nss_myhostname
+Obsoletes:	nss_myhostname < 0.4
 
 %description libs
 Shared systemd libraries.
@@ -590,7 +637,7 @@ Summary:	bash-completion for systemd
 Summary(pl.UTF-8):	Bashowe dopełnianie składni dla systemd
 Group:		Applications/Shells
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	bash-completion >= 2.0
+Requires:	bash-completion >= 1:2.0
 Obsoletes:	bash-completion-elogind
 BuildArch:	noarch
 
@@ -653,7 +700,7 @@ Requires:	libblkid >= 2.24
 Requires:	setup >= 2.10.1
 Requires:	systemd-libs = %{epoch}:%{version}-%{release}
 Requires:	udev-libs = %{epoch}:%{version}-%{release}
-Requires:	uname(release) >= 3.13
+Requires:	uname(release) >= 4.15
 Obsoletes:	udev-compat < 1:182-1
 Obsoletes:	udev-dbus < 027
 Obsoletes:	udev-digicam < 1:079-2
@@ -700,7 +747,7 @@ Plik nagłówkowy biblioteki libudev.
 Summary:	bash-completion for udev
 Summary(pl.UTF-8):	Bashowe dopełnianie składni dla udev
 Group:		Applications/Shells
-Requires:	bash-completion >= 2.0
+Requires:	bash-completion >= 1:2.0
 Requires:	udev = %{epoch}:%{version}-%{release}
 BuildArch:	noarch
 
@@ -724,11 +771,16 @@ zsh completion for udev commands.
 Uzupełnianie parametrów w zsh dla poleceń udev.
 
 %package -n rpm-macros-systemd
-Summary:	Macros that define paths and scriptlets related to systemd
+Summary:	RPM macros that define paths and scriptlets related to systemd
+Summary(pl.UTF-8):	Makra RPM-a definiujące ścieżki i skryptlety związane z systemd
+Group:		Development/Building
 BuildArch:	noarch
 
 %description -n rpm-macros-systemd
-Macros that define paths and scriptlets related to systemd.
+RPM macros that define paths and scriptlets related to systemd.
+
+%description -n rpm-macros-systemd -l pl.UTF-8
+Makra RPM-a definiujące ścieżki i skryptlety związane z systemd.
 
 %prep
 %setup -q -n systemd-stable-%{version}
@@ -749,6 +801,7 @@ Macros that define paths and scriptlets related to systemd.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 cp -p %{SOURCE2} src/systemd_booted.c
 
@@ -778,6 +831,7 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
 	-Dnobody-user="nobody" \
 	-Dnobody-group="nogroup" \
 	-Daudit=%{__true_false audit} \
+	-Dbpf-framework=%{__true_false bpf} \
 	-Ddefault-kill-user-processes=false \
 	%{?debug:--buildtype=debug} \
 	-Defi=%{__true_false efi} \
@@ -821,11 +875,11 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/lib/{%{name}/{catalog,coredump},machines} \
 	$RPM_BUILD_ROOT%{_rootsbindir} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,repart.d,systemd/system-preset} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,repart.d,systemd/{system,user}-preset,sysupdate.d} \
 	$RPM_BUILD_ROOT%{systemduserunitdir}/sockets.target.wants \
 	$RPM_BUILD_ROOT%{systemdunitdir}/{final,sound,system-update}.target.wants \
 	$RPM_BUILD_ROOT%{systemdunitdir}/systemd-udevd.service.d \
-	$RPM_BUILD_ROOT%{_prefix}/lib/{repart.d,systemd/system-environment-generators}
+	$RPM_BUILD_ROOT%{_prefix}/lib/{repart.d,systemd/system-environment-generators,sysupdate.d}
 
 %ninja_install -C build
 
@@ -968,10 +1022,6 @@ rm -rf $RPM_BUILD_ROOT
 %useradd -u 317 -g 317 -d /var/log/journal -s /bin/false -c "Systemd Resolver" systemd-resolve
 %groupadd -g 318 systemd-timesync
 %useradd -u 318 -g 318 -d /var/log/journal -s /bin/false -c "Systemd Time Synchronization" systemd-timesync
-%groupadd -g 319 systemd-journal-remote
-%useradd -u 319 -g 319 -d /var/log/journal -s /bin/false -c "Systemd Journal Remote" systemd-journal-remote
-%groupadd -g 320 systemd-journal-upload
-%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
@@ -1000,10 +1050,6 @@ if [ "$1" = "0" ]; then
 	%groupremove systemd-resolve
 	%userremove systemd-timesync
 	%groupremove systemd-timesync
-	%userremove systemd-journal-remote
-	%groupremove systemd-journal-remote
-	%userremove systemd-journal-upload
-	%groupremove systemd-journal-upload
 	%groupremove systemd-journal
 fi
 
@@ -1113,22 +1159,30 @@ fi
 %postun inetd
 %systemd_reload
 
-%pre journal-gateway
+%pre journal-remote
 %groupadd -g 287 systemd-journal-gateway
 %useradd -u 287 -g 287 -d /var/log/journal -s /bin/false -c "Systemd Journal Gateway" systemd-journal-gateway
+%groupadd -g 319 systemd-journal-remote
+%useradd -u 319 -g 319 -d /var/log/journal -s /bin/false -c "Systemd Journal Remote" systemd-journal-remote
+%groupadd -g 320 systemd-journal-upload
+%useradd -u 320 -g 320 -d /var/log/journal -s /bin/false -c "Systemd Journal Upload" systemd-journal-upload
 
-%post journal-gateway
+%post journal-remote
 %systemd_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
 
-%preun journal-gateway
+%preun journal-remote
 %systemd_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service
 
-%postun journal-gateway
+%postun journal-remote
 %systemd_reload
 
 if [ "$1" = "0" ]; then
 	%userremove systemd-journal-gateway
 	%groupremove systemd-journal-gateway
+	%userremove systemd-journal-remote
+	%groupremove systemd-journal-remote
+	%userremove systemd-journal-upload
+	%groupremove systemd-journal-upload
 fi
 
 %post networkd
@@ -1196,17 +1250,13 @@ fi
 %doc docs/{AUTOMATIC_BOOT_ASSESSMENT,BLOCK_DEVICE_LOCKING,BOOT_LOADER_INTERFACE,BOOT_LOADER_SPECIFICATION,DISTRO_PORTING,ENVIRONMENT,GROUP_RECORD,PREDICTABLE_INTERFACE_NAMES,TRANSIENT-SETTINGS,UIDS-GIDS,USER_GROUP_API,USER_RECORD}.md NEWS README TODO
 %{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.*.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.login1.*.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.*.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.timedate1.xml
 %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
-%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf
-%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
 %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
@@ -1219,10 +1269,6 @@ fi
 %dir %{_sysconfdir}/kernel
 %dir %{_sysconfdir}/kernel/install.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/coredump.conf
-%if %{with microhttpd}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/journal-remote.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/journal-upload.conf
-%endif
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/journald.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/logind.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/pstore.conf
@@ -1236,7 +1282,6 @@ fi
 /etc/xdg/systemd
 %attr(755,root,root) /bin/journalctl
 %attr(755,root,root) /bin/loginctl
-%attr(755,root,root) /bin/machinectl
 %attr(755,root,root) /bin/systemd
 %attr(755,root,root) /bin/systemd-ask-password
 %attr(755,root,root) /bin/systemd-creds
@@ -1259,7 +1304,6 @@ fi
 %{?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
 %attr(755,root,root) %{_bindir}/systemd-id128
 %attr(755,root,root) %{_bindir}/systemd-mount
 %attr(755,root,root) %{_bindir}/systemd-nspawn
@@ -1268,11 +1312,9 @@ fi
 %attr(755,root,root) %{_bindir}/systemd-run
 %attr(755,root,root) %{_bindir}/systemd-socket-activate
 %attr(755,root,root) %{_bindir}/systemd-stdio-bridge
-%attr(755,root,root) %{_bindir}/systemd-sysv-convert
 %attr(755,root,root) %{_bindir}/systemd-umount
 %attr(755,root,root) %{_bindir}/timedatectl
 /lib/modprobe.d/systemd.conf
-/lib/systemd/import-pubring.gpg
 /lib/systemd/resolv.conf
 %attr(755,root,root) /lib/systemd/pld-clean-tmp
 %attr(755,root,root) /lib/systemd/systemd-ac-power
@@ -1289,27 +1331,17 @@ fi
 %attr(755,root,root) /usr/%{_lib}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so
 %{?with_tpm2:%attr(755,root,root) /usr/%{_lib}/cryptsetup/libcryptsetup-token-systemd-tpm2.so}
 %endif
-%attr(755,root,root) /lib/systemd/systemd-export
 %attr(755,root,root) /lib/systemd/systemd-fsck
 %attr(755,root,root) /lib/systemd/systemd-growfs
 %attr(755,root,root) /lib/systemd/systemd-hibernate-resume
 %attr(755,root,root) /lib/systemd/systemd-hostnamed
-%attr(755,root,root) /lib/systemd/systemd-import
-%attr(755,root,root) /lib/systemd/systemd-import-fs
-%attr(755,root,root) /lib/systemd/systemd-importd
 %attr(755,root,root) /lib/systemd/systemd-initctl
 %attr(755,root,root) /lib/systemd/systemd-journald
-%if %{with microhttpd}
-%attr(755,root,root) /lib/systemd/systemd-journal-remote
-%attr(755,root,root) /lib/systemd/systemd-journal-upload
-%endif
 %attr(755,root,root) /lib/systemd/systemd-localed
 %attr(755,root,root) /lib/systemd/systemd-logind
-%attr(755,root,root) /lib/systemd/systemd-machined
 %attr(755,root,root) /lib/systemd/systemd-makefs
 %attr(755,root,root) /lib/systemd/systemd-modules-load
 %attr(755,root,root) /lib/systemd/systemd-pstore
-%attr(755,root,root) /lib/systemd/systemd-pull
 %attr(755,root,root) /lib/systemd/systemd-quotacheck
 %attr(755,root,root) /lib/systemd/systemd-random-seed
 %attr(755,root,root) /lib/systemd/systemd-remount-fs
@@ -1416,26 +1448,23 @@ fi
 %endif
 %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service
 %{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
+%{_datadir}/polkit-1/actions/org.freedesktop.timesync1.policy
 %{_datadir}/polkit-1/rules.d/systemd-networkd.rules
 %dir %{_datadir}/systemd
-%{?with_microhttpd:%{_datadir}/systemd/gatewayd}
 %{_datadir}/systemd/kbd-model-map
 %{_datadir}/systemd/language-fallback-map
 %{_datadir}/factory/etc/issue
+%{_datadir}/factory/etc/locale.conf
 %{_datadir}/factory/etc/nsswitch.conf
 %{_datadir}/factory/etc/pam.d/other
 %{_datadir}/factory/etc/pam.d/system-auth
@@ -1446,7 +1475,6 @@ fi
 %{_mandir}/man1/journalctl.1*
 %{_mandir}/man1/localectl.1*
 %{_mandir}/man1/loginctl.1*
-%{_mandir}/man1/machinectl.1*
 %{_mandir}/man1/systemd.1*
 %{_mandir}/man1/systemd-ask-password.1*
 %{_mandir}/man1/systemd-cat.1*
@@ -1467,6 +1495,7 @@ fi
 %{_mandir}/man1/systemd-path.1*
 %{_mandir}/man1/systemd-run.1*
 %{_mandir}/man1/systemd-socket-activate.1*
+%{_mandir}/man1/systemd-stdio-bridge.1*
 %{_mandir}/man1/systemd-tty-ask-password-agent.1*
 %{_mandir}/man1/systemd-umount.1*
 %{_mandir}/man1/timedatectl.1*
@@ -1480,12 +1509,6 @@ fi
 %{_mandir}/man5/initrd-release.5*
 %{_mandir}/man5/journald@.conf.5*
 %{?with_efi:%{_mandir}/man5/loader.conf.5*}
-%if %{with microhttpd}
-%{_mandir}/man5/journal-remote.conf.5*
-%{_mandir}/man5/journal-remote.conf.d.5*
-%{_mandir}/man5/journal-upload.conf.5.*
-%{_mandir}/man5/journal-upload.conf.d.5*
-%endif
 %{_mandir}/man5/journald.conf.5*
 %{_mandir}/man5/journald.conf.d.5*
 %{_mandir}/man5/locale.conf.5*
@@ -1497,10 +1520,8 @@ fi
 %{_mandir}/man5/modules-load.d.5*
 %{_mandir}/man5/org.freedesktop.LogControl1.5*
 %{_mandir}/man5/org.freedesktop.hostname1.5*
-%{_mandir}/man5/org.freedesktop.import1.5*
 %{_mandir}/man5/org.freedesktop.locale1.5*
 %{_mandir}/man5/org.freedesktop.login1.5*
-%{_mandir}/man5/org.freedesktop.machine1.5*
 %{_mandir}/man5/org.freedesktop.systemd1.5*
 %{_mandir}/man5/org.freedesktop.timedate1.5*
 %{_mandir}/man5/os-release.5*
@@ -1534,6 +1555,7 @@ fi
 %{_mandir}/man7/linuxaa64.efi.stub.7*
 %endif
 %{_mandir}/man7/sd-boot.7*
+%{_mandir}/man7/sd-stub.7*
 %{_mandir}/man7/systemd-boot.7*
 %{_mandir}/man7/systemd-stub.7*
 %endif
@@ -1574,20 +1596,14 @@ fi
 %{_mandir}/man8/systemd-hibernate-resume.8*
 %{_mandir}/man8/systemd-hibernate-resume@.service.8*
 %{_mandir}/man8/systemd-hostnamed.8*
-%{_mandir}/man8/systemd-importd.8*
 %{_mandir}/man8/systemd-initctl.8*
 %{_mandir}/man8/systemd-journald-dev-log.socket.8*
 %{_mandir}/man8/systemd-journald-varlink@.socket.8*
 %{_mandir}/man8/systemd-journald.8*
 %{_mandir}/man8/systemd-journald@.service.8*
 %{_mandir}/man8/systemd-journald@.socket.8*
-%if %{with microhttpd}
-%{_mandir}/man8/systemd-journal-remote.8*
-%{_mandir}/man8/systemd-journal-upload.8*
-%endif
 %{_mandir}/man8/systemd-localed.8*
 %{_mandir}/man8/systemd-logind.8*
-%{_mandir}/man8/systemd-machined.8*
 %{_mandir}/man8/systemd-machine-id-commit.service.8*
 %{_mandir}/man8/systemd-makefs.8*
 %{_mandir}/man8/systemd-makefs@.service.8*
@@ -1664,6 +1680,10 @@ fi
 %{_mandir}/man8/shutdown.8*
 %{_mandir}/man8/telinit.8*
 
+%files sysv-compat
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/systemd-sysv-convert
+
 %files units
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/binfmt.d
@@ -1675,6 +1695,7 @@ fi
 %dir %{_sysconfdir}/systemd/system
 %dir %{_sysconfdir}/systemd/system-preset
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system-preset/default.preset
+%dir %{_sysconfdir}/systemd/user-preset
 %dir %{_sysconfdir}/tmpfiles.d
 %dir %{_prefix}/lib/binfmt.d
 %dir %{_prefix}/lib/environment.d
@@ -1720,6 +1741,7 @@ fi
 /lib/systemd/system-preset/90-systemd.preset
 %dir /lib/systemd/system-sleep
 %dir /lib/systemd/system-shutdown
+%attr(755,root,root) /lib/systemd/systemd-update-helper
 %attr(755,root,root) /bin/systemctl
 %attr(755,root,root) /bin/systemd-tmpfiles
 %attr(755,root,root) /bin/systemd_booted
@@ -1744,7 +1766,6 @@ fi
 %{systemdunitdir}/systemd-pstore.service
 %{systemdunitdir}/systemd-rfkill.socket
 %{systemdunitdir}/tmp.mount
-%{systemdunitdir}/var-lib-machines.mount
 %{systemdunitdir}/var-lock.mount
 %{systemdunitdir}/var-run.mount
 %{systemdunitdir}/systemd-ask-password-console.path
@@ -1756,10 +1777,8 @@ fi
 %{systemdunitdir}/container-getty@.service
 %{systemdunitdir}/cpusets.service
 %{systemdunitdir}/dbus-org.freedesktop.hostname1.service
-%{systemdunitdir}/dbus-org.freedesktop.import1.service
 %{systemdunitdir}/dbus-org.freedesktop.locale1.service
 %{systemdunitdir}/dbus-org.freedesktop.login1.service
-%{systemdunitdir}/dbus-org.freedesktop.machine1.service
 %{systemdunitdir}/dbus-org.freedesktop.timedate1.service
 %{systemdunitdir}/debug-shell.service
 %{systemdunitdir}/display-manager.service
@@ -1806,20 +1825,15 @@ fi
 %{systemdunitdir}/systemd-hostnamed.service
 %{systemdunitdir}/systemd-hwdb-update.service
 %{systemdunitdir}/systemd-hybrid-sleep.service
-%{systemdunitdir}/systemd-importd.service
 %{systemdunitdir}/systemd-initctl.service
 %{systemdunitdir}/systemd-journal-catalog-update.service
 %{systemdunitdir}/systemd-journal-flush.service
-%{systemdunitdir}/systemd-journal-gatewayd.service
-%{systemdunitdir}/systemd-journal-remote.service
-%{systemdunitdir}/systemd-journal-upload.service
 %{systemdunitdir}/systemd-journald.service
 %{systemdunitdir}/systemd-journald@.service
 %{systemdunitdir}/systemd-kexec.service
 %{systemdunitdir}/systemd-localed.service
 %{systemdunitdir}/systemd-logind.service
 %{systemdunitdir}/systemd-machine-id-commit.service
-%{systemdunitdir}/systemd-machined.service
 %{systemdunitdir}/systemd-modules-load.service
 %{systemdunitdir}/systemd-nspawn@.service
 %{systemdunitdir}/systemd-poweroff.service
@@ -1862,7 +1876,6 @@ fi
 %exclude %{systemdunitdir}/rc-inetd.service
 %{systemdunitdir}/syslog.socket
 %{systemdunitdir}/systemd-initctl.socket
-%{systemdunitdir}/systemd-journal-remote.socket
 %{systemdunitdir}/systemd-journald-audit.socket
 %{systemdunitdir}/systemd-journald-dev-log.socket
 %{systemdunitdir}/systemd-journald-varlink@.socket
@@ -1903,7 +1916,6 @@ fi
 %{systemdunitdir}/kexec.target
 %{systemdunitdir}/local-fs-pre.target
 %{systemdunitdir}/local-fs.target
-%{systemdunitdir}/machines.target
 %{systemdunitdir}/multi-user.target
 %{systemdunitdir}/network-online.target
 %{systemdunitdir}/network-pre.target
@@ -1956,7 +1968,6 @@ fi
 %dir %{systemdunitdir}/initrd-root-fs.target.wants
 %dir %{systemdunitdir}/kexec.target.wants
 %dir %{systemdunitdir}/local-fs.target.wants
-%dir %{systemdunitdir}/machines.target.wants
 %dir %{systemdunitdir}/multi-user.target.wants
 %dir %{systemdunitdir}/poweroff.target.wants
 %dir %{systemdunitdir}/reboot.target.wants
@@ -1980,14 +1991,12 @@ fi
 %{systemdunitdir}/local-fs.target.wants/pld-clean-tmp.service
 %{systemdunitdir}/local-fs.target.wants/var-lock.mount
 %{systemdunitdir}/local-fs.target.wants/var-run.mount
-%{systemdunitdir}/machines.target.wants/var-lib-machines.mount
 %{systemdunitdir}/multi-user.target.wants/getty.target
 %{systemdunitdir}/multi-user.target.wants/rc-local.service
 %{systemdunitdir}/multi-user.target.wants/systemd-ask-password-wall.path
 %{systemdunitdir}/multi-user.target.wants/systemd-logind.service
 %{systemdunitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service
 %{systemdunitdir}/multi-user.target.wants/systemd-user-sessions.service
-%{systemdunitdir}/remote-fs.target.wants/var-lib-machines.mount
 %{systemdunitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service
 %{systemdunitdir}/sigpwr.target.wants/sigpwr-container-shutdown.service
 %{systemdunitdir}/sockets.target.wants/systemd-initctl.socket
@@ -2059,19 +2068,14 @@ fi
 %{_mandir}/man8/systemd-hibernate.service.8*
 %{_mandir}/man8/systemd-hostnamed.service.8*
 %{_mandir}/man8/systemd-hybrid-sleep.service.8*
-%{_mandir}/man8/systemd-importd.service.8*
 %{_mandir}/man8/systemd-initctl.service.8*
 %{_mandir}/man8/systemd-initctl.socket.8*
-%{_mandir}/man8/systemd-journal-remote.service.8*
-%{_mandir}/man8/systemd-journal-remote.socket.8*
-%{_mandir}/man8/systemd-journal-upload.service.8*
 %{_mandir}/man8/systemd-journald.service.8*
 %{_mandir}/man8/systemd-journald.socket.8*
 %{_mandir}/man8/systemd-journald-audit.socket.8*
 %{_mandir}/man8/systemd-kexec.service.8*
 %{_mandir}/man8/systemd-localed.service.8*
 %{_mandir}/man8/systemd-logind.service.8*
-%{_mandir}/man8/systemd-machined.service.8*
 %{_mandir}/man8/systemd-modules-load.service.8*
 %{_mandir}/man8/systemd-poweroff.service.8*
 %{_mandir}/man8/systemd-quotacheck.service.8*
@@ -2106,14 +2110,68 @@ fi
 %{_mandir}/man1/systemd-cgls.1*
 %{_mandir}/man1/systemd-cgtop.1*
 
+%files container
+%defattr(644,root,root,755)
+%attr(755,root,root) /bin/machinectl
+/lib/systemd/import-pubring.gpg
+%attr(755,root,root) /lib/systemd/systemd-export
+%attr(755,root,root) /lib/systemd/systemd-import
+%attr(755,root,root) /lib/systemd/systemd-import-fs
+%attr(755,root,root) /lib/systemd/systemd-machined
+%attr(755,root,root) /lib/systemd/systemd-pull
+%attr(755,root,root) /lib/systemd/systemd-importd
+%attr(755,root,root) %{_bindir}/systemd-dissect
+%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
+%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.*.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.*.xml
+%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
+%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
+%{_mandir}/man1/machinectl.1*
+%{_mandir}/man5/org.freedesktop.import1.5*
+%{_mandir}/man5/org.freedesktop.machine1.5*
+%{_mandir}/man8/systemd-importd.8*
+%{_mandir}/man8/systemd-importd.service.8*
+%{_mandir}/man8/systemd-machined.8*
+%{_mandir}/man8/systemd-machined.service.8*
+%{systemdunitdir}/dbus-org.freedesktop.import1.service
+%{systemdunitdir}/dbus-org.freedesktop.machine1.service
+%{systemdunitdir}/machines.target
+%dir %{systemdunitdir}/machines.target.wants
+%{systemdunitdir}/machines.target.wants/var-lib-machines.mount
+%{systemdunitdir}/remote-fs.target.wants/var-lib-machines.mount
+%{systemdunitdir}/var-lib-machines.mount
+%{systemdunitdir}/systemd-importd.service
+%{systemdunitdir}/systemd-machined.service
+
 %if %{with microhttpd}
-%files journal-gateway
+%files journal-remote
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/journal-remote.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/journal-upload.conf
+%{systemdunitdir}/systemd-journal-gatewayd.service
 %{systemdunitdir}/systemd-journal-gatewayd.socket
+%{systemdunitdir}/systemd-journal-remote.service
+%{systemdunitdir}/systemd-journal-upload.service
+%{systemdunitdir}/systemd-journal-remote.socket
 %attr(755,root,root) /lib/systemd/systemd-journal-gatewayd
+%attr(755,root,root) /lib/systemd/systemd-journal-remote
+%attr(755,root,root) /lib/systemd/systemd-journal-upload
+%{_datadir}/systemd/gatewayd
+%{_mandir}/man5/journal-remote.conf.5*
+%{_mandir}/man5/journal-remote.conf.d.5*
+%{_mandir}/man5/journal-upload.conf.5.*
+%{_mandir}/man5/journal-upload.conf.d.5*
 %{_mandir}/man8/systemd-journal-gatewayd.8*
 %{_mandir}/man8/systemd-journal-gatewayd.service.8*
 %{_mandir}/man8/systemd-journal-gatewayd.socket.8*
+%{_mandir}/man8/systemd-journal-remote.8*
+%{_mandir}/man8/systemd-journal-upload.8*
+%{_mandir}/man8/systemd-journal-remote.service.8*
+%{_mandir}/man8/systemd-journal-remote.socket.8*
+%{_mandir}/man8/systemd-journal-upload.service.8*
 %endif
 
 %files homed
@@ -2143,6 +2201,7 @@ fi
 %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/networkd.conf
 %dir %{_sysconfdir}/systemd/network
+%{_prefix}/lib/tmpfiles.d/systemd-network.conf
 /lib/systemd/network/80-6rd-tunnel.network
 /lib/systemd/network/80-container-host0.network
 /lib/systemd/network/80-container-ve.network
@@ -2152,6 +2211,7 @@ fi
 %{_prefix}/lib/sysusers.d/systemd-network.conf
 %{systemdunitdir}/systemd-network-generator.service
 %{systemdunitdir}/systemd-networkd-wait-online.service
+%{systemdunitdir}/systemd-networkd-wait-online@.service
 %{systemdunitdir}/systemd-networkd.service
 %{systemdunitdir}/systemd-networkd.socket
 %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service
@@ -2169,16 +2229,16 @@ fi
 %{_mandir}/man8/systemd-network-generator.service.8*
 %{_mandir}/man8/systemd-networkd-wait-online.8*
 %{_mandir}/man8/systemd-networkd-wait-online.service.8*
+%{_mandir}/man8/systemd-networkd-wait-online@.service.8*
 %{_mandir}/man8/systemd-networkd.8*
 %{_mandir}/man8/systemd-networkd.service.8*
 
 %files oomd
 %defattr(644,root,root,755)
-%attr(755,root,root) /bin/oomctl
+%attr(755,root,root) %{_bindir}/oomctl
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/oomd.conf
 %attr(755,root,root) /lib/systemd/systemd-oomd
 %{_prefix}/lib/sysusers.d/systemd-oom.conf
-%{systemdunitdir}/dbus-org.freedesktop.oom1.service
 %{systemdunitdir}/systemd-oomd.service
 %{systemdunitdir}/systemd-oomd.socket
 %{_datadir}/dbus-1/interfaces/org.freedesktop.oom1.*.xml
@@ -2251,6 +2311,22 @@ fi
 %{_mandir}/man8/systemd-resolved.8*
 %{_mandir}/man8/systemd-resolved.service.8*
 
+%files sysupdate
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/sysupdate.d
+%{systemdunitdir}/systemd-sysupdate.service
+%{systemdunitdir}/systemd-sysupdate.timer
+%{systemdunitdir}/systemd-sysupdate-reboot.service
+%{systemdunitdir}/systemd-sysupdate-reboot.timer
+%attr(755,root,root) /lib/systemd/systemd-sysupdate
+%dir %{_prefix}/lib/sysupdate.d
+%{_mandir}/man5/sysupdate.d.5*
+%{_mandir}/man8/systemd-sysupdate.8*
+%{_mandir}/man8/systemd-sysupdate.service.8*
+%{_mandir}/man8/systemd-sysupdate.timer.8*
+%{_mandir}/man8/systemd-sysupdate-reboot.service.8*
+%{_mandir}/man8/systemd-sysupdate-reboot.timer.8*
+
 %files inetd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{systemdunitdir}-generators/pld-rc-inetd-generator
@@ -2269,6 +2345,7 @@ fi
 %attr(755,root,root) /%{_lib}/libnss_systemd.so.2
 %attr(755,root,root) /%{_lib}/libsystemd.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libsystemd.so.0
+%attr(755,root,root) /lib/systemd/libsystemd-core*.so
 %attr(755,root,root) /lib/systemd/libsystemd-shared*.so
 %{_mandir}/man8/libnss_resolve.so.2.8*
 %{_mandir}/man8/libnss_systemd.so.2.8*
@@ -2297,6 +2374,7 @@ fi
 %{bash_compdir}/loginctl
 %{bash_compdir}/machinectl
 %{bash_compdir}/networkctl
+%{bash_compdir}/oomctl
 %{bash_compdir}/portablectl
 %{bash_compdir}/resolvectl
 %{bash_compdir}/systemctl
@@ -2325,6 +2403,7 @@ fi
 %{zsh_compdir}/_loginctl
 %{zsh_compdir}/_machinectl
 %{zsh_compdir}/_networkctl
+%{zsh_compdir}/_oomctl
 %{zsh_compdir}/_resolvectl
 %{zsh_compdir}/_sd_hosts_or_user_at_host
 %{zsh_compdir}/_sd_machines
@@ -2385,9 +2464,11 @@ fi
 /lib/udev/hwdb.d/60-seat.hwdb
 /lib/udev/hwdb.d/60-sensor.hwdb
 /lib/udev/hwdb.d/70-analyzers.hwdb
+/lib/udev/hwdb.d/70-av-production.hwdb
 /lib/udev/hwdb.d/70-cameras.hwdb
 /lib/udev/hwdb.d/70-joystick.hwdb
 /lib/udev/hwdb.d/70-mouse.hwdb
+/lib/udev/hwdb.d/70-pda.hwdb
 /lib/udev/hwdb.d/70-pointingstick.hwdb
 /lib/udev/hwdb.d/70-touchpad.hwdb
 /lib/udev/hwdb.d/80-ieee1394-unit-function.hwdb