Changeset d394d13e

Timestamp:

02/10/2024 05:30:01 PM (3 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

042f99a

Parents:

34ffa57 (diff), b1998a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (2 diffs)
• chapter08/systemd.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)
• stylesheets/lfs-xsl/lfs-l10n.xml (modified) (1 diff)

chapter01/changelog.xml

@@ -41 +41 @@
     -->
 
+    <listitem revision='systemd'>
+      <para>2024-02-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Fix a bug in systemd breaking running
+          systemd-analyze on an instantiated systemd unit.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-02-02</para>

chapter01/whatsnew.xml

@@ -296 +296 @@
 
     <listitem>
+      <para>&pkgconf-upstream-fix-patch;</para>
+    </listitem>
+
+    <listitem>
+      <para>&readline-fixes-patch;</para>
+    </listitem>
+
+    <listitem>
       <para>setuptools-&setuptools-version;</para>
     </listitem>
 
     <listitem>
-      <para>&pkgconf-upstream-fix-patch;</para>
-    </listitem>
-
-    <listitem>
-      <para>&readline-fixes-patch;</para>
+      <para>&systemd-upstream-patch;</para>
     </listitem>
 

chapter03/patches.xml

@@ -143 +143 @@
     </varlistentry>
 
-<!--
     <varlistentry revision="systemd">
-      <term>Systemd Upstream Patch - <token>&systemd-upstream-patch-size;</token>:</term>
+      <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&systemd-upstream-patch;"/></para>
@@ -151 +150 @@
       </listitem>
     </varlistentry>
--->
 <!--
     <varlistentry>

chapter08/systemd.xml

@@ -51 +51 @@
     <!-- https://github.com/systemd/systemd/pull/30549 -->
     <para>Now fix a security vulnerability in the DNSSEC verification of
-    <command>systemd-resolved</command>:</para>
-
-<screen><userinput remap='pre'>sed -e '/return FLAGS_SET.*AUTHENTICATED/s/(t/(dt/' \
-    -i src/resolve/resolved-dns-transaction.c</userinput></screen>
+    <command>systemd-resolved</command> and a bug breaking running
+    <command>systemd-analyze verify</command> on an instantiated systemd
+    unit:</para>
+
+<screen><userinput remap='pre'>patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>

patches.ent

@@ -39 +39 @@
 <!ENTITY sysvinit-consolidated-patch-size "2.5 KB">
 
+<!ENTITY systemd-upstream-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
+<!ENTITY systemd-upstream-patch-md5 "8d9c1014445c463cf7c24c162b1e0686">
+<!ENTITY systemd-upstream-patch-size "7.2 KB">

stylesheets/lfs-xsl/lfs-l10n.xml

@@ -1 +1 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE l:i18n SYSTEM "https://cdn.docbook.org/release/xsl-nons/current/common/l10n.dtd">
+<!DOCTYPE l:i18n SYSTEM "http://cdn.docbook.org/release/xsl-nons/current/common/l10n.dtd">
 
 <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">