Changeset f94c8ba for chapter08

Timestamp:

01/15/2022 04:45:10 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

1e15437

Parents:

aa95507 (diff), ade3efa (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

Location:

chapter08

Files:

• meson.xml (modified) (1 diff)
• shadow.xml (modified) (3 diffs)

chapter08/meson.xml

@@ -49 +49 @@
     <title>Installation of Meson</title>
 
-<!-- Applied in 0.56.2
-    <para>First, apply a patch that fixes an issue with pkgconfig files
-    for static libraries:</para>
+    <para>First, apply a patch that fixes an issue identified upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen>
--->
     <para>Compile Meson with the following command:</para>
+
 
 <screen><userinput remap="make">python3 setup.py build</userinput></screen>

chapter08/shadow.xml

@@ -41 +41 @@
   <sect2 role="installation">
     <title>Installation of Shadow</title>
-
-    <para>First, apply a fix to prevent a segmentation fault when running
-    <command>useradd</command>:</para>
-
-<!-- Hardcoding the patch version because it has been merged upstream and
-     the patch will be unnecessary when the next version is released. -->
-
-<screen><userinput remap="pre">patch -Np1 -i ../shadow-4.10-useradd_segfault-1.patch</userinput></screen>
 
     <note>
@@ -104 +96 @@
 <screen><userinput remap="pre">sed -i 's/1000/999/' etc/useradd</userinput></screen>
 -->
+<!--
     <para>Fix a simple programming error by modifying a file with following command:</para>
 
 <screen><userinput remap="pre">sed -e "224s/rounds/min_rounds/" -i libmisc/salt.c</userinput></screen>
-
+-->
     <para>Prepare Shadow for compilation:</para>
 
@@ -122 +115 @@
           <para>The file <filename>/usr/bin/passwd</filename> needs
           to exist because its location is harcoded in some programs, and
-          the default location if it does not exist is not right.</para>
+          if it does not exist, the default location is not right.</para>
         </listitem>
       </varlistentry>