From 9a5be6c08579769fa21d0add3f813bb3a73a93efc79271b19e20cb750dbf64a2 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 29 Aug 2022 08:11:19 +0000 Subject: [PATCH 1/6] Accepting request 999867 from home:bmwiedemann:reproducible 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/request/show/999867 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 fe438c37..9606652a 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 eea6b0ff..98fb983e 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 fed8c6ba7d9a547141cda7a7db5da3e99b9da06509eb27fe0ac3478aa71aaa95 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 9606652a..c011ce02 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 2d029247ee7d1f9804aaae6d37e522b9f1737aac2b900a89cec27ca5c22047c2 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 a245c56f..a149243f 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 49e50a81..786a9b3c 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 c011ce02..c1d25240 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 1db434c868ab56201f86d1fd2bc992001f8c3698e054e597b49b49bc1b54792e Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 12 Sep 2022 07:35:44 +0000 Subject: [PATCH 4/6] Accepting request 1001304 from home:fawz:branches:Base:System - 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/request/show/1001304 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 0b7e58fe..51ad61b8 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 c1d25240..64113e4f 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 98fb983e..0922fd48 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 6767078e0672fb4c4cd6681f11798b8d9711363a471fefc7efb7bc22fdf7aee6 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 51ad61b8..0377d227 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 533ed70a2fa95c7b380afba125d541f45336842120a9a4da6be3b4ebc5db54b7 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 0377d227..daf66aa9 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