Merge upstream

INSTALL

@@ -1,7 +1,7 @@
 LFS Book Conversion Tools Installation Instructions
 
-After downloading the SVN source, there are some things that need to be set up
-on your computer if you want to convert the XML source into something easier to
+After downloading the XML source, there are some things that need to be set up
+on your computer if you want to convert the source into something easier to
 read (e.g. HTML, TXT, or PDF).  If you are interested in this, then keep
 reading.  If you are only interested in editing the XML source for re-
 submission to the lfs-book or lfs-dev mailing lists, then you do not need this

Makefile

@@ -131,7 +131,7 @@ validate: tmpdir version
 	@echo "Validating the book..."
 	$(Q)xmllint --nonet                            \
                --encode UTF-8                     \
-               --postvalid                        \
+               --postvalid --valid                \
                --output $(RENDERTMP)/lfs-full.xml \
                $(RENDERTMP)/lfs-html2.xml
 

appendices/dependencies.xml

@@ -44,15 +44,15 @@
       <segmentedlist id="acl-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Attr, Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make,
+          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Grep, M4, Make,
           Perl, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
       <segmentedlist id="acl-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
-          <seg>Attr and Glibc</seg>
+          <seg>Glibc</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1371,7 +1371,7 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Intltool dependency info -->
+<!-- Begin Intltool dependency info 
   <bridgehead renderas="sect2" id="intltool-dep">Intltool</bridgehead>
 
       <segmentedlist id="intltool-depends">
@@ -1380,7 +1380,7 @@
           <seg>Bash, Gawk, Glibc, Make, Perl, Sed, and XML::Parser</seg>
         </seglistitem>
       </segmentedlist>
-
+-->
       <segmentedlist id="intltool-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
@@ -2214,6 +2214,45 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Mpdecimal dependency info -->
+  <bridgehead renderas="sect2" id="mpdecimal-dep">Mpdecimal</bridgehead>
+
+      <segmentedlist id="mpdecimal-depends">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+          Make, and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="mpdecimal-rundeps">
+        <segtitle>&runtime;</segtitle>
+        <seglistitem>
+          <seg>GCC <!-- for libstdc++ --> and Glibc</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="mpdecimal-testdeps">
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="mpdecimal-before">
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Python</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="mpdecimal-optdeps">
+        <segtitle>&external;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin MPC dependency info -->
   <bridgehead renderas="sect2" id="mpc-dep">MPC</bridgehead>
 
@@ -2583,8 +2622,7 @@
       <segmentedlist id="pkgconf-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
-          Sed, and Sqlite</seg>
+          <seg>Binutils, GCC, Glibc, Meson, Ninja, and Python</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2711,16 +2749,16 @@
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
           <seg>Bash, Binutils, Coreutils, Expat, GCC, Gdbm, Gettext, Glibc,
-          Grep, Libffi, Libxcrypt, Make, Ncurses, OpenSSL, Pkgconf, Sed,
-          Util-linux, and Zstd</seg>
+          Grep, Libffi, Libxcrypt, Make, Mpdecimal, Ncurses, OpenSSL,
+          Pkgconf, Sed, Util-linux, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
       <segmentedlist id="python-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
-          <seg>Bzip2, Expat, Gdbm, Glibc, Libffi, Libxcrypt, Ncurses,
-          OpenSSL, and Zlib</seg>
+          <seg>Bzip2, Expat, Gdbm, Glibc, Libffi, Libxcrypt, Mpdecimal,
+          Ncurses, OpenSSL, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2743,8 +2781,7 @@
         <seglistitem>
           <seg>
             &bdb;,
-            <ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>,
-            <ulink url="&blfs-book;server/sqlite.html">SQLite</ulink>, and
+            <ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>, and
             <ulink url="&blfs-book;general/tk.html">Tk</ulink>
           </seg>
         </seglistitem>
@@ -2910,12 +2947,12 @@
       </segmentedlist>
 
 <!-- Begin Sqlite dependency info -->
-  <bridgehead renderas="sect2" id="Sqlite-dep">Pcre2</bridgehead>
+  <bridgehead renderas="sect2" id="Sqlite-dep">Sqlite</bridgehead>
 
       <segmentedlist id="Sqlite-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, GCC, Glibc, Gzip, Make, Ncurses, and Readline</seg>
+          <seg>Bash, Binutils, GCC, Glibc, Gzip, Make, Ncurses, Readline, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3422,7 +3459,7 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin XML::Parser dependency info -->
+<!-- Begin XML::Parser dependency info 
   <bridgehead renderas="sect2" id="xml-parser-dep">XML::Parser</bridgehead>
 
       <segmentedlist id="xml-parser-depends">
@@ -3432,7 +3469,7 @@
           Perl</seg>
         </seglistitem>
       </segmentedlist>
-
+-->
       <segmentedlist id="xml-parser-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
@@ -3529,7 +3566,7 @@
       <segmentedlist id="zlib-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>File, Kmod, Libelf, Perl, and Util-linux</seg>
+          <seg>File, Kmod, Libelf, Perl, Python, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>