From 4e94ac9546033711fb9557bb0afe95d1b9938a5c02ba360b5f2c0ff3edb67e85 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 29 Aug 2022 08:11:19 +0000 Subject: [PATCH 1/6] Let systemd trust the RTC for 30y instead of 15 (bsc#1202356) to allow for our systems to be used in edge locations without systemd updates for a long time OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1306 --- systemd.changes | 7 +++++++ systemd.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/systemd.changes b/systemd.changes index fe438c3..9606652 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 29 08:00:09 UTC 2022 - Bernhard Wiedemann + +- Let systemd trust the RTC for 30y instead of 15 (bsc#1202356) + to allow for our systems to be used in edge locations + without systemd updates for a long time + ------------------------------------------------------------------- Tue Aug 16 15:55:26 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index eea6b0f..98fb983 100644 --- a/systemd.spec +++ b/systemd.spec @@ -661,6 +661,7 @@ Have fun with these services at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ + -Dclock-valid-range-usec-max=946728000000000 \ -Dadm-group=false \ -Dwheel-group=false \ -Ddefault-hierarchy=unified \ From ade1cc1ff6bbbebde3cb78d1215bd9727d2b5f1fb6f5373f047162eca38c0166 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 29 Aug 2022 08:14:55 +0000 Subject: [PATCH 2/6] - Let systemd trust the RTC for 30 years after the last update instead of 15 (bsc#1202356) To allow for our systems to be used in edge locations without systemd updates for a long time. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1307 --- systemd.changes | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/systemd.changes b/systemd.changes index 9606652..c011ce0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,9 +1,10 @@ ------------------------------------------------------------------- Mon Aug 29 08:00:09 UTC 2022 - Bernhard Wiedemann -- Let systemd trust the RTC for 30y instead of 15 (bsc#1202356) - to allow for our systems to be used in edge locations - without systemd updates for a long time +- Let systemd trust the RTC for 30 years after the last update instead of 15 (bsc#1202356) + + To allow for our systems to be used in edge locations without systemd updates + for a long time. ------------------------------------------------------------------- Tue Aug 16 15:55:26 UTC 2022 - Franck Bui From 902b8dcabd1c5d582027a64c0738a38b54c85871b4f57afc2265c5785e6c0211 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 5 Sep 2022 06:57:58 +0000 Subject: [PATCH 3/6] - rc-local.service.8 belongs to the systemd-sysvcompat sub-package (bsc#1203053) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1308 --- files.systemd | 1 - files.sysvcompat | 1 + systemd.changes | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/files.systemd b/files.systemd index a245c56..a149243 100644 --- a/files.systemd +++ b/files.systemd @@ -330,7 +330,6 @@ %{_mandir}/man8/halt.8.gz %{_mandir}/man8/pam_systemd.8.gz %{_mandir}/man8/poweroff.8.gz -%{_mandir}/man8/rc-local.service.8.gz %{_mandir}/man8/reboot.8.gz %{_mandir}/man8/shutdown.8.gz %{_mandir}/man8/systemd-ask-password-console.path.8.gz diff --git a/files.sysvcompat b/files.sysvcompat index 49e50a8..786a9b3 100644 --- a/files.sysvcompat +++ b/files.sysvcompat @@ -6,6 +6,7 @@ %dir %{_unitdir}/runlevel3.target.wants %dir %{_unitdir}/runlevel4.target.wants %dir %{_unitdir}/runlevel5.target.wants +%{_mandir}/man8/rc-local.service.8.gz %{_mandir}/man8/runlevel.8.gz %{_mandir}/man8/systemd-initctl.8.gz %{_mandir}/man8/systemd-initctl.service.8.gz diff --git a/systemd.changes b/systemd.changes index c011ce0..c1d2524 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 5 06:56:51 UTC 2022 - Franck Bui + +- rc-local.service.8 belongs to the systemd-sysvcompat sub-package (bsc#1203053) + ------------------------------------------------------------------- Mon Aug 29 08:00:09 UTC 2022 - Bernhard Wiedemann From e71ea8d0841e91ee47b480f626133cb49e543cb987388e1dd109c3e918162b28 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 12 Sep 2022 07:35:44 +0000 Subject: [PATCH 4/6] - Enable building and include libcryptsetup-plugins provided by systemd Now that dracut 057 has been released we can enable building libcryptsetup plugins. These can be used by cryptsetup to extend functionality including fido2, pkcs11 and tpm2 support. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1309 --- files.udev | 6 +++--- systemd.changes | 9 +++++++++ systemd.spec | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/files.udev b/files.udev index 0b7e58f..51ad61b 100644 --- a/files.udev +++ b/files.udev @@ -35,9 +35,9 @@ %{_datadir}/zsh/site-functions/_udevadm %endif %if %{without bootstrap} -# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so -# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so -# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +%%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so +%%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +%%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so %{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/integritytab.5.gz diff --git a/systemd.changes b/systemd.changes index c1d2524..64113e4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -3,6 +3,15 @@ Mon Sep 5 06:56:51 UTC 2022 - Franck Bui - rc-local.service.8 belongs to the systemd-sysvcompat sub-package (bsc#1203053) +------------------------------------------------------------------- +Fri Sep 2 20:17:01 UTC 2022 - Bob Haley + +- Enable building and include libcryptsetup-plugins provided by systemd + + Now that dracut 057 has been released we can enable building libcryptsetup + plugins. These can be used by cryptsetup to extend functionality including + fido2, pkcs11 and tpm2 support. + ------------------------------------------------------------------- Mon Aug 29 08:00:09 UTC 2022 - Bernhard Wiedemann diff --git a/systemd.spec b/systemd.spec index 98fb983..0922fd4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -687,7 +687,6 @@ Have fun with these services at your own risk. -Dgshadow=false \ -Dima=false \ -Dldconfig=false \ - -Dlibcryptsetup-plugins=false \ -Dsmack=false \ \ -Dpstore=true \ @@ -697,6 +696,7 @@ Have fun with these services at your own risk. -Defi=%{when_not bootstrap} \ -Delfutils=%{when_not bootstrap} \ -Dhtml=%{when_not bootstrap} \ + -Dlibcryptsetup-plugins=%{when_not bootstrap} \ -Dman=%{when_not bootstrap} \ -Dnss-myhostname=%{when_not bootstrap} \ -Dnss-systemd=%{when_not bootstrap} \ From e88e17342f1cb7c848420918cc5223f60fd978c366ecf87694d0baac7416061a Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 12 Sep 2022 07:39:26 +0000 Subject: [PATCH 5/6] fix listing of libcryptsetup-plugins files in files.udev OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1310 --- files.udev | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files.udev b/files.udev index 51ad61b..0377d22 100644 --- a/files.udev +++ b/files.udev @@ -35,9 +35,9 @@ %{_datadir}/zsh/site-functions/_udevadm %endif %if %{without bootstrap} -%%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so -%%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so -%%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so %{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/integritytab.5.gz From 475413ef0a25cd0092230bd737d8ce50739c99f89a3c8b3a51a20cf0dd005ec2 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 12 Sep 2022 09:17:16 +0000 Subject: [PATCH 6/6] also uncomment %{_libdir}/cryptsetup in files.udev OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1311 --- files.udev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files.udev b/files.udev index 0377d22..daf66aa 100644 --- a/files.udev +++ b/files.udev @@ -4,7 +4,7 @@ %config(noreplace) %{_sysconfdir}/systemd/pstore.conf %config(noreplace) %{_sysconfdir}/udev/udev.conf %if %{without bootstrap} -# %%dir %{_libdir}/cryptsetup +%dir %{_libdir}/cryptsetup %dir %{_modulesloaddir} %endif %dir %{_prefix}/lib/udev