diff --git a/systemd.spec b/systemd.spec index ac73ea7..126a672 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 249 -Release: 57 +Release: 58 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -655,7 +655,7 @@ Patch9063: embedded-use-yocto-configs.patch BuildRequires: gcc, gcc-c++ BuildRequires: libcap-devel, libmount-devel, pam-devel, libselinux-devel -BuildRequires: audit-libs-devel, dbus-devel, libacl-devel +BuildRequires: audit-libs-devel, cryptsetup-devel, dbus-devel, libacl-devel BuildRequires: gobject-introspection-devel, libblkid-devel, xz-devel, xz BuildRequires: lz4-devel, lz4, bzip2-devel, libidn2-devel BuildRequires: kmod-devel, libgcrypt-devel, libgpg-error-devel @@ -863,7 +863,7 @@ CONFIGURE_OPTS=( -Dgcrypt=true -Daudit=true -Delfutils=false - -Dlibcryptsetup=false + -Dlibcryptsetup=true -Dqrencode=false -Dgnutls=true -Dmicrohttpd=false @@ -1501,6 +1501,7 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_systemddir}/systemd %dir %{_systemddir}/user-preset %{_systemddir}/systemd-coredump +%{_systemddir}/systemd-veritysetup %{_systemddir}/systemd-network-generator %{_systemddir}/systemd-binfmt %{_systemddir}/user-preset/90-systemd.preset @@ -1684,6 +1685,7 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_unitdir}/blockdev@.target %{_unitdir}/sys-kernel-tracing.mount %{_unitdir}/sysinit.target.wants/sys-kernel-tracing.mount +%{_unitdir}/system-systemd\x2dcryptsetup.slice %{_unitdir}/systemd-journald-varlink@.socket %{_unitdir}/systemd-journald@.service %{_unitdir}/systemd-journald@.socket @@ -1692,6 +1694,7 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_systemddir}/system-generators/systemd-sysv-generator %{_systemddir}/system-generators/systemd-rc-local-generator %{_systemddir}/system-generators/systemd-debug-generator +%{_systemddir}/system-generators/systemd-veritysetup-generator %{_systemddir}/system-generators/systemd-run-generator %{_systemddir}/system-generators/systemd-system-update-generator %{_systemddir}/system-generators/systemd-getty-generator @@ -1775,9 +1778,17 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %config(noreplace) /etc/xdg/systemd/user %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf /usr/lib/rpm/macros.d/macros.systemd + +/usr/bin/systemd-cryptenroll /usr/lib/modprobe.d/README /usr/lib/sysctl.d/README /usr/lib/systemd/system/first-boot-complete.target +/usr/lib/systemd/system/initrd-root-device.target.wants/remote-cryptsetup.target +/usr/lib/systemd/system/initrd-root-device.target.wants/remote-veritysetup.target +/usr/lib/systemd/system/remote-veritysetup.target +/usr/lib/systemd/system/sysinit.target.wants/veritysetup.target +/usr/lib/systemd/system/veritysetup-pre.target +/usr/lib/systemd/system/veritysetup.target /usr/lib/systemd/user/app.slice /usr/lib/systemd/user/background.slice /usr/lib/systemd/user/session.slice @@ -1851,6 +1862,7 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_systemddir}/systemd-hibernate-resume %{_systemddir}/systemd-random-seed %{_systemddir}/systemd-sleep +%{_systemddir}/systemd-cryptsetup %{_systemddir}/systemd-udevd %{_systemddir}/systemd-vconsole-setup %{_unitdir}/systemd-udevd.service @@ -1869,6 +1881,7 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_unitdir}/suspend.target %{_unitdir}/systemd-hybrid-sleep.service %{_unitdir}/systemd-suspend-then-hibernate.service +%{_unitdir}/cryptsetup-pre.target %{_unitdir}/hybrid-sleep.target %{_unitdir}/systemd-hwdb-update.service %{_unitdir}/systemd-hibernate-resume@.service @@ -1876,6 +1889,8 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_unitdir}/sleep.target %{_unitdir}/kmod-static-nodes.service %{_unitdir}/systemd-udevd-kernel.socket +%{_unitdir}/remote-cryptsetup.target +%{_unitdir}/cryptsetup.target %{_unitdir}/systemd-udev-trigger.service %{_unitdir}/sysinit.target.wants/systemd-udevd.service %{_unitdir}/sysinit.target.wants/systemd-modules-load.service @@ -1883,10 +1898,12 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_unitdir}/sysinit.target.wants/systemd-random-seed.service %{_unitdir}/sysinit.target.wants/systemd-hwdb-update.service %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service +%{_unitdir}/sysinit.target.wants/cryptsetup.target %{_unitdir}/sysinit.target.wants/systemd-udev-trigger.service %{_unitdir}/systemd-udev-trigger.service.d/systemd-udev-trigger-no-reload.conf %{_unitdir}/sockets.target.wants/systemd-udevd-control.socket %{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket +%{_systemddir}/system-generators/systemd-cryptsetup-generator %{_systemddir}/system-generators/systemd-hibernate-resume-generator %{_systemddir}/system-generators/systemd-gpt-auto-generator %{_systemddir}/network/99-default.link @@ -2066,6 +2083,9 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_libdir}/security/pam_systemd.so %changelog +* Tue Oct 31 2023 beta - 249-58 +- enable libcryptsetup + * Mon Oct 23 2023 zhangyao - 249-57 - change the permission on vhost-net and vhost-vsock to 0660