From fe99d50d949255dbb5a9f28d9fcbaa05b4bc55a2 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 10 Feb 2024 18:49:55 +0800
Subject: [PATCH] systemd: Fix a bug breaking systemd-verify an instantiated
 unit

It's breaking Git test suite (and maybe other things).
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter01/whatsnew.xml  | 12 ++++++++----
 chapter03/patches.xml   |  4 +---
 chapter08/systemd.xml   |  7 ++++---
 patches.ent             |  3 +++
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fa7fc12c4..0a646f658 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,16 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <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>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 5faf938b7..f7b9ed05c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -294,10 +294,6 @@
       <para>&bash-upstream-fixes-patch;</para>
     </listitem>
 
-    <listitem>
-      <para>setuptools-&setuptools-version;</para>
-    </listitem>
-
     <listitem>
       <para>&pkgconf-upstream-fix-patch;</para>
     </listitem>
@@ -306,6 +302,14 @@
       <para>&readline-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>setuptools-&setuptools-version;</para>
+    </listitem>
+
+    <listitem>
+      <para>&systemd-upstream-patch;</para>
+    </listitem>
+
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f05fbd604..c48e2ce0e 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -142,15 +142,13 @@
       </listitem>
     </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>
         <para>MD5 sum: <literal>&systemd-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
 <!--
     <varlistentry>
       <term>Xz Upstream Fix Patch - <token>&xz-upstream-fix-patch-size;</token>:</term>
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 5bc2a3553..2d325d5cd 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -50,10 +50,11 @@
 
     <!-- https://github.com/systemd/systemd/pull/30549 -->
     <para>Now fix a security vulnerability in the DNSSEC verification of
-    <command>systemd-resolved</command>:</para>
+    <command>systemd-resolved</command> and a bug breaking running
+    <command>systemd-analyze verify</command> on an instantiated systemd
+    unit:</para>
 
-<screen><userinput remap='pre'>sed -e '/return FLAGS_SET.*AUTHENTICATED/s/(t/(dt/' \
-    -i src/resolve/resolved-dns-transaction.c</userinput></screen>
+<screen><userinput remap='pre'>patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
 
diff --git a/patches.ent b/patches.ent
index a6e3a306e..b10f24414 100644
--- a/patches.ent
+++ b/patches.ent
@@ -38,3 +38,6 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "17ffccbb8e18c39e8cedc32046f3a475">
 <!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">