From 0b4bb654f9e72c178b46b0f0aec2dc4d33aa9f56e0f4c47c6bf57b2923a0edef Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 4 Jul 2021 20:10:18 +0000 Subject: [PATCH] Accepting request 903365 from Base:System - Finally don't create /run/lock/subsys anymore This effectively reverts the fix for bsc#1187292 made earlier. This directory is specific to RH sysvinit and since we're going to fade the support of SysV init script away the directory has no future. - Enable TPM2 support OBS-URL: https://build.opensuse.org/request/show/903365 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=331 --- systemd-mini.changes | 14 ++++++++++++++ systemd-mini.spec | 7 +++++++ systemd.changes | 14 ++++++++++++++ systemd.spec | 7 +++++++ tmpfiles-suse.conf | 4 ---- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 84317eb..c11e4dc 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 1 07:47:31 UTC 2021 - Franck Bui + +- Finally don't create /run/lock/subsys anymore + + This effectively reverts the fix for bsc#1187292 made earlier. This + directory is specific to RH sysvinit and since we're going to fade + the support of SysV init script away the directory has no future. + ------------------------------------------------------------------- Mon Jun 28 16:45:04 UTC 2021 - Franck Bui @@ -6,6 +15,11 @@ Mon Jun 28 16:45:04 UTC 2021 - Franck Bui 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 +------------------------------------------------------------------- +Mon Jun 28 12:46:04 UTC 2021 - Fabian Vogt + +- Enable TPM2 support + ------------------------------------------------------------------- Thu Jun 24 13:39:30 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index cef8960..65f56a4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -83,6 +83,9 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(tss2-esys) +BuildRequires: pkgconfig(tss2-mu) +BuildRequires: pkgconfig(tss2-rc) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif @@ -134,6 +137,9 @@ Requires: group(lock) Recommends: libpcre2-8-0 # ditto but dlopen()ed by systemd-cryptenroll Recommends: libfido2 +Recommends: libtss2-esys0 +Recommends: libtss2-mu0 +Recommends: libtss2-rc0 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -588,6 +594,7 @@ Have fun with these services at your own risk. %if 0%{?bootstrap} -Dnss-myhostname=false \ %else + -Dtpm2=true \ -Dman=true \ -Dhtml=true \ %endif diff --git a/systemd.changes b/systemd.changes index 84317eb..c11e4dc 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 1 07:47:31 UTC 2021 - Franck Bui + +- Finally don't create /run/lock/subsys anymore + + This effectively reverts the fix for bsc#1187292 made earlier. This + directory is specific to RH sysvinit and since we're going to fade + the support of SysV init script away the directory has no future. + ------------------------------------------------------------------- Mon Jun 28 16:45:04 UTC 2021 - Franck Bui @@ -6,6 +15,11 @@ Mon Jun 28 16:45:04 UTC 2021 - Franck Bui 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 +------------------------------------------------------------------- +Mon Jun 28 12:46:04 UTC 2021 - Fabian Vogt + +- Enable TPM2 support + ------------------------------------------------------------------- Thu Jun 24 13:39:30 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 9ba1870..1b9aeaa 100644 --- a/systemd.spec +++ b/systemd.spec @@ -81,6 +81,9 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(tss2-esys) +BuildRequires: pkgconfig(tss2-mu) +BuildRequires: pkgconfig(tss2-rc) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif @@ -132,6 +135,9 @@ Requires: group(lock) Recommends: libpcre2-8-0 # ditto but dlopen()ed by systemd-cryptenroll Recommends: libfido2 +Recommends: libtss2-esys0 +Recommends: libtss2-mu0 +Recommends: libtss2-rc0 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -586,6 +592,7 @@ Have fun with these services at your own risk. %if 0%{?bootstrap} -Dnss-myhostname=false \ %else + -Dtpm2=true \ -Dman=true \ -Dhtml=true \ %endif diff --git a/tmpfiles-suse.conf b/tmpfiles-suse.conf index 6863529..885e852 100644 --- a/tmpfiles-suse.conf +++ b/tmpfiles-suse.conf @@ -9,10 +9,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts # FIXME: Might be moved to lockded. d /run/lock 0775 root lock - -# /run/lock/subsys is used for serializing SysV service execution, and -# hence without use on SysV-less systems. -d /run/lock/subsys 0755 root root - - # FIXME: Should these one be moved to shadow ? f /var/log/wtmp 0664 root utmp - f /var/log/btmp 0660 root utmp -