开源软件构建与测试

Changes of Revision 17

_service:tar_scm:systemd.spec Changed

@@ -25,7 +25,7 @@
 Name:           systemd
 Url:            https://systemd.io/
 Version:        255
-Release:        17
+Release:        18
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -302,6 +302,14 @@
 %description pam
 Systemd PAM module registers the session with systemd-logind.
 
+%package cryptsetup
+Summary:          systemd cryptsetup module
+Requires:         %{name} = %{version}-%{release}
+License:          LGPLv2+
+
+%description cryptsetup
+systemd-cryptsetup is used to set up (with attach) and tear down (with detach) access to an encrypted block device.
+
 %package_help
 
 %prep
@@ -398,11 +406,11 @@
         -Dlink-journalctl-shared=false
         -Dlink-boot-shared=false
         -Dpwquality=disabled
-	-Dpasswdqc=disabled
+        -Dpasswdqc=disabled
         -Dxenctrl=disabled
         -Dbootloader=disabled
         -Dukify=disabled
-	-Dsysupdate=disabled
+        -Dsysupdate=disabled
         -Dremote=disabled
         -Dstoragetm=false
         -Dvmspawn=disabled
@@ -877,7 +885,6 @@
 /usr/share/bash-completion/completions/loginctl
 /usr/share/bash-completion/completions/timedatectl
 /usr/share/bash-completion/completions/busctl
-/usr/share/bash-completion/completions/systemd-cryptenroll
 /usr/share/zsh/site-functions/_loginctl
 /usr/share/zsh/site-functions/_systemd-inhibit
 /usr/share/zsh/site-functions/_journalctl
@@ -967,8 +974,6 @@
 /usr/bin/systemd-ac-power
 /usr/bin/systemd-creds
 /usr/bin/varlinkctl
-/usr/bin/systemd-cryptenroll
-/usr/bin/systemd-cryptsetup
 %dir /usr/lib/environment.d
 %dir /usr/lib/binfmt.d
 %dir /usr/lib/tmpfiles.d
@@ -1016,9 +1021,6 @@
 %{_systemddir}/systemd
 %dir %{_systemddir}/user-preset
 %{_systemddir}/systemd-coredump
-%{_systemddir}/systemd-cryptsetup
-%{_systemddir}/systemd-integritysetup
-%{_systemddir}/systemd-veritysetup
 %{_systemddir}/systemd-network-generator
 %{_systemddir}/systemd-binfmt
 %{_systemddir}/user-preset/90-systemd.preset
@@ -1117,24 +1119,6 @@
 %{_unitdir}/initrd-switch-root.service
 %{_unitdir}/initrd.target
 %dir %{_unitdir}/initrd.target.wants
-%{_systemddir}/system-generators/systemd-cryptsetup-generator
-%{_systemddir}/system-generators/systemd-integritysetup-generator
-%{_systemddir}/system-generators/systemd-veritysetup-generator
-%{_unitdir}/cryptsetup-pre.target
-%{_unitdir}/cryptsetup.target
-%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target
-%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target
-%{_unitdir}/integritysetup-pre.target
-%{_unitdir}/integritysetup.target
-%{_unitdir}/remote-cryptsetup.target
-%{_unitdir}/remote-veritysetup.target
-%{_unitdir}/sysinit.target.wants/cryptsetup.target
-%{_unitdir}/sysinit.target.wants/integritysetup.target
-%{_unitdir}/sysinit.target.wants/veritysetup.target
-%{_unitdir}/system-systemd\x2dcryptsetup.slice
-%{_unitdir}/system-systemd\x2dveritysetup.slice
-%{_unitdir}/veritysetup-pre.target
-%{_unitdir}/veritysetup.target
 %{_unitdir}/ldconfig.service
 %{_unitdir}/initrd-root-device.target
 %{_unitdir}/default.target
@@ -1645,7 +1629,36 @@
 %{_libdir}/security/pam_systemd.so
 %{_libdir}/security/pam_systemd_loadkey.so
 
+%files cryptsetup
+/usr/share/bash-completion/completions/systemd-cryptenroll
+/usr/bin/systemd-cryptenroll
+/usr/bin/systemd-cryptsetup
+%{_systemddir}/systemd-cryptsetup
+%{_systemddir}/systemd-integritysetup
+%{_systemddir}/systemd-veritysetup
+%{_systemddir}/system-generators/systemd-cryptsetup-generator
+%{_systemddir}/system-generators/systemd-integritysetup-generator
+%{_systemddir}/system-generators/systemd-veritysetup-generator
+%{_unitdir}/cryptsetup-pre.target
+%{_unitdir}/cryptsetup.target
+%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target
+%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target
+%{_unitdir}/integritysetup-pre.target
+%{_unitdir}/integritysetup.target
+%{_unitdir}/remote-cryptsetup.target
+%{_unitdir}/remote-veritysetup.target
+%{_unitdir}/sysinit.target.wants/cryptsetup.target
+%{_unitdir}/sysinit.target.wants/integritysetup.target
+%{_unitdir}/sysinit.target.wants/veritysetup.target
+%{_unitdir}/system-systemd\x2dcryptsetup.slice
+%{_unitdir}/system-systemd\x2dveritysetup.slice
+%{_unitdir}/veritysetup-pre.target
+%{_unitdir}/veritysetup.target
+
 %changelog
+* Thu Jun 13 2024 wangyuhang <wangyuhang27@huawei.com> - 255-18
+- extract systemd-cryptsetup
+
 * Tue May 21 2024 dufuhang <dufuhang@kylinos.cn> - 255-17
 - main: pass the right error variable