gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-06 06:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2022-01-14 05:45:10 +01:00
commit aa95507be6
6 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
chapter01/changelog.xml
View File

@ -39,6 +39,17 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem revision="systemd">
<para>2021-01-13</para>
<itemizedlist>
<listitem>
<para>[renodr] - Fixed CVE-2021-3997 in systemd, as well as fixing
an issue with the default hostname and idle units. Fixes
<ulink url="&lfs-ticket-root;4981">#4981</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem revision="systemd">
<para>2021-01-03</para>
<itemizedlist>

3
chapter01/whatsnew.xml
View File

@ -293,6 +293,9 @@
<listitem revision="sysv">
<para>sysvinit-3.01-consolidated-1.patch</para>
</listitem>
<listitem revision="systemd">
<para>systemd-250-upstream_fixes-1.patch</para>
</listitem>
<!--
<listitem revision="systemd">
<para>MarkupSafe-&markupsafe-version;</para>

2
chapter03/patches.xml
View File

@ -127,7 +127,6 @@
</listitem>
</varlistentry>
<!--
<varlistentry revision="systemd">
<term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-fixes-patch-size;</token>:</term>
<listitem>
@ -135,7 +134,6 @@
<para>MD5 sum: <literal>&systemd-upstream-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
-->
</variablelist>

11
chapter08/systemd.xml
View File

@ -40,12 +40,10 @@
<sect2 role="installation">
<title>Installation of systemd</title>
<!--Fix CVE-2021-33910 -->
<!--
<para>First, apply a patch to fix a security vulnerability:</para>
<para>First, apply a patch to fix a security vulnerability and regressions
with hostnames and idle units:</para>
<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
-->
<para>Remove two unneeded groups,
<systemitem class="groupname">render</systemitem> and
@ -204,11 +202,6 @@ meson --prefix=/usr \
<screen><userinput remap="adjust">systemctl disable systemd-time-wait-sync.service</userinput></screen>
<para>Fix a regression in a systemd unit that causes a delay when
switching TTYs:</para>
<screen><userinput remap="adjust">sed -i 's/idle/simple/' /usr/lib/systemd/system/getty@.service</userinput></screen>
<!-- dev: 50-pid-max.conf is not removed in BLFS, so I commented the following out.
If it causes any trouble, we can add this back and also copy it into BLFS -->
<!--

6
chapter10/kernel.xml
View File

@ -244,12 +244,6 @@ File systems ---&gt;
configuration menus and create the kernel configuration from
scratch.</para>
<note revision="systemd">
<para revision="systemd">Ensure that CONFIG_DEFAULT_HOSTNAME is set to '(none)' or a hostname.
If it is left blank, systemd will fail to set the hostname to the
content of <filename>/etc/hostname</filename>.</para>
</note>
<para>Compile the kernel image and modules:</para>
<screen><userinput remap="make">make</userinput></screen>

6
patches.ent
View File

@ -82,8 +82,6 @@
<!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
<!--
<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
<!ENTITY systemd-upstream-fixes-patch-md5 "a4449dedf514486b8995ee501d1bb8cc">
<!ENTITY systemd-upstream-fixes-patch-size "4 KB">
-->
<!ENTITY systemd-upstream-fixes-patch-md5 "71eac6abdad5fba2039dcd011a9ae5b3">
<!ENTITY systemd-upstream-fixes-patch-size "20 KB">